From 6c7d53ca24f44c5c5ea01cc7e381435b68aa04e4 Mon Sep 17 00:00:00 2001 From: Leister Francisco Alvarez Campos Date: Tue, 20 Jul 2021 17:24:09 -0600 Subject: [PATCH 01/54] fix(backend): use environment variables (#600) * fix(backend): use envarioment variables * fix(backend): update .env.example variables * fix(backend): rename envarioment variables * fix(backend): minor change * fix(backend): update docker-compose * fix(backend): update .env.example values * fix(backend): refactor variables names * fix(backend): add config.yaml file and remove .gitignore from it * fix(backend): update cryptolions to jungle.eosio * fix(.env.example): update unauthorized role to anonymous * fix(push-enviroment): remove duplicated variable * fix(netlify): update toml * fix(netlify): add command CI * fix(netlify): add command CI * fix(netlify): change NODE_OPTIONS --- .env.example | 29 +- .../workflows/push-master-environment.yaml | 15 +- .../workflows/push-staging-environment.yaml | 13 +- docker-compose.staging.yml | 43 +- docker-compose.yml | 54 +- kubernetes/configmaps.yaml | 19 +- kubernetes/cronjob.yaml | 28 +- makefile | 28 +- netlify.toml | 3 +- services/demux/local.env | 6 - services/demux/src/config/index.js | 3 + services/demux/src/config/massive.config.js | 8 + .../demux/src/handlerVersions/v1/dbConfig.js | 17 +- .../demux/src/handlerVersions/v1/index.js | 4 +- services/frontend/.env.staging | 8 - .../components/input-autocomplete/index.js | 6 +- services/frontend/yarn.lock | 3838 +++++++++-------- services/hapi/package.json | 2 - services/hapi/src/config/dbConfig.js | 14 - services/hapi/src/config/index.js | 3 + services/hapi/src/config/server.config.js | 8 + services/hapi/src/index.js | 9 +- services/hapi/src/libs/add-bps-info.js | 4 +- services/hapi/src/libs/sync-bp-stats.js | 4 +- services/hapi/src/libs/sync-bps.js | 4 +- services/hapi/src/libs/sync-proxies.js | 4 +- services/hapi/src/libs/sync-ratings.js | 4 +- services/hapi/src/libs/sync-stats.js | 4 +- services/hapi/src/libs/sync-user-rating.js | 4 +- services/hapi/yarn.lock | 2031 ++++----- services/hasura/.gitignore | 1 - services/hasura/Dockerfile | 3 + services/hasura/config.yaml | 2 + services/hasura/makefile | 6 +- services/hasura/migrations/.env | 1 - 35 files changed, 3133 insertions(+), 3097 deletions(-) delete mode 100644 services/demux/local.env create mode 100644 services/demux/src/config/index.js create mode 100644 services/demux/src/config/massive.config.js delete mode 100644 services/frontend/.env.staging delete mode 100644 services/hapi/src/config/dbConfig.js create mode 100644 services/hapi/src/config/index.js create mode 100644 services/hapi/src/config/server.config.js delete mode 100644 services/hasura/.gitignore create mode 100644 services/hasura/config.yaml delete mode 100644 services/hasura/migrations/.env diff --git a/.env.example b/.env.example index b9182a67..c699fb37 100644 --- a/.env.example +++ b/.env.example @@ -1,27 +1,36 @@ +#GLOBAL +APP_NAME=EOS-RATE +STAGE=dev + # POSTGRES -DB_USER=userhere -DB_PASSWORD=passhere -DB_NAME=dbnamehere -DB_PORT=dbporthere +POSTGRES_HOST=localhost +POSTGRES_PORT=5432 +POSTGRES_USER=user +POSTGRES_PASSWORD=password +POSTGRES_DB=localdb +POSTGRES_SCHEMA=public POSTGRES_DATA=./db_data # HAPI -VIRTUAL_HOST=virtualhosthere -VIRTUAL_PORT=virtualporthere +HAPI_SERVER_PORT=9090 +HAPI_SERVER_ADDRESS=0.0.0.0 EOS_API_ENDPOINT=https://jungle.eosio.cr PROXY_INFO_CONTRACT_CODE=proxyaccount PROXY_INFO_CONTRACT_SCOPE=proxyaccount # HASURA -HASURA_GRAPHQL_DATABASE_URL=dburlhere -HASURA_GRAPHQL_ADMIN_SECRET=hasurasecrethere -HASURA_GRAPHQL_UNAUTHORIZED_ROLE=rolehere +HASURA_GRAPHQL_DATABASE_URL=postgres://user:password@eosrate_postgres:5432/localdb +HASURA_GRAPHQL_ADMIN_SECRET=hasurasecret +HASURA_GRAPHQL_UNAUTHORIZED_ROLE=anonymous +HASURA_GRAPHQL_ACTION_BASE_URL=http://hapi:9090 # WEBAPP REACT_APP_GRAPHQL_HTTP_URL=http://localhost:8080/v1/graphql +REACT_APP_API_URL=https://jungle.eosio.cr REACT_APP_GRAPHQL_WS_URL=ws://localhost:8080/v1/graphql REACT_APP_EOS_API_URL=https://jungle.eosio.cr REACT_APP_EOS_API_HOST=jungle.eosio.cr REACT_APP_EOS_API_PORT=443 REACT_APP_EOS_API_PROTOCOL=https -REACT_APP_EOS_CHAIN_ID=2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840 \ No newline at end of file +REACT_APP_EOS_CHAIN_ID=2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840 +REACT_APP_BLOCK_EXPLORER=https://jungle3.bloks.io \ No newline at end of file diff --git a/.github/workflows/push-master-environment.yaml b/.github/workflows/push-master-environment.yaml index 97c192ff..089ab058 100644 --- a/.github/workflows/push-master-environment.yaml +++ b/.github/workflows/push-master-environment.yaml @@ -76,19 +76,16 @@ jobs: REACT_APP_BLOCK_EXPLORER: https://bloks.io # postgres DATABASE_DIRECTORY: database - DB_NAME: ${{ secrets.DB_NAME }} - DB_PASSWORD: ${{ secrets.DB_PASSWORD }} - DB_USER: ${{ secrets.DB_USER }} POSTGRES_DB: ${{ secrets.POSTGRES_DB }} - POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }} POSTGRES_USER: ${{ secrets.POSTGRES_USER }} + POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }} # hapi - DB_HOST: ${{ secrets.DB_HOST }} - DB_PORT: "5432" - DB_SCHEMA: ${{ secrets.DB_SCHEMA }} + POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }} + POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }} + POSTGRES_SCHEMA: ${{ secrets.POSTGRES_SCHEMA }} EOS_API_ENDPOINT: https://api.eosio.cr - VIRTUAL_HOST: 0.0.0.0 - VIRTUAL_PORT: 9090 + HAPI_SERVER_ADDRESS: 0.0.0.0 + HAPI_SERVER_PORT: 9090 PROXY_INFO_CONTRACT_CODE: regproxyinfo PROXY_INFO_CONTRACT_SCOPE: regproxyinfo # hasura diff --git a/.github/workflows/push-staging-environment.yaml b/.github/workflows/push-staging-environment.yaml index 7bf8a596..3d46860c 100644 --- a/.github/workflows/push-staging-environment.yaml +++ b/.github/workflows/push-staging-environment.yaml @@ -76,19 +76,16 @@ jobs: REACT_APP_BLOCK_EXPLORER: https://jungle3.bloks.io # postgres DATABASE_DIRECTORY: database - DB_NAME: ${{ secrets.DB_NAME }} - DB_PASSWORD: ${{ secrets.DB_PASSWORD }} - DB_USER: ${{ secrets.DB_USER }} POSTGRES_DB: ${{ secrets.POSTGRES_DB }} POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }} POSTGRES_USER: ${{ secrets.POSTGRES_USER }} # hapi - DB_HOST: ${{ secrets.DB_HOST }} - DB_PORT: "5432" - DB_SCHEMA: ${{ secrets.DB_SCHEMA }} + POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }} + POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }} + POSTGRES_SCHEMA: ${{ secrets.POSTGRES_SCHEMA }} EOS_API_ENDPOINT: https://jungle3.cryptolions.io - VIRTUAL_HOST: 0.0.0.0 - VIRTUAL_PORT: 9090 + HAPI_SERVER_ADDRESS: 0.0.0.0 + HAPI_SERVER_PORT: 9090 PROXY_INFO_CONTRACT_CODE: proxyaccount PROXY_INFO_CONTRACT_SCOPE: proxyaccount # hasura diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml index 107dd06a..16a5fe72 100644 --- a/docker-compose.staging.yml +++ b/docker-compose.staging.yml @@ -9,12 +9,9 @@ services: ports: - "5432:5432" environment: - POSTGRES_USER: user - POSTGRES_PASSWORD: pass - DB_NAME: eosrate - DB_USER: user - DB_PASSWORD: pass - POSTGRES_DB: eosrate + POSTGRES_USER: "${POSTGRES_USER}" + POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" + POSTGRES_DB: "${POSTGRES_DB}" pgweb: container_name: eosrate_pgweb @@ -38,14 +35,14 @@ services: ports: - "3005:9090" environment: - VIRTUAL_HOST: "${VIRTUAL_HOST}" - VIRTUAL_PORT: "${VIRTUAL_PORT}" - DB_USER: "${DB_USER}" - DB_PASSWORD: "${DB_PASSWORD}" - DB_PORT: "${DB_PORT}" - DB_NAME: "${DB_NAME}" - DB_HOST: postgres - DB_SCHEMA: public + HAPI_SERVER_ADDRESS: "${HAPI_SERVER_ADDRESS}" + HAPI_SERVER_PORT: "${HAPI_SERVER_PORT}" + POSTGRES_USER: "${POSTGRES_USER}" + POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" + POSTGRES_PORT: "${POSTGRES_PORT}" + POSTGRES_DB: "${POSTGRES_DB}" + POSTGRES_HOST: "${POSTGRES_HOST}" + POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" EOS_API_ENDPOINT: "${EOS_API_ENDPOINT}" depends_on: @@ -64,14 +61,14 @@ services: - postgres - hasura environment: - DB_USER: "${DB_USER}" - DB_PASSWORD: "${DB_PASSWORD}" - DB_PORT: "${DB_PORT}" - DB_NAME: "${DB_NAME}" - DB_HOST: postgres - DB_SCHEMA: public + POSTGRES_USER: "${POSTGRES_USER}" + POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" + POSTGRES_PORT: "${POSTGRES_PORT}" + POSTGRES_DB: "${POSTGRES_DB}" + POSTGRES_HOST: postgres + POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" EOS_API_ENDPOINT: "${EOS_API_ENDPOINT}" - WAIT_HOSTS: postgres:"${DB_PORT}" , hasura:8080 + WAIT_HOSTS: postgres:"${POSTGRES_PORT}" , hasura:8080 WAIT_HOSTS_TIMEOUT: 60 ports: - "3030:3030" @@ -89,8 +86,8 @@ services: environment: HASURA_GRAPHQL_DATABASE_URL: postgres://user:pass@postgres:5432/eosrate?sslmode=disable HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations - VIRTUAL_HOST: staging.eosrate.io - VIRTUAL_PORT: 8088 + HAPI_SERVER_ADDRESS: staging.eosrate.io + HAPI_SERVER_PORT: 8088 HASURA_GRAPHQL_ACTION_BASE_URL: http://hapi:9090 volumes: - ./services/hasura/migrations:/hasura-migrations # mount hasura migrations folder diff --git a/docker-compose.yml b/docker-compose.yml index 3dfb9068..2036de66 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -9,12 +9,9 @@ services: ports: - "5432:5432" environment: - POSTGRES_USER: user - POSTGRES_PASSWORD: pass - DB_NAME: eosrate - DB_USER: user - DB_PASSWORD: pass - POSTGRES_DB: eosrate + POSTGRES_USER: "${POSTGRES_USER}" + POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" + POSTGRES_DB: "${POSTGRES_DB}" pgweb: container_name: eosrate_pgweb @@ -23,7 +20,7 @@ services: ports: - "8082:8081" environment: - DATABASE_URL: postgres://user:pass@postgres:5432/eosrate?sslmode=disable + DATABASE_URL: "${HASURA_GRAPHQL_DATABASE_URL}" depends_on: - postgres @@ -34,18 +31,18 @@ services: dockerfile: Dockerfile volumes: - ./services/hapi:/opt/application - - /opt/application/node_modules # prevents host/container conflicts + - /opt/application/node_modules ports: - "9090:9090" environment: - VIRTUAL_HOST: "${VIRTUAL_HOST}" - VIRTUAL_PORT: "${VIRTUAL_PORT}" - DB_USER: "${DB_USER}" - DB_PASSWORD: "${DB_PASSWORD}" - DB_PORT: "${DB_PORT}" - DB_NAME: "${DB_NAME}" - DB_HOST: postgres - DB_SCHEMA: public + HAPI_SERVER_ADDRESS: "${HAPI_SERVER_ADDRESS}" + HAPI_SERVER_PORT: "${HAPI_SERVER_PORT}" + POSTGRES_USER: "${POSTGRES_USER}" + POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" + POSTGRES_PORT: "${POSTGRES_PORT}" + POSTGRES_DB: "${POSTGRES_DB}" + POSTGRES_HOST: "${POSTGRES_HOST}" + POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" EOS_API_ENDPOINT: "${EOS_API_ENDPOINT}" depends_on: @@ -58,20 +55,20 @@ services: dockerfile: ./Dockerfile image: eosrate/demux volumes: - - ./services/demux:/opt/application # mount demux service folder - - /opt/application/node_modules # prevents host/container conflicts + - ./services/demux:/opt/application + - /opt/application/node_modules depends_on: - postgres - hasura environment: - DB_USER: "${DB_USER}" - DB_PASSWORD: "${DB_PASSWORD}" - DB_PORT: "${DB_PORT}" - DB_NAME: "${DB_NAME}" - DB_HOST: postgres - DB_SCHEMA: public + POSTGRES_USER: "${POSTGRES_USER}" + POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" + POSTGRES_PORT: "${POSTGRES_PORT}" + POSTGRES_DB: "${POSTGRES_DB}" + POSTGRES_HOST: "${POSTGRES_HOST}" + POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" EOS_API_ENDPOINT: "${EOS_API_ENDPOINT}" - WAIT_HOSTS: postgres:"${DB_PORT}", hasura:8080 + WAIT_HOSTS: postgres:"${POSTGRES_PORT}", hasura:8080 WAIT_HOSTS_TIMEOUT: 60 ports: - "3030:3030" @@ -92,13 +89,14 @@ services: environment: HASURA_GRAPHQL_DATABASE_URL: "${HASURA_GRAPHQL_DATABASE_URL}" HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations - HASURA_GRAPHQL_ACTION_BASE_URL: http://hapi:9090 + HASURA_GRAPHQL_METADATA_DIR: /hasura-metadata + HASURA_GRAPHQL_ACTION_BASE_URL: "${HASURA_GRAPHQL_ACTION_BASE_URL}" HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}" HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "${HASURA_GRAPHQL_UNAUTHORIZED_ROLE}" volumes: - - ./services/hasura/migrations:/hasura-migrations # mount hasura migrations folder - - ./services/hasura/migrations:/hasura-metadata + - ./services/hasura/migrations:/hasura-migrations + - ./services/hasura/metadata:/hasura-metadata frontend: container_name: eosrate_frontend diff --git a/kubernetes/configmaps.yaml b/kubernetes/configmaps.yaml index c3017998..e6c94067 100644 --- a/kubernetes/configmaps.yaml +++ b/kubernetes/configmaps.yaml @@ -5,9 +5,6 @@ metadata: data: # postgres DATABASE_DIRECTORY: "${DATABASE_DIRECTORY}" - DB_NAME: "${DB_NAME}" - DB_PASSWORD: "${DB_PASSWORD}" - DB_USER: "${DB_USER}" POSTGRES_DB: "${POSTGRES_DB}" POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" POSTGRES_USER: "${POSTGRES_USER}" @@ -18,15 +15,15 @@ metadata: name: hapi-config data: # hapi - DB_HOST: "${DB_HOST}" - DB_NAME: "${DB_NAME}" - DB_PASSWORD: "${DB_PASSWORD}" - DB_PORT: "${DB_PORT}" - DB_SCHEMA: "${DB_SCHEMA}" - DB_USER: "${DB_USER}" + POSTGRES_HOST: "${POSTGRES_HOST}" + POSTGRES_DB: "${POSTGRES_DB}" + POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" + POSTGRES_PORT: "${POSTGRES_PORT}" + POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" + POSTGRES_USER: "${POSTGRES_USER}" EOS_API_ENDPOINT: "${EOS_API_ENDPOINT}" - VIRTUAL_HOST: "${VIRTUAL_HOST}" - VIRTUAL_PORT: "${VIRTUAL_PORT}" + HAPI_SERVER_ADDRESS: "${HAPI_SERVER_ADDRESS}" + HAPI_SERVER_PORT: "${HAPI_SERVER_PORT}" PROXY_INFO_CONTRACT_CODE: "${PROXY_INFO_CONTRACT_CODE}" PROXY_INFO_CONTRACT_SCOPE: "${PROXY_INFO_CONTRACT_SCOPE}" --- diff --git a/kubernetes/cronjob.yaml b/kubernetes/cronjob.yaml index 3108fcae..bc35d82e 100644 --- a/kubernetes/cronjob.yaml +++ b/kubernetes/cronjob.yaml @@ -16,23 +16,23 @@ spec: - -c - /usr/bin/node /opt/application/src/libs/sync-bps.js; /usr/bin/node /opt/application/src/libs/sync-proxies.js env: - - name: DB_HOST - value: "${DB_HOST}" - - name: DB_NAME - value: "${DB_NAME}" - - name: DB_PASSWORD - value: "${DB_PASSWORD}" - - name: DB_PORT - value: "${DB_PORT}" - - name: DB_SCHEMA - value: "${DB_SCHEMA}" - - name: DB_USER - value: "${DB_USER}" + - name: POSTGRES_HOST + value: "${POSTGRES_HOST}" + - name: POSTGRES_DB + value: "${POSTGRES_DB}" + - name: POSTGRES_PASSWORD + value: "${POSTGRES_PASSWORD}" + - name: POSTGRES_PORT + value: "${POSTGRES_PORT}" + - name: POSTGRES_SCHEMA + value: "${POSTGRES_SCHEMA}" + - name: POSTGRES_USER + value: "${POSTGRES_USER}" - name: EOS_API_ENDPOINT value: https://api.eosio.cr - - name: VIRTUAL_HOST + - name: HAPI_SERVER_ADDRESS value: 0.0.0.0 - - name: VIRTUAL_PORT + - name: HAPI_SERVER_PORT value: "9090" dnsConfig: options: diff --git a/makefile b/makefile index 060b6b0d..be48b5d9 100644 --- a/makefile +++ b/makefile @@ -13,23 +13,27 @@ K8S_FILES := $(shell find ./kubernetes -name '*.yaml' | sed 's:./kubernetes/::g' stop: @docker-compose stop -## MAKE SURE YOU HAVE INITIALIZED THE PROJECT (make start) BEFORE RUN THIS +## MAKE SURE YOU HAVE INITIALIZED THE PROJECT (make run) BEFORE RUN THIS fresh: scripts/fresh.sh ./scripts/fresh.sh -start: - make -B start-postgres - make -B start-hapi - make -B start-hasura - make -B -j 3 start-hasura-cli start-logs start-frontend +install: ##@local Install hapi dependencies +install: + @cd ./services/hapi && yarn -start-postgres: +run: + make -B run-postgres + make -B run-hapi + make -B run-hasura + make -B -j 3 run-hasura-cli run-logs run-frontend + +run-postgres: @docker-compose up -d --build postgres -start-hapi: +run-hapi: @docker-compose up -d --build hapi -start-hasura: +run-hasura: $(eval -include .env) @until \ docker-compose exec -T postgres pg_isready; \ @@ -43,7 +47,7 @@ start-hasura: @docker-compose stop hasura @docker-compose up -d --build hasura -start-hasura-cli: +run-hasura-cli: $(eval -include .env) @until \ curl http://localhost:8080; \ @@ -52,7 +56,7 @@ start-hasura-cli: @echo "..." @cd services/hasura && hasura console --endpoint http://localhost:8080 --skip-update-check; -start-frontend: +run-frontend: $(eval -include .env) @until \ curl -s -o /dev/null -w 'hasura status %{http_code}\n' http://localhost:8080; \ @@ -61,7 +65,7 @@ start-frontend: @cd services/frontend && yarn && yarn start | cat @echo "done frontend start" -start-logs: +run-logs: @docker-compose logs -f hapi frontend migrate: scripts/migrate.sh diff --git a/netlify.toml b/netlify.toml index 4ddedbd0..3f59d076 100644 --- a/netlify.toml +++ b/netlify.toml @@ -1 +1,2 @@ -NODE_OPTIONS="--max-old-space-size=16384" \ No newline at end of file +[build.environment] +NODE_OPTIONS = "--max_old_space_size=4096" \ No newline at end of file diff --git a/services/demux/local.env b/services/demux/local.env deleted file mode 100644 index c1e5590c..00000000 --- a/services/demux/local.env +++ /dev/null @@ -1,6 +0,0 @@ -EOS_API_ENDPOINT=https://jungle.eosio.cr -DB_NAME=eosrate -DB_USER=user -DB_HOST=127.0.0.1 -DB_PORT=5432 -DB_PASSWORD=pass \ No newline at end of file diff --git a/services/demux/src/config/index.js b/services/demux/src/config/index.js new file mode 100644 index 00000000..a9bb073f --- /dev/null +++ b/services/demux/src/config/index.js @@ -0,0 +1,3 @@ +module.exports = { + massiveConfig: require('./massive.config') +} \ No newline at end of file diff --git a/services/demux/src/config/massive.config.js b/services/demux/src/config/massive.config.js new file mode 100644 index 00000000..2a594511 --- /dev/null +++ b/services/demux/src/config/massive.config.js @@ -0,0 +1,8 @@ + +module.exports = { + host: process.env.POSTGRES_HOST || 'localhost', + port: process.env.POSTGRES_PORT || 5432, + database: process.env.POSTGRES_DB || 'eosrate', + user: process.env.POSTGRES_USER || 'user', + password: process.env.POSTGRES_PASSWORD || 'pass' +} \ No newline at end of file diff --git a/services/demux/src/handlerVersions/v1/dbConfig.js b/services/demux/src/handlerVersions/v1/dbConfig.js index f2906fa8..72131dec 100644 --- a/services/demux/src/handlerVersions/v1/dbConfig.js +++ b/services/demux/src/handlerVersions/v1/dbConfig.js @@ -1,14 +1,11 @@ -const { DB_NAME, DB_USER, DB_HOST, DB_PORT, DB_PASSWORD } = process.env +const { POSTGRES_DB, POSTGRES_USER, POSTGRES_HOST, POSTGRES_PORT, POSTGRES_PASSWORD } = process.env const massiveConfig = { - host: DB_HOST || '127.0.0.1', - port: DB_PORT || 5432, - database: DB_NAME || 'eosrate', - user: DB_USER || 'user', - password: DB_PASSWORD || 'pass' + host: POSTGRES_HOST || '127.0.0.1', + port: POSTGRES_PORT || 5432, + database: POSTGRES_DB || 'eosrate', + user: POSTGRES_USER || 'user', + password: POSTGRES_PASSWORD || 'pass' } -module.exports = massiveConfig - -// console.log('==== massiveConfig ====') -// console.log(massiveConfig) \ No newline at end of file +module.exports = massiveConfig \ No newline at end of file diff --git a/services/demux/src/handlerVersions/v1/index.js b/services/demux/src/handlerVersions/v1/index.js index 8f35b5f6..5c584688 100644 --- a/services/demux/src/handlerVersions/v1/index.js +++ b/services/demux/src/handlerVersions/v1/index.js @@ -29,7 +29,7 @@ */ const massive = require('massive') -const dbConfig = require('./dbConfig') +const { massiveConfig } = require('../../config') const eosjs = require('eosjs') const fetch = require('node-fetch') @@ -51,7 +51,7 @@ const getStats = async bp => { const updateStatsData = async (state, payload) => { const updateStat = async stat => { - await massive(dbConfig).then(async db => { + await massive(massiveConfig).then(async db => { const blockProducerStat = await db.ratings_stats.findOne({ bp: stat.bp }) if (blockProducerStat && blockProducerStat.bp) { await db.ratings_stats.save(stat) diff --git a/services/frontend/.env.staging b/services/frontend/.env.staging deleted file mode 100644 index 2b2a98a6..00000000 --- a/services/frontend/.env.staging +++ /dev/null @@ -1,8 +0,0 @@ -REACT_APP_GRAPHQL_HTTP_URL=https://graphql-jungle.eosrate.io/v1/graphql -REACT_APP_API_URL=https://jungle.eosio.cr -REACT_APP_GRAPHQL_WS_URL=wss://graphql-jungle.eosrate.io/v1/graphql -REACT_APP_EOS_API_URL=https://jungle.eosio.cr -REACT_APP_EOS_API_HOST=jungle.eosio.cr -REACT_APP_EOS_API_PORT=443 -REACT_APP_EOS_API_PROTOCOL=https -REACT_APP_EOS_CHAIN_ID=2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840 \ No newline at end of file diff --git a/services/frontend/src/components/input-autocomplete/index.js b/services/frontend/src/components/input-autocomplete/index.js index 30ede0f3..ab35ed61 100644 --- a/services/frontend/src/components/input-autocomplete/index.js +++ b/services/frontend/src/components/input-autocomplete/index.js @@ -104,8 +104,10 @@ const InputAutocomplete = ({ ...props }) => { const getSuggestionValue = ({ name }) => name - const handleSuggestionsFetchRequested = (list) => ({ value }) => - setSuggestions(getSuggestions(list, value)) + const handleSuggestionsFetchRequested = + (list) => + ({ value }) => + setSuggestions(getSuggestions(list, value)) const handleSuggestionsClearRequested = () => { setText('') diff --git a/services/frontend/yarn.lock b/services/frontend/yarn.lock index f1645ecb..d85e8ff9 100644 --- a/services/frontend/yarn.lock +++ b/services/frontend/yarn.lock @@ -65,17 +65,17 @@ dependencies: "@babel/highlight" "^7.10.4" -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.5.5": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658" - integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.5.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" + integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== dependencies: - "@babel/highlight" "^7.12.13" + "@babel/highlight" "^7.14.5" -"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.8.tgz#5b783b9808f15cef71547f1b691f34f8ff6003a6" - integrity sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog== +"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" + integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== "@babel/core@7.12.3": version "7.12.3" @@ -120,84 +120,84 @@ source-map "^0.5.0" "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.7.5", "@babel/core@^7.8.4": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.8.tgz#c191d9c5871788a591d69ea1dc03e5843a3680fb" - integrity sha512-oYapIySGw1zGhEFRd6lzWNLWFX2s5dA/jm+Pw/+59ZdXtjyIuwlXbrId22Md0rgZVop+aVoqow2riXhBLNyuQg== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.0" - "@babel/helper-compilation-targets" "^7.13.8" - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helpers" "^7.13.0" - "@babel/parser" "^7.13.4" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.8.tgz#20cdf7c84b5d86d83fac8710a8bc605a7ba3f010" + integrity sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.14.8" + "@babel/helper-compilation-targets" "^7.14.5" + "@babel/helper-module-transforms" "^7.14.8" + "@babel/helpers" "^7.14.8" + "@babel/parser" "^7.14.8" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.14.8" + "@babel/types" "^7.14.8" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" json5 "^2.1.2" - lodash "^4.17.19" semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.12.1", "@babel/generator@^7.13.0", "@babel/generator@^7.6.0": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39" - integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw== +"@babel/generator@^7.12.1", "@babel/generator@^7.14.8", "@babel/generator@^7.6.0": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070" + integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg== dependencies: - "@babel/types" "^7.13.0" + "@babel/types" "^7.14.8" jsesc "^2.5.1" source-map "^0.5.0" -"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.10.4", "@babel/helper-annotate-as-pure@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab" - integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw== +"@babel/helper-annotate-as-pure@^7.0.0", "@babel/helper-annotate-as-pure@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61" + integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.14.5" -"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc" - integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA== +"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191" + integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w== dependencies: - "@babel/helper-explode-assignable-expression" "^7.12.13" - "@babel/types" "^7.12.13" + "@babel/helper-explode-assignable-expression" "^7.14.5" + "@babel/types" "^7.14.5" -"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz#02bdb22783439afb11b2f009814bdd88384bd468" - integrity sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A== +"@babel/helper-compilation-targets@^7.12.1", "@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf" + integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw== dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-validator-option" "^7.12.17" - browserslist "^4.14.5" + "@babel/compat-data" "^7.14.5" + "@babel/helper-validator-option" "^7.14.5" + browserslist "^4.16.6" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.13.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.8.tgz#0367bd0a7505156ce018ca464f7ac91ba58c1a04" - integrity sha512-qioaRrKHQbn4hkRKDHbnuQ6kAxmmOF+kzKGnIfxPK4j2rckSJCpKzr/SSTlohSCiE3uAQpNDJ9FIh4baeE8W+w== +"@babel/helper-create-class-features-plugin@^7.12.1", "@babel/helper-create-class-features-plugin@^7.14.5", "@babel/helper-create-class-features-plugin@^7.14.6": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz#a6f8c3de208b1e5629424a9a63567f56501955fc" + integrity sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ== dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-member-expression-to-functions" "^7.13.0" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-member-expression-to-functions" "^7.14.7" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/helper-replace-supers" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" -"@babel/helper-create-regexp-features-plugin@^7.12.13": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7" - integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg== +"@babel/helper-create-regexp-features-plugin@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4" + integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A== dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" + "@babel/helper-annotate-as-pure" "^7.14.5" regexpu-core "^4.7.1" -"@babel/helper-define-polyfill-provider@^0.1.5": - version "0.1.5" - resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.5.tgz#3c2f91b7971b9fc11fe779c945c014065dea340e" - integrity sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg== +"@babel/helper-define-polyfill-provider@^0.2.2": + version "0.2.3" + resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6" + integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew== dependencies: "@babel/helper-compilation-targets" "^7.13.0" "@babel/helper-module-imports" "^7.12.13" @@ -208,168 +208,175 @@ resolve "^1.14.2" semver "^6.1.2" -"@babel/helper-explode-assignable-expression@^7.12.13": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f" - integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA== - dependencies: - "@babel/types" "^7.13.0" - -"@babel/helper-function-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a" - integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA== - dependencies: - "@babel/helper-get-function-arity" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/helper-get-function-arity@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583" - integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-hoist-variables@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz#5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8" - integrity sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g== - dependencies: - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - -"@babel/helper-member-expression-to-functions@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091" - integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ== - dependencies: - "@babel/types" "^7.13.0" - -"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0" - integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1" - integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw== - dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-simple-access" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/helper-validator-identifier" "^7.12.11" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - lodash "^4.17.19" - -"@babel/helper-optimise-call-expression@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea" - integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af" - integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ== - -"@babel/helper-remap-async-to-generator@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209" - integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg== +"@babel/helper-explode-assignable-expression@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645" + integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ== dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-wrap-function" "^7.13.0" - "@babel/types" "^7.13.0" - -"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24" - integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw== + "@babel/types" "^7.14.5" + +"@babel/helper-function-name@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" + integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== dependencies: - "@babel/helper-member-expression-to-functions" "^7.13.0" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" + "@babel/helper-get-function-arity" "^7.14.5" + "@babel/template" "^7.14.5" + "@babel/types" "^7.14.5" -"@babel/helper-simple-access@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4" - integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA== +"@babel/helper-get-function-arity@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" + integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== dependencies: - "@babel/types" "^7.12.13" + "@babel/types" "^7.14.5" + +"@babel/helper-hoist-variables@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" + integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== + dependencies: + "@babel/types" "^7.14.5" -"@babel/helper-skip-transparent-expression-wrappers@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf" - integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA== - dependencies: - "@babel/types" "^7.12.1" - -"@babel/helper-split-export-declaration@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05" - integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg== - dependencies: - "@babel/types" "^7.12.13" - -"@babel/helper-validator-identifier@^7.12.11": - version "7.12.11" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" - integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== - -"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.12.17": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831" - integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw== - -"@babel/helper-wrap-function@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4" - integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA== - dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - -"@babel/helpers@^7.12.1", "@babel/helpers@^7.13.0", "@babel/helpers@^7.6.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.0.tgz#7647ae57377b4f0408bf4f8a7af01c42e41badc0" - integrity sha512-aan1MeFPxFacZeSz6Ld7YZo5aPuqnKlD7+HZY75xQsueczFccP9A7V05+oe0XpLwHK3oLorPe9eaAUljL7WEaQ== - dependencies: - "@babel/template" "^7.12.13" - "@babel/traverse" "^7.13.0" - "@babel/types" "^7.13.0" - -"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.8.tgz#10b2dac78526424dfc1f47650d0e415dfd9dc481" - integrity sha512-4vrIhfJyfNf+lCtXC2ck1rKSzDwciqF7IWFhXXrSOUC2O5DrVp+w4c6ed4AllTxhTkUP5x2tYj41VaxdVMMRDw== - dependencies: - "@babel/helper-validator-identifier" "^7.12.11" +"@babel/helper-member-expression-to-functions@^7.14.5", "@babel/helper-member-expression-to-functions@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970" + integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.1", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3" + integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-module-transforms@^7.12.1", "@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.14.8": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz#d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49" + integrity sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA== + dependencies: + "@babel/helper-module-imports" "^7.14.5" + "@babel/helper-replace-supers" "^7.14.5" + "@babel/helper-simple-access" "^7.14.8" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/helper-validator-identifier" "^7.14.8" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.14.8" + "@babel/types" "^7.14.8" + +"@babel/helper-optimise-call-expression@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c" + integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" + integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== + +"@babel/helper-remap-async-to-generator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6" + integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-wrap-function" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-replace-supers@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94" + integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow== + dependencies: + "@babel/helper-member-expression-to-functions" "^7.14.5" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helper-simple-access@^7.14.5", "@babel/helper-simple-access@^7.14.8": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924" + integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg== + dependencies: + "@babel/types" "^7.14.8" + +"@babel/helper-skip-transparent-expression-wrappers@^7.12.1", "@babel/helper-skip-transparent-expression-wrappers@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4" + integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-split-export-declaration@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" + integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== + dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c" + integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow== + +"@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3" + integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow== + +"@babel/helper-wrap-function@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff" + integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ== + dependencies: + "@babel/helper-function-name" "^7.14.5" + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/helpers@^7.12.1", "@babel/helpers@^7.14.8", "@babel/helpers@^7.6.0": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.8.tgz#839f88f463025886cff7f85a35297007e2da1b77" + integrity sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw== + dependencies: + "@babel/template" "^7.14.5" + "@babel/traverse" "^7.14.8" + "@babel/types" "^7.14.8" + +"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.12.3", "@babel/parser@^7.13.0", "@babel/parser@^7.13.4", "@babel/parser@^7.6.0", "@babel/parser@^7.7.0": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.9.tgz#ca34cb95e1c2dd126863a84465ae8ef66114be99" - integrity sha512-nEUfRiARCcaVo3ny3ZQjURjHQZUo/JkEw7rLlSZy/psWGnvwXFtPcr6jb7Yb41DVW5LTe6KRq9LGleRNsg1Frw== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.6.0", "@babel/parser@^7.7.0": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4" + integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA== -"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.13.8", "@babel/plugin-proposal-async-generator-functions@^7.2.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1" - integrity sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA== +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e" + integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-remap-async-to-generator" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" + "@babel/plugin-proposal-optional-chaining" "^7.14.5" + +"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.14.7", "@babel/plugin-proposal-async-generator-functions@^7.2.0": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace" + integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-remap-async-to-generator" "^7.14.5" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-proposal-class-properties@7.12.1": @@ -380,13 +387,22 @@ "@babel/helper-create-class-features-plugin" "^7.12.1" "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37" - integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg== +"@babel/plugin-proposal-class-properties@^7.12.1", "@babel/plugin-proposal-class-properties@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e" + integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg== dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-proposal-class-static-block@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681" + integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-proposal-decorators@7.12.1": version "7.12.1" @@ -397,36 +413,36 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-decorators" "^7.12.1" -"@babel/plugin-proposal-dynamic-import@^7.12.1", "@babel/plugin-proposal-dynamic-import@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d" - integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ== +"@babel/plugin-proposal-dynamic-import@^7.12.1", "@babel/plugin-proposal-dynamic-import@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c" + integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.12.1", "@babel/plugin-proposal-export-namespace-from@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d" - integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw== +"@babel/plugin-proposal-export-namespace-from@^7.12.1", "@babel/plugin-proposal-export-namespace-from@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76" + integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.12.1", "@babel/plugin-proposal-json-strings@^7.13.8", "@babel/plugin-proposal-json-strings@^7.2.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b" - integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q== +"@babel/plugin-proposal-json-strings@^7.12.1", "@babel/plugin-proposal-json-strings@^7.14.5", "@babel/plugin-proposal-json-strings@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb" + integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.12.1", "@babel/plugin-proposal-logical-assignment-operators@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a" - integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A== +"@babel/plugin-proposal-logical-assignment-operators@^7.12.1", "@babel/plugin-proposal-logical-assignment-operators@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738" + integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" "@babel/plugin-proposal-nullish-coalescing-operator@7.12.1": @@ -437,12 +453,12 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.0" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3" - integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A== +"@babel/plugin-proposal-nullish-coalescing-operator@^7.12.1", "@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6" + integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" "@babel/plugin-proposal-numeric-separator@7.12.1": @@ -453,31 +469,31 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-numeric-separator@^7.12.1", "@babel/plugin-proposal-numeric-separator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db" - integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w== +"@babel/plugin-proposal-numeric-separator@^7.12.1", "@babel/plugin-proposal-numeric-separator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18" + integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-numeric-separator" "^7.10.4" -"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.13.8", "@babel/plugin-proposal-object-rest-spread@^7.2.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a" - integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g== +"@babel/plugin-proposal-object-rest-spread@^7.12.1", "@babel/plugin-proposal-object-rest-spread@^7.14.7", "@babel/plugin-proposal-object-rest-spread@^7.2.0": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363" + integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g== dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-compilation-targets" "^7.13.8" - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/compat-data" "^7.14.7" + "@babel/helper-compilation-targets" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-object-rest-spread" "^7.8.3" - "@babel/plugin-transform-parameters" "^7.13.0" + "@babel/plugin-transform-parameters" "^7.14.5" -"@babel/plugin-proposal-optional-catch-binding@^7.12.1", "@babel/plugin-proposal-optional-catch-binding@^7.13.8", "@babel/plugin-proposal-optional-catch-binding@^7.2.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107" - integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA== +"@babel/plugin-proposal-optional-catch-binding@^7.12.1", "@babel/plugin-proposal-optional-catch-binding@^7.14.5", "@babel/plugin-proposal-optional-catch-binding@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c" + integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-proposal-optional-chaining@7.12.1": @@ -489,30 +505,40 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" "@babel/plugin-syntax-optional-chaining" "^7.8.0" -"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.13.8": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.8.tgz#e39df93efe7e7e621841babc197982e140e90756" - integrity sha512-hpbBwbTgd7Cz1QryvwJZRo1U0k1q8uyBmeXOSQUjdg/A2TASkhR/rz7AyqZ/kS8kbpsNA80rOYbxySBJAqmhhQ== +"@babel/plugin-proposal-optional-chaining@^7.12.1", "@babel/plugin-proposal-optional-chaining@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603" + integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.12.1", "@babel/plugin-proposal-private-methods@^7.13.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787" - integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q== +"@babel/plugin-proposal-private-methods@^7.12.1", "@babel/plugin-proposal-private-methods@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d" + integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g== dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.2.0", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba" - integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg== +"@babel/plugin-proposal-private-property-in-object@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636" + integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-create-class-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + +"@babel/plugin-proposal-unicode-property-regex@^7.12.1", "@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.2.0", "@babel/plugin-proposal-unicode-property-regex@^7.4.4": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8" + integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-async-generators@^7.2.0", "@babel/plugin-syntax-async-generators@^7.8.0", "@babel/plugin-syntax-async-generators@^7.8.4": version "7.8.4" @@ -535,12 +561,19 @@ dependencies: "@babel/helper-plugin-utils" "^7.12.13" +"@babel/plugin-syntax-class-static-block@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406" + integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw== + dependencies: + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-decorators@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648" - integrity sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20" + integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-dynamic-import@^7.8.0", "@babel/plugin-syntax-dynamic-import@^7.8.3": version "7.8.3" @@ -557,11 +590,11 @@ "@babel/helper-plugin-utils" "^7.8.3" "@babel/plugin-syntax-flow@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.12.13.tgz#5df9962503c0a9c918381c929d51d4d6949e7e86" - integrity sha512-J/RYxnlSLXZLVR7wTRsozxKT8qbsx1mNKJzXEEjQ0Kjx1ZACcyHgbanNWNCFtc36IzuWhYWPpvJFFoexoOWFmA== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.14.5.tgz#2ff654999497d7d7d142493260005263731da180" + integrity sha512-9WK5ZwKCdWHxVuU13XNT6X73FGmutAXeor5lGFq6qhOFtMFUF4jkbijuyUdZZlpYq6E2hZeZf/u3959X9wsv0Q== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-import-meta@^7.8.3": version "7.10.4" @@ -577,12 +610,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-jsx@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15" - integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g== +"@babel/plugin-syntax-jsx@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz#000e2e25d8673cce49300517a3eda44c263e4201" + integrity sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3": version "7.10.4" @@ -626,99 +659,106 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/plugin-syntax-top-level-await@^7.12.1", "@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.8.3": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178" - integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ== +"@babel/plugin-syntax-private-property-in-object@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad" + integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-syntax-typescript@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.12.13.tgz#9dff111ca64154cef0f4dc52cf843d9f12ce4474" - integrity sha512-cHP3u1JiUiG2LFDKbXnwVad81GvfyIOmCD6HIEId6ojrY0Drfy2q1jw7BwN7dE84+kTnBjLkXoL3IEy/3JPu2w== +"@babel/plugin-syntax-top-level-await@^7.12.1", "@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c" + integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.13.0", "@babel/plugin-transform-arrow-functions@^7.2.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae" - integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg== +"@babel/plugin-syntax-typescript@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz#b82c6ce471b165b5ce420cf92914d6fb46225716" + integrity sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-async-to-generator@^7.12.1", "@babel/plugin-transform-async-to-generator@^7.13.0", "@babel/plugin-transform-async-to-generator@^7.2.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f" - integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg== +"@babel/plugin-transform-arrow-functions@^7.12.1", "@babel/plugin-transform-arrow-functions@^7.14.5", "@babel/plugin-transform-arrow-functions@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a" + integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A== dependencies: - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-remap-async-to-generator" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-block-scoped-functions@^7.12.1", "@babel/plugin-transform-block-scoped-functions@^7.12.13", "@babel/plugin-transform-block-scoped-functions@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4" - integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg== +"@babel/plugin-transform-async-to-generator@^7.12.1", "@babel/plugin-transform-async-to-generator@^7.14.5", "@babel/plugin-transform-async-to-generator@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67" + integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-module-imports" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-remap-async-to-generator" "^7.14.5" -"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.12.13", "@babel/plugin-transform-block-scoping@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61" - integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ== +"@babel/plugin-transform-block-scoped-functions@^7.12.1", "@babel/plugin-transform-block-scoped-functions@^7.14.5", "@babel/plugin-transform-block-scoped-functions@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4" + integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.13.0", "@babel/plugin-transform-classes@^7.2.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b" - integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g== +"@babel/plugin-transform-block-scoping@^7.12.1", "@babel/plugin-transform-block-scoping@^7.14.5", "@babel/plugin-transform-block-scoping@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939" + integrity sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw== dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-optimise-call-expression" "^7.12.13" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-replace-supers" "^7.13.0" - "@babel/helper-split-export-declaration" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" + +"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.14.5", "@babel/plugin-transform-classes@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf" + integrity sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA== + dependencies: + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-optimise-call-expression" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-replace-supers" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.12.1", "@babel/plugin-transform-computed-properties@^7.13.0", "@babel/plugin-transform-computed-properties@^7.2.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed" - integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg== +"@babel/plugin-transform-computed-properties@^7.12.1", "@babel/plugin-transform-computed-properties@^7.14.5", "@babel/plugin-transform-computed-properties@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f" + integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.13.0", "@babel/plugin-transform-destructuring@^7.2.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz#c5dce270014d4e1ebb1d806116694c12b7028963" - integrity sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA== +"@babel/plugin-transform-destructuring@^7.12.1", "@babel/plugin-transform-destructuring@^7.14.7", "@babel/plugin-transform-destructuring@^7.2.0": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576" + integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.2.0", "@babel/plugin-transform-dotall-regex@^7.4.4": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad" - integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ== +"@babel/plugin-transform-dotall-regex@^7.12.1", "@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.2.0", "@babel/plugin-transform-dotall-regex@^7.4.4": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a" + integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-create-regexp-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-duplicate-keys@^7.12.1", "@babel/plugin-transform-duplicate-keys@^7.12.13", "@babel/plugin-transform-duplicate-keys@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de" - integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ== +"@babel/plugin-transform-duplicate-keys@^7.12.1", "@babel/plugin-transform-duplicate-keys@^7.14.5", "@babel/plugin-transform-duplicate-keys@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954" + integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-exponentiation-operator@^7.12.1", "@babel/plugin-transform-exponentiation-operator@^7.12.13", "@babel/plugin-transform-exponentiation-operator@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1" - integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA== +"@babel/plugin-transform-exponentiation-operator@^7.12.1", "@babel/plugin-transform-exponentiation-operator@^7.14.5", "@babel/plugin-transform-exponentiation-operator@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493" + integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA== dependencies: - "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-flow-strip-types@7.12.1": version "7.12.1" @@ -728,115 +768,115 @@ "@babel/helper-plugin-utils" "^7.10.4" "@babel/plugin-syntax-flow" "^7.12.1" -"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.13.0", "@babel/plugin-transform-for-of@^7.2.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062" - integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg== +"@babel/plugin-transform-for-of@^7.12.1", "@babel/plugin-transform-for-of@^7.14.5", "@babel/plugin-transform-for-of@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb" + integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-function-name@^7.12.1", "@babel/plugin-transform-function-name@^7.12.13", "@babel/plugin-transform-function-name@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051" - integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ== +"@babel/plugin-transform-function-name@^7.12.1", "@babel/plugin-transform-function-name@^7.14.5", "@babel/plugin-transform-function-name@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2" + integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ== dependencies: - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-literals@^7.12.1", "@babel/plugin-transform-literals@^7.12.13", "@babel/plugin-transform-literals@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9" - integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ== +"@babel/plugin-transform-literals@^7.12.1", "@babel/plugin-transform-literals@^7.14.5", "@babel/plugin-transform-literals@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78" + integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-member-expression-literals@^7.12.1", "@babel/plugin-transform-member-expression-literals@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40" - integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg== +"@babel/plugin-transform-member-expression-literals@^7.12.1", "@babel/plugin-transform-member-expression-literals@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7" + integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.2.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3" - integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ== +"@babel/plugin-transform-modules-amd@^7.12.1", "@babel/plugin-transform-modules-amd@^7.14.5", "@babel/plugin-transform-modules-amd@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7" + integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g== dependencies: - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.2.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b" - integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw== +"@babel/plugin-transform-modules-commonjs@^7.12.1", "@babel/plugin-transform-modules-commonjs@^7.14.5", "@babel/plugin-transform-modules-commonjs@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97" + integrity sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A== dependencies: - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-simple-access" "^7.12.13" + "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-simple-access" "^7.14.5" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.13.8", "@babel/plugin-transform-modules-systemjs@^7.2.0": - version "7.13.8" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3" - integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A== +"@babel/plugin-transform-modules-systemjs@^7.12.1", "@babel/plugin-transform-modules-systemjs@^7.14.5", "@babel/plugin-transform-modules-systemjs@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29" + integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA== dependencies: - "@babel/helper-hoist-variables" "^7.13.0" - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-validator-identifier" "^7.12.11" + "@babel/helper-hoist-variables" "^7.14.5" + "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-validator-identifier" "^7.14.5" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.12.1", "@babel/plugin-transform-modules-umd@^7.13.0", "@babel/plugin-transform-modules-umd@^7.2.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b" - integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw== +"@babel/plugin-transform-modules-umd@^7.12.1", "@babel/plugin-transform-modules-umd@^7.14.5", "@babel/plugin-transform-modules-umd@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0" + integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA== dependencies: - "@babel/helper-module-transforms" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9" - integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA== +"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.14.7": + version "7.14.7" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e" + integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" + "@babel/helper-create-regexp-features-plugin" "^7.14.5" -"@babel/plugin-transform-new-target@^7.0.0", "@babel/plugin-transform-new-target@^7.12.1", "@babel/plugin-transform-new-target@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c" - integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ== +"@babel/plugin-transform-new-target@^7.0.0", "@babel/plugin-transform-new-target@^7.12.1", "@babel/plugin-transform-new-target@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8" + integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-object-super@^7.12.1", "@babel/plugin-transform-object-super@^7.12.13", "@babel/plugin-transform-object-super@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7" - integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ== +"@babel/plugin-transform-object-super@^7.12.1", "@babel/plugin-transform-object-super@^7.14.5", "@babel/plugin-transform-object-super@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45" + integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/helper-replace-supers" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-replace-supers" "^7.14.5" -"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.13.0", "@babel/plugin-transform-parameters@^7.2.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007" - integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw== +"@babel/plugin-transform-parameters@^7.12.1", "@babel/plugin-transform-parameters@^7.14.5", "@babel/plugin-transform-parameters@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3" + integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-property-literals@^7.12.1", "@babel/plugin-transform-property-literals@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81" - integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A== +"@babel/plugin-transform-property-literals@^7.12.1", "@babel/plugin-transform-property-literals@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34" + integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-react-constant-elements@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.12.13.tgz#f8ee56888545d53d80f766b3cc1563ab2c241f92" - integrity sha512-qmzKVTn46Upvtxv8LQoQ8mTCdUC83AOVQIQm57e9oekLT5cmK9GOMOfcWhe8jMNx4UJXn/UDhVZ/7lGofVNeDQ== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.14.5.tgz#41790d856f7c5cec82d2bcf5d0e5064d682522ed" + integrity sha512-NBqLEx1GxllIOXJInJAQbrnwwYJsV3WaMHIcOwD8rhYS0AabTWn7kHdHgPgu5RmHLU0q4DMxhAMu8ue/KampgQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-react-display-name@7.12.1": version "7.12.1" @@ -845,66 +885,66 @@ dependencies: "@babel/helper-plugin-utils" "^7.10.4" -"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.12.1", "@babel/plugin-transform-react-display-name@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.12.13.tgz#c28effd771b276f4647411c9733dbb2d2da954bd" - integrity sha512-MprESJzI9O5VnJZrL7gg1MpdqmiFcUv41Jc7SahxYsNP2kDkFqClxxTZq+1Qv4AFCamm+GXMRDQINNn+qrxmiA== +"@babel/plugin-transform-react-display-name@^7.0.0", "@babel/plugin-transform-react-display-name@^7.12.1", "@babel/plugin-transform-react-display-name@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.14.5.tgz#baa92d15c4570411301a85a74c13534873885b65" + integrity sha512-07aqY1ChoPgIxsuDviptRpVkWCSbXWmzQqcgy65C6YSFOfPFvb/DX3bBRHh7pCd/PMEEYHYWUTSVkCbkVainYQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-react-jsx-development@^7.12.1", "@babel/plugin-transform-react-jsx-development@^7.12.12": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.12.17.tgz#f510c0fa7cd7234153539f9a362ced41a5ca1447" - integrity sha512-BPjYV86SVuOaudFhsJR1zjgxxOhJDt6JHNoD48DxWEIxUCAMjV1ys6DYw4SDYZh0b1QsS2vfIA9t/ZsQGsDOUQ== +"@babel/plugin-transform-react-jsx-development@^7.12.1", "@babel/plugin-transform-react-jsx-development@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.14.5.tgz#1a6c73e2f7ed2c42eebc3d2ad60b0c7494fcb9af" + integrity sha512-rdwG/9jC6QybWxVe2UVOa7q6cnTpw8JRRHOxntG/h6g/guAOe6AhtQHJuJh5FwmnXIT1bdm5vC2/5huV8ZOorQ== dependencies: - "@babel/plugin-transform-react-jsx" "^7.12.17" + "@babel/plugin-transform-react-jsx" "^7.14.5" "@babel/plugin-transform-react-jsx-self@^7.0.0", "@babel/plugin-transform-react-jsx-self@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.12.13.tgz#422d99d122d592acab9c35ea22a6cfd9bf189f60" - integrity sha512-FXYw98TTJ125GVCCkFLZXlZ1qGcsYqNQhVBQcZjyrwf8FEUtVfKIoidnO8S0q+KBQpDYNTmiGo1gn67Vti04lQ== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.5.tgz#703b5d1edccd342179c2a99ee8c7065c2b4403cc" + integrity sha512-M/fmDX6n0cfHK/NLTcPmrfVAORKDhK8tyjDhyxlUjYyPYYO8FRWwuxBA3WBx8kWN/uBUuwGa3s/0+hQ9JIN3Tg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-react-jsx-source@^7.0.0", "@babel/plugin-transform-react-jsx-source@^7.12.1": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.12.13.tgz#051d76126bee5c9a6aa3ba37be2f6c1698856bcb" - integrity sha512-O5JJi6fyfih0WfDgIJXksSPhGP/G0fQpfxYy87sDc+1sFmsCS6wr3aAn+whbzkhbjtq4VMqLRaSzR6IsshIC0Q== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.14.5.tgz#79f728e60e6dbd31a2b860b0bf6c9765918acf1d" + integrity sha512-1TpSDnD9XR/rQ2tzunBVPThF5poaYT9GqP+of8fAtguYuI/dm2RkrMBDemsxtY0XBzvW7nXjYM0hRyKX9QYj7Q== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.12.1", "@babel/plugin-transform-react-jsx@^7.12.13", "@babel/plugin-transform-react-jsx@^7.12.17": - version "7.12.17" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.17.tgz#dd2c1299f5e26de584939892de3cfc1807a38f24" - integrity sha512-mwaVNcXV+l6qJOuRhpdTEj8sT/Z0owAVWf9QujTZ0d2ye9X/K+MTOTSizcgKOj18PGnTc/7g1I4+cIUjsKhBcw== +"@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.12.1", "@babel/plugin-transform-react-jsx@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz#39749f0ee1efd8a1bd729152cf5f78f1d247a44a" + integrity sha512-7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q== dependencies: - "@babel/helper-annotate-as-pure" "^7.12.13" - "@babel/helper-module-imports" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-syntax-jsx" "^7.12.13" - "@babel/types" "^7.12.17" + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-module-imports" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-jsx" "^7.14.5" + "@babel/types" "^7.14.5" -"@babel/plugin-transform-react-pure-annotations@^7.12.1": - version "7.12.1" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.12.1.tgz#05d46f0ab4d1339ac59adf20a1462c91b37a1a42" - integrity sha512-RqeaHiwZtphSIUZ5I85PEH19LOSzxfuEazoY7/pWASCAIBuATQzpSVD+eT6MebeeZT2F4eSL0u4vw6n4Nm0Mjg== +"@babel/plugin-transform-react-pure-annotations@^7.12.1", "@babel/plugin-transform-react-pure-annotations@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.14.5.tgz#18de612b84021e3a9802cbc212c9d9f46d0d11fc" + integrity sha512-3X4HpBJimNxW4rhUy/SONPyNQHp5YRr0HhJdT2OH1BRp0of7u3Dkirc7x9FRJMKMqTBI079VZ1hzv7Ouuz///g== dependencies: - "@babel/helper-annotate-as-pure" "^7.10.4" - "@babel/helper-plugin-utils" "^7.10.4" + "@babel/helper-annotate-as-pure" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.12.1", "@babel/plugin-transform-regenerator@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5" - integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA== +"@babel/plugin-transform-regenerator@^7.0.0", "@babel/plugin-transform-regenerator@^7.12.1", "@babel/plugin-transform-regenerator@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f" + integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg== dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.12.1", "@babel/plugin-transform-reserved-words@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695" - integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg== +"@babel/plugin-transform-reserved-words@^7.12.1", "@babel/plugin-transform-reserved-words@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304" + integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-runtime@7.12.1": version "7.12.1" @@ -916,65 +956,65 @@ resolve "^1.8.1" semver "^5.5.1" -"@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.12.13", "@babel/plugin-transform-shorthand-properties@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad" - integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw== +"@babel/plugin-transform-shorthand-properties@^7.12.1", "@babel/plugin-transform-shorthand-properties@^7.14.5", "@babel/plugin-transform-shorthand-properties@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58" + integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.13.0", "@babel/plugin-transform-spread@^7.2.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd" - integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg== +"@babel/plugin-transform-spread@^7.12.1", "@babel/plugin-transform-spread@^7.14.6", "@babel/plugin-transform-spread@^7.2.0": + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144" + integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" -"@babel/plugin-transform-sticky-regex@^7.12.1", "@babel/plugin-transform-sticky-regex@^7.12.13", "@babel/plugin-transform-sticky-regex@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f" - integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg== +"@babel/plugin-transform-sticky-regex@^7.12.1", "@babel/plugin-transform-sticky-regex@^7.14.5", "@babel/plugin-transform-sticky-regex@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9" + integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.13.0", "@babel/plugin-transform-template-literals@^7.2.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d" - integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw== +"@babel/plugin-transform-template-literals@^7.12.1", "@babel/plugin-transform-template-literals@^7.14.5", "@babel/plugin-transform-template-literals@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93" + integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg== dependencies: - "@babel/helper-plugin-utils" "^7.13.0" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-typeof-symbol@^7.12.1", "@babel/plugin-transform-typeof-symbol@^7.12.13", "@babel/plugin-transform-typeof-symbol@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f" - integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ== +"@babel/plugin-transform-typeof-symbol@^7.12.1", "@babel/plugin-transform-typeof-symbol@^7.14.5", "@babel/plugin-transform-typeof-symbol@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4" + integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-typescript@^7.12.1": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.13.0.tgz#4a498e1f3600342d2a9e61f60131018f55774853" - integrity sha512-elQEwluzaU8R8dbVuW2Q2Y8Nznf7hnjM7+DSCd14Lo5fF63C9qNLbwZYbmZrtV9/ySpSUpkRpQXvJb6xyu4hCQ== + version "7.14.6" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.14.6.tgz#6e9c2d98da2507ebe0a883b100cde3c7279df36c" + integrity sha512-XlTdBq7Awr4FYIzqhmYY80WN0V0azF74DMPyFqVHBvf81ZUgc4X7ZOpx6O8eLDK6iM5cCQzeyJw0ynTaefixRA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.13.0" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/plugin-syntax-typescript" "^7.12.13" + "@babel/helper-create-class-features-plugin" "^7.14.6" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/plugin-syntax-typescript" "^7.14.5" -"@babel/plugin-transform-unicode-escapes@^7.12.1", "@babel/plugin-transform-unicode-escapes@^7.12.13": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74" - integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw== +"@babel/plugin-transform-unicode-escapes@^7.12.1", "@babel/plugin-transform-unicode-escapes@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b" + integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-unicode-regex@^7.12.1", "@babel/plugin-transform-unicode-regex@^7.12.13", "@babel/plugin-transform-unicode-regex@^7.2.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac" - integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA== +"@babel/plugin-transform-unicode-regex@^7.12.1", "@babel/plugin-transform-unicode-regex@^7.14.5", "@babel/plugin-transform-unicode-regex@^7.2.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e" + integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw== dependencies: - "@babel/helper-create-regexp-features-plugin" "^7.12.13" - "@babel/helper-plugin-utils" "^7.12.13" + "@babel/helper-create-regexp-features-plugin" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" "@babel/preset-env@7.12.1": version "7.12.1" @@ -1096,29 +1136,33 @@ semver "^5.3.0" "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.8.4": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.9.tgz#3ee5f233316b10d066d7f379c6d1e13a96853654" - integrity sha512-mcsHUlh2rIhViqMG823JpscLMesRt3QbMsv1+jhopXEb3W2wXvQ9QoiOlZI9ZbR3XqPtaFpZwEZKYqGJnGMZTQ== - dependencies: - "@babel/compat-data" "^7.13.8" - "@babel/helper-compilation-targets" "^7.13.8" - "@babel/helper-plugin-utils" "^7.13.0" - "@babel/helper-validator-option" "^7.12.17" - "@babel/plugin-proposal-async-generator-functions" "^7.13.8" - "@babel/plugin-proposal-class-properties" "^7.13.0" - "@babel/plugin-proposal-dynamic-import" "^7.13.8" - "@babel/plugin-proposal-export-namespace-from" "^7.12.13" - "@babel/plugin-proposal-json-strings" "^7.13.8" - "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8" - "@babel/plugin-proposal-numeric-separator" "^7.12.13" - "@babel/plugin-proposal-object-rest-spread" "^7.13.8" - "@babel/plugin-proposal-optional-catch-binding" "^7.13.8" - "@babel/plugin-proposal-optional-chaining" "^7.13.8" - "@babel/plugin-proposal-private-methods" "^7.13.0" - "@babel/plugin-proposal-unicode-property-regex" "^7.12.13" + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.8.tgz#254942f5ca80ccabcfbb2a9f524c74bca574005b" + integrity sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg== + dependencies: + "@babel/compat-data" "^7.14.7" + "@babel/helper-compilation-targets" "^7.14.5" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-validator-option" "^7.14.5" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" + "@babel/plugin-proposal-async-generator-functions" "^7.14.7" + "@babel/plugin-proposal-class-properties" "^7.14.5" + "@babel/plugin-proposal-class-static-block" "^7.14.5" + "@babel/plugin-proposal-dynamic-import" "^7.14.5" + "@babel/plugin-proposal-export-namespace-from" "^7.14.5" + "@babel/plugin-proposal-json-strings" "^7.14.5" + "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5" + "@babel/plugin-proposal-numeric-separator" "^7.14.5" + "@babel/plugin-proposal-object-rest-spread" "^7.14.7" + "@babel/plugin-proposal-optional-catch-binding" "^7.14.5" + "@babel/plugin-proposal-optional-chaining" "^7.14.5" + "@babel/plugin-proposal-private-methods" "^7.14.5" + "@babel/plugin-proposal-private-property-in-object" "^7.14.5" + "@babel/plugin-proposal-unicode-property-regex" "^7.14.5" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" + "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" "@babel/plugin-syntax-json-strings" "^7.8.3" @@ -1128,45 +1172,46 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.3" - "@babel/plugin-syntax-top-level-await" "^7.12.13" - "@babel/plugin-transform-arrow-functions" "^7.13.0" - "@babel/plugin-transform-async-to-generator" "^7.13.0" - "@babel/plugin-transform-block-scoped-functions" "^7.12.13" - "@babel/plugin-transform-block-scoping" "^7.12.13" - "@babel/plugin-transform-classes" "^7.13.0" - "@babel/plugin-transform-computed-properties" "^7.13.0" - "@babel/plugin-transform-destructuring" "^7.13.0" - "@babel/plugin-transform-dotall-regex" "^7.12.13" - "@babel/plugin-transform-duplicate-keys" "^7.12.13" - "@babel/plugin-transform-exponentiation-operator" "^7.12.13" - "@babel/plugin-transform-for-of" "^7.13.0" - "@babel/plugin-transform-function-name" "^7.12.13" - "@babel/plugin-transform-literals" "^7.12.13" - "@babel/plugin-transform-member-expression-literals" "^7.12.13" - "@babel/plugin-transform-modules-amd" "^7.13.0" - "@babel/plugin-transform-modules-commonjs" "^7.13.8" - "@babel/plugin-transform-modules-systemjs" "^7.13.8" - "@babel/plugin-transform-modules-umd" "^7.13.0" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13" - "@babel/plugin-transform-new-target" "^7.12.13" - "@babel/plugin-transform-object-super" "^7.12.13" - "@babel/plugin-transform-parameters" "^7.13.0" - "@babel/plugin-transform-property-literals" "^7.12.13" - "@babel/plugin-transform-regenerator" "^7.12.13" - "@babel/plugin-transform-reserved-words" "^7.12.13" - "@babel/plugin-transform-shorthand-properties" "^7.12.13" - "@babel/plugin-transform-spread" "^7.13.0" - "@babel/plugin-transform-sticky-regex" "^7.12.13" - "@babel/plugin-transform-template-literals" "^7.13.0" - "@babel/plugin-transform-typeof-symbol" "^7.12.13" - "@babel/plugin-transform-unicode-escapes" "^7.12.13" - "@babel/plugin-transform-unicode-regex" "^7.12.13" + "@babel/plugin-syntax-private-property-in-object" "^7.14.5" + "@babel/plugin-syntax-top-level-await" "^7.14.5" + "@babel/plugin-transform-arrow-functions" "^7.14.5" + "@babel/plugin-transform-async-to-generator" "^7.14.5" + "@babel/plugin-transform-block-scoped-functions" "^7.14.5" + "@babel/plugin-transform-block-scoping" "^7.14.5" + "@babel/plugin-transform-classes" "^7.14.5" + "@babel/plugin-transform-computed-properties" "^7.14.5" + "@babel/plugin-transform-destructuring" "^7.14.7" + "@babel/plugin-transform-dotall-regex" "^7.14.5" + "@babel/plugin-transform-duplicate-keys" "^7.14.5" + "@babel/plugin-transform-exponentiation-operator" "^7.14.5" + "@babel/plugin-transform-for-of" "^7.14.5" + "@babel/plugin-transform-function-name" "^7.14.5" + "@babel/plugin-transform-literals" "^7.14.5" + "@babel/plugin-transform-member-expression-literals" "^7.14.5" + "@babel/plugin-transform-modules-amd" "^7.14.5" + "@babel/plugin-transform-modules-commonjs" "^7.14.5" + "@babel/plugin-transform-modules-systemjs" "^7.14.5" + "@babel/plugin-transform-modules-umd" "^7.14.5" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7" + "@babel/plugin-transform-new-target" "^7.14.5" + "@babel/plugin-transform-object-super" "^7.14.5" + "@babel/plugin-transform-parameters" "^7.14.5" + "@babel/plugin-transform-property-literals" "^7.14.5" + "@babel/plugin-transform-regenerator" "^7.14.5" + "@babel/plugin-transform-reserved-words" "^7.14.5" + "@babel/plugin-transform-shorthand-properties" "^7.14.5" + "@babel/plugin-transform-spread" "^7.14.6" + "@babel/plugin-transform-sticky-regex" "^7.14.5" + "@babel/plugin-transform-template-literals" "^7.14.5" + "@babel/plugin-transform-typeof-symbol" "^7.14.5" + "@babel/plugin-transform-unicode-escapes" "^7.14.5" + "@babel/plugin-transform-unicode-regex" "^7.14.5" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.13.0" - babel-plugin-polyfill-corejs2 "^0.1.4" - babel-plugin-polyfill-corejs3 "^0.1.3" - babel-plugin-polyfill-regenerator "^0.1.2" - core-js-compat "^3.9.0" + "@babel/types" "^7.14.8" + babel-plugin-polyfill-corejs2 "^0.2.2" + babel-plugin-polyfill-corejs3 "^0.2.2" + babel-plugin-polyfill-regenerator "^0.2.2" + core-js-compat "^3.15.0" semver "^6.3.0" "@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.4": @@ -1205,15 +1250,16 @@ "@babel/plugin-transform-react-pure-annotations" "^7.12.1" "@babel/preset-react@^7.12.5": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.12.13.tgz#5f911b2eb24277fa686820d5bd81cad9a0602a0a" - integrity sha512-TYM0V9z6Abb6dj1K7i5NrEhA13oS5ujUYQYDfqIBXYHOc2c2VkFgc+q9kyssIyUfy4/hEwqrgSlJ/Qgv8zJLsA== + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.14.5.tgz#0fbb769513f899c2c56f3a882fa79673c2d4ab3c" + integrity sha512-XFxBkjyObLvBaAvkx1Ie95Iaq4S/GUEIrejyrntQ/VCMKUYvKLoyKxOBzJ2kjA3b6rC9/KL6KXfDC2GqvLiNqQ== dependencies: - "@babel/helper-plugin-utils" "^7.12.13" - "@babel/plugin-transform-react-display-name" "^7.12.13" - "@babel/plugin-transform-react-jsx" "^7.12.13" - "@babel/plugin-transform-react-jsx-development" "^7.12.12" - "@babel/plugin-transform-react-pure-annotations" "^7.12.1" + "@babel/helper-plugin-utils" "^7.14.5" + "@babel/helper-validator-option" "^7.14.5" + "@babel/plugin-transform-react-display-name" "^7.14.5" + "@babel/plugin-transform-react-jsx" "^7.14.5" + "@babel/plugin-transform-react-jsx-development" "^7.14.5" + "@babel/plugin-transform-react-pure-annotations" "^7.14.5" "@babel/preset-typescript@7.12.1": version "7.12.1" @@ -1224,11 +1270,11 @@ "@babel/plugin-transform-typescript" "^7.12.1" "@babel/runtime-corejs3@^7.10.2": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.13.9.tgz#b2fa9a6e5690ef8d4c4f2d30cac3ec1a8bb633ce" - integrity sha512-p6WSr71+5u/VBf1KDS/Y4dK3ZwbV+DD6wQO3X2EbUVluEOiyXUk09DzcwSaUH4WomYXrEPC+i2rqzuthhZhOJw== + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz#68539e0129f13eb1ed9a9aa273d3542b93c88384" + integrity sha512-4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w== dependencies: - core-js-pure "^3.0.0" + core-js-pure "^3.15.0" regenerator-runtime "^0.13.4" "@babel/runtime@7.12.1": @@ -1245,44 +1291,43 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.6", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": - version "7.13.9" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.9.tgz#97dbe2116e2630c489f22e0656decd60aaa1fcee" - integrity sha512-aY2kU+xgJ3dJ1eU6FMB9EH8dIe8dmusF1xEku52joLvw6eAFN0AI+WxCLDnpev2LEejWBAy2sBvBOBAjI3zmvA== +"@babel/runtime@^7.10.1", "@babel/runtime@^7.10.2", "@babel/runtime@^7.10.5", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.1", "@babel/runtime@^7.12.5", "@babel/runtime@^7.14.5", "@babel/runtime@^7.14.6", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.4", "@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.3", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446" + integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg== dependencies: regenerator-runtime "^0.13.4" -"@babel/template@^7.10.4", "@babel/template@^7.12.13", "@babel/template@^7.3.3", "@babel/template@^7.6.0": - version "7.12.13" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327" - integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/parser" "^7.12.13" - "@babel/types" "^7.12.13" - -"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.6.0", "@babel/traverse@^7.7.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc" - integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ== - dependencies: - "@babel/code-frame" "^7.12.13" - "@babel/generator" "^7.13.0" - "@babel/helper-function-name" "^7.12.13" - "@babel/helper-split-export-declaration" "^7.12.13" - "@babel/parser" "^7.13.0" - "@babel/types" "^7.13.0" +"@babel/template@^7.10.4", "@babel/template@^7.14.5", "@babel/template@^7.3.3", "@babel/template@^7.6.0": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" + integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/parser" "^7.14.5" + "@babel/types" "^7.14.5" + +"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8", "@babel/traverse@^7.6.0", "@babel/traverse@^7.7.0": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce" + integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.14.8" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-hoist-variables" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/parser" "^7.14.8" + "@babel/types" "^7.14.8" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.19" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.12.17", "@babel/types@^7.12.6", "@babel/types@^7.13.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.0", "@babel/types@^7.7.0": - version "7.13.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80" - integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA== +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.0", "@babel/types@^7.7.0": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728" + integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q== dependencies: - "@babel/helper-validator-identifier" "^7.12.11" - lodash "^4.17.19" + "@babel/helper-validator-identifier" "^7.14.8" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -1331,9 +1376,9 @@ integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== "@eoscostarica/eoscr-components@^3.1.0": - version "3.1.0" - resolved "https://registry.yarnpkg.com/@eoscostarica/eoscr-components/-/eoscr-components-3.1.0.tgz#f4f5a238da53845cb7344e24c66fd7f96d9d5f44" - integrity sha512-yTfurrlYdWj5zOO/Yp0Is6Jn8/zy2fKmBhmjCZ+59BgHvJpO9b7kmpDtZNKieMTmvZgHwpZn6gU3vZLb/sPAvQ== + version "3.1.4" + resolved "https://registry.yarnpkg.com/@eoscostarica/eoscr-components/-/eoscr-components-3.1.4.tgz#037f205c2e521e693d9ed8026fec1e1a7de7feff" + integrity sha512-HmqfGeM24KQRD0JsOBuJT1vZuPjUwTMa4ekl9EfR6j08mO+nkKeTCuxuk2gQFTyJ8cXnft4NQMDjzntLV6GMvA== dependencies: "@material-ui/core" "^4.11.0" "@material-ui/icons" "^4.9.1" @@ -1378,29 +1423,29 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@eslint/eslintrc@^0.4.0": - version "0.4.0" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547" - integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog== +"@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== dependencies: ajv "^6.12.4" debug "^4.1.1" espree "^7.3.0" - globals "^12.1.0" + globals "^13.9.0" ignore "^4.0.6" import-fresh "^3.2.1" js-yaml "^3.13.1" minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@greymass/eosio@^0.2.3", "@greymass/eosio@^0.2.5": - version "0.2.7" - resolved "https://registry.yarnpkg.com/@greymass/eosio/-/eosio-0.2.7.tgz#a7d58f5fabaf13343b1f62dc8ad50c6fa896c72d" - integrity sha512-EbAq05C3YQY5dfgygKEBz6ZGJ9QR2tG3BheN+6HkQJ4aLaCcMuFa8o4KE8Ly6Ckip3AOFteFCe18YhUrDfdOtQ== +"@greymass/eosio@^0.4.0", "@greymass/eosio@^0.4.3": + version "0.4.7" + resolved "https://registry.yarnpkg.com/@greymass/eosio/-/eosio-0.4.7.tgz#157811fce097e442a716f8c6cee53ee20014db2b" + integrity sha512-vIioXD1MMdajDFsZ6PL/J6FxcrVckre4khzvKTwfJQGBeEiv2yhC9uITYgt7prvaZhxytu5Z3JU6wYhQED/mVw== dependencies: - bn.js "^4.4.0" - brorand "^1.0.1" - elliptic "^6.5.3" + bn.js "^4.11.9" + brorand "^1.1.0" + elliptic "^6.5.4" hash.js "^1.0.0" tslib "^2.0.3" @@ -1436,6 +1481,20 @@ dependencies: "@hapi/hoek" "^8.3.0" +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" + integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== + dependencies: + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" + integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -1670,14 +1729,14 @@ integrity sha512-o+TYF8vBcyySRsb2kqBDv/KMeme8a2nwWoG+lAWzbDmWfb2/MrVWYCVYDYvjXdSoI/Cujqy1i0gIDrkdxa9chA== "@material-ui/core@^4.11.0", "@material-ui/core@^4.9.12": - version "4.11.3" - resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.11.3.tgz#f22e41775b0bd075e36a7a093d43951bf7f63850" - integrity sha512-Adt40rGW6Uds+cAyk3pVgcErpzU/qxc7KBR94jFHBYretU4AtWZltYcNsbeMn9tXL86jjVL1kuGcIHsgLgFGRw== + version "4.12.2" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.2.tgz#59a8b19f16b8c218d912f37f5ae70473c3c82c73" + integrity sha512-Q1npB8V73IC+eV2X6as+g71MpEGQwqKHUI2iujY62npk35V8nMx/bUXAHjv5kKG1BZ8s8XUWoG6s/VkjYPjjQA== dependencies: "@babel/runtime" "^7.4.4" - "@material-ui/styles" "^4.11.3" - "@material-ui/system" "^4.11.3" - "@material-ui/types" "^5.1.0" + "@material-ui/styles" "^4.11.4" + "@material-ui/system" "^4.12.1" + "@material-ui/types" "5.1.0" "@material-ui/utils" "^4.11.2" "@types/react-transition-group" "^4.2.0" clsx "^1.0.4" @@ -1695,9 +1754,9 @@ "@babel/runtime" "^7.4.4" "@material-ui/lab@^4.0.0-alpha.51", "@material-ui/lab@^4.0.0-alpha.56": - version "4.0.0-alpha.57" - resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.57.tgz#e8961bcf6449e8a8dabe84f2700daacfcafbf83a" - integrity sha512-qo/IuIQOmEKtzmRD2E4Aa6DB4A87kmY6h0uYhjUmrrgmEAgbbw9etXpWPVXuRK6AGIQCjFzV6WO2i21m1R4FCw== + version "4.0.0-alpha.60" + resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.60.tgz#5ad203aed5a8569b0f1753945a21a05efa2234d2" + integrity sha512-fadlYsPJF+0fx2lRuyqAuJj7hAS1tLDdIEEdov5jlrpb5pp4b+mRDUqQTUxi4inRZHS1bEXpU8QWUhO6xX88aA== dependencies: "@babel/runtime" "^7.4.4" "@material-ui/utils" "^4.11.2" @@ -1705,14 +1764,14 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" -"@material-ui/styles@^4.10.0", "@material-ui/styles@^4.11.3": - version "4.11.3" - resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.3.tgz#1b8d97775a4a643b53478c895e3f2a464e8916f2" - integrity sha512-HzVzCG+PpgUGMUYEJ2rTEmQYeonGh41BYfILNFb/1ueqma+p1meSdu4RX6NjxYBMhf7k+jgfHFTTz+L1SXL/Zg== +"@material-ui/styles@^4.10.0", "@material-ui/styles@^4.11.4": + version "4.11.4" + resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.4.tgz#eb9dfccfcc2d208243d986457dff025497afa00d" + integrity sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew== dependencies: "@babel/runtime" "^7.4.4" "@emotion/hash" "^0.8.0" - "@material-ui/types" "^5.1.0" + "@material-ui/types" "5.1.0" "@material-ui/utils" "^4.11.2" clsx "^1.0.4" csstype "^2.5.2" @@ -1727,17 +1786,17 @@ jss-plugin-vendor-prefixer "^10.5.1" prop-types "^15.7.2" -"@material-ui/system@^4.11.3": - version "4.11.3" - resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.11.3.tgz#466bc14c9986798fd325665927c963eb47cc4143" - integrity sha512-SY7otguNGol41Mu2Sg6KbBP1ZRFIbFLHGK81y4KYbsV2yIcaEPOmsCK6zwWlp+2yTV3J/VwT6oSBARtGIVdXPw== +"@material-ui/system@^4.12.1": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.1.tgz#2dd96c243f8c0a331b2bb6d46efd7771a399707c" + integrity sha512-lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw== dependencies: "@babel/runtime" "^7.4.4" "@material-ui/utils" "^4.11.2" csstype "^2.5.2" prop-types "^15.7.2" -"@material-ui/types@^5.1.0": +"@material-ui/types@5.1.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2" integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A== @@ -1751,25 +1810,25 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" -"@nodelib/fs.scandir@2.1.4": - version "2.1.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69" - integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA== +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== dependencies: - "@nodelib/fs.stat" "2.0.4" + "@nodelib/fs.stat" "2.0.5" run-parallel "^1.1.9" -"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2": - version "2.0.4" - resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655" - integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q== +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== "@nodelib/fs.walk@^1.2.3": - version "1.2.6" - resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063" - integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow== + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== dependencies: - "@nodelib/fs.scandir" "2.1.4" + "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" "@npmcli/move-file@^1.0.1": @@ -1826,9 +1885,9 @@ resolve "^1.14.2" "@rollup/plugin-replace@^2.3.1": - version "2.4.1" - resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.1.tgz#c411b5ab72809fb1bfc8b487d8d02eef661460d3" - integrity sha512-XwC1oK5rrtRJ0tn1ioLHS6OV5JTluJF7QE1J/q1hN3bquwjnVxjtMyY9iCnoyH9DQbf92CxajB3o98wZbP3oAQ== + version "2.4.2" + resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz#a2d539314fbc77c244858faa523012825068510a" + integrity sha512-IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg== dependencies: "@rollup/pluginutils" "^3.1.0" magic-string "^0.25.7" @@ -1874,9 +1933,9 @@ "@scatterjs/core" "^2.7.51" "@sinonjs/commons@^1.7.0": - version "1.8.2" - resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.2.tgz#858f5c4b48d80778fde4b9d541f27edc0d56488b" - integrity sha512-sruwd86RJHdsVf/AtBoijDmUqJp3B6hF/DGC23C+JaegnDHaZyewCjoVGTdg3J0uz3Zs7NnIT05OBOmML72lQw== + version "1.8.3" + resolved "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.3.tgz#3802ddd21a50a949b6721ddd72da36e67e7f1b2d" + integrity sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ== dependencies: type-detect "4.0.8" @@ -1998,15 +2057,15 @@ "@svgr/plugin-svgo" "^5.5.0" loader-utils "^2.0.0" -"@types/anymatch@*": - version "1.3.1" - resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a" - integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA== +"@tootallnate/once@1": + version "1.1.2" + resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" + integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.12" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.12.tgz#4d8e9e51eb265552a7e4f1ff2219ab6133bdfb2d" - integrity sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ== + version "7.1.15" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.15.tgz#2ccfb1ad55a02c83f8e0ad327cbc332f55eb1024" + integrity sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -2015,24 +2074,24 @@ "@types/babel__traverse" "*" "@types/babel__generator@*": - version "7.6.2" - resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8" - integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ== + version "7.6.3" + resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5" + integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA== dependencies: "@babel/types" "^7.0.0" "@types/babel__template@*": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.0.tgz#0c888dd70b3ee9eebb6e4f200e809da0076262be" - integrity sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A== + version "7.4.1" + resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969" + integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" "@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6": - version "7.11.0" - resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0" - integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg== + version "7.14.2" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43" + integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA== dependencies: "@babel/types" "^7.3.0" @@ -2051,17 +2110,17 @@ "@types/bn.js" "*" "@types/eslint@^7.2.6": - version "7.2.6" - resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c" - integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw== + version "7.28.0" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a" + integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A== dependencies: "@types/estree" "*" "@types/json-schema" "*" "@types/estree@*": - version "0.0.46" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.46.tgz#0fb6bfbbeabd7a30880504993369c4bf1deab1fe" - integrity sha512-laIjwTQaD+5DukBZaygQ79K1Z0jb1bPEMRrkXSLjtCcZm+abyp5YbrqpSLzD42FwWW6gK/aS4NYpJ804nG2brg== + version "0.0.50" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83" + integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw== "@types/estree@0.0.39": version "0.0.39" @@ -2069,9 +2128,9 @@ integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw== "@types/glob@^7.1.1": - version "7.1.3" - resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183" - integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w== + version "7.1.4" + resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672" + integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA== dependencies: "@types/minimatch" "*" "@types/node" "*" @@ -2083,10 +2142,18 @@ dependencies: "@types/node" "*" +"@types/hoist-non-react-statics@^3.3.0": + version "3.3.1" + resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f" + integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA== + dependencies: + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + "@types/html-minifier-terser@^5.0.0": - version "5.1.1" - resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50" - integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA== + version "5.1.2" + resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.2.tgz#693b316ad323ea97eed6b38ed1a3cc02b1672b57" + integrity sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w== "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.3" @@ -2101,41 +2168,36 @@ "@types/istanbul-lib-coverage" "*" "@types/istanbul-reports@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821" - integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff" + integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw== dependencies: "@types/istanbul-lib-report" "*" -"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6": - version "7.0.7" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad" - integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA== - -"@types/json5@^0.0.29": - version "0.0.29" - resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" - integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= +"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8": + version "7.0.8" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818" + integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg== "@types/lodash@^4.14.165": - version "4.14.168" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008" - integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q== + version "4.14.171" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.171.tgz#f01b3a5fe3499e34b622c362a46a609fdb23573b" + integrity sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg== "@types/minimatch@*", "@types/minimatch@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/node@*", "@types/node@>=6": - version "14.14.31" - resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.31.tgz#72286bd33d137aa0d152d47ec7c1762563d34055" - integrity sha512-vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g== + version "16.3.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.3.3.tgz#0c30adff37bbbc7a50eb9b58fae2a504d0d88038" + integrity sha512-8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ== "@types/normalize-package-data@^2.4.0": - version "2.4.0" - resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" - integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== + version "2.4.1" + resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" + integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw== "@types/parse-json@^4.0.0": version "4.0.0" @@ -2143,33 +2205,44 @@ integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== "@types/prettier@^2.0.0": - version "2.2.2" - resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.2.tgz#e2280c89ddcbeef340099d6968d8c86ba155fdf6" - integrity sha512-i99hy7Ki19EqVOl77WplDrvgNugHnsSjECVR/wUrzw2TJXz1zlUfT2ngGckR6xN7yFYaijsMAqPkOLx9HgUqHg== + version "2.3.2" + resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.2.tgz#fc8c2825e4ed2142473b4a81064e6e081463d1b3" + integrity sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog== "@types/prop-types@*": - version "15.7.3" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.3.tgz#2ab0d5da2e5815f94b0b9d4b95d1e5f243ab2ca7" - integrity sha512-KfRL3PuHmqQLOG+2tGpRO26Ctg+Cq1E01D2DMriKEATHgWLfeNDmq9e29Q9WIky0dQ3NPkd1mzYH8Lm936Z9qw== + version "15.7.4" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" + integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== "@types/q@^1.5.1": - version "1.5.4" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24" - integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug== + version "1.5.5" + resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" + integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== + +"@types/react-redux@^7.1.16": + version "7.1.18" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.18.tgz#2bf8fd56ebaae679a90ebffe48ff73717c438e04" + integrity sha512-9iwAsPyJ9DLTRH+OFeIrm9cAbIj1i2ANL3sKQFATqnPWRbg+jEFXyZOKHiQK/N86pNRXbb4HRxAxo0SIX1XwzQ== + dependencies: + "@types/hoist-non-react-statics" "^3.3.0" + "@types/react" "*" + hoist-non-react-statics "^3.3.0" + redux "^4.0.0" "@types/react-transition-group@^4.2.0": - version "4.4.1" - resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.1.tgz#e1a3cb278df7f47f17b5082b1b3da17170bd44b1" - integrity sha512-vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ== + version "4.4.2" + resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.2.tgz#38890fd9db68bf1f2252b99a942998dc7877c5b3" + integrity sha512-KibDWL6nshuOJ0fu8ll7QnV/LVTo3PzQ9aCPnRUYPfX7eZohHwLIdNHj7pftanREzHNP4/nJa8oeM73uSiavMQ== dependencies: "@types/react" "*" "@types/react@*": - version "17.0.2" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8" - integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA== + version "17.0.14" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.14.tgz#f0629761ca02945c4e8fea99b8177f4c5c61fb0f" + integrity sha512-0WwKHUbWuQWOce61UexYuWTGuGY/8JvtUe/dtQ6lR4sZ3UiylHotJeWpf3ArP9+DSGUoLY3wbU59VyMrJps5VQ== dependencies: "@types/prop-types" "*" + "@types/scheduler" "*" csstype "^3.0.2" "@types/resolve@0.0.8": @@ -2179,91 +2252,95 @@ dependencies: "@types/node" "*" +"@types/scheduler@*": + version "0.16.2" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" + integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== + "@types/source-list-map@*": version "0.1.2" resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9" integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA== "@types/stack-utils@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" - integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.1.tgz#20f18294f797f2209b5f65c8e3b5c8e8261d127c" + integrity sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw== -"@types/tapable@*", "@types/tapable@^1.0.5": - version "1.0.6" - resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.6.tgz#a9ca4b70a18b270ccb2bc0aaafefd1d486b7ea74" - integrity sha512-W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA== +"@types/tapable@^1", "@types/tapable@^1.0.5": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310" + integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ== "@types/uglify-js@*": - version "3.12.0" - resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.12.0.tgz#2bb061c269441620d46b946350c8f16d52ef37c5" - integrity sha512-sYAF+CF9XZ5cvEBkI7RtrG9g2GtMBkviTnBxYYyq+8BWvO4QtXfwwR6a2LFwCi4evMKZfpv6U43ViYvv17Wz3Q== + version "3.13.1" + resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea" + integrity sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ== dependencies: source-map "^0.6.1" "@types/webpack-sources@*": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.0.tgz#8882b0bd62d1e0ce62f183d0d01b72e6e82e8c10" - integrity sha512-LXn/oYIpBeucgP1EIJbKQ2/4ZmpvRl+dlrFdX7+94SKRUV3Evy3FsfMZY318vGhkWUS5MPhtOM3w1/hCOAOXcg== + version "2.1.1" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.1.tgz#6af17e3a3ded71eec2b98008d7c12f498a0a4506" + integrity sha512-MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ== dependencies: "@types/node" "*" "@types/source-list-map" "*" source-map "^0.7.3" "@types/webpack@^4.41.8": - version "4.41.26" - resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.26.tgz#27a30d7d531e16489f9c7607c747be6bc1a459ef" - integrity sha512-7ZyTfxjCRwexh+EJFwRUM+CDB2XvgHl4vfuqf1ZKrgGvcS5BrNvPQqJh3tsZ0P6h6Aa1qClVHaJZszLPzpqHeA== + version "4.41.30" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.30.tgz#fd3db6d0d41e145a8eeeafcd3c4a7ccde9068ddc" + integrity sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA== dependencies: - "@types/anymatch" "*" "@types/node" "*" - "@types/tapable" "*" + "@types/tapable" "^1" "@types/uglify-js" "*" "@types/webpack-sources" "*" + anymatch "^3.0.0" source-map "^0.6.0" "@types/yargs-parser@*": - version "20.2.0" - resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" - integrity sha512-37RSHht+gzzgYeobbG+KWryeAW8J33Nhr69cjTqSYymXVZEN9NbRYWoYlRtDhHKPVT1FyNKwaTPC1NynKZpzRA== + version "20.2.1" + resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.1.tgz#3b9ce2489919d9e4fea439b76916abc34b2df129" + integrity sha512-7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw== "@types/yargs@^15.0.0": - version "15.0.13" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.13.tgz#34f7fec8b389d7f3c1fd08026a5763e072d3c6dc" - integrity sha512-kQ5JNTrbDv3Rp5X2n/iUu37IJBDU2gsZ5R/g1/KHOOEc5IKfUFjXT6DENPGduh08I/pamwtEq4oul7gUqKTQDQ== + version "15.0.14" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.14.tgz#26d821ddb89e70492160b66d10a0eb6df8f6fb06" + integrity sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ== dependencies: "@types/yargs-parser" "*" "@types/zen-observable@^0.8.0": - version "0.8.2" - resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.2.tgz#808c9fa7e4517274ed555fa158f2de4b4f468e71" - integrity sha512-HrCIVMLjE1MOozVoD86622S7aunluLb2PJdPfb3nYiEtohm8mIB/vyv0Fd37AdeMFrTUQXEunw78YloMA3Qilg== + version "0.8.3" + resolved "https://registry.yarnpkg.com/@types/zen-observable/-/zen-observable-0.8.3.tgz#781d360c282436494b32fe7d9f7f8e64b3118aa3" + integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw== "@typescript-eslint/eslint-plugin@^4.5.0": - version "4.16.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.16.1.tgz#2caf6a79dd19c3853b8d39769a27fccb24e4e651" - integrity sha512-SK777klBdlkUZpZLC1mPvyOWk9yAFCWmug13eAjVQ4/Q1LATE/NbcQL1xDHkptQkZOLnPmLUA1Y54m8dqYwnoQ== - dependencies: - "@typescript-eslint/experimental-utils" "4.16.1" - "@typescript-eslint/scope-manager" "4.16.1" - debug "^4.1.1" - functional-red-black-tree "^1.0.1" - lodash "^4.17.15" - regexpp "^3.0.0" - semver "^7.3.2" - tsutils "^3.17.1" - -"@typescript-eslint/experimental-utils@4.16.1", "@typescript-eslint/experimental-utils@^4.0.1": - version "4.16.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.16.1.tgz#da7a396dc7d0e01922acf102b76efff17320b328" - integrity sha512-0Hm3LSlMYFK17jO4iY3un1Ve9x1zLNn4EM50Lia+0EV99NdbK+cn0er7HC7IvBA23mBg3P+8dUkMXy4leL33UQ== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.16.1" - "@typescript-eslint/types" "4.16.1" - "@typescript-eslint/typescript-estree" "4.16.1" - eslint-scope "^5.0.0" - eslint-utils "^2.0.0" + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz#e73c8cabbf3f08dee0e1bda65ed4e622ae8f8921" + integrity sha512-s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw== + dependencies: + "@typescript-eslint/experimental-utils" "4.28.4" + "@typescript-eslint/scope-manager" "4.28.4" + debug "^4.3.1" + functional-red-black-tree "^1.0.1" + regexpp "^3.1.0" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/experimental-utils@4.28.4", "@typescript-eslint/experimental-utils@^4.0.1": + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz#9c70c35ebed087a5c70fb0ecd90979547b7fec96" + integrity sha512-OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA== + dependencies: + "@types/json-schema" "^7.0.7" + "@typescript-eslint/scope-manager" "4.28.4" + "@typescript-eslint/types" "4.28.4" + "@typescript-eslint/typescript-estree" "4.28.4" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" "@typescript-eslint/experimental-utils@^3.10.1": version "3.10.1" @@ -2277,32 +2354,32 @@ eslint-utils "^2.0.0" "@typescript-eslint/parser@^4.5.0": - version "4.16.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.16.1.tgz#3bbd3234dd3c5b882b2bcd9899bc30e1e1586d2a" - integrity sha512-/c0LEZcDL5y8RyI1zLcmZMvJrsR6SM1uetskFkoh3dvqDKVXPsXI+wFB/CbVw7WkEyyTKobC1mUNp/5y6gRvXg== + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.4.tgz#bc462dc2779afeefdcf49082516afdc3e7b96fab" + integrity sha512-4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA== dependencies: - "@typescript-eslint/scope-manager" "4.16.1" - "@typescript-eslint/types" "4.16.1" - "@typescript-eslint/typescript-estree" "4.16.1" - debug "^4.1.1" + "@typescript-eslint/scope-manager" "4.28.4" + "@typescript-eslint/types" "4.28.4" + "@typescript-eslint/typescript-estree" "4.28.4" + debug "^4.3.1" -"@typescript-eslint/scope-manager@4.16.1": - version "4.16.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.16.1.tgz#244e2006bc60cfe46987e9987f4ff49c9e3f00d5" - integrity sha512-6IlZv9JaurqV0jkEg923cV49aAn8V6+1H1DRfhRcvZUrptQ+UtSKHb5kwTayzOYTJJ/RsYZdcvhOEKiBLyc0Cw== +"@typescript-eslint/scope-manager@4.28.4": + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz#bdbce9b6a644e34f767bd68bc17bb14353b9fe7f" + integrity sha512-ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w== dependencies: - "@typescript-eslint/types" "4.16.1" - "@typescript-eslint/visitor-keys" "4.16.1" + "@typescript-eslint/types" "4.28.4" + "@typescript-eslint/visitor-keys" "4.28.4" "@typescript-eslint/types@3.10.1": version "3.10.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727" integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ== -"@typescript-eslint/types@4.16.1": - version "4.16.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.16.1.tgz#5ba2d3e38b1a67420d2487519e193163054d9c15" - integrity sha512-nnKqBwMgRlhzmJQF8tnFDZWfunXmJyuXj55xc8Kbfup4PbkzdoDXZvzN8//EiKR27J6vUSU8j4t37yUuYPiLqA== +"@typescript-eslint/types@4.28.4": + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.4.tgz#41acbd79b5816b7c0dd7530a43d97d020d3aeb42" + integrity sha512-3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww== "@typescript-eslint/typescript-estree@3.10.1": version "3.10.1" @@ -2318,18 +2395,18 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/typescript-estree@4.16.1": - version "4.16.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.16.1.tgz#c2fc46b05a48fbf8bbe8b66a63f0a9ba04b356f1" - integrity sha512-m8I/DKHa8YbeHt31T+UGd/l8Kwr0XCTCZL3H4HMvvLCT7HU9V7yYdinTOv1gf/zfqNeDcCgaFH2BMsS8x6NvJg== +"@typescript-eslint/typescript-estree@4.28.4": + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz#252e6863278dc0727244be9e371eb35241c46d00" + integrity sha512-z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ== dependencies: - "@typescript-eslint/types" "4.16.1" - "@typescript-eslint/visitor-keys" "4.16.1" - debug "^4.1.1" - globby "^11.0.1" + "@typescript-eslint/types" "4.28.4" + "@typescript-eslint/visitor-keys" "4.28.4" + debug "^4.3.1" + globby "^11.0.3" is-glob "^4.0.1" - semver "^7.3.2" - tsutils "^3.17.1" + semver "^7.3.5" + tsutils "^3.21.0" "@typescript-eslint/visitor-keys@3.10.1": version "3.10.1" @@ -2338,12 +2415,12 @@ dependencies: eslint-visitor-keys "^1.1.0" -"@typescript-eslint/visitor-keys@4.16.1": - version "4.16.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.16.1.tgz#d7571fb580749fae621520deeb134370bbfc7293" - integrity sha512-s/aIP1XcMkEqCNcPQtl60ogUYjSM8FU2mq1O7y5cFf3Xcob1z1iXWNB6cC43Op+NGRTFgGolri6s8z/efA9i1w== +"@typescript-eslint/visitor-keys@4.28.4": + version "4.28.4" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz#92dacfefccd6751cbb0a964f06683bfd72d0c4d3" + integrity sha512-NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg== dependencies: - "@typescript-eslint/types" "4.16.1" + "@typescript-eslint/types" "4.28.4" eslint-visitor-keys "^2.0.0" "@webassemblyjs/ast@1.9.0": @@ -2521,7 +2598,7 @@ resolved "https://registry.yarnpkg.com/@zeit/schemas/-/schemas-2.6.0.tgz#004e8e553b4cd53d538bd38eac7bcbf58a867fe3" integrity sha512-uUrgZ8AxS+Lio0fZKAipJjAh415JyrOZowliZAzmnJSsf7piVL5w+G0+gFJ0KSu3QRhvui/7zuvpLz03YjXAhg== -abab@^2.0.3: +abab@^2.0.3, abab@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== @@ -2543,9 +2620,9 @@ acorn-globals@^6.0.0: acorn-walk "^7.1.1" acorn-jsx@^5.3.1: - version "5.3.1" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" - integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== acorn-walk@^7.1.1: version "7.2.0" @@ -2562,6 +2639,11 @@ acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== +acorn@^8.2.4: + version "8.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" + integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== + address@1.1.2, address@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/address/-/address-1.1.2.tgz#bf1116c9c758c51b7a933d296b72c221ed9428b6" @@ -2575,6 +2657,13 @@ adjust-sourcemap-loader@3.0.0: loader-utils "^2.0.0" regex-parser "^2.2.11" +agent-base@6: + version "6.0.2" + resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" + integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ== + dependencies: + debug "4" + aggregate-error@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" @@ -2603,7 +2692,7 @@ ajv@6.5.3: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: +ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -2613,10 +2702,10 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" -ajv@^7.0.2: - version "7.1.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.1.1.tgz#1e6b37a454021fa9941713f38b952fc1c8d32a84" - integrity sha512-ga/aqDYnUy/o7vbsRTFhhTsNeXiYb5JWDIcRIeZfwRNCefwjNTVYCGdGSUrEmiu3yDK3vFvNbgJxvrQW4JXrYQ== +ajv@^8.0.1: + version "8.6.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571" + integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -2628,21 +2717,21 @@ alphanum-sort@^1.0.0: resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= -anchor-link-browser-transport@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/anchor-link-browser-transport/-/anchor-link-browser-transport-3.0.1.tgz#c36ab2ce0cf995aa33113a07341ef35500386360" - integrity sha512-YZoP2HV/Uh3CT2wva3EWMJMngcHoSj8S19yblgcHJoyHpqro08smRoPW9iDxifUIEEPsYpmk2F6x8BeRjsU6Ww== +anchor-link-browser-transport@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/anchor-link-browser-transport/-/anchor-link-browser-transport-3.1.3.tgz#eb65dbcba9380885f36b08b2a9d05bf9cdeb4e46" + integrity sha512-r5S7r/NkkBQaUydh0Q3MOZZ7oQo1KZZ72LHtJzW5PX1v2dIW76/hxsKVE9IjwmIIeHvB6jqgHgTk0Rm3YVdqYw== dependencies: tslib "^2.0.3" -anchor-link@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/anchor-link/-/anchor-link-3.0.3.tgz#74aafc9b2e096f9be897d893191b09635c8e1c7a" - integrity sha512-KaIASOIj9Fne0egWf/bNNFXjrQKLd6QtNpTbFO5UwaOzIhheCAAGNbCfLXLtXJ3RQLb3fUt0rDISvBdCGM5JIg== +anchor-link@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/anchor-link/-/anchor-link-3.2.3.tgz#ed57b54050a74ae3fb391bdb67f78c7196d8a343" + integrity sha512-1AnQLwO6tKWAP7l9/dwQ4iRT8RvNFBDPb7mxdqS2hURJa6zXEI9UdIMKCVKP64iiu2Jekf8/TSXnFKJFVXIPog== dependencies: - "@greymass/eosio" "^0.2.5" + "@greymass/eosio" "^0.4.0" asmcrypto.js "^2.3.2" - eosio-signing-request "^2.0.0" + eosio-signing-request "^2.2.0" fetch-ponyfill "^7.1.0" isomorphic-ws "^4.0.1" pako "^2.0.3" @@ -2668,11 +2757,11 @@ ansi-colors@^4.1.1: integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== ansi-escapes@^4.2.1, ansi-escapes@^4.3.0, ansi-escapes@^4.3.1: - version "4.3.1" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61" - integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA== + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== dependencies: - type-fest "^0.11.0" + type-fest "^0.21.3" ansi-html@0.0.7, ansi-html@^0.0.7: version "0.0.7" @@ -2721,10 +2810,10 @@ anymatch@^2.0.0: micromatch "^3.1.4" normalize-path "^2.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== +anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716" + integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg== dependencies: normalize-path "^3.0.0" picomatch "^2.0.4" @@ -2873,7 +2962,7 @@ array-flatten@^2.1.0: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== -array-includes@^3.1.1, array-includes@^3.1.2: +array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== @@ -2906,7 +2995,7 @@ array-unique@^0.3.2: resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428" integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg= -array.prototype.flat@^1.2.3: +array.prototype.flat@^1.2.3, array.prototype.flat@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== @@ -2915,7 +3004,7 @@ array.prototype.flat@^1.2.3: define-properties "^1.1.3" es-abstract "^1.18.0-next.1" -array.prototype.flatmap@^1.2.3: +array.prototype.flatmap@^1.2.3, array.prototype.flatmap@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9" integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q== @@ -2955,18 +3044,6 @@ asn1.js@^5.2.0: minimalistic-assert "^1.0.0" safer-buffer "^2.1.0" -asn1@~0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.4.tgz#8d2475dfab553bb33e77b54e59e880bb8ce23136" - integrity sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg== - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= - assert@^1.1.1: version "1.5.0" resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb" @@ -3045,20 +3122,10 @@ autoprefixer@^9.6.1: postcss "^7.0.32" postcss-value-parser "^4.1.0" -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= - -aws4@^1.8.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" - integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== - axe-core@^4.0.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.1.2.tgz#7cf783331320098bfbef620df3b3c770147bc224" - integrity sha512-V+Nq70NxKhYt89ArVcaNL9FDryB3vQOd+BFXZIfO3RP6rwtj+2yqqqdHEkacutglPaZLkJeuXKCjCJDMGPtPqg== + version "4.3.1" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.1.tgz#0c6a076e4a1c3e0544ba6a9479158f9be7a7928e" + integrity sha512-3WVgVPs/7OnKU3s+lqMtkv3wQlg3WxK1YifmpJSDO0E1aPBrZWlrrTO6cxRqCXLuX2aYgCljqXIQd0VnRidV0g== axobject-query@^2.2.0: version "2.2.0" @@ -3151,34 +3218,34 @@ babel-plugin-named-asset-import@^0.3.7: resolved "https://registry.yarnpkg.com/babel-plugin-named-asset-import/-/babel-plugin-named-asset-import-0.3.7.tgz#156cd55d3f1228a5765774340937afc8398067dd" integrity sha512-squySRkf+6JGnvjoUtDEjSREJEBirnXi9NqP6rjSYsylxQxqBTz+pkmf395i9E2zsvmYUaI40BHo6SqZUdydlw== -babel-plugin-polyfill-corejs2@^0.1.4: - version "0.1.10" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.10.tgz#a2c5c245f56c0cac3dbddbf0726a46b24f0f81d1" - integrity sha512-DO95wD4g0A8KRaHKi0D51NdGXzvpqVLnLu5BTvDlpqUEpTmeEtypgC1xqesORaWmiUOQI14UHKlzNd9iZ2G3ZA== +babel-plugin-polyfill-corejs2@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327" + integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ== dependencies: - "@babel/compat-data" "^7.13.0" - "@babel/helper-define-polyfill-provider" "^0.1.5" + "@babel/compat-data" "^7.13.11" + "@babel/helper-define-polyfill-provider" "^0.2.2" semver "^6.1.1" -babel-plugin-polyfill-corejs3@^0.1.3: - version "0.1.7" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.7.tgz#80449d9d6f2274912e05d9e182b54816904befd0" - integrity sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw== +babel-plugin-polyfill-corejs3@^0.2.2: + version "0.2.3" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz#72add68cf08a8bf139ba6e6dfc0b1d504098e57b" + integrity sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g== dependencies: - "@babel/helper-define-polyfill-provider" "^0.1.5" - core-js-compat "^3.8.1" + "@babel/helper-define-polyfill-provider" "^0.2.2" + core-js-compat "^3.14.0" -babel-plugin-polyfill-regenerator@^0.1.2: - version "0.1.6" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.6.tgz#0fe06a026fe0faa628ccc8ba3302da0a6ce02f3f" - integrity sha512-OUrYG9iKPKz8NxswXbRAdSwF0GhRdIEMTloQATJi4bDuFqrXaXcCUT/VGNrr8pBcjMh1RxZ7Xt9cytVJTJfvMg== +babel-plugin-polyfill-regenerator@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077" + integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg== dependencies: - "@babel/helper-define-polyfill-provider" "^0.1.5" + "@babel/helper-define-polyfill-provider" "^0.2.2" "babel-plugin-styled-components@>= 1": - version "1.12.0" - resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.12.0.tgz#1dec1676512177de6b827211e9eda5a30db4f9b9" - integrity sha512-FEiD7l5ZABdJPpLssKXjBUJMYqzbcNzBowfXDCdJhOpbhWiewapUaY+LZGT8R4Jg2TwOjGjG4RKeyrO5p9sBkA== + version "1.13.2" + resolved "https://registry.yarnpkg.com/babel-plugin-styled-components/-/babel-plugin-styled-components-1.13.2.tgz#ebe0e6deff51d7f93fceda1819e9b96aeb88278d" + integrity sha512-Vb1R3d4g+MUfPQPVDMCGjm3cDocJEUTR7Xq7QS95JWWeksN1wdFRYpD2kulDgI3Huuaf1CZd+NK4KQmqUFh5dA== dependencies: "@babel/helper-annotate-as-pure" "^7.0.0" "@babel/helper-module-imports" "^7.0.0" @@ -3279,9 +3346,9 @@ bail@^1.0.0: integrity sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ== balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== base-x@^3.0.2: version "3.0.8" @@ -3318,13 +3385,6 @@ batch@0.6.1: resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY= -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4= - dependencies: - tweetnacl "^0.14.3" - bfj@^7.0.2: version "7.0.2" resolved "https://registry.yarnpkg.com/bfj/-/bfj-7.0.2.tgz#1988ce76f3add9ac2913fd8ba47aad9e651bfbb2" @@ -3377,16 +3437,16 @@ bluebird@^3.5.5: resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== +bn.js@5.2.0, bn.js@^5.0.0, bn.js@^5.1.1: + version "5.2.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" + integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== + bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9, bn.js@^4.4.0: version "4.12.0" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -bn.js@^5.0.0, bn.js@^5.1.1: - version "5.2.0" - resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" - integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== - body-parser@1.19.0: version "1.19.0" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" @@ -3556,16 +3616,16 @@ browserslist@4.14.2: escalade "^3.0.2" node-releases "^1.1.61" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.3, browserslist@^4.3.4, browserslist@^4.6.2, browserslist@^4.6.4: - version "4.16.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" - integrity sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.16.6, browserslist@^4.3.4, browserslist@^4.6.2, browserslist@^4.6.4: + version "4.16.6" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" + integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== dependencies: - caniuse-lite "^1.0.30001181" - colorette "^1.2.1" - electron-to-chromium "^1.3.649" + caniuse-lite "^1.0.30001219" + colorette "^1.2.2" + electron-to-chromium "^1.3.723" escalade "^3.1.1" - node-releases "^1.1.70" + node-releases "^1.1.71" bs58@4.0.1, bs58@^4.0.1: version "4.0.1" @@ -3662,9 +3722,9 @@ cacache@^12.0.2: y18n "^4.0.0" cacache@^15.0.5: - version "15.0.5" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.5.tgz#69162833da29170d6732334643c60e005f5f17d0" - integrity sha512-lloiL22n7sOjEEXdL8NAjTgv9a1u43xICE9/203qonkZUCj5X1UEWIdf2/Y0d6QcCtMzbKQyhrcDbdvlZTs/+A== + version "15.2.0" + resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389" + integrity sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw== dependencies: "@npmcli/move-file" "^1.0.1" chownr "^2.0.0" @@ -3680,7 +3740,7 @@ cacache@^15.0.5: p-map "^4.0.0" promise-inflight "^1.0.1" rimraf "^3.0.2" - ssri "^8.0.0" + ssri "^8.0.1" tar "^6.0.2" unique-filename "^1.1.1" @@ -3777,10 +3837,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001181: - version "1.0.30001196" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001196.tgz#00518a2044b1abf3e0df31fadbe5ed90b63f4e64" - integrity sha512-CPvObjD3ovWrNBaXlAIGWmg2gQQuJ5YhuciUOjPRox6hIQttu8O+b51dx6VIpIY9ESd2d0Vac1RKpICdG4rGUg== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001219: + version "1.0.30001245" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz#45b941bbd833cb0fa53861ff2bae746b3c6ca5d4" + integrity sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA== capture-exit@^2.0.0: version "2.0.0" @@ -3794,11 +3854,6 @@ case-sensitive-paths-webpack-plugin@2.3.0: resolved "https://registry.yarnpkg.com/case-sensitive-paths-webpack-plugin/-/case-sensitive-paths-webpack-plugin-2.3.0.tgz#23ac613cc9a856e4f88ff8bb73bbb5e989825cf7" integrity sha512-/4YgnZS8y1UXXmC02xD5rRrBEu6T5ub+mQHLNRj0fzTRbgdBYhsNo2V5EqwgqrExjxsjtF/OpAKAMkKsxbD5XQ== -caseless@~0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" - integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= - chalk@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" @@ -3826,9 +3881,9 @@ chalk@^3.0.0: supports-color "^7.1.0" chalk@^4.0.0, chalk@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" - integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -3901,19 +3956,19 @@ chokidar@^2.1.8: fsevents "^1.2.7" chokidar@^3.4.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a" - integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw== + version "3.5.2" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75" + integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ== dependencies: - anymatch "~3.1.1" + anymatch "~3.1.2" braces "~3.0.2" - glob-parent "~5.1.0" + glob-parent "~5.1.2" is-binary-path "~2.1.0" is-glob "~4.0.1" normalize-path "~3.0.0" - readdirp "~3.5.0" + readdirp "~3.6.0" optionalDependencies: - fsevents "~2.3.1" + fsevents "~2.3.2" chownr@^1.1.1: version "1.1.4" @@ -3926,11 +3981,9 @@ chownr@^2.0.0: integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ== chrome-trace-event@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4" - integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ== - dependencies: - tslib "^1.9.0" + version "1.0.3" + resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" + integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== ci-info@^2.0.0: version "2.0.0" @@ -3961,9 +4014,9 @@ class-utils@^0.3.5: static-extend "^0.1.1" classnames@2.x, classnames@^2.2.1, classnames@^2.2.5, classnames@^2.2.6: - version "2.2.6" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" - integrity sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q== + version "2.3.1" + resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" + integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== clean-css@^4.2.3: version "4.2.3" @@ -4060,7 +4113,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.9.0, color-convert@^1.9.1, color-convert@^1.9.3: +color-convert@^1.9.0, color-convert@^1.9.3: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -4084,28 +4137,28 @@ color-name@^1.0.0, color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^1.5.4: - version "1.5.4" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6" - integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw== +color-string@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.6.0.tgz#c3915f61fe267672cb7e1e064c9d692219f6c312" + integrity sha512-c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" color@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e" - integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ== + version "3.2.1" + resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164" + integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA== dependencies: - color-convert "^1.9.1" - color-string "^1.5.4" + color-convert "^1.9.3" + color-string "^1.6.0" colorette@^1.2.1, colorette@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== -combined-stream@^1.0.6, combined-stream@~1.0.6: +combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -4254,7 +4307,7 @@ convert-hex@~0.1.0: resolved "https://registry.yarnpkg.com/convert-hex/-/convert-hex-0.1.0.tgz#08c04568922c27776b8a2e81a95d393362ea0b65" integrity sha1-CMBFaJIsJ3drii6BqV05M2LqC2U= -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: +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== @@ -4266,6 +4319,13 @@ convert-source-map@^0.3.3: resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190" integrity sha1-8dgClQr33SYxof6+BZZVDIarMZA= +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.8.0" + resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369" + integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA== + dependencies: + safe-buffer "~5.1.1" + convert-string@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/convert-string/-/convert-string-0.1.0.tgz#79ce41a9bb0d03bcf72cdc6a8f3c56fbbc64410a" @@ -4298,18 +4358,18 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.6.2, core-js-compat@^3.8.1, core-js-compat@^3.9.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.1.tgz#4e572acfe90aff69d76d8c37759d21a5c59bb455" - integrity sha512-jXAirMQxrkbiiLsCx9bQPJFA6llDadKMpYrBJQJ3/c4/vsPP/fAf29h24tviRlvwUL6AmY5CHLu2GvjuYviQqA== +core-js-compat@^3.14.0, core-js-compat@^3.15.0, core-js-compat@^3.6.2: + version "3.15.2" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz#47272fbb479880de14b4e6081f71f3492f5bd3cb" + integrity sha512-Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ== dependencies: - browserslist "^4.16.3" + browserslist "^4.16.6" semver "7.0.0" -core-js-pure@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.9.1.tgz#677b322267172bd490e4464696f790cbc355bec5" - integrity sha512-laz3Zx0avrw9a4QEIdmIblnVuJz8W51leY9iLThatCsFawWxC3sE4guASC78JbCin+DkwMpCdp1AVAuzL/GN7A== +core-js-pure@^3.15.0: + version "3.15.2" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.15.2.tgz#c8e0874822705f3385d3197af9348f7c9ae2e3ce" + integrity sha512-D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA== core-js@^2.4.0: version "2.6.12" @@ -4317,11 +4377,11 @@ core-js@^2.4.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.6.5: - version "3.9.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.9.1.tgz#cec8de593db8eb2a85ffb0dbdeb312cb6e5460ae" - integrity sha512-gSjRvzkxQc1zjM/5paAmL4idJBFzuJoo+jDjF1tStYFMV2ERfD02HhahhCGXUyHxQRG4yFKVSdO6g62eoRMcDg== + version "3.15.2" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" + integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q== -core-util-is@1.0.2, core-util-is@~1.0.0: +core-util-is@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= @@ -4428,9 +4488,9 @@ create-react-context@0.3.0: warning "^4.0.3" cross-fetch@^3.0.4: - version "3.0.6" - resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz#3a4040bc8941e653e0e9cf17f29ebcd177d3365c" - integrity sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ== + version "3.1.4" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.4.tgz#9723f3a3a247bf8b89039f3a380a9244e8fa2f39" + integrity sha512-1eAtFWdIubi6T4XPy6ei9iUFoKpUkIF971QLN8lIvvvwueI65+Nw5haMNKUwfJxabqlIIDODJKGrQ66gxC0PbQ== dependencies: node-fetch "2.6.1" @@ -4553,7 +4613,7 @@ css-select-base-adapter@^0.1.1: resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w== -css-select@^2.0.0, css-select@^2.0.2: +css-select@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef" integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ== @@ -4563,6 +4623,17 @@ css-select@^2.0.0, css-select@^2.0.2: domutils "^1.7.0" nth-check "^1.0.2" +css-select@^4.1.3: + version "4.1.3" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" + integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA== + dependencies: + boolbase "^1.0.0" + css-what "^5.0.0" + domhandler "^4.2.0" + domutils "^2.6.0" + nth-check "^2.0.0" + css-to-react-native@^2.2.2: version "2.3.2" resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-2.3.2.tgz#e75e2f8f7aa385b4c3611c52b074b70a002f2e7d" @@ -4581,9 +4652,9 @@ css-tree@1.0.0-alpha.37: source-map "^0.6.1" css-tree@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.2.tgz#9ae393b5dafd7dae8a622475caec78d3d8fbd7b5" - integrity sha512-wCoWush5Aeo48GLhfHPbmvZs59Z+M7k5+B1xDnXbdWNcEF423DoFdqSWE0PM5aNk5nI5cp1q7ms36zGApY/sKQ== + version "1.1.3" + resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d" + integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q== dependencies: mdn-data "2.0.14" source-map "^0.6.1" @@ -4601,6 +4672,11 @@ css-what@^3.2.1: resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== +css-what@^5.0.0: + version "5.0.1" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad" + integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg== + css@^2.0.0: version "2.2.4" resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" @@ -4626,10 +4702,10 @@ cssesc@^3.0.0: resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -cssnano-preset-default@^4.0.7: - version "4.0.7" - resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76" - integrity sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA== +cssnano-preset-default@^4.0.8: + version "4.0.8" + resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.8.tgz#920622b1fc1e95a34e8838203f1397a504f2d3ff" + integrity sha512-LdAyHuq+VRyeVREFmuxUZR1TXjQm8QQU/ktoo/x7bz+SdOge1YKc5eMN6pRW7YWBmyq59CqYba1dJ5cUukEjLQ== dependencies: css-declaration-sorter "^4.0.1" cssnano-util-raw-cache "^4.0.1" @@ -4659,7 +4735,7 @@ cssnano-preset-default@^4.0.7: postcss-ordered-values "^4.1.2" postcss-reduce-initial "^4.0.3" postcss-reduce-transforms "^4.0.2" - postcss-svgo "^4.0.2" + postcss-svgo "^4.0.3" postcss-unique-selectors "^4.0.1" cssnano-util-get-arguments@^4.0.0: @@ -4685,12 +4761,12 @@ cssnano-util-same-parent@^4.0.0: integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q== cssnano@^4.1.10: - version "4.1.10" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2" - integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ== + version "4.1.11" + resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.11.tgz#c7b5f5b81da269cb1fd982cb960c1200910c9a99" + integrity sha512-6gZm2htn7xIPJOHY824ERgj8cNPgPxyCSnkXc4v7YvNW+TdVfzgngHcEhy/8D11kUWRUMbke+tC+AUcUsnMz2g== dependencies: cosmiconfig "^5.0.0" - cssnano-preset-default "^4.0.7" + cssnano-preset-default "^4.0.8" is-resolvable "^1.0.0" postcss "^7.0.0" @@ -4711,7 +4787,7 @@ cssom@~0.3.6: resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg== -cssstyle@^2.2.0: +cssstyle@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852" integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A== @@ -4719,14 +4795,14 @@ cssstyle@^2.2.0: cssom "~0.3.6" csstype@^2.5.2: - version "2.6.16" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.16.tgz#544d69f547013b85a40d15bff75db38f34fe9c39" - integrity sha512-61FBWoDHp/gRtsoDkq/B1nWrCUG/ok1E3tUrcNbZjsE9Cxd9yzUirjS3+nAATB8U4cTtaQmAHbNndoFz5L6C9Q== + version "2.6.17" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.17.tgz#4cf30eb87e1d1a005d8b6510f95292413f6a1c0e" + integrity sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A== csstype@^3.0.2: - version "3.0.7" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.7.tgz#2a5fb75e1015e84dd15692f71e89a1450290950b" - integrity sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g== + version "3.0.8" + resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340" + integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw== cyclist@^1.0.1: version "1.0.1" @@ -4742,16 +4818,9 @@ d@1, d@^1.0.1: type "^1.0.1" damerau-levenshtein@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz#143c1641cb3d85c60c32329e26899adea8701791" - integrity sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug== - -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA= - dependencies: - assert-plus "^1.0.0" + version "1.0.7" + resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d" + integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw== data-urls@^2.0.0: version "2.0.0" @@ -4769,29 +4838,29 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: dependencies: ms "2.0.0" -debug@^3.1.1, debug@^3.2.5: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + +debug@^3.1.1, debug@^3.2.5, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: - version "4.3.1" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" - integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== - dependencies: - ms "2.1.2" - decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA= -decimal.js@^10.2.0: - version "10.2.1" - resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz#238ae7b0f0c793d3e3cea410108b35a2c01426a3" - integrity sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw== +decimal.js@^10.2.1: + version "10.3.1" + resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783" + integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ== decode-uri-component@^0.2.0: version "0.2.0" @@ -4909,9 +4978,9 @@ detect-newline@^3.0.0: integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA== detect-node@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c" - integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw== + version "2.1.0" + resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" + integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== detect-port-alt@1.1.6: version "1.1.6" @@ -4958,9 +5027,9 @@ dns-equal@^1.0.0: integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-packet@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a" - integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg== + version "1.3.4" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== dependencies: ip "^1.1.0" safe-buffer "^5.0.1" @@ -4995,11 +5064,11 @@ doctrine@^3.0.0: esutils "^2.0.2" dom-align@^1.7.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.0.tgz#56fb7156df0b91099830364d2d48f88963f5a29c" - integrity sha512-YkoezQuhp3SLFGdOlr5xkqZ640iXrnHAwVYcDg8ZKRUtO7mSzSC2BA5V0VuyAwPSJA4CLIc6EDDJh4bEsD2+zA== + version "1.12.2" + resolved "https://registry.yarnpkg.com/dom-align/-/dom-align-1.12.2.tgz#0f8164ebd0c9c21b0c790310493cd855892acd4b" + integrity sha512-pHuazgqrsTFrGU2WLDdXxCFabkdQDx72ddkraZNih1KsMcN5qsRSTR9O4VJRlwTPCPb5COYg3LOfiMHHcPInHg== -dom-converter@^0.2: +dom-converter@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768" integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA== @@ -5007,9 +5076,9 @@ dom-converter@^0.2: utila "~0.4" dom-helpers@^5.0.1, dom-helpers@^5.1.3: - version "5.2.0" - resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.0.tgz#57fd054c5f8f34c52a3eeffdb7e7e93cd357d95b" - integrity sha512-Ru5o9+V8CpunKnz5LGgWXkmrH/20cGKwcHwS4m73zIvs54CN9epEmT/HLqFJW3kXpakAFkEdzgy1hzlJe3E4OQ== + version "5.2.1" + resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902" + integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA== dependencies: "@babel/runtime" "^7.8.7" csstype "^3.0.2" @@ -5023,12 +5092,12 @@ dom-serializer@0: entities "^2.0.0" dom-serializer@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1" - integrity sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA== + version "1.3.2" + resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" + integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig== dependencies: domelementtype "^2.0.1" - domhandler "^4.0.0" + domhandler "^4.2.0" entities "^2.0.0" dom-walk@^0.1.0: @@ -5041,15 +5110,15 @@ domain-browser@^1.1.1: resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA== -domelementtype@1, domelementtype@^1.3.1: +domelementtype@1: version "1.3.1" resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f" integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w== -domelementtype@^2.0.1, domelementtype@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e" - integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w== +domelementtype@^2.0.1, domelementtype@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57" + integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A== domexception@^2.0.1: version "2.0.1" @@ -5058,13 +5127,6 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -domhandler@^2.3.0: - version "2.4.2" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803" - integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA== - dependencies: - domelementtype "1" - domhandler@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a" @@ -5072,14 +5134,14 @@ domhandler@^3.3.0: dependencies: domelementtype "^2.0.1" -domhandler@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz#01ea7821de996d85f69029e81fa873c21833098e" - integrity sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA== +domhandler@^4.0.0, domhandler@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059" + integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA== dependencies: - domelementtype "^2.1.0" + domelementtype "^2.2.0" -domutils@^1.5.1, domutils@^1.7.0: +domutils@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a" integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg== @@ -5087,14 +5149,14 @@ domutils@^1.5.1, domutils@^1.7.0: dom-serializer "0" domelementtype "1" -domutils@^2.4.2: - version "2.4.4" - resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.4.tgz#282739c4b150d022d34699797369aad8d19bbbd3" - integrity sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA== +domutils@^2.4.2, domutils@^2.5.2, domutils@^2.6.0: + version "2.7.0" + resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442" + integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg== dependencies: dom-serializer "^1.0.1" - domelementtype "^2.0.1" - domhandler "^4.0.0" + domelementtype "^2.2.0" + domhandler "^4.2.0" dot-case@^3.0.4: version "3.0.4" @@ -5136,14 +5198,6 @@ duplexify@^3.4.2, duplexify@^3.6.0: readable-stream "^2.0.0" stream-shift "^1.0.0" -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk= - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - ecurve@1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/ecurve/-/ecurve-1.0.5.tgz#d148e8fe50a674f983bb5bae09da0ea23e10535e" @@ -5169,10 +5223,10 @@ ejs@^2.6.1: resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba" integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== -electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.649: - version "1.3.680" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.680.tgz#88cc44bd2a85b46cf7521f714db57dd74d0cd488" - integrity sha512-XBACJT9RdpdWtoMXQPR8Be3ZtmizWWbxfw8cY2b5feUwiDO3FUl8qo4W2jXoq/WnnA3xBRqafu1XbpczqyUvlA== +electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.723: + version "1.3.780" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.780.tgz#f946e10dc0005a3b59b9afa2d2c92f5c421f7fc5" + integrity sha512-2KQ9OYm9WMUNpAPA/4aerURl3hwRc9tNlpsiEj3Y8Gf7LVf26NzyLIX2v0hSagQwrS9+cWab+28A2GPKDoVNRA== elliptic@6.5.0: version "6.5.0" @@ -5200,20 +5254,7 @@ elliptic@6.5.2: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -elliptic@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.3.tgz#cb59eb2efdaf73a0bd78ccd7015a62ad6e0f93d6" - integrity sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw== - dependencies: - bn.js "^4.4.0" - brorand "^1.0.1" - hash.js "^1.0.0" - hmac-drbg "^1.0.0" - inherits "^2.0.1" - minimalistic-assert "^1.0.0" - minimalistic-crypto-utils "^1.0.0" - -elliptic@^6.5.3: +elliptic@6.5.4, elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== @@ -5291,11 +5332,6 @@ enquirer@^2.3.5, enquirer@^2.3.6: dependencies: ansi-colors "^4.1.1" -entities@^1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== - entities@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" @@ -5309,12 +5345,12 @@ env-cmd@^10.1.0: commander "^4.0.0" cross-spawn "^7.0.0" -eosio-signing-request@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eosio-signing-request/-/eosio-signing-request-2.1.0.tgz#9bdb5708ac58056d464e540e9ab6d0a6772a8211" - integrity sha512-96pUSg5ZH4ypc1IQTcXr5U773Ne0fxnBl3dLA1l2zikLTfDurhmvOpdUKpcdzrbSTB7pnpUQ/eFVyXFBnfFtew== +eosio-signing-request@^2.2.0, eosio-signing-request@^2.2.1: + version "2.2.2" + resolved "https://registry.yarnpkg.com/eosio-signing-request/-/eosio-signing-request-2.2.2.tgz#281cfe0843dc80205c89003d5638baf70fdcc449" + integrity sha512-lxRBHYkk2rAnnZrFnTqweD1FLH3usL5oE24m3+1zNK2vJHRVlIyUk7tlUlmax78j8+FE54Po8LQCQ8TrCSSFGg== dependencies: - "@greymass/eosio" "^0.2.3" + "@greymass/eosio" "^0.4.0" tslib "^2.0.3" eosjs-api@^7.0.4: @@ -5399,13 +5435,14 @@ eosjs@21.0.1-rc1: text-encoding "0.7.0" eosjs@^21.0.3: - version "21.0.3" - resolved "https://registry.yarnpkg.com/eosjs/-/eosjs-21.0.3.tgz#126388f5045647f687fd0aacff4f08ed92d4369f" - integrity sha512-EO/lM1pvA1nohzmPnwyE6k5OvYqRo9ZkI6PfMI4npXkru04Nt/zBjcneNLFpRc7gg5W7vtGLzJeLB7NOFquDMg== + version "21.0.4" + resolved "https://registry.yarnpkg.com/eosjs/-/eosjs-21.0.4.tgz#67794a9fbc3c7659de19a7926c2c13cce4515571" + integrity sha512-XbuIoidplA1hHIejy7VQ+hmBfC6T28kYFaQMsn6G1DMTg1CFwUzxwzUvZg/dGNPuf7hgPxOpaQvAUsdidTgGhQ== dependencies: - elliptic "6.5.3" + bn.js "5.2.0" + elliptic "6.5.4" hash.js "1.1.7" - pako "1.0.11" + pako "2.0.3" errno@^0.1.3, errno@~0.1.7: version "0.1.8" @@ -5428,10 +5465,10 @@ error-stack-parser@^2.0.6: dependencies: stackframe "^1.1.1" -es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2: - version "1.18.0" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4" - integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw== +es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: + version "1.18.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0" + integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -5441,14 +5478,14 @@ es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2: has-symbols "^1.0.2" is-callable "^1.2.3" is-negative-zero "^2.0.1" - is-regex "^1.1.2" - is-string "^1.0.5" - object-inspect "^1.9.0" + is-regex "^1.1.3" + is-string "^1.0.6" + object-inspect "^1.10.3" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" string.prototype.trimstart "^1.0.4" - unbox-primitive "^1.0.0" + unbox-primitive "^1.0.1" es-to-primitive@^1.2.1: version "1.2.1" @@ -5510,22 +5547,27 @@ escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -escodegen@^1.14.1: - version "1.14.3" - resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503" - integrity sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw== +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +escodegen@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd" + integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw== dependencies: esprima "^4.0.1" - estraverse "^4.2.0" + estraverse "^5.2.0" esutils "^2.0.2" optionator "^0.8.1" optionalDependencies: source-map "~0.6.1" eslint-config-prettier@^8.0.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.1.0.tgz#4ef1eaf97afe5176e6a75ddfb57c335121abc5a6" - integrity sha512-oKMhGv3ihGbCIimCAjqkdzx2Q+jthoqnXSP+d86M9tptwugycmTFdVR4IpLgq2c4SHifbwO90z2fQ8/Aio73yw== + version "8.3.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" + integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== eslint-config-react-app@^6.0.0: version "6.0.0" @@ -5544,11 +5586,16 @@ eslint-config-standard-react@^11.0.1: resolved "https://registry.yarnpkg.com/eslint-config-standard-react/-/eslint-config-standard-react-11.0.1.tgz#1f488e0062c1e21c4c8584551619f11750658f55" integrity sha512-4WlBynOqBZJRaX81CBcIGDHqUiqxvw4j/DbEIICz8QkMs3xEncoPgAoysiqCSsg71X92uhaBc8sgqB96smaMmg== -eslint-config-standard@16.0.2, eslint-config-standard@^16.0.2: +eslint-config-standard@16.0.2: version "16.0.2" resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz#71e91727ac7a203782d0a5ca4d1c462d14e234f6" integrity sha512-fx3f1rJDsl9bY7qzyX8SAtP8GBSk6MfXFaTfaGgk12aAYW4gJSyRm7dM790L6cbXv63fvjY4XeSzXnb4WM+SKw== +eslint-config-standard@^16.0.2: + version "16.0.3" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516" + integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg== + eslint-import-resolver-node@^0.3.4: version "0.3.4" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" @@ -5557,12 +5604,12 @@ eslint-import-resolver-node@^0.3.4: debug "^2.6.9" resolve "^1.13.1" -eslint-module-utils@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6" - integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA== +eslint-module-utils@^2.6.0, eslint-module-utils@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233" + integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A== dependencies: - debug "^2.6.9" + debug "^3.2.7" pkg-dir "^2.0.0" eslint-plugin-es@^3.0.0: @@ -5574,14 +5621,35 @@ eslint-plugin-es@^3.0.0: regexpp "^3.0.0" eslint-plugin-flowtype@^5.2.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.3.1.tgz#df6227e28c61d967b825c1327a27818bbb2ad325" - integrity sha512-mziJD+zw+VTwLtF9qLIxYac0GJCbSEDyqMLP5ENzQeNY5EOxbAfitMFLo+UItjYOISQdh1BCobwE2d4i1o+9Rw== + version "5.8.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.8.0.tgz#35b55e4ce559b90efbe913ed33630e391e301481" + integrity sha512-feK1xnUTsMSNTOw9jFw7aVgZl7Ep+ghpta/YEoaV6jbXU6Yso30B7BIj9ObHLzZ5TFJL7D98az080wfykLCrcw== dependencies: lodash "^4.17.15" string-natural-compare "^3.0.1" -eslint-plugin-import@^2.22.1, eslint-plugin-import@~2.22.1: +eslint-plugin-import@^2.22.1: + version "2.23.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz#8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97" + integrity sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ== + dependencies: + array-includes "^3.1.3" + array.prototype.flat "^1.2.4" + debug "^2.6.9" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.4" + eslint-module-utils "^2.6.1" + find-up "^2.0.0" + has "^1.0.3" + is-core-module "^2.4.0" + minimatch "^3.0.4" + object.values "^1.1.3" + pkg-up "^2.0.0" + read-pkg-up "^3.0.0" + resolve "^1.20.0" + tsconfig-paths "^3.9.0" + +eslint-plugin-import@~2.22.1: version "2.22.1" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== @@ -5601,9 +5669,9 @@ eslint-plugin-import@^2.22.1, eslint-plugin-import@~2.22.1: tsconfig-paths "^3.9.0" eslint-plugin-jest@^24.1.0: - version "24.1.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.1.5.tgz#1e866a9f0deac587d0a3d5d7cefe99815a580de2" - integrity sha512-FIP3lwC8EzEG+rOs1y96cOJmMVpdFNreoDJv29B5vIupVssRi8zrSY3QadogT0K3h1Y8TMxJ6ZSAzYUmFCp2hg== + version "24.3.6" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz#5f0ca019183c3188c5ad3af8e80b41de6c8e9173" + integrity sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg== dependencies: "@typescript-eslint/experimental-utils" "^4.0.1" @@ -5637,9 +5705,9 @@ eslint-plugin-node@^11.0.0, eslint-plugin-node@~11.1.0: semver "^6.1.0" eslint-plugin-prettier@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.3.1.tgz#7079cfa2497078905011e6f82e8dd8453d1371b7" - integrity sha512-Rq3jkcFY8RYeQLgk2cCwuc0P7SEFwDravPhsJZOQ5N4YI4DSg50NyqJ/9gdZHzQlHf8MvafSesbNJCcP/FF6pQ== + version "3.4.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz#cdbad3bf1dbd2b177e9825737fe63b476a08f0c7" + integrity sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw== dependencies: prettier-linter-helpers "^1.0.0" @@ -5654,21 +5722,22 @@ eslint-plugin-react-hooks@^4.2.0: integrity sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ== eslint-plugin-react@^7.21.5: - version "7.22.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.22.0.tgz#3d1c542d1d3169c45421c1215d9470e341707269" - integrity sha512-p30tuX3VS+NWv9nQot9xIGAHBXR0+xJVaZriEsHoJrASGCJZDJ8JLNM0YqKqI0AKm6Uxaa1VUHoNEibxRCMQHA== + version "7.24.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz#eadedfa351a6f36b490aa17f4fa9b14e842b9eb4" + integrity sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q== dependencies: - array-includes "^3.1.1" - array.prototype.flatmap "^1.2.3" + array-includes "^3.1.3" + array.prototype.flatmap "^1.2.4" doctrine "^2.1.0" has "^1.0.3" jsx-ast-utils "^2.4.1 || ^3.0.0" - object.entries "^1.1.2" - object.fromentries "^2.0.2" - object.values "^1.1.1" + minimatch "^3.0.4" + object.entries "^1.1.4" + object.fromentries "^2.0.4" + object.values "^1.1.4" prop-types "^15.7.2" - resolve "^1.18.1" - string.prototype.matchall "^4.0.2" + resolve "^2.0.0-next.3" + string.prototype.matchall "^4.0.5" eslint-plugin-react@~7.21.5: version "7.21.5" @@ -5693,9 +5762,9 @@ eslint-plugin-standard@^5.0.0: integrity sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg== eslint-plugin-testing-library@^3.9.2: - version "3.10.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.10.1.tgz#4dd02306d601c3238fdabf1d1dbc5f2a8e85d531" - integrity sha512-nQIFe2muIFv2oR2zIuXE4vTbcFNx8hZKRzgHZqJg8rfopIWwoTwtlbCCNELT/jXzVe1uZF68ALGYoDXjLczKiQ== + version "3.10.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-testing-library/-/eslint-plugin-testing-library-3.10.2.tgz#609ec2b0369da7cf2e6d9edff5da153cc31d87bd" + integrity sha512-WAmOCt7EbF1XM8XfbCKAEzAPnShkNSwcIsAD2jHdsMUT9mZJPjLCG7pMzbcC8kK366NOuGip8HKLDC+Xk4yIdA== dependencies: "@typescript-eslint/experimental-utils" "^3.10.1" @@ -5722,50 +5791,61 @@ eslint-utils@^2.0.0, eslint-utils@^2.1.0: dependencies: eslint-visitor-keys "^1.1.0" +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA== + dependencies: + eslint-visitor-keys "^2.0.0" + eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== eslint-visitor-keys@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" - integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== eslint-webpack-plugin@^2.1.0: - version "2.5.2" - resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.5.2.tgz#4ee17577d6392bf72048080a1678d6237183db81" - integrity sha512-ndD9chZ/kaGnjjx7taRg7c6FK/YKb29SSYzaLtPBIYLYJQmZtuKqtQbAvTS2ymiMQT6X0VW9vZIHK0KLstv93Q== + version "2.5.4" + resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.5.4.tgz#473b84932f1a8e2c2b8e66a402d0497bf440b986" + integrity sha512-7rYh0m76KyKSDE+B+2PUQrlNS4HJ51t3WKpkJg6vo2jFMbEPTG99cBV0Dm7LXSHucN4WGCG65wQcRiTFrj7iWw== dependencies: "@types/eslint" "^7.2.6" arrify "^2.0.1" jest-worker "^26.6.2" micromatch "^4.0.2" + normalize-path "^3.0.0" schema-utils "^3.0.0" eslint@^7.11.0: - version "7.21.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.21.0.tgz#4ecd5b8c5b44f5dedc9b8a110b01bbfeb15d1c83" - integrity sha512-W2aJbXpMNofUp0ztQaF40fveSsJBjlSCSWpy//gzfTvwC+USs/nceBrKmlJOiM8r1bLwP2EuYkCqArn/6QTIgg== + version "7.31.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz#f972b539424bf2604907a970860732c5d99d3aca" + integrity sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA== dependencies: "@babel/code-frame" "7.12.11" - "@eslint/eslintrc" "^0.4.0" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" + escape-string-regexp "^4.0.0" eslint-scope "^5.1.1" eslint-utils "^2.1.0" eslint-visitor-keys "^2.0.0" espree "^7.3.1" esquery "^1.4.0" esutils "^2.0.2" + fast-deep-equal "^3.1.3" file-entry-cache "^6.0.1" functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" - globals "^12.1.0" + glob-parent "^5.1.2" + globals "^13.6.0" ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" @@ -5773,7 +5853,7 @@ eslint@^7.11.0: js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" levn "^0.4.1" - lodash "^4.17.20" + lodash.merge "^4.6.2" minimatch "^3.0.4" natural-compare "^1.4.0" optionator "^0.9.1" @@ -5782,7 +5862,7 @@ eslint@^7.11.0: semver "^7.2.1" strip-ansi "^6.0.0" strip-json-comments "^3.1.0" - table "^6.0.4" + table "^6.0.9" text-table "^0.2.0" v8-compile-cache "^2.0.3" @@ -5857,7 +5937,7 @@ esrecurse@^4.1.0, esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1, estraverse@^4.2.0: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== @@ -5903,9 +5983,9 @@ events@^3.0.0: integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q== eventsource@^1.0.7: - version "1.0.7" - resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0" - integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ== + version "1.1.0" + resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf" + integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg== dependencies: original "^1.0.0" @@ -5918,9 +5998,9 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: 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== + version "0.3.6" + resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.3.6.tgz#ff264f9e325519a60cb5e273692943483cca63bc" + integrity sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w== execa@^0.7.0: version "0.7.0" @@ -6064,7 +6144,7 @@ extend-shallow@^3.0.0, extend-shallow@^3.0.2: assign-symbols "^1.0.0" is-extendable "^1.0.1" -extend@^3.0.0, extend@~3.0.2: +extend@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== @@ -6083,22 +6163,12 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU= - -extsprintf@^1.2.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" - integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= - fast-deep-equal@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= -fast-deep-equal@^3.1.1: +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== @@ -6109,16 +6179,15 @@ fast-diff@^1.1.2: integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w== fast-glob@^3.1.1: - version "3.2.5" - resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661" - integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg== + version "3.2.7" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1" + integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q== dependencies: "@nodelib/fs.stat" "^2.0.2" "@nodelib/fs.walk" "^1.2.3" - glob-parent "^5.1.0" + glob-parent "^5.1.2" merge2 "^1.3.0" - micromatch "^4.0.2" - picomatch "^2.2.1" + micromatch "^4.0.4" fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: version "2.1.0" @@ -6138,9 +6207,9 @@ fast-url-parser@1.1.3: punycode "^1.3.2" fastq@^1.6.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" - integrity sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g== + version "1.11.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807" + integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw== dependencies: reusify "^1.0.4" @@ -6152,9 +6221,9 @@ faye-websocket@^0.10.0: websocket-driver ">=0.5.1" faye-websocket@~0.11.1: - version "0.11.3" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e" - integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA== + version "0.11.4" + resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" + integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== dependencies: websocket-driver ">=0.5.1" @@ -6202,13 +6271,6 @@ figgy-pudding@^3.5.1: resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e" integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw== -figures@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -6346,9 +6408,9 @@ flatted@^2.0.0: integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== flatted@^3.1.0: - version "3.1.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" - integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + version "3.2.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz#bbef080d95fca6709362c73044a1634f7c6e7d05" + integrity sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg== flatten@^1.0.2: version "1.0.3" @@ -6372,20 +6434,15 @@ flux@^4.0.1: fbjs "^3.0.0" follow-redirects@^1.0.0: - version "1.13.3" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.3.tgz#e5598ad50174c1bc4e872301e82ac2cd97f90267" - integrity sha512-DUgl6+HDzB0iEptNQEXLx/KhTmDb8tZUHSeLqpnjpknR70H0nC2t9N73BK6fN4hOvJ84pKlIQVQ4k5FFlBedKA== + version "1.14.1" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" + integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== 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= -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE= - fork-ts-checker-webpack-plugin@4.1.6: version "4.1.6" resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-4.1.6.tgz#5055c703febcf37fa06405d400c122b905167fc5" @@ -6399,19 +6456,19 @@ fork-ts-checker-webpack-plugin@4.1.6: tapable "^1.0.0" worker-rpc "^0.1.0" -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== dependencies: asynckit "^0.4.0" - combined-stream "^1.0.6" + combined-stream "^1.0.8" mime-types "^2.1.12" -forwarded@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84" - integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ= +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== fragment-cache@^0.2.1: version "0.2.1" @@ -6491,7 +6548,7 @@ fsevents@^1.2.7: bindings "^1.5.0" nan "^2.12.1" -fsevents@^2.1.2, fsevents@^2.1.3, fsevents@~2.3.1: +fsevents@^2.1.2, fsevents@^2.1.3, fsevents@~2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a" integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA== @@ -6571,13 +6628,6 @@ get-value@^2.0.3, get-value@^2.0.6: resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28" integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg= -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo= - dependencies: - assert-plus "^1.0.0" - glob-parent@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae" @@ -6586,17 +6636,17 @@ glob-parent@^3.1.0: is-glob "^3.1.0" path-dirname "^1.0.0" -glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" - integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== +glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -6641,6 +6691,13 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^13.6.0, globals@^13.9.0: + version "13.10.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676" + integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g== + dependencies: + type-fest "^0.20.2" + globby@11.0.1: version "11.0.1" resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.1.tgz#9a2bf107a068f3ffeabc49ad702c79ede8cfd357" @@ -6653,10 +6710,10 @@ globby@11.0.1: merge2 "^1.3.0" slash "^3.0.0" -globby@^11.0.1: - version "11.0.2" - resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.2.tgz#1af538b766a3b540ebfb58a32b2e2d5897321d83" - integrity sha512-2ZThXDvvV8fYFRVIxnrMQBipZQDr7MxKAmQK1vujaj9/7eF0efG7BPUKJ7jP7G5SLF37xKDXvO4S/KKLj/Z0og== +globby@^11.0.3: + version "11.0.4" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5" + integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg== dependencies: array-union "^2.1.0" dir-glob "^3.0.1" @@ -6682,14 +6739,16 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== graphql-tag@^2.10.3: - version "2.11.0" - resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.11.0.tgz#1deb53a01c46a7eb401d6cb59dec86fa1cccbffd" - integrity sha512-VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA== + version "2.12.5" + resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.5.tgz#5cff974a67b417747d05c8d9f5f3cb4495d0db8f" + integrity sha512-5xNhP4063d16Pz3HBtKprutsPrmHZi5IdUGOWRxA2B6VF7BIRGOHZ5WQvDmJXZuPcBg7rYwaFxvQYjqkSdR3TQ== + dependencies: + tslib "^2.1.0" graphql@^15.5.0: - version "15.5.0" - resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.0.tgz#39d19494dbe69d1ea719915b578bf920344a69d5" - integrity sha512-OmaM7y0kaK31NKG31q4YbD2beNYa6jBBKtMFT6gLYJljHLJr42IqJ8KX08u3Li/0ifzTU5HjmoOOrwa5BRLeDA== + version "15.5.1" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.1.tgz#f2f84415d8985e7b84731e7f3536f8bb9d383aad" + integrity sha512-FeTRX67T3LoE3LWAxxOlW2K3Bz+rMYAC18rRguK4wgXaTZMiJwSUwDmPFo3UadAKbzirKIg5Qy+sNJXbpPRnQw== growly@^1.3.0: version "1.3.0" @@ -6714,25 +6773,12 @@ handle-thing@^2.0.0: resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e" integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg== -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= - -har-validator@~5.1.3: - version "5.1.5" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" - integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== - dependencies: - ajv "^6.12.3" - har-schema "^2.0.0" - harmony-reflect@^1.4.6: - version "1.6.1" - resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.1.tgz#c108d4f2bb451efef7a37861fdbdae72c9bdefa9" - integrity sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA== + version "1.6.2" + resolved "https://registry.yarnpkg.com/harmony-reflect/-/harmony-reflect-1.6.2.tgz#31ecbd32e648a34d030d86adb67d4d47547fe710" + integrity sha512-HIp/n38R9kQjDEziXyDTuW3vvoxxyxjxFzXLrBr18uB47GnSt+G9D29fqrpM5ZkspMcPICud3XsBJQ4Y2URg8g== -has-bigints@^1.0.0: +has-bigints@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== @@ -6747,7 +6793,7 @@ has-flag@^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, has-symbols@^1.0.1, has-symbols@^1.0.2: +has-symbols@^1.0.1, has-symbols@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== @@ -6839,9 +6885,9 @@ hoopy@^0.1.4: integrity sha512-HRcs+2mr52W0K+x8RzcLzuPPmVIKMSv97RGHy0Ea9y/mpcaK+xTrjICA04KAHi4GRzxliNqNJEFYWHghy3rSfQ== hosted-git-info@^2.1.4: - version "2.8.8" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488" - integrity sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg== + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== hpack.js@^2.1.6: version "2.1.6" @@ -6863,11 +6909,6 @@ hsla-regex@^1.0.0: resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38" integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg= -html-comment-regex@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" - integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== - html-encoding-sniffer@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3" @@ -6898,12 +6939,12 @@ html-minifier-terser@^5.0.1: relateurl "^0.2.7" terser "^4.6.3" -html-parse-stringify2@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/html-parse-stringify2/-/html-parse-stringify2-2.0.1.tgz#dc5670b7292ca158b7bc916c9a6735ac8872834a" - integrity sha1-3FZwtyksoVi3vJFsmmc1rIhyg0o= +html-parse-stringify@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2" + integrity sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg== dependencies: - void-elements "^2.0.1" + void-elements "3.1.0" html-to-react@^1.3.4: version "1.4.5" @@ -6930,18 +6971,6 @@ html-webpack-plugin@4.5.0: tapable "^1.1.3" util.promisify "1.0.0" -htmlparser2@^3.10.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f" - integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ== - dependencies: - domelementtype "^1.3.1" - domhandler "^2.3.0" - domutils "^1.5.1" - entities "^1.1.1" - inherits "^2.0.1" - readable-stream "^3.1.1" - htmlparser2@^5.0: version "5.0.1" resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-5.0.1.tgz#7daa6fc3e35d6107ac95a4fc08781f091664f6e7" @@ -6952,6 +6981,16 @@ htmlparser2@^5.0: domutils "^2.4.2" entities "^2.0.0" +htmlparser2@^6.1.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7" + integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A== + dependencies: + domelementtype "^2.0.1" + domhandler "^4.0.0" + domutils "^2.5.2" + entities "^2.0.0" + http-deceiver@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87" @@ -6994,6 +7033,15 @@ http-parser-js@>=0.5.1: resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.3.tgz#01d2709c79d41698bb01d4decc5e9da4e4a033d9" integrity sha512-t7hjvef/5HEK7RWTdUzVUhl8zkEu+LlaE0IYzdMuvbSDipxBRpOn4Uhw8ZyECEa808iVT8XCjzo6xmYt4CiLZg== +http-proxy-agent@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a" + integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg== + dependencies: + "@tootallnate/once" "1" + agent-base "6" + debug "4" + http-proxy-middleware@0.19.1: version "0.19.1" resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a" @@ -7013,29 +7061,28 @@ http-proxy@^1.17.0: follow-redirects "^1.0.0" requires-port "^1.0.0" -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE= - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM= +https-proxy-agent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2" + integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA== + dependencies: + agent-base "6" + 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== husky@^5.1.1: - version "5.1.3" - resolved "https://registry.yarnpkg.com/husky/-/husky-5.1.3.tgz#1a0645a4fe3ffc006c4d0d8bd0bcb4c98787cc9d" - integrity sha512-fbNJ+Gz5wx2LIBtMweJNY1D7Uc8p1XERi5KNRMccwfQA+rXlxWNSdUxswo0gT8XqxywTIw7Ywm/F4v/O35RdMg== + version "5.2.0" + resolved "https://registry.yarnpkg.com/husky/-/husky-5.2.0.tgz#fc5e1c2300d34855d47de4753607d00943fc0802" + integrity sha512-AM8T/auHXRBxlrfPVLKP6jt49GCM2Zz47m8G3FOMsLmTv8Dj/fKVWE0Rh2d4Qrvmy131xEsdQnb3OXRib67PGg== hyphenate-style-name@^1.0.3: version "1.0.4" @@ -7043,9 +7090,9 @@ hyphenate-style-name@^1.0.3: integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== i18n-iso-countries@^6.5.0: - version "6.5.0" - resolved "https://registry.yarnpkg.com/i18n-iso-countries/-/i18n-iso-countries-6.5.0.tgz#0fb3f6fcc8e9f67a2ce907cdc92efb48e2ccd8f6" - integrity sha512-9cQv5DnAaaEoRohH3RuN6l+GEEk8QtTLalg1D9ngIC7oKCKqqWKKFIWUMazpECAD7mzQAZhXpo2pLXnF6IiyZA== + version "6.8.0" + resolved "https://registry.yarnpkg.com/i18n-iso-countries/-/i18n-iso-countries-6.8.0.tgz#eebbc75594c6832aff86176c1bb38daa133d6dfd" + integrity sha512-jJs/+CA6+VUICFxqGcB0vFMERGfhfvyNk+8Vb9EagSZkl7kSpm/kT0VyhvzM/zixDWEV/+oN9L7v/GT9BwzoGg== dependencies: diacritics "1.3.0" @@ -7055,11 +7102,11 @@ i18next-browser-languagedetector@2.2.4: integrity sha512-wPbtH18FdOuB245I8Bhma5/XSDdN/HpYlX+wga1eMy+slhaFQSnrWX6fp+aYSL2eEuj0RlfHeEVz6Fo/lxAj6A== i18next-browser-languagedetector@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-6.0.1.tgz#83654bc87302be2a6a5a75146ffea97b4ca268cf" - integrity sha512-3H+OsNQn3FciomUU0d4zPFHsvJv4X66lBelXk9hnIDYDsveIgT7dWZ3/VvcSlpKk9lvCK770blRZ/CwHMXZqWw== + version "6.1.2" + resolved "https://registry.yarnpkg.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-6.1.2.tgz#68565a28b929cbc98ab6a56826ef2faf0e927ff8" + integrity sha512-YDzIGHhMRvr7M+c8B3EQUKyiMBhfqox4o1qkFvt4QXuu5V2cxf74+NCr+VEkUuU0y+RwcupA238eeolW1Yn80g== dependencies: - "@babel/runtime" "^7.5.5" + "@babel/runtime" "^7.14.6" i18next@14.0.1: version "14.0.1" @@ -7067,9 +7114,9 @@ i18next@14.0.1: integrity sha512-wsKfQuYsy4RdCaqqN71eDjWMhizhTfQSIBGttEA7vcboQrUfpQlCezrSzrtmoW9F9tmVyNs38iBgLYLMhRSeIQ== i18next@^19.3.2: - version "19.9.1" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.9.1.tgz#7a072b75daf677aa51fd4ce55214f21702af3ffd" - integrity sha512-9Azzyb3DvMJUMd7sPhwVEs6PQcogvdHmLQTjMQ+P+h3XwW4O66/8lgZTmYShgkjPOCqTw4Fwl5LOp/VhZgPo5A== + version "19.9.2" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.9.2.tgz#ea5a124416e3c5ab85fddca2c8e3c3669a8da397" + integrity sha512-0i6cuo6ER6usEOtKajUUDj92zlG+KArFia0857xxiEHAQcUwh/RtOQocui1LPJwunSYT574Pk64aNva1kwtxZg== dependencies: "@babel/runtime" "^7.12.0" @@ -7081,9 +7128,9 @@ iconv-lite@0.4.24: safer-buffer ">= 2.1.2 < 3" iconv-lite@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" - integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== dependencies: safer-buffer ">= 2.1.2 < 3.0.0" @@ -7177,13 +7224,6 @@ imurmurhash@^0.1.4: resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= -indefinite-observable@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/indefinite-observable/-/indefinite-observable-2.0.1.tgz#574af29bfbc17eb5947793797bddc94c9d859400" - integrity sha512-G8vgmork+6H9S8lUAg1gtXEj2JxIQTo0g2PbFiYOdjkziSI0F7UYBiVwhZRuixhBCNGczAls34+5HJPyZysvxQ== - dependencies: - symbol-observable "1.2.0" - indent-string@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" @@ -7321,9 +7361,9 @@ is-arrayish@^0.3.1: integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-bigint@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.1.tgz#6923051dfcbc764278540b9ce0e6b3213aa5ebc2" - integrity sha512-J0ELF4yHFxHy0cmSxZuheDOz2luOdVvqjwmEcj8H/L1JHeuEDSDbeRP+Dk9kFVk5RTFzbucJ2Kb9F7ixY2QaCg== + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" + integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== is-binary-path@^1.0.0: version "1.0.1" @@ -7340,11 +7380,11 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0" - integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" + integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" is-buffer@^1.1.4, is-buffer@^1.1.5: version "1.1.6" @@ -7375,10 +7415,10 @@ is-color-stop@^1.0.0: rgb-regex "^1.0.1" rgba-regex "^1.0.0" -is-core-module@^2.0.0, is-core-module@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a" - integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ== +is-core-module@^2.0.0, is-core-module@^2.2.0, is-core-module@^2.4.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491" + integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg== dependencies: has "^1.0.3" @@ -7397,9 +7437,9 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" - integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" + integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== is-decimal@^1.0.0: version "1.0.4" @@ -7430,9 +7470,9 @@ is-directory@^0.3.1: integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE= is-docker@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156" - integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw== + version "2.2.1" + resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa" + integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ== is-extendable@^0.1.0, is-extendable@^0.1.1: version "0.1.1" @@ -7501,9 +7541,9 @@ is-negative-zero@^2.0.1: integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== is-number-object@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197" - integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw== + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" + integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== is-number@^3.0.0: version "3.0.0" @@ -7558,18 +7598,18 @@ is-plain-object@^2.0.3, is-plain-object@^2.0.4: dependencies: isobject "^3.0.1" -is-potential-custom-element-name@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397" - integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c= +is-potential-custom-element-name@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5" + integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== -is-regex@^1.0.4, is-regex@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251" - integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg== +is-regex@^1.0.4, is-regex@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" + integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== dependencies: call-bind "^1.0.2" - has-symbols "^1.0.1" + has-symbols "^1.0.2" is-regexp@^1.0.0: version "1.0.0" @@ -7596,30 +7636,28 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== -is-string@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" - integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== - -is-svg@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75" - integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ== - dependencies: - html-comment-regex "^1.1.0" +is-string@^1.0.5, is-string@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" + integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== is-symbol@^1.0.2, is-symbol@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" - integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: - has-symbols "^1.0.1" + has-symbols "^1.0.2" -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= +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== + is-what@^3.3.1: version "3.14.1" resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1" @@ -7687,11 +7725,6 @@ isomorphic-ws@^4.0.1: resolved "https://registry.yarnpkg.com/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz#55fd4cd6c5e6491e76dc125938dd863f5cd4f2dc" integrity sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w== -isstream@~0.1.2: - version "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@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec" @@ -8191,41 +8224,37 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= - jsdom@^16.4.0: - version "16.4.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" - integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== + version "16.6.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac" + integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg== dependencies: - abab "^2.0.3" - acorn "^7.1.1" + abab "^2.0.5" + acorn "^8.2.4" acorn-globals "^6.0.0" cssom "^0.4.4" - cssstyle "^2.2.0" + cssstyle "^2.3.0" data-urls "^2.0.0" - decimal.js "^10.2.0" + decimal.js "^10.2.1" domexception "^2.0.1" - escodegen "^1.14.1" + escodegen "^2.0.0" + form-data "^3.0.0" html-encoding-sniffer "^2.0.1" - is-potential-custom-element-name "^1.0.0" + http-proxy-agent "^4.0.1" + https-proxy-agent "^5.0.0" + is-potential-custom-element-name "^1.0.1" nwsapi "^2.2.0" - parse5 "5.1.1" - request "^2.88.2" - request-promise-native "^1.0.8" - saxes "^5.0.0" + parse5 "6.0.1" + saxes "^5.0.1" symbol-tree "^3.2.4" - tough-cookie "^3.0.1" + tough-cookie "^4.0.0" w3c-hr-time "^1.0.2" w3c-xmlserializer "^2.0.0" webidl-conversions "^6.1.0" whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" - whatwg-url "^8.0.0" - ws "^7.2.3" + whatwg-url "^8.5.0" + ws "^7.4.5" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -8258,21 +8287,11 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" - integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= - json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= -json-stringify-safe@~5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" - integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= - json3@^3.3.2: version "3.3.3" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" @@ -8285,7 +8304,7 @@ json5@^1.0.1: dependencies: minimist "^1.2.0" -json5@^2.1.0, json5@^2.1.2: +json5@^2.1.0, json5@^2.1.2, json5@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== @@ -8308,84 +8327,73 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsprim@^1.2.2: - version "1.4.1" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" - integrity sha1-MT5mvB5cwG5Di8G3SZwuXFastqI= - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.2.3" - verror "1.10.0" - jss-plugin-camel-case@^10.5.1: - version "10.5.1" - resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.5.1.tgz#427b24a9951b4c2eaa7e3d5267acd2e00b0934f9" - integrity sha512-9+oymA7wPtswm+zxVti1qiowC5q7bRdCJNORtns2JUj/QHp2QPXYwSNRD8+D2Cy3/CEMtdJzlNnt5aXmpS6NAg== + version "10.7.1" + resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.7.1.tgz#e7f7097cf97e9deec599cef3275e213452318b93" + integrity sha512-+ioIyWvmAfgDCWXsQcW1NMnLBvRinOVFkSYJUgewQ6TynOcSj5F1bSU23B7z0p1iqK0PPHIU62xY1iNJD33WGA== dependencies: "@babel/runtime" "^7.3.1" hyphenate-style-name "^1.0.3" - jss "10.5.1" + jss "10.7.1" jss-plugin-default-unit@^10.5.1: - version "10.5.1" - resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.5.1.tgz#2be385d71d50aee2ee81c2a9ac70e00592ed861b" - integrity sha512-D48hJBc9Tj3PusvlillHW8Fz0y/QqA7MNmTYDQaSB/7mTrCZjt7AVRROExoOHEtd2qIYKOYJW3Jc2agnvsXRlQ== + version "10.7.1" + resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.7.1.tgz#826270e2ee38d7024a281ac67c30d6944f124786" + integrity sha512-tW+dfYVNARBQb/ONzBwd8uyImigyzMiAEDai+AbH5rcHg5h3TtqhAkxx06iuZiT/dZUiFdSKlbe3q9jZGAPIwA== dependencies: "@babel/runtime" "^7.3.1" - jss "10.5.1" + jss "10.7.1" jss-plugin-global@^10.5.1: - version "10.5.1" - resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.5.1.tgz#0e1793dea86c298360a7e2004721351653c7e764" - integrity sha512-jX4XpNgoaB8yPWw/gA1aPXJEoX0LNpvsROPvxlnYe+SE0JOhuvF7mA6dCkgpXBxfTWKJsno7cDSCgzHTocRjCQ== + version "10.7.1" + resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.7.1.tgz#9725c46d662aac2e596a0a8741944c060e2b90a1" + integrity sha512-FbxCnu44IkK/bw8X3CwZKmcAnJqjAb9LujlAc/aP0bMSdVa3/MugKQRyeQSu00uGL44feJJDoeXXiHOakBr/Zw== dependencies: "@babel/runtime" "^7.3.1" - jss "10.5.1" + jss "10.7.1" jss-plugin-nested@^10.5.1: - version "10.5.1" - resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.5.1.tgz#8753a80ad31190fb6ac6fdd39f57352dcf1295bb" - integrity sha512-xXkWKOCljuwHNjSYcXrCxBnjd8eJp90KVFW1rlhvKKRXnEKVD6vdKXYezk2a89uKAHckSvBvBoDGsfZrldWqqQ== + version "10.7.1" + resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.7.1.tgz#35563a7a710a45307fd6b9742ffada1d72a62eb7" + integrity sha512-RNbICk7FlYKaJyv9tkMl7s6FFfeLA3ubNIFKvPqaWtADK0KUaPsPXVYBkAu4x1ItgsWx67xvReMrkcKA0jSXfA== dependencies: "@babel/runtime" "^7.3.1" - jss "10.5.1" + jss "10.7.1" tiny-warning "^1.0.2" jss-plugin-props-sort@^10.5.1: - version "10.5.1" - resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.5.1.tgz#ab1c167fd2d4506fb6a1c1d66c5f3ef545ff1cd8" - integrity sha512-t+2vcevNmMg4U/jAuxlfjKt46D/jHzCPEjsjLRj/J56CvP7Iy03scsUP58Iw8mVnaV36xAUZH2CmAmAdo8994g== + version "10.7.1" + resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.7.1.tgz#1d12b26048541ed3a2ed1b69f7fc231605728362" + integrity sha512-eyd5FhA+J0QrpqXxO7YNF/HMSXXl4pB0EmUdY4vSJI4QG22F59vQ6AHtP6fSwhmBdQ98Qd9gjfO+RMxcE39P1A== dependencies: "@babel/runtime" "^7.3.1" - jss "10.5.1" + jss "10.7.1" jss-plugin-rule-value-function@^10.5.1: - version "10.5.1" - resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.5.1.tgz#37f4030523fb3032c8801fab48c36c373004de7e" - integrity sha512-3gjrSxsy4ka/lGQsTDY8oYYtkt2esBvQiceGBB4PykXxHoGRz14tbCK31Zc6DHEnIeqsjMUGbq+wEly5UViStQ== + version "10.7.1" + resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.7.1.tgz#123eb796eb9982f8efa7a7e362daddd90c0c69fe" + integrity sha512-fGAAImlbaHD3fXAHI3ooX6aRESOl5iBt3LjpVjxs9II5u9tzam7pqFUmgTcrip9VpRqYHn8J3gA7kCtm8xKwHg== dependencies: "@babel/runtime" "^7.3.1" - jss "10.5.1" + jss "10.7.1" tiny-warning "^1.0.2" jss-plugin-vendor-prefixer@^10.5.1: - version "10.5.1" - resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.5.1.tgz#45a183a3a0eb097bdfab0986b858d99920c0bbd8" - integrity sha512-cLkH6RaPZWHa1TqSfd2vszNNgxT1W0omlSjAd6hCFHp3KIocSrW21gaHjlMU26JpTHwkc+tJTCQOmE/O1A4FKQ== + version "10.7.1" + resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.7.1.tgz#217821be2d6dacee31d2d464886760ba7742e19a" + integrity sha512-1UHFmBn7hZNsHXTkLLOL8abRl8vi+D1EVzWD4WmLFj55vawHZfnH1oEz6TUf5Y61XHv0smdHabdXds6BgOXe3A== dependencies: "@babel/runtime" "^7.3.1" css-vendor "^2.0.8" - jss "10.5.1" + jss "10.7.1" -jss@10.5.1, jss@^10.5.1: - version "10.5.1" - resolved "https://registry.yarnpkg.com/jss/-/jss-10.5.1.tgz#93e6b2428c840408372d8b548c3f3c60fa601c40" - integrity sha512-hbbO3+FOTqVdd7ZUoTiwpHzKXIo5vGpMNbuXH1a0wubRSWLWSBvwvaq4CiHH/U42CmjOnp6lVNNs/l+Z7ZdDmg== +jss@10.7.1, jss@^10.5.1: + version "10.7.1" + resolved "https://registry.yarnpkg.com/jss/-/jss-10.7.1.tgz#16d846e1a22fb42e857b99f9c6a0c5a27341c804" + integrity sha512-5QN8JSVZR6cxpZNeGfzIjqPEP+ZJwJJfZbXmeABNdxiExyO+eJJDy6WDtqTf8SDKnbL5kZllEpAP71E/Lt7PXg== dependencies: "@babel/runtime" "^7.3.1" csstype "^3.0.2" - indefinite-observable "^2.0.1" is-in-browser "^1.1.3" tiny-warning "^1.0.2" @@ -8504,17 +8512,15 @@ lint-staged@^10.0.8: stringify-object "^3.3.0" listr2@^3.2.2: - version "3.3.4" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.3.4.tgz#bca480e784877330b9d96d6cdc613ad243332e20" - integrity sha512-b0lhLAvXSr63AtPF9Dgn6tyxm8Kiz6JXpVGM0uZJdnDcZp02jt7FehgAnMfA9R7riQimOKjQgLknBTdz2nmXwQ== + version "3.10.0" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.10.0.tgz#58105a53ed7fa1430d1b738c6055ef7bb006160f" + integrity sha512-eP40ZHihu70sSmqFNbNy2NL1YwImmlMmPh9WO5sLmPDleurMHt3n+SwEWNu2kzKScexZnkyFtc1VI0z/TGlmpw== dependencies: - chalk "^4.1.0" cli-truncate "^2.1.0" - figures "^3.2.0" - indent-string "^4.0.0" + colorette "^1.2.2" log-update "^4.0.0" p-map "^4.0.0" - rxjs "^6.6.6" + rxjs "^6.6.7" through "^2.3.8" wrap-ansi "^7.0.0" @@ -8528,6 +8534,16 @@ 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" @@ -8609,6 +8625,11 @@ lodash.camelcase@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= +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.curry@^4.0.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.curry/-/lodash.curry-4.1.1.tgz#248e36072ede906501d75966200a86dab8b23170" @@ -8639,16 +8660,16 @@ lodash.memoize@^4.1.2: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + 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.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - lodash.template@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab" @@ -8664,22 +8685,28 @@ lodash.templatesettings@^4.0.0: dependencies: lodash._reinterpolate "^3.0.0" +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -"lodash@>=3.5 <5", lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.5: +"lodash@>=3.5 <5", lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.17.5, lodash@^4.7.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== log-symbols@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920" - integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA== + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== dependencies: - chalk "^4.0.0" + chalk "^4.1.0" + is-unicode-supported "^0.1.0" log-update@^4.0.0: version "4.0.0" @@ -8825,9 +8852,9 @@ meet-bridge@^2.0.2-release: integrity sha512-ko9WQ2K6S/IpVOAh+jgHdM8RM/hWlxqB09m+hqE4pQkMgxHZngA2kxIVS5bxCYcjKlsKTOfQycpDEu1vjTdUzA== memoize-one@^5.0.0: - version "5.1.1" - resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.1.1.tgz#047b6e3199b508eaec03504de71229b8eb1d75c0" - integrity sha512-HKeeBpWvqiVJD57ZUAsJNm71eHTykffzcLZVYWiVfQeI1rJtuEaS7hQiEpWfVVk18donPwJEcFKIkCmPJNOhHA== + version "5.2.1" + resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e" + integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q== memory-fs@^0.4.1: version "0.4.1" @@ -8896,13 +8923,13 @@ 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== +micromatch@^4.0.2, micromatch@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: braces "^3.0.1" - picomatch "^2.0.5" + picomatch "^2.2.3" miller-rabin@^4.0.0: version "4.0.1" @@ -8912,10 +8939,10 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.46.0, "mime-db@>= 1.43.0 < 2": - version "1.46.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee" - integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ== +mime-db@1.48.0, "mime-db@>= 1.43.0 < 2": + version "1.48.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" + integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== mime-db@~1.33.0: version "1.33.0" @@ -8929,12 +8956,12 @@ mime-types@2.1.18: dependencies: mime-db "~1.33.0" -mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24: - version "2.1.29" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.29.tgz#1d4ab77da64b91f5f72489df29236563754bb1b2" - integrity sha512-Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ== +mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24: + version "2.1.31" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" + integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== dependencies: - mime-db "1.46.0" + mime-db "1.48.0" mime@1.6.0: version "1.6.0" @@ -9138,10 +9165,10 @@ nanoclone@^0.2.1: resolved "https://registry.yarnpkg.com/nanoclone/-/nanoclone-0.2.1.tgz#dd4090f8f1a110d26bb32c49ed2f5b9235209ed4" integrity sha512-wynEP02LmIbLpcYw8uBKpcfF6dmg2vcpKqxeH5UcoKEYdExslsdUA4ugFauuaeYdTB76ez6gJW8XAZ6CgkXYxA== -nanoid@^3.1.20: - version "3.1.20" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788" - integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw== +nanoid@^3.1.23: + version "3.1.23" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" + integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== nanomatch@^1.2.9: version "1.2.13" @@ -9265,9 +9292,9 @@ node-modules-regexp@^1.0.0: integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA= node-notifier@^8.0.0: - version "8.0.1" - resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.1.tgz#f86e89bbc925f2b068784b31f382afdc6ca56be1" - integrity sha512-BvEXF+UmsnAfYfoapKM9nGxnP+Wn7P91YfXmrKnfcYCx6VBeoN5Ez5Ogck6I8Bi5k4RlpqRYaw75pAwzX9OphA== + version "8.0.2" + resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.2.tgz#f3167a38ef0d2c8a866a83e318c1ba0efeb702c5" + integrity sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg== dependencies: growly "^1.3.0" is-wsl "^2.2.0" @@ -9276,10 +9303,10 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^1.1.61, node-releases@^1.1.70: - version "1.1.71" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" - integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg== +node-releases@^1.1.61, node-releases@^1.1.71: + version "1.1.73" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" + integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== normalize-package-data@^2.3.2, normalize-package-data@^2.5.0: version "2.5.0" @@ -9344,6 +9371,13 @@ nth-check@^1.0.2: dependencies: boolbase "~1.0.0" +nth-check@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125" + integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q== + dependencies: + boolbase "^1.0.0" + num2fraction@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" @@ -9354,11 +9388,6 @@ nwsapi@^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" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - object-assign@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2" @@ -9378,10 +9407,10 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.9.0: - version "1.9.0" - resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.9.0.tgz#c90521d74e1127b67266ded3394ad6116986533a" - integrity sha512-i3Bp9iTqwhaLZBxGkRfo5ZbE07BQRT7MGu8+nNgwW9ItGp1TzCTw2DLEoWwjClxBjOFI/hWljTAmYGCEwmtnOw== +object-inspect@^1.10.3, object-inspect@^1.9.0: + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== object-is@^1.0.1: version "1.1.5" @@ -9413,17 +9442,16 @@ object.assign@^4.1.0, object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -object.entries@^1.1.0, object.entries@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.3.tgz#c601c7f168b62374541a07ddbd3e2d5e4f7711a6" - integrity sha512-ym7h7OZebNS96hn5IJeyUmaWhaSM4SVtAPPfNLQEI2MYWCO2egsITb9nab2+i/Pwibx+R0mtn+ltKJXRSeTMGg== +object.entries@^1.1.0, object.entries@^1.1.2, object.entries@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd" + integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - has "^1.0.3" + es-abstract "^1.18.2" -object.fromentries@^2.0.2: +object.fromentries@^2.0.2, object.fromentries@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8" integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ== @@ -9449,15 +9477,14 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" -object.values@^1.1.0, object.values@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee" - integrity sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw== +object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.3, object.values@^1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" + integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.2" - has "^1.0.3" + es-abstract "^1.18.2" obuf@^1.0.0, obuf@^1.1.2: version "1.1.2" @@ -9637,16 +9664,16 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -pako@1.0.11, pako@~1.0.5: - version "1.0.11" - resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" - integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== - -pako@^2.0.3: +pako@2.0.3, pako@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.3.tgz#cdf475e31b678565251406de9e759196a0ea7a43" integrity sha512-WjR1hOeg+kki3ZIOjaf4b5WVcay1jaliKSYiEaB1XzwhMQZJxRdQRv0V31EKBYlxb4T7SK3hjfc/jxyU64BoSw== +pako@~1.0.5: + version "1.0.11" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" + integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw== + parallel-transform@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/parallel-transform/-/parallel-transform-1.2.0.tgz#9049ca37d6cb2182c3b1d2c720be94d14a5814fc" @@ -9719,10 +9746,10 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse5@5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178" - integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug== +parse5@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b" + integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw== parseurl@~1.3.2, parseurl@~1.3.3: version "1.3.3" @@ -9783,9 +9810,9 @@ path-key@^3.0.0, path-key@^3.1.0: integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-to-regexp@0.1.7: version "0.1.7" @@ -9804,15 +9831,22 @@ path-type@^2.0.0: dependencies: pify "^2.0.0" +path-type@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== + dependencies: + pify "^3.0.0" + path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw== pbkdf2@^3.0.3: - version "3.1.1" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94" - integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg== + version "3.1.2" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" + integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -9825,16 +9859,21 @@ 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, picomatch@^2.2.1, picomatch@^2.2.2: - version "2.2.2" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad" - integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg== +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY= + pify@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231" @@ -9895,6 +9934,13 @@ pkg-up@3.1.0: dependencies: find-up "^3.0.0" +pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= + dependencies: + find-up "^2.1.0" + please-upgrade-node@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz#aeddd3f994c933e4ad98b99d9a556efa0e2fe942" @@ -10132,11 +10178,10 @@ postcss-image-set-function@^3.0.1: postcss-values-parser "^2.0.0" postcss-initial@^3.0.0: - version "3.0.2" - resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz#f018563694b3c16ae8eaabe3c585ac6319637b2d" - integrity sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA== + version "3.0.4" + resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz#9d32069a10531fe2ecafa0b6ac750ee0bc7efc53" + integrity sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg== dependencies: - lodash.template "^4.5.0" postcss "^7.0.2" postcss-lab-function@^2.0.1: @@ -10525,21 +10570,18 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: uniq "^1.0.1" postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: - version "6.0.4" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3" - integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw== + version "6.0.6" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" + integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg== dependencies: cssesc "^3.0.0" - indexes-of "^1.0.1" - uniq "^1.0.1" util-deprecate "^1.0.2" -postcss-svgo@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258" - integrity sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw== +postcss-svgo@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" + integrity sha512-NoRbrcMWTtUghzuKSoIm6XV+sJdvZ7GZSc3wdBN0W19FTtp2ko8NqLsgoh/m9CzNhU3KLPvQmjIwtaNFkaFTvw== dependencies: - is-svg "^3.0.0" postcss "^7.0.0" postcss-value-parser "^3.0.0" svgo "^1.0.0" @@ -10572,32 +10614,23 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1: indexes-of "^1.0.1" uniq "^1.0.1" -postcss@7.0.21: - version "7.0.21" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.21.tgz#06bb07824c19c2021c5d056d5b10c35b989f7e17" - integrity sha512-uIFtJElxJo29QC753JzhidoAhvp/e/Exezkdhfmt8AymWT6/5B7W1WmponYWkHk2eg6sONyTch0A3nkMPun3SQ== - dependencies: - chalk "^2.4.2" - source-map "^0.6.1" - supports-color "^6.1.0" - -postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: - version "7.0.35" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24" - integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg== +postcss@7.0.36, postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6: + version "7.0.36" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb" + integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw== dependencies: chalk "^2.4.2" source-map "^0.6.1" supports-color "^6.1.0" postcss@^8.1.0: - version "8.2.7" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.7.tgz#48ed8d88b4de10afa0dfd1c3f840aa57b55c4d47" - integrity sha512-DsVLH3xJzut+VT+rYr0mtvOtpTjSyqDwPf5EZWXcb0uAKfitGpTY9Ec+afi2+TgdN8rWS9Cs88UDYehKo/RvOw== + version "8.3.5" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709" + integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA== dependencies: colorette "^1.2.2" - nanoid "^3.1.20" - source-map "^0.6.1" + nanoid "^3.1.23" + source-map-js "^0.6.2" prelude-ls@^1.2.1: version "1.2.1" @@ -10622,9 +10655,9 @@ prettier-linter-helpers@^1.0.0: fast-diff "^1.1.2" prettier@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" - integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== + version "2.3.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" + integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== pretty-bytes@^5.3.0: version "5.6.0" @@ -10650,9 +10683,9 @@ pretty-format@^26.6.0, pretty-format@^26.6.2: react-is "^17.0.1" pretty-quick@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.1.0.tgz#cb172e9086deb57455dea7c7e8f136cd0a4aef6c" - integrity sha512-DtxIxksaUWCgPFN7E1ZZk4+Aav3CCuRdhrDSFZENb404sYMtuo9Zka823F+Mgeyt8Zt3bUiCjFzzWYE9LYqkmQ== + version "3.1.1" + resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.1.1.tgz#93ca4e2dd38cc4e970e3f54a0ead317a25454688" + integrity sha512-ZYLGiMoV2jcaas3vTJrLvKAYsxDoXQBUn8OSTxkl67Fyov9lyXivJTl0+2WVh+y6EovGcw7Lm5ThYpH+Sh3XxQ== dependencies: chalk "^3.0.0" execa "^4.0.0" @@ -10695,7 +10728,7 @@ promise@^8.0.1, promise@^8.1.0: dependencies: asap "~2.0.6" -prompts@2.4.0, prompts@^2.0.1: +prompts@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.0.tgz#4aa5de0723a231d1ee9121c40fdf663df73f61d7" integrity sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ== @@ -10703,6 +10736,14 @@ prompts@2.4.0, prompts@^2.0.1: kleur "^3.0.3" sisteransi "^1.0.5" +prompts@^2.0.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.1.tgz#befd3b1195ba052f9fd2fde8a486c4e82ee77f61" + integrity sha512-EQyfIuO2hPDsX1L/blblV+H7I0knhgAd82cVneCwcdND9B8AuCDuRcBH6yIcG4dFzlOUqbazQqwGjx5xmsNLuQ== + dependencies: + kleur "^3.0.3" + sisteransi "^1.0.5" + prop-types@15.7.2, prop-types@^15.5.0, prop-types@^15.5.4, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2: version "15.7.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" @@ -10718,11 +10759,11 @@ property-expr@^2.0.4: integrity sha512-sFPkHQjVKheDNnPvotjQmm3KD3uk1fWKUN7CrpdbwmUx3CrG3QiM8QpTSimvig5vTXmTvjz7+TDvXOI9+4rkcg== proxy-addr@~2.0.5: - version "2.0.6" - resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf" - integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw== + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== dependencies: - forwarded "~0.1.2" + forwarded "0.2.0" ipaddr.js "1.9.1" prr@~1.0.1: @@ -10735,7 +10776,7 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= -psl@^1.1.28: +psl@^1.1.33: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== @@ -10808,14 +10849,11 @@ qs@6.7.0: integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== qs@^6.9.1: - version "6.9.6" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.6.tgz#26ed3c8243a431b2924aca84cc90471f35d5a0ee" - integrity sha512-TIRk4aqYLNoJUbd+g2lEdz5kLWIuTMRagAXxl78Q0RiVjAOugHmeKNGdd3cwo/ktpf9aL9epCfFqWDEKysUlLQ== - -qs@~6.5.2: - version "6.5.2" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" - integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== + version "6.10.1" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" + integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg== + dependencies: + side-channel "^1.0.4" query-string@^4.1.0: version "4.3.4" @@ -10846,9 +10884,9 @@ querystringify@^2.1.1: integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ== queue-microtask@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3" - integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg== + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== raf@^3.4.1: version "3.4.1" @@ -10921,18 +10959,18 @@ rc-align@^4.0.0: resize-observer-polyfill "^1.5.1" rc-motion@^2.0.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.4.1.tgz#323f47c8635e6b2bc0cba2dfad25fc415b58e1dc" - integrity sha512-TWLvymfMu8SngPx5MDH8dQ0D2RYbluNTfam4hY/dNNx9RQ3WtGuZ/GXHi2ymLMzH+UNd6EEFYkOuR5JTTtm8Xg== + version "2.4.4" + resolved "https://registry.yarnpkg.com/rc-motion/-/rc-motion-2.4.4.tgz#e995d5fa24fc93065c24f714857cf2677d655bb0" + integrity sha512-ms7n1+/TZQBS0Ydd2Q5P4+wJTSOrhIrwNxLXCZpR7Fa3/oac7Yi803HDALc2hLAKaCTQtw9LmQeB58zcwOsqlQ== dependencies: "@babel/runtime" "^7.11.1" classnames "^2.2.1" rc-util "^5.2.1" rc-slider@^9.2.2: - version "9.7.1" - resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-9.7.1.tgz#63535177a74a3ee44f090909e8c6f98426eb9dba" - integrity sha512-r9r0dpFA3PEvxBhIfVi1lVzxuSogWxeY+tGvi2AqMM1rPgaOXQ7WbtT+9kVFkJ9K8TntA/vYPgiCCKfN29KTkw== + version "9.7.2" + resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-9.7.2.tgz#282f571f7582752ebaa33964e441184f4e79ad74" + integrity sha512-mVaLRpDo6otasBs6yVnG02ykI3K6hIrLTNfT5eyaqduFv95UODI9PDS6fWuVVehVpdS4ENgOSwsTjrPVun+k9g== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" @@ -10941,17 +10979,17 @@ rc-slider@^9.2.2: shallowequal "^1.1.0" rc-tooltip@^5.0.1: - version "5.1.0" - resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-5.1.0.tgz#abb453c463c31a705aa01d268279f4ae6ae3b15f" - integrity sha512-pFqD1JZwNIpbdcefB7k5xREoHAWM/k3yQwYF0iminbmDXERgq4rvBfUwIvlCqqZSM7HDr9hYeYr6ZsVNaKtvCQ== + version "5.1.1" + resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-5.1.1.tgz#94178ed162d0252bc4993b725f5dc2ac0fccf154" + integrity sha512-alt8eGMJulio6+4/uDm7nvV+rJq9bsfxFDCI0ljPdbuoygUscbsMYb6EQgwib/uqsXQUvzk+S7A59uYHmEgmDA== dependencies: "@babel/runtime" "^7.11.2" rc-trigger "^5.0.0" rc-trigger@^5.0.0: - version "5.2.3" - resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.3.tgz#8c55046ab432d7b52d51c69afb57ebb5bbe37e17" - integrity sha512-6Fokao07HUbqKIDkDRFEM0AGZvsvK0Fbp8A/KFgl1ngaqfO1nY037cISCG1Jm5fxImVsXp9awdkP7Vu5cxjjog== + version "5.2.9" + resolved "https://registry.yarnpkg.com/rc-trigger/-/rc-trigger-5.2.9.tgz#795a787d2b038347dcde27b89a4a5cec8fc40f3e" + integrity sha512-0Bxsh2Xe+etejMn73am+jZBcOpsueAZiEKLiGoDfA0fvm/JHLNOiiww3zJ0qgyPOTmbYxhsxFcGOZu+VcbaZhQ== dependencies: "@babel/runtime" "^7.11.2" classnames "^2.2.6" @@ -10960,9 +10998,9 @@ rc-trigger@^5.0.0: rc-util "^5.5.0" rc-util@^5.0.0, rc-util@^5.2.1, rc-util@^5.3.0, rc-util@^5.5.0: - version "5.8.1" - resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.8.1.tgz#e3630abfb92b40becb31476cee136d65e80e02e0" - integrity sha512-kXV/QjL+azh3AxMk68gm8+nltVoL6bjeJJULAZLRCLus2Fhvo/aaMZokxYov/E0dbfjo31I78pF4yVljqQB7bA== + version "5.13.2" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.13.2.tgz#a8a0bb77743351841ba8bed6393e03b8d2f685c8" + integrity sha512-eYc71XXGlp96RMzg01Mhq/T3BL6OOVTDSS0urFEuvpi+e7slhJRhaHGCKy2hqJm18m9ff7VoRoptplKu60dYog== dependencies: "@babel/runtime" "^7.12.5" react-is "^16.12.0" @@ -11031,17 +11069,17 @@ react-base16-styling@^0.6.0: pure-color "^1.2.0" react-chartjs-2@^2.9.0: - version "2.11.1" - resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-2.11.1.tgz#a78d0df05fc8bc8ffcd4c4ab5b89a25dd2ca3278" - integrity sha512-G7cNq/n2Bkh/v4vcI+GKx7Q1xwZexKYhOSj2HmrFXlvNeaURWXun6KlOUpEQwi1cv9Tgs4H3kGywDWMrX2kxfA== + version "2.11.2" + resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-2.11.2.tgz#156c0d2618600561efc23bef278bd48a335cadb6" + integrity sha512-hcPS9vmRJeAALPPf0uo02BiD8BDm0HNmneJYTZVR74UKprXOpql+Jy1rVuj93rKw0Jfx77mkcRfXPxTe5K83uw== dependencies: lodash "^4.17.19" prop-types "^15.7.2" react-dev-utils@^11.0.2: - version "11.0.3" - resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.3.tgz#b61ed499c7d74f447d4faddcc547e5e671e97c08" - integrity sha512-4lEA5gF4OHrcJLMUV1t+4XbNDiJbsAWCH5Z2uqlTqW6dD7Cf5nEASkeXrCI/Mz83sI2o527oBIFKVMXtRf1Vtg== + version "11.0.4" + resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.4.tgz#a7ccb60257a1ca2e0efe7a83e38e6700d17aa37a" + integrity sha512-dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A== dependencies: "@babel/code-frame" "7.10.4" address "1.1.2" @@ -11078,9 +11116,9 @@ react-dom@16.13.0, react-dom@17.0.1, react-dom@^16.13.1: scheduler "^0.20.1" react-dropzone@^11.0.1: - version "11.3.1" - resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.3.1.tgz#a3115e728b32b33e89f03d691b5b3b44b7f9072f" - integrity sha512-gPyw524T6dYZW81aQoBGmBG90cVNs+YJreh3HaN45Yw09Bm6m4aA6IF9ergHZQAWGeDSJ+DUhDKKAAaDdTj3RQ== + version "11.3.4" + resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-11.3.4.tgz#aeb098df5c4491e165042c9f0b5e2e7185484740" + integrity sha512-B1nzNRZ4F1cnrfEC0T6KXeBN1mCPinu4JCoTrp7NjB+442KSPxqfDrw41QIA2kAwlYs1+wj/0BTedeM5hc2+xw== dependencies: attr-accept "^2.2.1" file-selector "^0.2.2" @@ -11135,12 +11173,12 @@ react-highlighter@^0.4.3: prop-types "^15.6.0" react-i18next@^11.3.3: - version "11.8.8" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.8.8.tgz#23d34518c784f2ada7cec41cfe439ac4ae51875c" - integrity sha512-Z8Daifh+FRpcQsCp48mWQViYSlojv0WiL2bf6e9DOzpfVMDaTT6qsYRbHCjLEeDeEioxoaWHMiWu2JPTW3Ni4w== + version "11.11.3" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.11.3.tgz#38d083bb079c3e6ee376b3321b0d6e409d798f68" + integrity sha512-upzG5/SpyOlYP5oSF4K8TZBvDWVhnCo38JNV+KnWjrg0+IaJCBltyh6lRGZDO5ovLyA4dU6Ip0bwbUCjb6Yyxw== dependencies: - "@babel/runtime" "^7.13.6" - html-parse-stringify2 "^2.0.1" + "@babel/runtime" "^7.14.5" + html-parse-stringify "^3.0.1" react-icons@3.9.0: version "3.9.0" @@ -11160,19 +11198,19 @@ react-is@^16.12.0, react-is@^16.13.1, react-is@^16.6.0, react-is@^16.7.0, react- integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== "react-is@^16.8.0 || ^17.0.0", react-is@^17.0.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" - integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" + integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== react-json-view@^1.19.1: - version "1.21.1" - resolved "https://registry.yarnpkg.com/react-json-view/-/react-json-view-1.21.1.tgz#221b3ec1f84d7225c1cbb56c504ab3e1d06e66ab" - integrity sha512-AonvGea4nWlsnNXCbnSdUHsetyNS8rUMhbFHS9eFaDB1oeaxgHcVsqo5LhGRMvWybfDdjVUo0xzDoMQP7jbrXw== + version "1.21.3" + resolved "https://registry.yarnpkg.com/react-json-view/-/react-json-view-1.21.3.tgz#f184209ee8f1bf374fb0c41b0813cff54549c475" + integrity sha512-13p8IREj9/x/Ye4WI/JpjhoIwuzEgUAtgJZNBJckfzJt1qyh24BdTm6UQNGnyTq9dapQdrqvquZTo3dz1X6Cjw== dependencies: flux "^4.0.1" react-base16-styling "^0.6.0" react-lifecycles-compat "^3.0.4" - react-textarea-autosize "^6.1.0" + react-textarea-autosize "^8.3.2" react-lifecycles-compat@^3.0.4: version "3.0.4" @@ -11199,11 +11237,12 @@ react-placeholder@^4.0.0: integrity sha512-z1HGD86NWJTYTQumHsmGH9jkozv4QHa9dju/vHVUd4f1svu23pf5v7QoBLBfs3kA1S9GLJaCeRMHLbO2SCdz5A== react-redux@^7.2.0: - version "7.2.2" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.2.tgz#03862e803a30b6b9ef8582dadcc810947f74b736" - integrity sha512-8+CQ1EvIVFkYL/vu6Olo7JFLWop1qRUeb46sGtIMDCSpgwPQq8fPLpirIB0iTqFe9XYEFPHssdX8/UwN6pAkEA== + version "7.2.4" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.4.tgz#1ebb474032b72d806de2e0519cd07761e222e225" + integrity sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA== dependencies: "@babel/runtime" "^7.12.1" + "@types/react-redux" "^7.1.16" hoist-non-react-statics "^3.3.2" loose-envify "^1.4.0" prop-types "^15.7.2" @@ -11285,12 +11324,14 @@ react-side-effect@^2.1.0: resolved "https://registry.yarnpkg.com/react-side-effect/-/react-side-effect-2.1.1.tgz#66c5701c3e7560ab4822a4ee2742dee215d72eb3" integrity sha512-2FoTQzRNTncBVtnzxFOk2mCpcfxQpenBMbk5kSVBg5UcPqV9fRbgY2zhb7GTWWOlpFmAxhClBDlIq8Rsubz1yQ== -react-textarea-autosize@^6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-6.1.0.tgz#df91387f8a8f22020b77e3833c09829d706a09a5" - integrity sha512-F6bI1dgib6fSvG8so1HuArPUv+iVEfPliuLWusLF+gAKz0FbB4jLrWUrTAeq1afnPT2c9toEZYUdz/y1uKMy4A== +react-textarea-autosize@^8.3.2: + version "8.3.3" + resolved "https://registry.yarnpkg.com/react-textarea-autosize/-/react-textarea-autosize-8.3.3.tgz#f70913945369da453fd554c168f6baacd1fa04d8" + integrity sha512-2XlHXK2TDxS6vbQaoPbMOfQ8GK7+irc2fVK6QFIcC8GOnH3zI/v481n+j1L0WaPVvKxwesnY93fEfH++sus2rQ== dependencies: - prop-types "^15.6.0" + "@babel/runtime" "^7.10.2" + use-composed-ref "^1.0.0" + use-latest "^1.0.0" react-themeable@^1.1.0: version "1.1.0" @@ -11308,9 +11349,9 @@ react-tooltip@3.9.2: prop-types "^15.6.0" react-transition-group@^4.4.0: - version "4.4.1" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.1.tgz#63868f9325a38ea5ee9535d828327f85773345c9" - integrity sha512-Djqr7OQ2aPUiYurhPalTrVy9ddmFCCzwhqQmtN+J3+3DzLO209Fdr70QrN8Z3DsglWql6iY1lDWAfpFiBtuKGw== + version "4.4.2" + resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" + integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== dependencies: "@babel/runtime" "^7.5.5" dom-helpers "^5.0.1" @@ -11345,6 +11386,14 @@ read-pkg-up@^2.0.0: find-up "^2.0.0" read-pkg "^2.0.0" +read-pkg-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" + integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= + dependencies: + find-up "^2.0.0" + read-pkg "^3.0.0" + read-pkg-up@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-7.0.1.tgz#f3a6135758459733ae2b95638056e1854e7ef507" @@ -11363,6 +11412,15 @@ 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" + read-pkg@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-5.2.0.tgz#7bf295438ca5a33e56cd30e053b34ee7250c93cc" @@ -11386,7 +11444,7 @@ read-pkg@^5.2.0: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.1.1, readable-stream@^3.6.0: +readable-stream@^3.0.2, readable-stream@^3.0.6, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -11404,10 +11462,10 @@ readdirp@^2.2.1: micromatch "^3.1.10" readable-stream "^2.0.2" -readdirp@~3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" - integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== +readdirp@~3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7" + integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA== dependencies: picomatch "^2.2.1" @@ -11423,13 +11481,12 @@ redux-persist@^6.0.0: resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-6.0.0.tgz#b4d2972f9859597c130d40d4b146fecdab51b3a8" integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ== -redux@^4.0.5: - version "4.0.5" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.5.tgz#4db5de5816e17891de8a80c424232d06f051d93f" - integrity sha512-VSz1uMAH24DM6MF72vcojpYPtrTUu3ByVWfPL1nPfVRb5mZVTve5GnNCUV53QM/BZ66xfWrm0CTWoM+Xlz8V1w== +redux@^4.0.0, redux@^4.0.5: + version "4.1.0" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.0.tgz#eb049679f2f523c379f1aff345c8612f294c88d4" + integrity sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g== dependencies: - loose-envify "^1.4.0" - symbol-observable "^1.2.0" + "@babel/runtime" "^7.9.2" regenerate-unicode-properties@^8.2.0: version "8.2.0" @@ -11482,9 +11539,9 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1: define-properties "^1.1.3" regexpp@^3.0.0, regexpp@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" - integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== regexpu-core@^4.7.1: version "4.7.1" @@ -11519,9 +11576,9 @@ regjsgen@^0.5.1: integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A== regjsparser@^0.6.4: - version "0.6.7" - resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c" - integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ== + version "0.6.9" + resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6" + integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ== dependencies: jsesc "~0.5.0" @@ -11557,20 +11614,20 @@ remove-trailing-separator@^1.0.1: integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= renderkid@^2.0.4: - version "2.0.5" - resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz#483b1ac59c6601ab30a7a596a5965cabccfdd0a5" - integrity sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ== - dependencies: - css-select "^2.0.2" - dom-converter "^0.2" - htmlparser2 "^3.10.1" - lodash "^4.17.20" - strip-ansi "^3.0.0" + version "2.0.7" + resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609" + integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ== + dependencies: + css-select "^4.1.3" + dom-converter "^0.2.0" + htmlparser2 "^6.1.0" + lodash "^4.17.21" + strip-ansi "^3.0.1" repeat-element@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce" - integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g== + version "1.1.4" + resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9" + integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ== repeat-string@^1.5.4, repeat-string@^1.6.1: version "1.6.1" @@ -11582,48 +11639,6 @@ replace-ext@1.0.0: resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb" integrity sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs= -request-promise-core@1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" - integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== - dependencies: - lodash "^4.17.19" - -request-promise-native@^1.0.8: - version "1.0.9" - resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28" - integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g== - dependencies: - request-promise-core "1.1.4" - stealthy-require "^1.1.1" - tough-cookie "^2.3.3" - -request@^2.88.2: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -11679,9 +11694,9 @@ resolve-from@^5.0.0: integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== resolve-url-loader@^3.1.2: - version "3.1.2" - resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz#235e2c28e22e3e432ba7a5d4e305c59a58edfc08" - integrity sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ== + version "3.1.4" + resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.4.tgz#3c16caebe0b9faea9c7cc252fa49d2353c412320" + integrity sha512-D3sQ04o0eeQEySLrcz4DsX3saHfsr8/N6tfhblxgZKXxMT2Louargg12oGNfoTRLV09GXhVUe5/qgA5vdgNigg== dependencies: adjust-sourcemap-loader "3.0.0" camelcase "5.3.1" @@ -11689,7 +11704,7 @@ resolve-url-loader@^3.1.2: convert-source-map "1.7.0" es6-iterator "2.0.3" loader-utils "1.2.3" - postcss "7.0.21" + postcss "7.0.36" rework "1.0.1" rework-visit "1.0.0" source-map "0.6.1" @@ -11707,7 +11722,7 @@ resolve@1.18.1: is-core-module "^2.0.0" path-parse "^1.0.6" -resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.8.1: +resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.20.0, resolve@^1.3.2, resolve@^1.8.1: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -11715,6 +11730,14 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.1 is-core-module "^2.2.0" path-parse "^1.0.6" +resolve@^2.0.0-next.3: + version "2.0.0-next.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" + integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + restore-cursor@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e" @@ -11844,10 +11867,10 @@ run-queue@^1.0.0, run-queue@^1.0.3: dependencies: aproba "^1.1.1" -rxjs@^6.5.3, rxjs@^6.6.6: - version "6.6.6" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.6.tgz#14d8417aa5a07c5e633995b525e1e3c0dec03b70" - integrity sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg== +rxjs@^6.5.3, rxjs@^6.6.7: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" @@ -11868,7 +11891,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -11894,9 +11917,9 @@ sanitize.css@^10.0.0: integrity sha512-vTxrZz4dX5W86M6oVWVdOVe72ZiPs41Oi7Z6Km4W5Turyz28mrXSJhhEBZoRtzJWIv3833WKVwLSDWWkEfupMg== sass-loader@^10.0.5: - version "10.1.1" - resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.1.1.tgz#4ddd5a3d7638e7949065dd6e9c7c04037f7e663d" - integrity sha512-W6gVDXAd5hR/WHsPicvZdjAWHBcEJ44UahgxcIE196fW2ong0ZHMPO1kZuI5q0VlvMQZh32gpv69PLWQm70qrw== + version "10.2.0" + resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-10.2.0.tgz#3d64c1590f911013b3fa48a0b22a83d5e1494716" + integrity sha512-kUceLzC1gIHz0zNJPpqRsJyisWatGYNFRmv2CKZK2/ngMJgLqxTbXwe/hJ85luyvZkgqU3VlJ33UVF2T/0g6mw== dependencies: klona "^2.0.4" loader-utils "^2.0.0" @@ -11909,7 +11932,7 @@ sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -saxes@^5.0.0: +saxes@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d" integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw== @@ -11917,9 +11940,9 @@ saxes@^5.0.0: xmlchars "^2.2.0" scheduler@^0.20.1: - version "0.20.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c" - integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== + version "0.20.2" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" + integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -11943,11 +11966,11 @@ schema-utils@^2.6.5, schema-utils@^2.7.0, schema-utils@^2.7.1: ajv-keywords "^3.5.2" schema-utils@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" - integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + version "3.1.1" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" + integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== dependencies: - "@types/json-schema" "^7.0.6" + "@types/json-schema" "^7.0.8" ajv "^6.12.5" ajv-keywords "^3.5.2" @@ -11962,9 +11985,9 @@ select-hose@^2.0.0: integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= selfsigned@^1.10.7: - version "1.10.8" - resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz#0d17208b7d12c33f8eac85c41835f27fc3d81a30" - integrity sha512-2P4PtieJeEwVgTU9QEcwIRDQ/mXJLX8/+I3ur+Pg16nS8oNbrGxEso9NyYWy8NAmXiNl4dlAp5MwoNeCWzON4w== + version "1.10.11" + resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9" + integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA== dependencies: node-forge "^0.10.0" @@ -11993,10 +12016,10 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.2.1, semver@^7.3.2: - version "7.3.4" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" - integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== +semver@^7.2.1, semver@^7.3.2, semver@^7.3.5: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== dependencies: lru-cache "^6.0.0" @@ -12309,6 +12332,11 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +source-map-js@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" + integrity sha512-/3GptzWzu0+0MBQFrDKzw/DvvMTUORvgY6k6jd/VS6iCR4RDTKWH6v6WPwQoUO8667uQEf9Oe38DxAYWY5F/Ug== + source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -12375,9 +12403,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.7" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65" - integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ== + version "3.0.9" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" + integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== spdy-transport@^3.0.0: version "3.0.0" @@ -12414,29 +12442,14 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= -sshpk@^1.7.0: - version "1.16.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.16.1.tgz#fb661c0bef29b39db40769ee39fa70093d6f6877" - integrity sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - ssri@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" - integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== + version "6.0.2" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" + integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== dependencies: figgy-pudding "^3.5.1" -ssri@^8.0.0: +ssri@^8.0.1: version "8.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af" integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ== @@ -12509,11 +12522,6 @@ static-extend@^0.1.1: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= -stealthy-require@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b" - integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks= - stream-browserify@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b" @@ -12557,9 +12565,9 @@ string-argv@0.3.1: integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg== string-length@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.1.tgz#4a973bf31ef77c4edbceadd6af2611996985f8a1" - integrity sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw== + version "4.0.2" + resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" + integrity sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ== dependencies: char-regex "^1.0.2" strip-ansi "^6.0.0" @@ -12595,15 +12603,16 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.matchall@^4.0.2: - version "4.0.4" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.4.tgz#608f255e93e072107f5de066f81a2dfb78cf6b29" - integrity sha512-pknFIWVachNcyqRfaQSeu/FUfpvJTe4uskUSZ9Wc1RijsPuzbZ8TyYT8WCNnntCjUEqQ3vUHMAfVj2+wLAisPQ== +string.prototype.matchall@^4.0.2, string.prototype.matchall@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da" + integrity sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.18.0-next.2" - has-symbols "^1.0.1" + es-abstract "^1.18.2" + get-intrinsic "^1.1.1" + has-symbols "^1.0.2" internal-slot "^1.0.3" regexp.prototype.flags "^1.3.1" side-channel "^1.0.4" @@ -12654,7 +12663,7 @@ strip-ansi@6.0.0, strip-ansi@^6.0.0: dependencies: ansi-regex "^5.0.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: +strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= @@ -12760,15 +12769,15 @@ stylis@^3.5.0: integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q== subscriptions-transport-ws@^0.9.16: - version "0.9.18" - resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.18.tgz#bcf02320c911fbadb054f7f928e51c6041a37b97" - integrity sha512-tztzcBTNoEbuErsVQpTN2xUNN/efAZXyCyL5m3x4t6SKrEiTL2N8SaKWBFWM4u56pL79ULif3zjyeq+oV+nOaA== + version "0.9.19" + resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz#10ca32f7e291d5ee8eb728b9c02e43c52606cdcf" + integrity sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw== dependencies: backo2 "^1.0.2" eventemitter3 "^3.1.0" iterall "^1.2.1" symbol-observable "^1.0.4" - ws "^5.2.0" + ws "^5.2.0 || ^6.0.0 || ^7.0.0" supports-color@^5.3.0, supports-color@^5.5.0: version "5.5.0" @@ -12792,9 +12801,9 @@ supports-color@^7.0.0, supports-color@^7.1.0: has-flag "^4.0.0" supports-hyperlinks@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz#f663df252af5f37c5d49bbd7eeefa9e0b9e59e47" - integrity sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA== + version "2.2.0" + resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb" + integrity sha512-6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ== dependencies: has-flag "^4.0.0" supports-color "^7.0.0" @@ -12823,7 +12832,7 @@ svgo@^1.0.0, svgo@^1.2.2: unquote "~1.1.1" util.promisify "~1.0.0" -symbol-observable@1.2.0, symbol-observable@^1.0.2, symbol-observable@^1.0.4, symbol-observable@^1.2.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" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== @@ -12843,15 +12852,17 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" -table@^6.0.4: - version "6.0.7" - resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" - integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== +table@^6.0.9: + version "6.7.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" + integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== dependencies: - ajv "^7.0.2" - lodash "^4.17.20" + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.truncate "^4.4.2" slice-ansi "^4.0.0" string-width "^4.2.0" + strip-ansi "^6.0.0" tapable@^1.0.0, tapable@^1.1.3: version "1.1.3" @@ -12939,9 +12950,9 @@ terser@^4.1.2, terser@^4.6.2, terser@^4.6.3: source-map-support "~0.5.12" terser@^5.3.4: - version "5.6.0" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2" - integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA== + version "5.7.1" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784" + integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg== dependencies: commander "^2.20.0" source-map "~0.7.2" @@ -13063,22 +13074,14 @@ toposort@^2.0.2: resolved "https://registry.yarnpkg.com/toposort/-/toposort-2.0.2.tgz#ae21768175d1559d48bef35420b2f4962f09c330" integrity sha1-riF2gXXRVZ1IvvNUILL0li8JwzA= -tough-cookie@^2.3.3, tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - 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== +tough-cookie@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4" + integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg== dependencies: - ip-regex "^2.1.0" - psl "^1.1.28" + psl "^1.1.33" punycode "^2.1.1" + universalify "^0.1.2" tp-eosjs@1.5.2: version "1.5.2" @@ -13087,10 +13090,10 @@ tp-eosjs@1.5.2: dependencies: promise "^8.0.1" -tr46@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479" - integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg== +tr46@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240" + integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw== dependencies: punycode "^2.1.1" @@ -13114,6 +13117,11 @@ tryer@^1.0.1: resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== +ts-essentials@^2.0.3: + version "2.0.12" + resolved "https://registry.yarnpkg.com/ts-essentials/-/ts-essentials-2.0.12.tgz#c9303f3d74f75fa7528c3d49b80e089ab09d8745" + integrity sha512-3IVX4nI6B5cc31/GFFE+i8ey/N2eA0CZDbo6n0yrz0zDX8ZJ8djmU1p+XRz7G3is0F3bB3pu2pAroFdAWQKU3w== + ts-invariant@^0.4.0, ts-invariant@^0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz#97a523518688f93aafad01b0e80eb803eb2abd86" @@ -13127,12 +13135,11 @@ ts-pnp@1.2.0, ts-pnp@^1.1.6: integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== tsconfig-paths@^3.9.0: - version "3.9.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz#098547a6c4448807e8fcb8eae081064ee9a3c90b" - integrity sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw== + version "3.10.1" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7" + integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q== dependencies: - "@types/json5" "^0.0.29" - json5 "^1.0.1" + json5 "^2.2.0" minimist "^1.2.0" strip-bom "^3.0.0" @@ -13142,14 +13149,14 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tslib@^2.0.3, tslib@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a" - integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A== + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== -tsutils@^3.17.1: - version "3.20.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.20.0.tgz#ea03ea45462e146b53d70ce0893de453ff24f698" - integrity sha512-RYbuQuvkhuqVeXweWT3tJLKOEJ/UUw9GjNEZGWdrLLlM+611o1gwLHBpxoFJKKl25fLprp2eVthtKs5JOrNeXg== +tsutils@^3.17.1, tsutils@^3.21.0: + version "3.21.0" + resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" + integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== dependencies: tslib "^1.8.1" @@ -13158,18 +13165,6 @@ tty-browserify@0.0.0: resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY= -tunnel-agent@^0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" - integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0= - dependencies: - safe-buffer "^5.0.1" - -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -13189,10 +13184,15 @@ type-detect@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.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.11.0.tgz#97abf0872310fed88a5c466b25681576145e33f1" - integrity sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ== +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== type-fest@^0.3.0, type-fest@^0.3.1: version "0.3.1" @@ -13223,9 +13223,9 @@ type@^1.0.1: integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg== type@^2.0.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/type/-/type-2.3.0.tgz#ada7c045f07ead08abf9e2edd29be1a0c0661132" - integrity sha512-rgPIqOdfK/4J9FhiVrZ3cveAjRRo5rsQBAIhnylX874y1DX/kEKSVdLsnuHB6l1KTjHyU01VjiMBHgU2adejyg== + version "2.5.0" + resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d" + integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw== typedarray-to-buffer@^3.1.5: version "3.1.5" @@ -13240,9 +13240,9 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= typescript@*: - version "4.2.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.2.tgz#1450f020618f872db0ea17317d16d8da8ddb8c4c" - integrity sha512-tbb+NVrLfnsJy3M59lsDgrzWIflR4d4TIUjz+heUnHZwdF7YsrMTKoRERiIvI2lvBG95dfpLxB21WZhys1bgaQ== + version "4.3.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4" + integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA== u2f-api@0.2.7: version "0.2.7" @@ -13250,20 +13250,21 @@ u2f-api@0.2.7: integrity sha512-fqLNg8vpvLOD5J/z4B6wpPg4Lvowz1nJ9xdHcCzdUPKcFE/qNCceV2gNZxSJd5vhAZemHr/K/hbzVA0zxB5mkg== ua-parser-js@^0.7.18: - version "0.7.24" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c" - integrity sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw== + version "0.7.28" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" + integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== ual-anchor@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/ual-anchor/-/ual-anchor-1.0.2.tgz#53536cd1c215c99f6887caf0a3e138e504aee03d" - integrity sha512-VVTzTDfYK+NB0sM0ZFxaKDiilhKHyBimVYT0xuuP7+BOIp3V8V2L0/sAs9ScfnOqrcH5/CVdFn1p97A7MNmK/w== - dependencies: - "@greymass/eosio" "^0.2.5" - anchor-link "^3.0.3" - anchor-link-browser-transport "^3.0.0" - elliptic "6.5.2" - eosjs "^20.0.3" + version "1.0.6" + resolved "https://registry.yarnpkg.com/ual-anchor/-/ual-anchor-1.0.6.tgz#55c0214cc2cb21abf103ab30cf9e23705a106aab" + integrity sha512-rtyCgmY7zf3BSFdiZx6y18e04kjLud6/vZibEwVmbN5XHywM/QhuD20986TQwMcvhS7vZ/pLExUcQEc3ycN+3w== + dependencies: + "@greymass/eosio" "^0.4.3" + anchor-link "^3.2.3" + anchor-link-browser-transport "^3.1.3" + elliptic "6.5.4" + eosio-signing-request "^2.2.1" + eosjs "^21.0.3" universal-authenticator-library "0.3.0" ual-ledger@^0.3.0: @@ -13325,15 +13326,15 @@ ual-token-pocket@^0.3.0: tp-eosjs "1.5.2" universal-authenticator-library "0.3.0" -unbox-primitive@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.0.tgz#eeacbc4affa28e9b3d36b5eaeccc50b3251b1d3f" - integrity sha512-P/51NX+JXyxK/aigg1/ZgyccdAxm5K1+n8+tvqSntjOivPt19gvm1VC49RWYetsiub8WViUchdxl/KWHHB0kzA== +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== dependencies: function-bind "^1.1.1" - has-bigints "^1.0.0" - has-symbols "^1.0.0" - which-boxed-primitive "^1.0.1" + has-bigints "^1.0.1" + has-symbols "^1.0.2" + which-boxed-primitive "^1.0.2" unherit@^1.0.4: version "1.1.3" @@ -13465,7 +13466,7 @@ universal-authenticator-library@0.3.0: resolved "https://registry.yarnpkg.com/universal-authenticator-library/-/universal-authenticator-library-0.3.0.tgz#c9001f1739578fae5b8c32c4d3e754ad681f541a" integrity sha512-G/D9S1/b0fwRHPWHi+bPKjqHb/A5BqiOQ3k/R3MYPQQa0yxStn+Gf3oZjKKFnj9ZhELZ6FHOFRTXzcn/ggxXDg== -universalify@^0.1.0: +universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== @@ -13548,6 +13549,25 @@ url@^0.11.0: punycode "1.3.2" querystring "0.2.0" +use-composed-ref@^1.0.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/use-composed-ref/-/use-composed-ref-1.1.0.tgz#9220e4e94a97b7b02d7d27eaeab0b37034438bbc" + integrity sha512-my1lNHGWsSDAhhVAT4MKs6IjBUtG6ZG11uUqexPH9PptiIZDQOzaF4f5tEbJ2+7qvNbtXNBbU3SfmN+fXlWDhg== + dependencies: + ts-essentials "^2.0.3" + +use-isomorphic-layout-effect@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz#7bb6589170cd2987a152042f9084f9effb75c225" + integrity sha512-L7Evj8FGcwo/wpbv/qvSfrkHFtOpCzvM5yl2KVyDJoylVuSvzphiiasmjgQPttIGBAy2WKiBNR98q8w7PiNgKQ== + +use-latest@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/use-latest/-/use-latest-1.2.0.tgz#a44f6572b8288e0972ec411bdd0840ada366f232" + integrity sha512-d2TEuG6nSLKQLAfW3By8mKr8HurOlTkul0sOpxbClIv4SQ4iOd7BYr7VIzdbktUCnv7dua/60xzd8igMU6jmyw== + dependencies: + use-isomorphic-layout-effect "^1.0.0" + use@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f" @@ -13611,14 +13631,14 @@ uuid@^8.3.0, uuid@^8.3.2: integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== v8-compile-cache@^2.0.3: - version "2.2.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" - integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== v8-to-istanbul@^7.0.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.0.tgz#5b95cef45c0f83217ec79f8fc7ee1c8b486aee07" - integrity sha512-uXUVqNUCLa0AH1vuVxzi+MI4RfxEOKt9pBgKwHbgH7st8Kv2P1m+jvWNnektzBh5QShF3ODgKmUFCf38LnVz1g== + version "7.1.2" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1" + integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -13642,15 +13662,6 @@ vendors@^1.0.0: resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA= - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - vfile-location@^2.0.0: version "2.0.6" resolved "https://registry.yarnpkg.com/vfile-location/-/vfile-location-2.0.6.tgz#8a274f39411b8719ea5728802e10d9e0dff1519e" @@ -13678,10 +13689,10 @@ vm-browserify@^1.0.1: resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0" integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ== -void-elements@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec" - integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w= +void-elements@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09" + integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk= w3c-hr-time@^1.0.2: version "1.0.2" @@ -13889,16 +13900,16 @@ whatwg-mimetype@^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@^8.0.0: - version "8.4.0" - resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.4.0.tgz#50fb9615b05469591d2b2bd6dfaed2942ed72837" - integrity sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw== +whatwg-url@^8.0.0, whatwg-url@^8.5.0: + version "8.7.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77" + integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg== dependencies: - lodash.sortby "^4.7.0" - tr46 "^2.0.2" + lodash "^4.7.0" + tr46 "^2.1.0" webidl-conversions "^6.1.0" -which-boxed-primitive@^1.0.1: +which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== @@ -14156,25 +14167,18 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" -ws@^5.2.0: - version "5.2.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f" - integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA== - dependencies: - async-limiter "~1.0.0" +"ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.4.3, ws@^7.4.5: + version "7.5.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" + integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== ws@^6.1.0, ws@^6.2.1: - version "6.2.1" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb" - integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA== + version "6.2.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" + integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw== dependencies: async-limiter "~1.0.0" -ws@^7.2.3, ws@^7.4.3: - version "7.4.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd" - integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA== - x-is-string@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82" @@ -14201,9 +14205,9 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.1: integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== y18n@^4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4" - integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ== + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== yallist@^2.1.2: version "2.1.2" @@ -14221,9 +14225,9 @@ yallist@^4.0.0: integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== yaml@^1.10.0, yaml@^1.7.2: - version "1.10.0" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" - integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== yargs-parser@^13.1.2: version "13.1.2" diff --git a/services/hapi/package.json b/services/hapi/package.json index 88d37bf0..48ff936a 100644 --- a/services/hapi/package.json +++ b/services/hapi/package.json @@ -23,11 +23,9 @@ "devDependencies": { "eslint": "^6.8.0", "eslint-config-standard": "^14.1.0", - "eslint-config-standard-react": "^9.2.0", "eslint-plugin-import": ">=2.20.1", "eslint-plugin-node": "^11.0.0", "eslint-plugin-promise": ">=4.2.1", - "eslint-plugin-react": ">=7.18.3", "eslint-plugin-standard": "^4.0.1", "husky": ">=4", "lint-staged": ">=10", diff --git a/services/hapi/src/config/dbConfig.js b/services/hapi/src/config/dbConfig.js deleted file mode 100644 index 69abab2e..00000000 --- a/services/hapi/src/config/dbConfig.js +++ /dev/null @@ -1,14 +0,0 @@ -const { DB_NAME, DB_USER, DB_HOST, DB_PORT, DB_PASSWORD } = process.env - -const massiveConfig = { - host: DB_HOST || 'localhost', - port: DB_PORT || 5432, - database: DB_NAME || 'eosrate', - user: DB_USER || 'user', - password: DB_PASSWORD || 'pass' -} - -module.exports = massiveConfig - -// console.log('==== massiveConfig ====') -// console.log(massiveConfig) diff --git a/services/hapi/src/config/index.js b/services/hapi/src/config/index.js new file mode 100644 index 00000000..2410fc17 --- /dev/null +++ b/services/hapi/src/config/index.js @@ -0,0 +1,3 @@ +module.exports = { + massiveConfig: require('./server.config') +} \ No newline at end of file diff --git a/services/hapi/src/config/server.config.js b/services/hapi/src/config/server.config.js new file mode 100644 index 00000000..2a594511 --- /dev/null +++ b/services/hapi/src/config/server.config.js @@ -0,0 +1,8 @@ + +module.exports = { + host: process.env.POSTGRES_HOST || 'localhost', + port: process.env.POSTGRES_PORT || 5432, + database: process.env.POSTGRES_DB || 'eosrate', + user: process.env.POSTGRES_USER || 'user', + password: process.env.POSTGRES_PASSWORD || 'pass' +} \ No newline at end of file diff --git a/services/hapi/src/index.js b/services/hapi/src/index.js index 1f9077c3..33f6ff9d 100644 --- a/services/hapi/src/index.js +++ b/services/hapi/src/index.js @@ -1,5 +1,5 @@ 'use strict' -const { VIRTUAL_PORT, VIRTUAL_HOST } = process.env +const { HAPI_SERVER_PORT, HAPI_SERVER_ADDRESS } = process.env const updateBpStats = require('./libs/sync-bp-stats') const updateUserRatings = require('./libs/sync-user-rating') @@ -9,8 +9,8 @@ const Hapi = require('@hapi/hapi') const init = async () => { const server = Hapi.server({ - port: VIRTUAL_PORT, - host: VIRTUAL_HOST + port: HAPI_SERVER_PORT, + host: HAPI_SERVER_ADDRESS }) server.route({ @@ -56,7 +56,8 @@ const init = async () => { }) await server.start() - console.log('Server running on %s', server.info.uri) + console.log(`🚀 Server ready at ${server.info.uri}`) + server.table().forEach(route => console.log(`${route.method}\t${route.path}`)) } process.on('unhandledRejection', err => { diff --git a/services/hapi/src/libs/add-bps-info.js b/services/hapi/src/libs/add-bps-info.js index 4c36644a..d6b61a97 100644 --- a/services/hapi/src/libs/add-bps-info.js +++ b/services/hapi/src/libs/add-bps-info.js @@ -366,7 +366,7 @@ const jungleBPinfo = [ ]; const massive = require("massive"); -const dbConfig = require("../config/dbConfig"); +const { massiveConfig } = require("../config"); const updateGeneralInfo = async (bpInfo, db) => { await db.producers.save(bpInfo) @@ -376,7 +376,7 @@ const updateGeneralInfo = async (bpInfo, db) => { const updateBps = async (bpInfoObj) => { if (Array.isArray(bpInfoObj)) { - const db = await massive(dbConfig) + const db = await massive(massiveConfig) console.log('db', db.listTables()) for (var i = 0; i < bpInfoObj.length; i++) { await updateGeneralInfo(bpInfoObj[i], db); diff --git a/services/hapi/src/libs/sync-bp-stats.js b/services/hapi/src/libs/sync-bp-stats.js index 27666e17..9e3dccda 100644 --- a/services/hapi/src/libs/sync-bp-stats.js +++ b/services/hapi/src/libs/sync-bp-stats.js @@ -1,5 +1,5 @@ const massive = require('massive') -const dbConfig = require('../config/dbConfig') +const { massiveConfig } = require('../config') const eosjs = require('eosjs') const fetch = require('node-fetch') @@ -33,7 +33,7 @@ const getBpStats = async bp => { const updateBpStats = async bpName => { let message const updateStat = async stat => { - await massive(dbConfig).then(async db => { + await massive(massiveConfig).then(async db => { const blockProducerStat = await db.ratings_stats.findOne({ bp: stat.bp }) if (blockProducerStat && blockProducerStat.bp) { diff --git a/services/hapi/src/libs/sync-bps.js b/services/hapi/src/libs/sync-bps.js index 836da385..0fad90e1 100644 --- a/services/hapi/src/libs/sync-bps.js +++ b/services/hapi/src/libs/sync-bps.js @@ -3,7 +3,7 @@ const EosApi = require('eosjs-api') const massive = require('massive') const request = require('request-promise') -const dbConfig = require('../config/dbConfig') +const { massiveConfig } = require('../config') const EOS_API_ENDPOINT = process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' @@ -91,7 +91,7 @@ const getBlockProducersData = async () => { // updates the postgresdb const updateBlockProducersData = async () => { console.log('==== updating block producer info ====') - const db = await massive(dbConfig) + const db = await massive(massiveConfig) const producersData = await getBlockProducersData() const saveBP = async ({ owner, system, bpJson: bpjson }) => { diff --git a/services/hapi/src/libs/sync-proxies.js b/services/hapi/src/libs/sync-proxies.js index b5236b11..39bd3f3c 100644 --- a/services/hapi/src/libs/sync-proxies.js +++ b/services/hapi/src/libs/sync-proxies.js @@ -4,14 +4,14 @@ const EosApi = require('eosjs-api') const fetch = require('node-fetch') const massive = require('massive') -const dbConfig = require('../config/dbConfig') +const { massiveConfig } = require('../config') const EOS_API_ENDPOINT = process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' // gets data from blockchain const getProxiesData = async () => { - const db = await massive(dbConfig) + const db = await massive(massiveConfig) const eos = new JsonRpc(EOS_API_ENDPOINT, { fetch }) const eosApi = EosApi({ httpEndpoint: EOS_API_ENDPOINT, diff --git a/services/hapi/src/libs/sync-ratings.js b/services/hapi/src/libs/sync-ratings.js index 7fec51f8..1d23c249 100644 --- a/services/hapi/src/libs/sync-ratings.js +++ b/services/hapi/src/libs/sync-ratings.js @@ -3,7 +3,7 @@ const { JsonRpc } = require('eosjs') const fetch = require('node-fetch') const massive = require('massive') -const dbConfig = require('../config/dbConfig') +const { massiveConfig } = require('../config') const EOS_API_ENDPOINT = process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' @@ -27,7 +27,7 @@ const getUserRatings = async () => { // updates the postgresdb const updateUserRatings = async () => { console.log('==== updating user ratings ====') - const db = await massive(dbConfig) + const db = await massive(massiveConfig) const userRatings = await getUserRatings() const saveRatings = async (rating) => { diff --git a/services/hapi/src/libs/sync-stats.js b/services/hapi/src/libs/sync-stats.js index b9a82861..423e7eda 100644 --- a/services/hapi/src/libs/sync-stats.js +++ b/services/hapi/src/libs/sync-stats.js @@ -3,7 +3,7 @@ const { JsonRpc } = require('eosjs') const fetch = require('node-fetch') const massive = require('massive') -const dbConfig = require('../config/dbConfig') +const { massiveConfig } = require('../config') const EOS_API_ENDPOINT = process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' @@ -27,7 +27,7 @@ const getRatingsStats = async () => { // updates the postgresdb const updateRatingsStats = async () => { console.log('==== updating ratings stats ====') - const db = await massive(dbConfig) + const db = await massive(massiveConfig) const ratingsStats = await getRatingsStats() const saveRatings = async (rating) => { diff --git a/services/hapi/src/libs/sync-user-rating.js b/services/hapi/src/libs/sync-user-rating.js index a7722a27..b36563b0 100644 --- a/services/hapi/src/libs/sync-user-rating.js +++ b/services/hapi/src/libs/sync-user-rating.js @@ -3,7 +3,7 @@ const { JsonRpc } = require('eosjs') const fetch = require('node-fetch') const massive = require('massive') -const dbConfig = require('../config/dbConfig') +const { massiveConfig } = require('../config') const EOS_API_ENDPOINT = process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' @@ -30,7 +30,7 @@ const updateUserRatings = async (userAccount, bpAccount) => { console.log('\x1b[33m%s\x1b[0m', '==== updating user ratings ====') try { - const db = await massive(dbConfig) + const db = await massive(massiveConfig) const userRatings = await getUserRatings() if (!userAccount || !bpAccount) diff --git a/services/hapi/yarn.lock b/services/hapi/yarn.lock index b44ee914..931b370a 100644 --- a/services/hapi/yarn.lock +++ b/services/hapi/yarn.lock @@ -2,59 +2,70 @@ # yarn lockfile v1 -"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" - integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== +"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" + integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw== dependencies: - "@babel/highlight" "^7.8.3" + "@babel/highlight" "^7.14.5" -"@babel/generator@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.6.tgz#57adf96d370c9a63c241cd719f9111468578537a" - integrity sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg== +"@babel/generator@^7.14.8": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070" + integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg== dependencies: - "@babel/types" "^7.8.6" + "@babel/types" "^7.14.8" jsesc "^2.5.1" - lodash "^4.17.13" source-map "^0.5.0" -"@babel/helper-function-name@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz#eeeb665a01b1f11068e9fb86ad56a1cb1a824cca" - integrity sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA== +"@babel/helper-function-name@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4" + integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ== dependencies: - "@babel/helper-get-function-arity" "^7.8.3" - "@babel/template" "^7.8.3" - "@babel/types" "^7.8.3" + "@babel/helper-get-function-arity" "^7.14.5" + "@babel/template" "^7.14.5" + "@babel/types" "^7.14.5" -"@babel/helper-get-function-arity@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz#b894b947bd004381ce63ea1db9f08547e920abd5" - integrity sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA== +"@babel/helper-get-function-arity@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815" + integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg== dependencies: - "@babel/types" "^7.8.3" + "@babel/types" "^7.14.5" -"@babel/helper-split-export-declaration@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz#31a9f30070f91368a7182cf05f831781065fc7a9" - integrity sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA== +"@babel/helper-hoist-variables@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d" + integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ== dependencies: - "@babel/types" "^7.8.3" + "@babel/types" "^7.14.5" -"@babel/highlight@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" - integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== +"@babel/helper-split-export-declaration@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a" + integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA== dependencies: + "@babel/types" "^7.14.5" + +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c" + integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow== + +"@babel/highlight@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" chalk "^2.0.0" - esutils "^2.0.2" js-tokens "^4.0.0" -"@babel/parser@^7.3.1", "@babel/parser@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.6.tgz#ba5c9910cddb77685a008e3c587af8d27b67962c" - integrity sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g== +"@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.3.1": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4" + integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA== "@babel/runtime@7.6.0": version "7.6.0" @@ -63,58 +74,50 @@ dependencies: regenerator-runtime "^0.13.2" -"@babel/runtime@^7.6.3": - version "7.8.4" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308" - integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ== +"@babel/template@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" + integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g== dependencies: - regenerator-runtime "^0.13.2" - -"@babel/template@^7.8.3": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" - integrity sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg== - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/parser" "^7.8.6" - "@babel/types" "^7.8.6" + "@babel/code-frame" "^7.14.5" + "@babel/parser" "^7.14.5" + "@babel/types" "^7.14.5" "@babel/traverse@^7.2.3": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.8.6.tgz#acfe0c64e1cd991b3e32eae813a6eb564954b5ff" - integrity sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A== - dependencies: - "@babel/code-frame" "^7.8.3" - "@babel/generator" "^7.8.6" - "@babel/helper-function-name" "^7.8.3" - "@babel/helper-split-export-declaration" "^7.8.3" - "@babel/parser" "^7.8.6" - "@babel/types" "^7.8.6" + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce" + integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg== + dependencies: + "@babel/code-frame" "^7.14.5" + "@babel/generator" "^7.14.8" + "@babel/helper-function-name" "^7.14.5" + "@babel/helper-hoist-variables" "^7.14.5" + "@babel/helper-split-export-declaration" "^7.14.5" + "@babel/parser" "^7.14.8" + "@babel/types" "^7.14.8" debug "^4.1.0" globals "^11.1.0" - lodash "^4.17.13" -"@babel/types@^7.8.3", "@babel/types@^7.8.6": - version "7.8.6" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz#629ecc33c2557fcde7126e58053127afdb3e6d01" - integrity sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA== +"@babel/types@^7.14.5", "@babel/types@^7.14.8": + version "7.14.8" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728" + integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q== dependencies: - esutils "^2.0.2" - lodash "^4.17.13" + "@babel/helper-validator-identifier" "^7.14.8" to-fast-properties "^2.0.0" "@hapi/accept@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-5.0.1.tgz#068553e867f0f63225a506ed74e899441af53e10" - integrity sha512-fMr4d7zLzsAXo28PRRQPXR1o2Wmu+6z+VY1UzDp0iFo13Twj8WePakwXBiqn3E1aAlTpSNzCXdnnQXFhst8h8Q== + version "5.0.2" + resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-5.0.2.tgz#ab7043b037e68b722f93f376afb05e85c0699523" + integrity sha512-CmzBx/bXUR8451fnZRuZAJRlzgm0Jgu5dltTX/bszmR2lheb9BpyN47Q1RbaGTsvFzn0PXAEs+lXDKfshccYZw== dependencies: "@hapi/boom" "9.x.x" "@hapi/hoek" "9.x.x" -"@hapi/address@4.x.x", "@hapi/address@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.0.tgz#36affb4509b5a6adc628bcc394450f2a7d51d111" - integrity sha512-GDDpkCdSUfkQCznmWUHh9dDN85BWf/V8TFKQ2JLuHdGB4Yy3YTEGBzZxoBNxfNBEvreSR/o+ZxBBSNNEVzY+lQ== +"@hapi/address@^4.0.1": + version "4.1.0" + resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.1.0.tgz#d60c5c0d930e77456fdcde2598e77302e2955e1d" + integrity sha512-SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ== dependencies: "@hapi/hoek" "^9.0.0" @@ -133,9 +136,9 @@ "@hapi/hoek" "9.x.x" "@hapi/boom@9.x.x": - version "9.0.0" - resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.0.0.tgz#28f9e77ecf2dea1fe3a8982b9d8827aa5137e33a" - integrity sha512-D+Or4yahLq3L7D1Jf0fR1+Lgr+HPK1lej8tc6hS/fBLmK66XdpvTyKv8YUR5ls1GeQy+KGtbpKAs+ZxyzNtUyA== + version "9.1.3" + resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.3.tgz#22cad56e39b7a4819161a99b1db19eaaa9b6cc6e" + integrity sha512-RlrGyZ603hE/eRTZtTltocRm50HHmrmL3kGOP0SQ9MasazlW1mt/fkv4C5P/6rnpFXjwld/POFX1C8tMZE3ldg== dependencies: "@hapi/hoek" "9.x.x" @@ -153,31 +156,30 @@ integrity sha512-WEezM1FWztfbzqIUbsDzFRVMxSoLy3HugVcux6KDDtTqzPsLE8NDRHfXvev66aH1i2oOKKar3/XDjbvh/OUBdg== "@hapi/call@8.x.x": - version "8.0.0" - resolved "https://registry.yarnpkg.com/@hapi/call/-/call-8.0.0.tgz#a5e456b611d848cf5a12662ef120da886041c54d" - integrity sha512-4xHIWWqaIDQlVU88XAnomACSoC7iWUfaLfdu2T7I0y+HFFwZUrKKGfwn6ik4kwKsJRMnOliG3UXsF8V/94+Lkg== + version "8.0.1" + resolved "https://registry.yarnpkg.com/@hapi/call/-/call-8.0.1.tgz#9e64cd8ba6128eb5be6e432caaa572b1ed8cd7c0" + integrity sha512-bOff6GTdOnoe5b8oXRV3lwkQSb/LAWylvDMae6RgEWWntd0SHtkYbQukDHKlfaYtVnSAgIavJ0kqszF/AIBb6g== dependencies: - "@hapi/address" "4.x.x" "@hapi/boom" "9.x.x" "@hapi/hoek" "9.x.x" "@hapi/catbox-memory@5.x.x": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@hapi/catbox-memory/-/catbox-memory-5.0.0.tgz#6c18dad1a80737480d1c33bfbefd5d028deec86d" - integrity sha512-ByuxVJPHNaXwLzbBv4GdTr6ccpe1nG+AfYt+8ftDWEJY7EWBWzD+Klhy5oPTDGzU26pNUh1e7fcYI1ILZRxAXQ== + version "5.0.1" + resolved "https://registry.yarnpkg.com/@hapi/catbox-memory/-/catbox-memory-5.0.1.tgz#cb63fca0ded01d445a2573b38eb2688df67f70ac" + integrity sha512-QWw9nOYJq5PlvChLWV8i6hQHJYfvdqiXdvTupJFh0eqLZ64Xir7mKNi96d5/ZMUAqXPursfNDIDxjFgoEDUqeQ== dependencies: "@hapi/boom" "9.x.x" "@hapi/hoek" "9.x.x" -"@hapi/catbox@11.x.x": - version "11.0.1" - resolved "https://registry.yarnpkg.com/@hapi/catbox/-/catbox-11.0.1.tgz#c3a1ce5c7a5aa587471e16914745fd27ae861571" - integrity sha512-CsdannMSzWqLcJ7rXT55JGAzoR+BPXesKn9POOrF0A0wsumbUwHP7vxBUH/21YitcM/dLxjUfphkRAQT+XaoyQ== +"@hapi/catbox@^11.1.0": + version "11.1.1" + resolved "https://registry.yarnpkg.com/@hapi/catbox/-/catbox-11.1.1.tgz#d277e2d5023fd69cddb33d05b224ea03065fec0c" + integrity sha512-u/8HvB7dD/6X8hsZIpskSDo4yMKpHxFd7NluoylhGrL6cUfYxdQPnvUp9YU2C6F9hsyBVLGulBd9vBN1ebfXOQ== dependencies: "@hapi/boom" "9.x.x" "@hapi/hoek" "9.x.x" - "@hapi/joi" "17.x.x" "@hapi/podium" "4.x.x" + "@hapi/validate" "1.x.x" "@hapi/content@^5.0.2": version "5.0.2" @@ -187,9 +189,9 @@ "@hapi/boom" "9.x.x" "@hapi/cryptiles@5.x.x": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@hapi/cryptiles/-/cryptiles-5.0.0.tgz#364ca3336594c7f261707a527c4d36da4a8eb86e" - integrity sha512-Yq43ti9N51Z7jbm0Q7YVCcofA+4Gh5wsBX/jZ++Z+FM8GYfBQ1WmI9ufZSL+BVX8vRxzDkdQ2fKoG6cxOQlnVQ== + version "5.1.0" + resolved "https://registry.yarnpkg.com/@hapi/cryptiles/-/cryptiles-5.1.0.tgz#655de4cbbc052c947f696148c83b187fc2be8f43" + integrity sha512-fo9+d1Ba5/FIoMySfMqPBR/7Pa29J2RsiPrl7bkwo5W5o+AN1dAYQRi4SPrPwwVxVGKjgLOEWrsvt1BonJSfLA== dependencies: "@hapi/boom" "9.x.x" @@ -204,16 +206,16 @@ integrity sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A== "@hapi/hapi@^19.1.1": - version "19.1.1" - resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-19.1.1.tgz#d3b73777194b2229be81dd237b23b06711a781ca" - integrity sha512-rpQzSs0XsHSF7usM4qdJJ0Bcmhs9stWhUW3OiamW33bw4qL8q3uEgUKB9KH8ODmluCAkkXOQ0X0Dh9t94E5VIw== + version "19.2.0" + resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-19.2.0.tgz#a177f27d1d067f1fb23de9c0a0b4349502190a7b" + integrity sha512-Isf/BUPQMRMYK+xx4y2B05lrrGw6PSbJKytk1SlaXeV7tXm6m+6tFRBog6c/na0QNgojafb0bjMB+vBg64CwUA== dependencies: "@hapi/accept" "^5.0.1" "@hapi/ammo" "^5.0.1" "@hapi/boom" "9.x.x" "@hapi/bounce" "2.x.x" "@hapi/call" "8.x.x" - "@hapi/catbox" "11.x.x" + "@hapi/catbox" "^11.1.0" "@hapi/catbox-memory" "5.x.x" "@hapi/heavy" "7.x.x" "@hapi/hoek" "9.x.x" @@ -228,18 +230,18 @@ "@hapi/topo" "5.x.x" "@hapi/heavy@7.x.x": - version "7.0.0" - resolved "https://registry.yarnpkg.com/@hapi/heavy/-/heavy-7.0.0.tgz#711b06be6c77a30c7a302d1a41f6edc400025d48" - integrity sha512-n/nheUG6zNleWkjY+3fzV3VJIAumUCaa/WoTmurjqlYY5JgC5ZKOpvP7tWi8rXmKZhbcXgjH3fHFoM55LoBT7g== + version "7.0.1" + resolved "https://registry.yarnpkg.com/@hapi/heavy/-/heavy-7.0.1.tgz#73315ae33b6e7682a0906b7a11e8ca70e3045874" + integrity sha512-vJ/vzRQ13MtRzz6Qd4zRHWS3FaUc/5uivV2TIuExGTM9Qk+7Zzqj0e2G7EpE6KztO9SalTbiIkTh7qFKj/33cA== dependencies: "@hapi/boom" "9.x.x" "@hapi/hoek" "9.x.x" - "@hapi/joi" "17.x.x" + "@hapi/validate" "1.x.x" -"@hapi/hoek@9.x.x", "@hapi/hoek@^9.0.0": - version "9.0.3" - resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.0.3.tgz#e49e637d5de8faa4f0d313c2590b455d7c00afd7" - integrity sha512-jKtjLLDiH95b002sJVc5c74PE6KKYftuyVdVmsuYId5stTaWcRFqE+5ukZI4gDUKjGn8wv2C3zPn3/nyjEI7gg== +"@hapi/hoek@9.x.x", "@hapi/hoek@^9.0.0", "@hapi/hoek@^9.0.4": + version "9.2.0" + resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131" + integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug== "@hapi/iron@6.x.x": version "6.0.0" @@ -253,11 +255,11 @@ "@hapi/hoek" "9.x.x" "@hapi/joi@17.x.x": - version "17.1.0" - resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.0.tgz#cc4000b6c928a6a39b9bef092151b6bdee10ce55" - integrity sha512-ob67RcPlwRWxBzLCnWvcwx5qbwf88I3ykD7gcJLWOTRfLLgosK7r6aeChz4thA3XRvuBfI0KB1tPVl2EQFlPXw== + version "17.1.1" + resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.1.tgz#9cc8d7e2c2213d1e46708c6260184b447c661350" + integrity sha512-p4DKeZAoeZW4g3u7ZeRo+vCDuSDgSvtsB/NpfjXEHTUjSeINAi/RrVOWiVQ1isaoLzMvFEhe8n5065mQq1AdQg== dependencies: - "@hapi/address" "^4.0.0" + "@hapi/address" "^4.0.1" "@hapi/formula" "^2.0.0" "@hapi/hoek" "^9.0.0" "@hapi/pinpoint" "^2.0.0" @@ -272,17 +274,17 @@ mime-db "1.x.x" "@hapi/nigel@4.x.x": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@hapi/nigel/-/nigel-4.0.0.tgz#dae214f1fa3fd3e0d361515e855a54f57cdf7d4c" - integrity sha512-Bqs1pjcDnDQo/XGoiCCNHWTFcMzPbz3L4KU04njeFQMzzEmsojMRX7TX+PezQYCMKtHJOtMg0bHxZyMGqYtbSA== + version "4.0.2" + resolved "https://registry.yarnpkg.com/@hapi/nigel/-/nigel-4.0.2.tgz#8f84ef4bca4fb03b2376463578f253b0b8e863c4" + integrity sha512-ht2KoEsDW22BxQOEkLEJaqfpoKPXxi7tvabXy7B/77eFtOyG5ZEstfZwxHQcqAiZhp58Ae5vkhEqI03kawkYNw== dependencies: - "@hapi/hoek" "9.x.x" - "@hapi/vise" "4.x.x" + "@hapi/hoek" "^9.0.4" + "@hapi/vise" "^4.0.0" "@hapi/pez@^5.0.1": - version "5.0.2" - resolved "https://registry.yarnpkg.com/@hapi/pez/-/pez-5.0.2.tgz#24ea8c566500b2a55216e63e14bc91dd57f22c33" - integrity sha512-jr1lAm8mE7J2IBxvDIuDI1qy2aAsoaD2jxOUd/7JRg/Vmrzco8HdKhtz4fKk6KHU6zbbsAp5m5aSWWVTUrag7g== + version "5.0.3" + resolved "https://registry.yarnpkg.com/@hapi/pez/-/pez-5.0.3.tgz#b75446e6fef8cbb16816573ab7da1b0522e7a2a1" + integrity sha512-mpikYRJjtrbJgdDHG/H9ySqYqwJ+QU/D7FXsYciS9P7NYBXE2ayKDAy3H0ou6CohOCaxPuTV4SZ0D936+VomHA== dependencies: "@hapi/b64" "5.x.x" "@hapi/boom" "9.x.x" @@ -296,34 +298,34 @@ integrity sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw== "@hapi/podium@4.x.x": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@hapi/podium/-/podium-4.1.0.tgz#f37166d4cd24f61a555d9e8f629f3f07f80fb5e2" - integrity sha512-k/n0McAu8PvonfQRLyKKUvvdb+Gh/O5iAeIwv535Hpxw9B1qZcrYdZyWtHZ8O5PkA9/b/Kk+BdvtgcxeKMB/2g== + version "4.1.3" + resolved "https://registry.yarnpkg.com/@hapi/podium/-/podium-4.1.3.tgz#91e20838fc2b5437f511d664aabebbb393578a26" + integrity sha512-ljsKGQzLkFqnQxE7qeanvgGj4dejnciErYd30dbrYzUOF/FyS/DOF97qcrT3bhoVwCYmxa6PEMhxfCPlnUcD2g== dependencies: "@hapi/hoek" "9.x.x" - "@hapi/joi" "17.x.x" - "@hapi/teamwork" "4.x.x" + "@hapi/teamwork" "5.x.x" + "@hapi/validate" "1.x.x" "@hapi/shot@5.x.x": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@hapi/shot/-/shot-5.0.0.tgz#64c908398295c1b4bd10f471b3a83b4e1410f342" - integrity sha512-JXddnJkRh3Xhv9lY1tA+TSIUaoODKbdNIPL/M8WFvFQKOttmGaDeqTW5e8Gf01LtLI7L5DraLMULHjrK1+YNFg== + version "5.0.5" + resolved "https://registry.yarnpkg.com/@hapi/shot/-/shot-5.0.5.tgz#a25c23d18973bec93c7969c51bf9579632a5bebd" + integrity sha512-x5AMSZ5+j+Paa8KdfCoKh+klB78otxF+vcJR/IoN91Vo2e5ulXIW6HUsFTCU+4W6P/Etaip9nmdAx2zWDimB2A== dependencies: "@hapi/hoek" "9.x.x" - "@hapi/joi" "17.x.x" + "@hapi/validate" "1.x.x" "@hapi/somever@3.x.x": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@hapi/somever/-/somever-3.0.0.tgz#f4e9b16a948415b926b4dd898013602b0cb45758" - integrity sha512-Upw/kmKotC9iEmK4y047HMYe4LDKsE5NWfjgX41XNKmFvxsQL7OiaCWVhuyyhU0ShDGBfIAnCH8jZr49z/JzZA== + version "3.0.1" + resolved "https://registry.yarnpkg.com/@hapi/somever/-/somever-3.0.1.tgz#9961cd5bdbeb5bb1edc0b2acdd0bb424066aadcc" + integrity sha512-4ZTSN3YAHtgpY/M4GOtHUXgi6uZtG9nEZfNI6QrArhK0XN/RDVgijlb9kOmXwCR5VclDSkBul9FBvhSuKXx9+w== dependencies: "@hapi/bounce" "2.x.x" "@hapi/hoek" "9.x.x" "@hapi/statehood@^7.0.2": - version "7.0.2" - resolved "https://registry.yarnpkg.com/@hapi/statehood/-/statehood-7.0.2.tgz#e797c7e6d8cdcdf6900e9ea69612181fe5553db6" - integrity sha512-+0VNxysQu+UYzkfvAXq3X4aN65TnUwiR7gsq2cQ/4Rq26nCJjHAfrkYReEeshU2hPmJ3m5QuaBzyDqRm8WOpyg== + version "7.0.3" + resolved "https://registry.yarnpkg.com/@hapi/statehood/-/statehood-7.0.3.tgz#655166f3768344ed3c3b50375a303cdeca8040d9" + integrity sha512-pYB+pyCHkf2Amh67QAXz7e/DN9jcMplIL7Z6N8h0K+ZTy0b404JKPEYkbWHSnDtxLjJB/OtgElxocr2fMH4G7w== dependencies: "@hapi/boom" "9.x.x" "@hapi/bounce" "2.x.x" @@ -331,7 +333,7 @@ "@hapi/cryptiles" "5.x.x" "@hapi/hoek" "9.x.x" "@hapi/iron" "6.x.x" - "@hapi/joi" "17.x.x" + "@hapi/validate" "1.x.x" "@hapi/subtext@^7.0.3": version "7.0.3" @@ -351,14 +353,27 @@ resolved "https://registry.yarnpkg.com/@hapi/teamwork/-/teamwork-4.0.0.tgz#4aadbb88de13bce39ab8431565cd50c7ecc6327f" integrity sha512-V6xYOrr5aFv/IJqNPneaYCu8vuGTKisamqHVRS3JJnbZr18TrpXdsJOYk9pjPhFti+M2YETPebQLUr820N5NoQ== +"@hapi/teamwork@5.x.x": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@hapi/teamwork/-/teamwork-5.1.0.tgz#7801a61fc727f702fd2196ef7625eb4e389f4124" + integrity sha512-llqoQTrAJDTXxG3c4Kz/uzhBS1TsmSBa/XG5SPcVXgmffHE1nFtyLIK0hNJHCB3EuBKT84adzd1hZNY9GJLWtg== + "@hapi/topo@5.x.x", "@hapi/topo@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.0.0.tgz#c19af8577fa393a06e9c77b60995af959be721e7" - integrity sha512-tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw== + version "5.1.0" + resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" + integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg== + dependencies: + "@hapi/hoek" "^9.0.0" + +"@hapi/validate@1.x.x": + version "1.1.3" + resolved "https://registry.yarnpkg.com/@hapi/validate/-/validate-1.1.3.tgz#f750a07283929e09b51aa16be34affb44e1931ad" + integrity sha512-/XMR0N0wjw0Twzq2pQOzPBZlDzkekGcoCtzO314BpIEsbXdYGthQUbxgkGDf4nhk1+IPDAsXqWjMohRQYO06UA== dependencies: "@hapi/hoek" "^9.0.0" + "@hapi/topo" "^5.0.0" -"@hapi/vise@4.x.x": +"@hapi/vise@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@hapi/vise/-/vise-4.0.0.tgz#c6a94fe121b94a53bf99e7489f7fcc74c104db02" integrity sha512-eYyLkuUiFZTer59h+SGy7hUm+qE9p+UemePTHLlIWppEd+wExn3Df5jO04bFQTm7nleF5V8CtuYQYb+VFpZ6Sg== @@ -366,50 +381,46 @@ "@hapi/hoek" "9.x.x" "@hapi/wreck@17.x.x": - version "17.0.0" - resolved "https://registry.yarnpkg.com/@hapi/wreck/-/wreck-17.0.0.tgz#8ab0ca286e937c3f7a82f67e4be4348c824b743c" - integrity sha512-d8lqCinbKyDByn7GzJDRDbitddhIEydNm44UcAMejfhEH3o4IYvKYq6K8cAqXbilXPuvZc0ErlUOg9SDdgRtMw== + version "17.1.0" + resolved "https://registry.yarnpkg.com/@hapi/wreck/-/wreck-17.1.0.tgz#fbdc380c6f3fa1f8052dc612b2d3b6ce3e88dbec" + integrity sha512-nx6sFyfqOpJ+EFrHX+XWwJAxs3ju4iHdbB/bwR8yTNZOiYmuhA8eCe7lYPtYmb4j7vyK/SlbaQsmTtUrMvPEBw== dependencies: "@hapi/boom" "9.x.x" "@hapi/bourne" "2.x.x" "@hapi/hoek" "9.x.x" -"@samverschueren/stream-to-observable@^0.3.0": - version "0.3.0" - resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" - integrity sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg== - dependencies: - any-observable "^0.3.0" - -"@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/minimatch@^3.0.3": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" - integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== + version "3.0.5" + resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" + integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/parse-json@^4.0.0": version "4.0.0" resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -acorn-jsx@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384" - integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw== +acorn-jsx@^5.2.0: + version "5.3.2" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" + integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn@^7.1.0: - version "7.1.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf" - integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg== +acorn@^7.1.1: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5: - version "6.12.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7" - integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw== +aggregate-error@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a" + integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA== + dependencies: + clean-stack "^2.0.0" + indent-string "^4.0.0" + +ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -423,22 +434,27 @@ ansi-align@^2.0.0: dependencies: string-width "^2.0.0" +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-escapes@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" integrity sha1-06ioOzGapneTZisT52HHkRQiMG4= -ansi-escapes@^3.0.0, ansi-escapes@^3.2.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== -ansi-escapes@^4.2.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d" - integrity sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg== +ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: + version "4.3.2" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" + integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== dependencies: - type-fest "^0.8.1" + type-fest "^0.21.3" ansi-regex@^2.0.0: version "2.1.1" @@ -472,19 +488,13 @@ ansi-styles@^3.2.0, ansi-styles@^3.2.1: dependencies: color-convert "^1.9.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== +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== dependencies: - "@types/color-name" "^1.1.1" color-convert "^2.0.1" -any-observable@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" - integrity sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog== - argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -492,6 +502,11 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + array-differ@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b" @@ -502,13 +517,15 @@ array-find-index@^1.0.1: resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= -array-includes@^3.0.3, array-includes@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.1.tgz#cdd67e6852bdf9c1215460786732255ed2459348" - integrity sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ== +array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" + integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== dependencies: + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.17.0" + es-abstract "^1.18.0-next.2" + get-intrinsic "^1.1.1" is-string "^1.0.5" array-union@^1.0.1: @@ -528,13 +545,14 @@ array-uniq@^1.0.1: resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= -array.prototype.flat@^1.2.1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b" - integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ== +array.prototype.flat@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" + integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== dependencies: + call-bind "^1.0.0" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + es-abstract "^1.18.0-next.1" arrify@^1.0.0: version "1.0.1" @@ -568,6 +586,11 @@ astral-regex@^1.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9" integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg== +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" @@ -579,9 +602,9 @@ aws-sign2@~0.7.0: integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg= aws4@^1.8.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz#7e33d8f7d449b3f673cd72deb9abdc552dbe528e" - integrity sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug== + version "1.11.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" + integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== babel-runtime@6.26.0, babel-runtime@^6.6.1: version "6.26.0" @@ -592,9 +615,9 @@ babel-runtime@6.26.0, babel-runtime@^6.6.1: regenerator-runtime "^0.11.0" balanced-match@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" - integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c= + version "1.0.2" + resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" + integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== base-x@^3.0.2: version "3.0.8" @@ -682,9 +705,9 @@ buffer-xor@^1.0.2: integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= builtin-modules@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484" - integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw== + version "3.2.0" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" + integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA== bytebuffer@5.0.1: version "5.0.1" @@ -693,6 +716,14 @@ bytebuffer@5.0.1: dependencies: long "~3" +call-bind@^1.0.0, call-bind@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" + integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA== + dependencies: + function-bind "^1.1.1" + get-intrinsic "^1.0.2" + callsite-record@^3.0.0: version "3.2.2" resolved "https://registry.yarnpkg.com/callsite-record/-/callsite-record-3.2.2.tgz#9a0390642e43fe8bb823945e51464f69f41643de" @@ -776,10 +807,10 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4 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== +chalk@^4.1.0, chalk@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -794,11 +825,6 @@ 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" @@ -807,6 +833,11 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3: inherits "^2.0.1" safe-buffer "^5.0.1" +clean-stack@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" + integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== + cli-boxes@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143" @@ -819,7 +850,7 @@ cli-cursor@^1.0.1, cli-cursor@^1.0.2: dependencies: restore-cursor "^1.0.1" -cli-cursor@^2.0.0, cli-cursor@^2.1.0: +cli-cursor@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5" integrity sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU= @@ -839,29 +870,34 @@ cli-spinners@^0.1.2: integrity sha1-u3ZNiOGF+54eaiofGXcjGPYF4xw= cli-spinners@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.2.0.tgz#e8b988d9206c692302d8ee834e7a85c0144d8f77" - integrity sha512-tgU3fKwzYjiLEQgPMD9Jt+JjHVL9kW93FiIMX/l7rivvOD4/LL0Mf7gda3+4U2KJBloybwgj5KEoQgGRioMiKQ== + version "2.6.0" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.0.tgz#36c7dc98fb6a9a76bd6238ec3f77e2425627e939" + integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q== cli-table@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.1.tgz#f53b05266a8b1a0b934b3d0821e6e2dc5914ae23" - integrity sha1-9TsFJmqLGguTSz0IIebi3FkUriM= + version "0.3.6" + resolved "https://registry.yarnpkg.com/cli-table/-/cli-table-0.3.6.tgz#e9d6aa859c7fe636981fd3787378c2a20bce92fc" + integrity sha512-ZkNZbnZjKERTY5NwC2SeMeLeifSPq/pubeRoTpdr3WchLlnZg6hEgvHkK5zL7KNFdd9PmHN8lxrENUwI3cE8vQ== dependencies: colors "1.0.3" -cli-truncate@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-0.2.1.tgz#9f15cfbb0705005369216c626ac7d05ab90dd574" - integrity sha1-nxXPuwcFAFNpIWxiasfQWrkN1XQ= +cli-truncate@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7" + integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg== dependencies: - slice-ansi "0.0.4" - string-width "^1.0.1" + slice-ansi "^3.0.0" + string-width "^4.2.0" cli-width@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz#ff19ede8a9a5e579324147b0c11f0fbcbabed639" - integrity sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk= + version "2.2.1" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" + integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== + +cli-width@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" + integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== cliui@^5.0.0: version "5.0.0" @@ -911,6 +947,11 @@ color-name@~1.1.4: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +colorette@^1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" + integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + colors@1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -923,26 +964,16 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@6.1.0: - version "6.1.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-6.1.0.tgz#f8d722b78103141006b66f4c7ba1e97315ba75bc" - integrity sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA== +commander@7.2.0, commander@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== commander@^2.17.1: 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@^4.0.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" - integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== - -compare-versions@^3.5.1: - version "3.6.0" - resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.6.0.tgz#1a5689913685e5a87637b8d3ffca75514ec41d62" - integrity sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA== - concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" @@ -959,11 +990,11 @@ concat-stream@^2.0.0: typedarray "^0.0.6" 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== + version "3.1.5" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.5.tgz#e9af331fadc14dabd544d3e7e76dc446a09a530f" + integrity sha512-nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA== dependencies: - dot-prop "^4.1.0" + dot-prop "^4.2.1" graceful-fs "^4.1.2" make-dir "^1.0.0" unique-string "^1.0.0" @@ -976,25 +1007,25 @@ contains-path@^0.1.0: integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo= core-js@^2.4.0: - version "2.6.11" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c" - integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg== + version "2.6.12" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" + integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-util-is@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= -cosmiconfig@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" - integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg== +cosmiconfig@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.0.tgz#ef9b44d773959cae63ddecd122de23853b60f8d3" + integrity sha512-pondGvTuVYDk++upghXJabWzL6Kxu6f26ljFw64Swq9v6sQPUL3EUlVDV56diOjpCayKihL6hVe8exIACU4XcA== dependencies: "@types/parse-json" "^4.0.0" - import-fresh "^3.1.0" + import-fresh "^3.2.1" parse-json "^5.0.0" path-type "^4.0.0" - yaml "^1.7.2" + yaml "^1.10.0" create-error-class@^3.0.0: version "3.0.2" @@ -1064,10 +1095,10 @@ cross-spawn@^6.0.5: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^7.0.0: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.1.tgz#0ab56286e0f7c24e153d04cc2aa027e43a9a5d14" - integrity sha512-u7v4o84SwFpD32Z8IIcPZ6z1/ie24O6RU3RbtL5Y316l3KuHVPx9ItBgWQ6VlfAFnRnTtMUrsQ9MUUTuEZjogg== +cross-spawn@^7.0.0, cross-spawn@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== dependencies: path-key "^3.1.0" shebang-command "^2.0.0" @@ -1092,11 +1123,6 @@ dashdash@^1.12.0: dependencies: assert-plus "^1.0.0" -date-fns@^1.27.2: - version "1.30.1" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c" - integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw== - de-indent@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" @@ -1114,13 +1140,20 @@ debug@^2.6.9: dependencies: ms "2.0.0" -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== +debug@^3.2.7: + version "3.2.7" + resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" + integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== dependencies: ms "^2.1.1" +debug@^4.0.1, debug@^4.1.0, debug@^4.3.1: + version "4.3.2" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" + integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== + dependencies: + ms "2.1.2" + decamelize@^1.1.2, decamelize@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -1148,14 +1181,14 @@ defaults@^1.0.3: dependencies: clone "^1.0.2" -define-properties@^1.1.2, define-properties@^1.1.3: +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== dependencies: object-keys "^1.0.12" -deglob@^4.0.0: +deglob@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/deglob/-/deglob-4.0.1.tgz#0685c6383992fd6009be10653a2b1116696fad55" integrity sha512-/g+RDZ7yf2HvoW+E5Cy+K94YhgcFgr6C8LuHZD1O5HoNPkf3KY6RfXJ0DBGlB/NkLi5gml+G9zqRzk9S0mHZCg== @@ -1225,10 +1258,10 @@ doctrine@^3.0.0: dependencies: esutils "^2.0.2" -dot-prop@^4.1.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" - integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ== +dot-prop@^4.2.1: + version "4.2.1" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.1.tgz#45884194a71fc2cda71cbb4bceb3a4dd2f433ba4" + integrity sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ== dependencies: is-obj "^1.0.0" @@ -1252,11 +1285,6 @@ ecurve@1.0.5: dependencies: bigi "^1.1.0" -elegant-spinner@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" - integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= - emoji-regex@^7.0.1: version "7.0.3" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156" @@ -1268,11 +1296,11 @@ emoji-regex@^8.0.0: integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== encoding@^0.1.11: - version "0.1.12" - resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.12.tgz#538b66f3ee62cd1ab51ec323829d1f9480c74beb" - integrity sha1-U4tm8+5izRq1HsMjgp0flIDHS+s= + version "0.1.13" + resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" + integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A== dependencies: - iconv-lite "~0.4.13" + iconv-lite "^0.6.2" end-of-stream@^1.1.0: version "1.4.4" @@ -1281,6 +1309,13 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" +enquirer@^2.3.6: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + eosjs-api@^7.0.4: version "7.0.4" resolved "https://registry.yarnpkg.com/eosjs-api/-/eosjs-api-7.0.4.tgz#dc3a7206d4ac3e6818f0a950b8d24333175ac7c9" @@ -1327,22 +1362,27 @@ error-stack-parser@^1.3.3: dependencies: stackframe "^0.3.1" -es-abstract@^1.17.0, es-abstract@^1.17.0-next.1: - version "1.17.4" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz#e3aedf19706b20e7c2594c35fc0d57605a79e184" - integrity sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ== +es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: + version "1.18.3" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0" + integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw== dependencies: + call-bind "^1.0.2" es-to-primitive "^1.2.1" function-bind "^1.1.1" + get-intrinsic "^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" + has-symbols "^1.0.2" + is-callable "^1.2.3" + is-negative-zero "^2.0.1" + is-regex "^1.1.3" + is-string "^1.0.6" + object-inspect "^1.10.3" object-keys "^1.1.1" - object.assign "^4.1.0" - string.prototype.trimleft "^2.1.1" - string.prototype.trimright "^2.1.1" + object.assign "^4.1.2" + string.prototype.trimend "^1.0.4" + string.prototype.trimstart "^1.0.4" + unbox-primitive "^1.0.1" es-to-primitive@^1.2.1: version "1.2.1" @@ -1358,37 +1398,30 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -eslint-config-standard-jsx@8.1.0, eslint-config-standard-jsx@^8.0.0: +eslint-config-standard-jsx@8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-8.1.0.tgz#314c62a0e6f51f75547f89aade059bec140edfc7" integrity sha512-ULVC8qH8qCqbU792ZOO6DaiaZyHNS/5CZt3hKqHkEhVlhPEPN3nfBqqxJCyp59XrjIBZPu1chMYe9T2DXZ7TMw== -eslint-config-standard-react@^9.2.0: - version "9.2.0" - resolved "https://registry.yarnpkg.com/eslint-config-standard-react/-/eslint-config-standard-react-9.2.0.tgz#b21f05c087c1b0cfeea9fa3bff3cf42bd08a68a9" - integrity sha512-u+KRP2uCtthZ/W4DlLWCC59GZNV/y9k9yicWWammgTs/Omh8ZUUPF3EnYm81MAcbkYQq2Wg0oxutAhi/FQ8mIw== - dependencies: - eslint-config-standard-jsx "^8.0.0" +eslint-config-standard@14.1.1, eslint-config-standard@^14.1.0: + version "14.1.1" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz#830a8e44e7aef7de67464979ad06b406026c56ea" + integrity sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg== -eslint-config-standard@14.1.0, eslint-config-standard@^14.1.0: - version "14.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-14.1.0.tgz#b23da2b76fe5a2eba668374f246454e7058f15d4" - integrity sha512-EF6XkrrGVbvv8hL/kYa/m6vnvmUT+K82pJJc4JJVMM6+Qgqh0pnwprSxdduDLB9p/7bIxD+YV5O0wfb8lmcPbA== - -eslint-import-resolver-node@^0.3.2: - version "0.3.3" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404" - integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg== +eslint-import-resolver-node@^0.3.2, eslint-import-resolver-node@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" + integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== dependencies: debug "^2.6.9" resolve "^1.13.1" -eslint-module-utils@^2.4.0, eslint-module-utils@^2.4.1: - version "2.5.2" - resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz#7878f7504824e1b857dd2505b59a8e5eda26a708" - integrity sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q== +eslint-module-utils@^2.4.0, eslint-module-utils@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233" + integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A== dependencies: - debug "^2.6.9" + debug "^3.2.7" pkg-dir "^2.0.0" eslint-plugin-es@^2.0.0: @@ -1400,30 +1433,33 @@ eslint-plugin-es@^2.0.0: regexpp "^3.0.0" eslint-plugin-es@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.0.tgz#98cb1bc8ab0aa807977855e11ad9d1c9422d014b" - integrity sha512-6/Jb/J/ZvSebydwbBJO1R9E5ky7YeElfK56Veh7e4QGFHCXoIXGH9HhVz+ibJLM3XJ1XjP+T7rKBLUa/Y7eIng== + version "3.0.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893" + integrity sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ== dependencies: eslint-utils "^2.0.0" regexpp "^3.0.0" eslint-plugin-import@>=2.20.1: - version "2.20.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz#802423196dcb11d9ce8435a5fc02a6d3b46939b3" - integrity sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw== + version "2.23.4" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz#8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97" + integrity sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ== dependencies: - array-includes "^3.0.3" - array.prototype.flat "^1.2.1" - contains-path "^0.1.0" + array-includes "^3.1.3" + array.prototype.flat "^1.2.4" debug "^2.6.9" - doctrine "1.5.0" - eslint-import-resolver-node "^0.3.2" - eslint-module-utils "^2.4.1" + doctrine "^2.1.0" + eslint-import-resolver-node "^0.3.4" + eslint-module-utils "^2.6.1" + find-up "^2.0.0" has "^1.0.3" + is-core-module "^2.4.0" minimatch "^3.0.4" - object.values "^1.1.0" - read-pkg-up "^2.0.0" - resolve "^1.12.0" + object.values "^1.1.3" + pkg-up "^2.0.0" + read-pkg-up "^3.0.0" + resolve "^1.20.0" + tsconfig-paths "^3.9.0" eslint-plugin-import@~2.18.0: version "2.18.2" @@ -1443,9 +1479,9 @@ eslint-plugin-import@~2.18.0: resolve "^1.11.0" eslint-plugin-node@^11.0.0: - version "11.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.0.0.tgz#365944bb0804c5d1d501182a9bc41a0ffefed726" - integrity sha512-chUs/NVID+sknFiJzxoN9lM7uKSOEta8GC8365hw1nDfwIPIjjpRSwwPvQanWv8dt/pDe9EV4anmVSwdiSndNg== + version "11.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d" + integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g== dependencies: eslint-plugin-es "^3.0.0" eslint-utils "^2.0.0" @@ -1466,27 +1502,16 @@ eslint-plugin-node@~10.0.0: resolve "^1.10.1" semver "^6.1.0" -eslint-plugin-promise@>=4.2.1, eslint-plugin-promise@~4.2.1: +eslint-plugin-promise@>=4.2.1: + version "5.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz#fb2188fb734e4557993733b41aa1a688f46c6f24" + integrity sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng== + +eslint-plugin-promise@~4.2.1: version "4.2.1" resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== -eslint-plugin-react@>=7.18.3: - version "7.18.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz#8be671b7f6be095098e79d27ac32f9580f599bc8" - integrity sha512-Bt56LNHAQCoou88s8ViKRjMB2+36XRejCQ1VoLj716KI1MoE99HpTVvIThJ0rvFmG4E4Gsq+UgToEjn+j044Bg== - dependencies: - array-includes "^3.1.1" - doctrine "^2.1.0" - has "^1.0.3" - jsx-ast-utils "^2.2.3" - object.entries "^1.1.1" - object.fromentries "^2.0.2" - object.values "^1.1.1" - prop-types "^15.7.2" - resolve "^1.14.2" - string.prototype.matchall "^4.0.2" - eslint-plugin-react@~7.14.2: version "7.14.3" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz#911030dd7e98ba49e1b2208599571846a66bdf13" @@ -1502,17 +1527,22 @@ eslint-plugin-react@~7.14.2: prop-types "^15.7.2" resolve "^1.10.1" -eslint-plugin-standard@^4.0.1, eslint-plugin-standard@~4.0.0: - version "4.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4" - integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ== +eslint-plugin-standard@^4.0.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz#0c3bf3a67e853f8bbbc580fb4945fbf16f41b7c5" + integrity sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ== + +eslint-plugin-standard@~4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.2.tgz#021211a9f077e63a6847e7bb9ab4247327ac8e0c" + integrity sha512-nKptN8l7jksXkwFk++PhJB3cCDTcXOEyhISIN86Ue2feJ1LFyY3PrY3/xT2keXlJSY5bpmbiTG0f885/YKAvTA== eslint-scope@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9" - integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw== + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== dependencies: - esrecurse "^4.1.0" + esrecurse "^4.3.0" estraverse "^4.1.1" eslint-utils@^1.4.2, eslint-utils@^1.4.3: @@ -1523,18 +1553,18 @@ eslint-utils@^1.4.2, eslint-utils@^1.4.3: eslint-visitor-keys "^1.1.0" eslint-utils@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.0.0.tgz#7be1cc70f27a72a76cd14aa698bcabed6890e1cd" - integrity sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA== + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== dependencies: eslint-visitor-keys "^1.1.0" eslint-visitor-keys@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2" - integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A== + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint@^6.8.0: +eslint@^6.8.0, eslint@~6.8.0: version "6.8.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== @@ -1577,56 +1607,13 @@ eslint@^6.8.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" -eslint@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.4.0.tgz#5aa9227c3fbe921982b2eda94ba0d7fae858611a" - integrity sha512-WTVEzK3lSFoXUovDHEbkJqCVPEPwbhCq4trDktNI6ygs7aO41d4cDT0JFAT5MivzZeVLWlg7vHL+bgrQv/t3vA== +espree@^6.1.2: + version "6.2.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" + integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== dependencies: - "@babel/code-frame" "^7.0.0" - ajv "^6.10.0" - chalk "^2.1.0" - cross-spawn "^6.0.5" - debug "^4.0.1" - doctrine "^3.0.0" - eslint-scope "^5.0.0" - eslint-utils "^1.4.2" - eslint-visitor-keys "^1.1.0" - espree "^6.1.1" - esquery "^1.0.1" - esutils "^2.0.2" - file-entry-cache "^5.0.1" - functional-red-black-tree "^1.0.1" - glob-parent "^5.0.0" - globals "^11.7.0" - ignore "^4.0.6" - import-fresh "^3.0.0" - imurmurhash "^0.1.4" - inquirer "^6.4.1" - is-glob "^4.0.0" - js-yaml "^3.13.1" - json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" - lodash "^4.17.14" - minimatch "^3.0.4" - mkdirp "^0.5.1" - natural-compare "^1.4.0" - optionator "^0.8.2" - progress "^2.0.0" - regexpp "^2.0.1" - semver "^6.1.2" - strip-ansi "^5.2.0" - strip-json-comments "^3.0.1" - table "^5.2.3" - text-table "^0.2.0" - v8-compile-cache "^2.0.3" - -espree@^6.1.1, espree@^6.1.2: - version "6.1.2" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d" - integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA== - dependencies: - acorn "^7.1.0" - acorn-jsx "^5.1.0" + acorn "^7.1.1" + acorn-jsx "^5.2.0" eslint-visitor-keys "^1.1.0" esprima@^4.0.0: @@ -1635,24 +1622,29 @@ esprima@^4.0.0: integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== esquery@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz#c5c0b66f383e7656404f86b31334d72524eddb48" - integrity sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q== + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== dependencies: - estraverse "^4.0.0" + estraverse "^5.1.0" -esrecurse@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf" - integrity sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ== +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== dependencies: - estraverse "^4.1.0" + estraverse "^5.2.0" -estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1: +estraverse@^4.1.1: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -1705,20 +1697,19 @@ execa@^2.1.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" -execa@^3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-3.4.0.tgz#c08ed4550ef65d858fac269ffc8572446f37eb89" - integrity sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g== +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== dependencies: - cross-spawn "^7.0.0" - get-stream "^5.0.0" - human-signals "^1.1.1" + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" 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" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" strip-final-newline "^2.0.0" exit-hook@^1.0.0: @@ -1765,9 +1756,9 @@ extsprintf@^1.2.0: integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= fast-deep-equal@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" - integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-json-stable-stringify@^2.0.0: version "2.1.0" @@ -1779,7 +1770,7 @@ fast-levenshtein@~2.0.6: resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= -figures@^1.3.5, figures@^1.7.0: +figures@^1.3.5: version "1.7.0" resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" integrity sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4= @@ -1816,9 +1807,9 @@ fill-range@^7.0.1: to-regex-range "^5.0.1" find-parent-dir@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54" - integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ= + version "0.3.1" + resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.1.tgz#c5c385b96858c3351f95d446cab866cbf9f11125" + integrity sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A== find-root@^1.0.0: version "1.1.0" @@ -1847,7 +1838,7 @@ find-up@^3.0.0: dependencies: locate-path "^3.0.0" -find-up@^4.0.0, find-up@^4.1.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== @@ -1855,13 +1846,6 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -find-versions@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.2.0.tgz#10297f98030a786829681690545ef659ed1d254e" - integrity sha512-P8WRou2S+oe222TOCHitLy8zj+SIsVJh52VP4lvXkaFVnOFFdoWv1H1Jjvel1aI6NCFOAaeAVm8qrI0odiLcww== - dependencies: - semver-regex "^2.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" @@ -1872,9 +1856,9 @@ flat-cache@^2.0.1: write "1.0.3" flatted@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08" - integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" + integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== forever-agent@~0.6.1: version "0.6.1" @@ -1915,6 +1899,15 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== +get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" + integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== + dependencies: + function-bind "^1.1.1" + has "^1.0.3" + has-symbols "^1.0.1" + get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" @@ -1936,12 +1929,17 @@ get-stream@^3.0.0: integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ= get-stream@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.1.0.tgz#01203cdc92597f9b909067c3e656cc1f4d3c4dc9" - integrity sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw== + version "5.2.0" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" + integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== dependencies: pump "^3.0.0" +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + getpass@^0.1.1: version "0.1.7" resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" @@ -1955,16 +1953,16 @@ giturl@^1.0.0: integrity sha512-wQourBdI13n8tbjcZTDl6k+ZrCRMU6p9vfp9jknZq+zfWc8xXNztpZFM4XkPHVzHcMSUZxEMYYKZjIGkPlei6Q== glob-parent@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" - integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw== + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" -glob@7.1.6, glob@^7.0.5, glob@^7.1.3: - version "7.1.6" - resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" - integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== +glob@7.1.7, glob@^7.0.5, glob@^7.1.3: + version "7.1.7" + resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" + integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -2011,15 +2009,15 @@ global-prefix@^1.0.1: is-windows "^1.0.1" which "^1.2.14" -globals@^11.1.0, globals@^11.7.0: +globals@^11.1.0: version "11.12.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^12.1.0: - version "12.3.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13" - integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw== + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== dependencies: type-fest "^0.8.1" @@ -2053,9 +2051,9 @@ got@^6.7.1: url-parse-lax "^1.0.0" graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.5: - version "4.2.3" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423" - integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ== + version "4.2.6" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" + integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== har-schema@^2.0.0: version "2.0.0" @@ -2063,11 +2061,11 @@ har-schema@^2.0.0: integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI= har-validator@~5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080" - integrity sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g== + version "5.1.5" + resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" + integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== dependencies: - ajv "^6.5.5" + ajv "^6.12.3" har-schema "^2.0.0" has-ansi@^2.0.0: @@ -2077,6 +2075,11 @@ has-ansi@^2.0.0: dependencies: ansi-regex "^2.0.0" +has-bigints@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" + integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== + has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -2087,10 +2090,10 @@ has-flag@^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, 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-symbols@^1.0.1, has-symbols@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423" + integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw== has@^1.0.3: version "1.0.3" @@ -2100,12 +2103,13 @@ has@^1.0.3: function-bind "^1.1.1" hash-base@^3.0.0: - version "3.0.4" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz#5fc8686847ecd73499403319a6b0a3f3f6ae4918" - integrity sha1-X8hoaEfs1zSZQDMZprCj8/auSRg= + version "3.1.0" + resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" + integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" + inherits "^2.0.4" + readable-stream "^3.6.0" + safe-buffer "^5.2.0" he@^1.1.0: version "1.2.0" @@ -2129,9 +2133,9 @@ homedir-polyfill@^1.0.1: parse-passwd "^1.0.0" hosted-git-info@^2.1.4: - version "2.8.6" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.6.tgz#3a6e6d0324c5371fc8c7ba7175e1e5d14578724d" - integrity sha512-Kp6rShEsCHhF5dD3EWKdkgVA8ix90oSUJ0VY4g9goxxa0+f4lx63muTftn0mlJ/+8IESGWyKnP//V2D7S4ZbIQ== + version "2.8.9" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" + integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== http-signature@~1.2.0: version "1.2.0" @@ -2142,48 +2146,44 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -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== +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== husky@>=4: - version "4.2.3" - resolved "https://registry.yarnpkg.com/husky/-/husky-4.2.3.tgz#3b18d2ee5febe99e27f2983500202daffbc3151e" - integrity sha512-VxTsSTRwYveKXN4SaH1/FefRJYCtx+wx04sSVcOpD7N2zjoHxa+cEJ07Qg5NmV3HAK+IRKOyNVpi2YBIVccIfQ== - dependencies: - chalk "^3.0.0" - ci-info "^2.0.0" - compare-versions "^3.5.1" - cosmiconfig "^6.0.0" - find-versions "^3.2.0" - opencollective-postinstall "^2.0.2" - pkg-dir "^4.2.0" - please-upgrade-node "^3.2.0" - slash "^3.0.0" - which-pm-runs "^1.0.0" + version "7.0.1" + resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.1.tgz#579f4180b5da4520263e8713cc832942b48e1f1c" + integrity sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA== -iconv-lite@^0.4.24, iconv-lite@~0.4.13: +iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA== dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.6.2: + version "0.6.3" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501" + integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + ignore@^4.0.6: version "4.0.6" resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== ignore@^5.0.0, ignore@^5.1.1, ignore@^5.1.4: - version "5.1.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" - integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A== + version "5.1.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" + integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== -import-fresh@^3.0.0, import-fresh@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66" - integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ== +import-fresh@^3.0.0, import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== dependencies: parent-module "^1.0.0" resolve-from "^4.0.0" @@ -2205,10 +2205,10 @@ indent-string@^2.1.0: dependencies: repeating "^2.0.0" -indent-string@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-3.2.0.tgz#4a5fd6d27cc332f37e5419a504dbb837105c9289" - integrity sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok= +indent-string@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" + integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== inflight@^1.0.4: version "1.0.6" @@ -2218,15 +2218,15 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.1, inherits@^2.0.3: +inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== ini@^1.3.4, 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== + version "1.3.8" + resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c" + integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew== inquirer@^0.12.0: version "0.12.0" @@ -2247,7 +2247,7 @@ inquirer@^0.12.0: strip-ansi "^3.0.0" through "^2.3.6" -inquirer@^6.1.0, inquirer@^6.4.1: +inquirer@^6.1.0: version "6.5.2" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.5.2.tgz#ad50942375d036d327ff528c08bd5fab089928ca" integrity sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ== @@ -2267,42 +2267,45 @@ inquirer@^6.1.0, inquirer@^6.4.1: through "^2.3.6" inquirer@^7.0.0: - version "7.0.4" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.4.tgz#99af5bde47153abca23f5c7fc30db247f39da703" - integrity sha512-Bu5Td5+j11sCkqfqmUTiwv+tWisMtP0L7Q8WrqA2C/BbBhy1YTdFrvjjlrKq8oagA/tLQBski2Gcx/Sqyi2qSQ== + version "7.3.3" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" + integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== dependencies: ansi-escapes "^4.2.1" - chalk "^2.4.2" + chalk "^4.1.0" cli-cursor "^3.1.0" - cli-width "^2.0.0" + cli-width "^3.0.0" external-editor "^3.0.3" figures "^3.0.0" - lodash "^4.17.15" + lodash "^4.17.19" mute-stream "0.0.8" - run-async "^2.2.0" - rxjs "^6.5.3" + run-async "^2.4.0" + rxjs "^6.6.0" string-width "^4.1.0" - strip-ansi "^5.1.0" + strip-ansi "^6.0.0" through "^2.3.6" -internal-slot@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.2.tgz#9c2e9fb3cd8e5e4256c6f45fe310067fcfa378a3" - integrity sha512-2cQNfwhAfJIkU4KZPkDI+Gj5yNNnbqi40W9Gge6dfnk4TocEVm00B3bdiL+JINrbGJil2TeHvM4rETGzk/f/0g== - dependencies: - es-abstract "^1.17.0-next.1" - has "^1.0.3" - side-channel "^1.0.2" - is-arrayish@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0= -is-callable@^1.1.4, 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-bigint@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" + integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== + +is-boolean-object@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" + integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== + dependencies: + call-bind "^1.0.2" + +is-callable@^1.1.4, is-callable@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" + integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== is-ci@^1.0.10, is-ci@^1.0.8: version "1.2.1" @@ -2311,10 +2314,17 @@ is-ci@^1.0.10, is-ci@^1.0.8: dependencies: ci-info "^1.5.0" +is-core-module@^2.2.0, is-core-module@^2.4.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491" + integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg== + dependencies: + has "^1.0.3" + is-date-object@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e" - integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5" + integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A== is-es2016-keyword@^1.0.0: version "1.0.0" @@ -2368,11 +2378,21 @@ is-installed-globally@^0.1.0: global-dirs "^0.1.0" is-path-inside "^1.0.0" +is-negative-zero@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.1.tgz#3de746c18dda2319241a53675908d8f766f11c24" + integrity sha512-2z6JzQvZRa9A2Y7xC6dQQm4FSTSTNWjKIYYTt4246eMTJmIo0Q+ZyOsU66X8lxK1AbB92dFeglPLrhwpeRKO6w== + is-npm@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ= +is-number-object@^1.0.4: + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" + integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== + is-number@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b" @@ -2383,13 +2403,6 @@ is-obj@^1.0.0, is-obj@^1.0.1: resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8= -is-observable@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e" - integrity sha512-NqCa4Sa2d+u7BWc6CukaObG3Fh+CU9bvixbpcXYhy2VvYS7vVGIdAgnIS5Ks3A/cqk4rebLJ9s8zBstT2aKnIA== - dependencies: - symbol-observable "^1.1.0" - is-path-inside@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-1.0.1.tgz#8ef5b7de50437a3fdca6b4e865ef7aa55cb48036" @@ -2397,22 +2410,18 @@ is-path-inside@^1.0.0: dependencies: path-is-inside "^1.0.1" -is-promise@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa" - integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o= - is-redirect@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24" integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ= -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== +is-regex@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f" + integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ== dependencies: - has "^1.0.3" + call-bind "^1.0.2" + has-symbols "^1.0.2" is-regexp@^1.0.0: version "1.0.0" @@ -2434,23 +2443,28 @@ is-stream@^2.0.0: resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== -is-string@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6" - integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ== +is-string@^1.0.5, is-string@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" + integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== -is-symbol@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" - integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ== +is-symbol@^1.0.2, is-symbol@^1.0.3: + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" + integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg== dependencies: - has-symbols "^1.0.1" + has-symbols "^1.0.2" 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= +is-unicode-supported@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" + integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw== + is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" @@ -2494,10 +2508,17 @@ js-tokens@^3.0.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-yaml@>=3.13.1, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.4.2, js-yaml@^3.8.3: - version "3.13.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" - integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== +js-yaml@>=3.13.1: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + +js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.4.2, js-yaml@^3.8.3: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== dependencies: argparse "^1.0.7" esprima "^4.0.0" @@ -2517,6 +2538,11 @@ json-parse-better-errors@^1.0.1: resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== +json-parse-even-better-errors@^2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d" + integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w== + json-schema-traverse@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" @@ -2537,6 +2563,13 @@ json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= +json5@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" + integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== + dependencies: + minimist "^1.2.5" + jsprim@^1.2.2: version "1.4.1" resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.1.tgz#313e66bc1e5cc06e438bc1b7499c2e5c56acb6a2" @@ -2547,12 +2580,12 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jsx-ast-utils@^2.1.0, jsx-ast-utils@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz#8a9364e402448a3ce7f14d357738310d9248054f" - integrity sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA== +jsx-ast-utils@^2.1.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz#1114a4c1209481db06c690c2b4f488cc665f657e" + integrity sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w== dependencies: - array-includes "^3.0.3" + array-includes "^3.1.1" object.assign "^4.1.0" latest-version@^3.0.0: @@ -2576,19 +2609,21 @@ lines-and-columns@^1.1.6: integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= lint-staged@>=10: - version "10.0.8" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.0.8.tgz#0f7849cdc336061f25f5d4fcbcfa385701ff4739" - integrity sha512-Oa9eS4DJqvQMVdywXfEor6F4vP+21fPHF8LUXgBbVWUSWBddjqsvO6Bv1LwMChmgQZZqwUvgJSHlu8HFHAPZmA== - dependencies: - chalk "^3.0.0" - commander "^4.0.1" - cosmiconfig "^6.0.0" - debug "^4.1.1" + version "11.0.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.0.1.tgz#1b8ae8ed5a52ed87252db95fe008c2618c85f55a" + integrity sha512-RkTA1ulE6jAGFskxpGAwxfVRXjHp7D9gFg/+KMARUWMPiVFP0t28Em2u0gL8sA0w3/ck3TC57F2v2RNeQ5XPnw== + dependencies: + chalk "^4.1.1" + cli-truncate "^2.1.0" + commander "^7.2.0" + cosmiconfig "^7.0.0" + debug "^4.3.1" dedent "^0.7.0" - execa "^3.4.0" - listr "^0.14.3" - log-symbols "^3.0.0" - micromatch "^4.0.2" + enquirer "^2.3.6" + execa "^5.0.0" + listr2 "^3.8.2" + log-symbols "^4.1.0" + micromatch "^4.0.4" normalize-path "^3.0.0" please-upgrade-node "^3.2.0" string-argv "0.3.1" @@ -2613,49 +2648,18 @@ lint@^0.7.0: simple-git "^1.96.0" write-yaml "^1.0.0" -listr-silent-renderer@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/listr-silent-renderer/-/listr-silent-renderer-1.1.1.tgz#924b5a3757153770bf1a8e3fbf74b8bbf3f9242e" - integrity sha1-kktaN1cVN3C/Go4/v3S4u/P5JC4= - -listr-update-renderer@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/listr-update-renderer/-/listr-update-renderer-0.5.0.tgz#4ea8368548a7b8aecb7e06d8c95cb45ae2ede6a2" - integrity sha512-tKRsZpKz8GSGqoI/+caPmfrypiaq+OQCbd+CovEC24uk1h952lVj5sC7SqyFUm+OaJ5HN/a1YLt5cit2FMNsFA== - dependencies: - chalk "^1.1.3" - cli-truncate "^0.2.1" - elegant-spinner "^1.0.1" - figures "^1.7.0" - indent-string "^3.0.0" - log-symbols "^1.0.2" - log-update "^2.3.0" - strip-ansi "^3.0.1" - -listr-verbose-renderer@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/listr-verbose-renderer/-/listr-verbose-renderer-0.5.0.tgz#f1132167535ea4c1261102b9f28dac7cba1e03db" - integrity sha512-04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw== +listr2@^3.8.2: + version "3.10.0" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.10.0.tgz#58105a53ed7fa1430d1b738c6055ef7bb006160f" + integrity sha512-eP40ZHihu70sSmqFNbNy2NL1YwImmlMmPh9WO5sLmPDleurMHt3n+SwEWNu2kzKScexZnkyFtc1VI0z/TGlmpw== dependencies: - chalk "^2.4.1" - cli-cursor "^2.1.0" - date-fns "^1.27.2" - figures "^2.0.0" - -listr@^0.14.3: - version "0.14.3" - resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.3.tgz#2fea909604e434be464c50bddba0d496928fa586" - integrity sha512-RmAl7su35BFd/xoMamRjpIE4j3v+L28o8CT5YhAXQJm1fD+1l9ngXY8JAQRJ+tFK2i5njvi0iRUKV09vPwA0iA== - dependencies: - "@samverschueren/stream-to-observable" "^0.3.0" - is-observable "^1.1.0" - is-promise "^2.1.0" - is-stream "^1.1.0" - listr-silent-renderer "^1.1.1" - listr-update-renderer "^0.5.0" - listr-verbose-renderer "^0.5.0" - p-map "^2.0.0" - rxjs "^6.3.3" + cli-truncate "^2.1.0" + colorette "^1.2.2" + log-update "^4.0.0" + p-map "^4.0.0" + rxjs "^6.6.7" + through "^2.3.8" + wrap-ansi "^7.0.0" load-json-file@^1.0.0: version "1.1.0" @@ -2678,6 +2682,16 @@ 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" @@ -2732,22 +2746,10 @@ lodash.toarray@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE= -lodash@4.17.20: - version "4.17.20" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" - integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== - -"lodash@4.6.1 || ^4.16.1", lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.3.0: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== - -log-symbols@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18" - integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg= - dependencies: - chalk "^1.0.0" +lodash@4.17.21, "lodash@4.6.1 || ^4.16.1", lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.3.0: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== log-symbols@^2.2.0: version "2.2.0" @@ -2756,21 +2758,23 @@ log-symbols@^2.2.0: dependencies: chalk "^2.0.1" -log-symbols@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-3.0.0.tgz#f3a08516a5dea893336a7dee14d18a1cfdab77c4" - integrity sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ== +log-symbols@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" + integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== dependencies: - chalk "^2.4.2" + chalk "^4.1.0" + is-unicode-supported "^0.1.0" -log-update@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/log-update/-/log-update-2.3.0.tgz#88328fd7d1ce7938b29283746f0b1bc126b24708" - integrity sha1-iDKP19HOeTiykoN0bwsbwSayRwg= +log-update@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1" + integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg== dependencies: - ansi-escapes "^3.0.0" - cli-cursor "^2.0.0" - wrap-ansi "^3.0.1" + ansi-escapes "^4.3.0" + cli-cursor "^3.1.0" + slice-ansi "^4.0.0" + wrap-ansi "^6.2.0" long@~3: version "3.2.0" @@ -2823,16 +2827,16 @@ map-obj@^1.0.0, map-obj@^1.0.1: integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= massive@^6.2.0: - version "6.6.5" - resolved "https://registry.yarnpkg.com/massive/-/massive-6.6.5.tgz#2f0e8cb8caac4f9afac738a569f4884d01286eeb" - integrity sha512-SzWHzMpIIZEvpf6LLQBKqj0HGChRJwWJBH3Fe86DFwpVwa1kf5kzJcLx9mvKMzkIiSNeOUue95wyt6l1CvKCYg== + version "6.10.0" + resolved "https://registry.yarnpkg.com/massive/-/massive-6.10.0.tgz#1d22853672de527e0ebb4c9afb376915d5d6025a" + integrity sha512-k30P9qc06MrBXIQc8noSIFN4HiJnMAkMRpfgEtDmyfrRsektey+UJU6/QNdETnQNBJcSHvnaJBCKhAZY4Z4Ufg== dependencies: - commander "6.1.0" - glob "7.1.6" - lodash "4.17.20" + commander "7.2.0" + glob "7.1.7" + lodash "4.17.21" murmurhash "1.0.0" - pg-promise "^10.9.1" - pg-query-stream "^4.0.0" + pg-promise "^10.10.2" + pg-query-stream "^4.1.0" md5.js@^1.3.4: version "1.3.5" @@ -2864,25 +2868,25 @@ merge-stream@^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@^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== +micromatch@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" + integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== dependencies: braces "^3.0.1" - picomatch "^2.0.5" + picomatch "^2.2.3" -mime-db@1.43.0, mime-db@1.x.x: - version "1.43.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58" - integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ== +mime-db@1.48.0, mime-db@1.x.x: + version "1.48.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" + integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.26" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06" - integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ== + version "2.1.31" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" + integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== dependencies: - mime-db "1.43.0" + mime-db "1.48.0" mimic-fn@^1.0.0: version "1.2.0" @@ -2901,43 +2905,43 @@ mimic-fn@^2.1.0: dependencies: brace-expansion "^1.1.7" -minimist@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" - integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0= - -minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284" - integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ= +minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== mkdirp@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" - integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= + version "0.5.5" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" + integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== dependencies: - minimist "0.0.8" + minimist "^1.2.5" moment@^2.22.2: - version "2.24.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b" - integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== + version "2.29.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" + integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== mri@^1.1.4: - version "1.1.4" - resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.4.tgz#7cb1dd1b9b40905f1fac053abe25b6720f44744a" - integrity sha512-6y7IjGPm8AzlvoUrwAaw1tLnUBudaS3752vcd8JtrpGGQn+rXIe63LFVHm/YMwtqAuh+LJPCFdlLYPWM1nYn6w== + version "1.1.6" + resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.6.tgz#49952e1044db21dbf90f6cd92bc9c9a777d415a6" + integrity sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ== ms@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= -ms@^2.1.1: +ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + multimatch@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3" @@ -3002,9 +3006,9 @@ node-fetch@^1.0.1: is-stream "^1.0.1" node-fetch@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" - integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== node-sass-tilde-importer@^1.0.2: version "1.0.2" @@ -3081,7 +3085,7 @@ npm-run-path@^3.0.0: dependencies: path-key "^3.0.0" -npm-run-path@^4.0.0: +npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -3103,55 +3107,53 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -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-inspect@^1.10.3: + version "1.11.0" + resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" + integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== -object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1: +object-keys@^1.0.12, 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== -object.assign@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz#968bf1100d7956bb3ca086f006f846b3bc4008da" - integrity sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w== +object.assign@^4.1.0, object.assign@^4.1.2: + version "4.1.2" + resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" + integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== dependencies: - define-properties "^1.1.2" - function-bind "^1.1.1" - has-symbols "^1.0.0" - object-keys "^1.0.11" + call-bind "^1.0.0" + define-properties "^1.1.3" + has-symbols "^1.0.1" + object-keys "^1.1.1" -object.entries@^1.1.0, object.entries@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz#ee1cf04153de02bb093fec33683900f57ce5399b" - integrity sha512-ilqR7BgdyZetJutmDPfXCDffGa0/Yzl2ivVNpbx/g4UeWrCdRnFDUBrKJGLhGieRHDATnyZXWBeCb29k9CJysQ== +object.entries@^1.1.0: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd" + integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA== dependencies: + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" - has "^1.0.3" + es-abstract "^1.18.2" -object.fromentries@^2.0.0, object.fromentries@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.2.tgz#4a09c9b9bb3843dd0f89acdb517a794d4f355ac9" - integrity sha512-r3ZiBH7MQppDJVLx6fhD618GKNG40CZYH9wgwdhKxBDDbQgjeWGGd4AtkZad84d291YxvWe7bJGuE65Anh0dxQ== +object.fromentries@^2.0.0: + version "2.0.4" + resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8" + integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ== dependencies: + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" + es-abstract "^1.18.0-next.2" has "^1.0.3" -object.values@^1.1.0, object.values@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.1.tgz#68a99ecde356b7e9295a3c5e0ce31dc8c953de5e" - integrity sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA== +object.values@^1.1.0, object.values@^1.1.3: + version "1.1.4" + resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" + integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg== dependencies: + call-bind "^1.0.2" define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" - function-bind "^1.1.1" - has "^1.0.3" + es-abstract "^1.18.2" once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" @@ -3172,19 +3174,14 @@ onetime@^2.0.0: dependencies: mimic-fn "^1.0.0" -onetime@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5" - integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q== +onetime@^5.1.0, onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== dependencies: mimic-fn "^2.1.0" -opencollective-postinstall@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz#5657f1bede69b6e33a45939b061eb53d3c6c3a89" - integrity sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw== - -optionator@^0.8.2, optionator@^0.8.3: +optionator@^0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== @@ -3241,9 +3238,9 @@ p-limit@^1.1.0: p-try "^1.0.0" p-limit@^2.0.0, p-limit@^2.2.0: - version "2.2.2" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz#61279b67721f5287aa1c13a9a7fbbc48c9291b1e" - integrity sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ== + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== dependencies: p-try "^2.0.0" @@ -3268,10 +3265,12 @@ p-locate@^4.1.0: dependencies: p-limit "^2.2.0" -p-map@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175" - integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw== +p-map@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b" + integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ== + dependencies: + aggregate-error "^3.0.0" p-try@^1.0.0: version "1.0.0" @@ -3321,13 +3320,13 @@ parse-json@^4.0.0: json-parse-better-errors "^1.0.1" parse-json@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz#73e5114c986d143efa3712d4ea24db9a4266f60f" - integrity sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw== + version "5.2.0" + resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd" + integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg== dependencies: "@babel/code-frame" "^7.0.0" error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" + json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" parse-passwd@^1.0.0: @@ -3378,9 +3377,9 @@ path-key@^3.0.0, path-key@^3.1.0: integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== path-parse@^1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" - integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== + version "1.0.7" + resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" + integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== path-type@^1.0.0: version "1.1.0" @@ -3398,6 +3397,13 @@ path-type@^2.0.0: dependencies: pify "^2.0.0" +path-type@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f" + integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg== + dependencies: + pify "^3.0.0" + path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -3408,15 +3414,15 @@ performance-now@^2.1.0: resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns= -pg-connection-string@^2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.4.0.tgz#c979922eb47832999a204da5dbe1ebf2341b6a10" - integrity sha512-3iBXuv7XKvxeMrIgym7njT+HlZkwZqqGX4Bu9cci8xHZNT+Um1gWKqCsAzcC0d95rcKMU5WBg6YRUcHyV0HZKQ== +pg-connection-string@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34" + integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== -pg-cursor@^2.5.2: - version "2.5.2" - resolved "https://registry.yarnpkg.com/pg-cursor/-/pg-cursor-2.5.2.tgz#9217fc989fa64221a02d6ed4b37323267d90abde" - integrity sha512-yS0lxXA5WoIVK7BUgJr1uOJDJe5JxVezItTLvqnTXj6bF3di4UtQOrPx8RW3GpFmom2NTQfpEc2N6vvdpopQSw== +pg-cursor@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/pg-cursor/-/pg-cursor-2.6.0.tgz#a85df1bd1389c75ffa443ee94073da0a1be360ba" + integrity sha512-BFLg40CTgBJ+LX9EwqjztUYaKxpxLffMmDTmlQNMCustX/JxMTYimxRkdhZvPYZGp++/2LjuqkKtO5DVVq0FNg== pg-int8@1.0.1: version "1.0.1" @@ -3428,32 +3434,32 @@ pg-minify@1.6.2: resolved "https://registry.yarnpkg.com/pg-minify/-/pg-minify-1.6.2.tgz#055acfe862cfca3ca0a529020846b0f308d68e70" integrity sha512-1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg== -pg-pool@^3.2.2: - version "3.2.2" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.2.2.tgz#a560e433443ed4ad946b84d774b3f22452694dff" - integrity sha512-ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA== +pg-pool@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.3.0.tgz#12d5c7f65ea18a6e99ca9811bd18129071e562fc" + integrity sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg== -pg-promise@^10.9.1: - version "10.9.2" - resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-10.9.2.tgz#292b06f3b173c9e94884ffac91da0000889f8153" - integrity sha512-ewelfzZeSPe5sbgd5ylB6edVXqoD8AH/fqZj4wPLL0242vXtkFY3JuUqt3mfvTruOqZHhoINpoXTfmC9UXbZ7A== +pg-promise@^10.10.2: + version "10.10.2" + resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-10.10.2.tgz#6895c4d38aaeede5c1a4388e5594f1604257bfd4" + integrity sha512-ezc5Jn2DdtYpNoDjo7v9TVQFXBEGR+tnseot8IsZ3/B4XD/CnIjyUPMfizDdbXWNO66hN8p2m8nNrcrJ8uhM/g== dependencies: assert-options "0.7.0" - pg "8.5.1" + pg "8.6.0" pg-minify "1.6.2" spex "3.2.0" -pg-protocol@^1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.4.0.tgz#43a71a92f6fe3ac559952555aa3335c8cb4908be" - integrity sha512-El+aXWcwG/8wuFICMQjM5ZSAm6OWiJicFdNYo+VY3QP+8vI4SvLIWVe51PppTzMhikUJR+PsyIFKqfdXPz/yxA== +pg-protocol@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.5.0.tgz#b5dd452257314565e2d54ab3c132adc46565a6a0" + integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ== -pg-query-stream@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/pg-query-stream/-/pg-query-stream-4.0.0.tgz#17949b58bb9b0e80219d443363847300a570d5e3" - integrity sha512-Jftit2EUBn+ilh4JtAgw0JXKR54vATmYHlZ4fmIlbZgL1qT/GKUuwMzLFT8QQm+qJHZwlRIIfkMUOP7soY38ag== +pg-query-stream@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/pg-query-stream/-/pg-query-stream-4.1.0.tgz#71ab18556ad2bd699e9263972a707f78e16d559b" + integrity sha512-QbupRwS1JHqRVmNLQax4dIENgi+HoT7ToEn+rCcWqsZ/fbjTVdV+RmeZJRSMIcDhza3CImb/yAsTN0g2UGy6vg== dependencies: - pg-cursor "^2.5.2" + pg-cursor "^2.6.0" pg-types@^2.1.0: version "2.2.0" @@ -3466,16 +3472,16 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@8.5.1: - version "8.5.1" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.5.1.tgz#34dcb15f6db4a29c702bf5031ef2e1e25a06a120" - integrity sha512-9wm3yX9lCfjvA98ybCyw2pADUivyNWT/yIP4ZcDVpMN0og70BUWYEGXPCTAQdGTAqnytfRADb7NERrY1qxhIqw== +pg@8.6.0: + version "8.6.0" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.6.0.tgz#e222296b0b079b280cce106ea991703335487db2" + integrity sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" - pg-connection-string "^2.4.0" - pg-pool "^3.2.2" - pg-protocol "^1.4.0" + pg-connection-string "^2.5.0" + pg-pool "^3.3.0" + pg-protocol "^1.5.0" pg-types "^2.1.0" pgpass "1.x" @@ -3486,10 +3492,10 @@ pgpass@1.x: dependencies: split2 "^3.1.1" -picomatch@^2.0.5: - version "2.2.1" - resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.1.tgz#21bac888b6ed8601f831ce7816e335bc779f0a4a" - integrity sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA== +picomatch@^2.2.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972" + integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw== pify@^2.0.0, pify@^2.3.0: version "2.3.0" @@ -3549,12 +3555,12 @@ pkg-dir@^2.0.0: dependencies: find-up "^2.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== +pkg-up@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f" + integrity sha1-yBmscoBZpGHKscOImivjxJoATX8= dependencies: - find-up "^4.0.0" + find-up "^2.1.0" please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0: version "3.2.0" @@ -3609,9 +3615,9 @@ prettier@^1.15.3, prettier@^1.19.1: integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== pretty-quick@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-2.0.1.tgz#417ee605ade98ecc686e72f63b5d28a2c35b43e9" - integrity sha512-y7bJt77XadjUr+P1uKqZxFWLddvj3SKY6EU4BuQtMxmmEFSMpbN132pUWdSG1g1mtUfO0noBvn7wBf0BVeomHg== + version "2.0.2" + resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-2.0.2.tgz#4e44d6489ed513ef111bee501f63688d854584e6" + integrity sha512-aLb6vtOTEfJDwi1w+MBTeE20GwPVUYyn6IqNg6TtGpiOB1W3y6vKcsGFjqGeaaEtQgMLSPXTWONqh33UBuwG8A== dependencies: chalk "^2.4.2" execa "^2.1.0" @@ -3640,9 +3646,9 @@ pseudomap@^1.0.2: integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM= psl@^1.1.28: - version "1.7.0" - resolved "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz#f1c4c47a8ef97167dea5d6bbf4816d736e884a3c" - integrity sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ== + version "1.8.0" + resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" + integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ== pump@^3.0.0: version "3.0.0" @@ -3662,6 +3668,11 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + randombytes@2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79" @@ -3680,9 +3691,9 @@ rc@^1.0.1, rc@^1.1.6: strip-json-comments "~2.0.1" react-is@^16.8.1: - 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== + version "16.13.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" + integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== read-pkg-up@^1.0.1: version "1.0.1" @@ -3700,6 +3711,14 @@ read-pkg-up@^2.0.0: find-up "^2.0.0" read-pkg "^2.0.0" +read-pkg-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07" + integrity sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc= + dependencies: + find-up "^2.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" @@ -3718,7 +3737,16 @@ read-pkg@^2.0.0: normalize-package-data "^2.3.2" path-type "^2.0.0" -readable-stream@^3.0.0, readable-stream@^3.0.2: +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@^3.0.0, readable-stream@^3.0.2, readable-stream@^3.6.0: version "3.6.0" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198" integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA== @@ -3750,17 +3778,9 @@ regenerator-runtime@^0.11.0: integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== regenerator-runtime@^0.13.2: - version "0.13.3" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" - integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== - -regexp.prototype.flags@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz#7aba89b3c13a64509dabcf3ca8d9fbb9bdf5cb75" - integrity sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0-next.1" + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== regexpp@^2.0.1: version "2.0.1" @@ -3768,9 +3788,9 @@ regexpp@^2.0.1: integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== regexpp@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e" - integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g== + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== registry-auth-token@^3.0.1: version "3.4.0" @@ -3803,20 +3823,20 @@ replace-in-file@^3.4.2: glob "^7.1.3" yargs "^13.2.2" -request-promise-core@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz#e9a3c081b51380dfea677336061fea879a829ee9" - integrity sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ== +request-promise-core@1.1.4: + version "1.1.4" + resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f" + integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw== dependencies: - lodash "^4.17.15" + lodash "^4.17.19" request-promise@^4.2.5: - version "4.2.5" - resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.5.tgz#186222c59ae512f3497dfe4d75a9c8461bd0053c" - integrity sha512-ZgnepCykFdmpq86fKGwqntyTiUrHycALuGggpyCZwMvGaZWgxW6yagT0FHkgo5LzYvOaCNvxYwWYIjevSH1EDg== + version "4.2.6" + resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.6.tgz#7e7e5b9578630e6f598e3813c0f8eb342a27f0a2" + integrity sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ== dependencies: bluebird "^3.5.0" - request-promise-core "1.1.3" + request-promise-core "1.1.4" stealthy-require "^1.1.1" tough-cookie "^2.3.3" @@ -3874,11 +3894,12 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2: - version "1.15.1" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8" - integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w== +resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.13.1, resolve@^1.20.0: + version "1.20.0" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" + integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== dependencies: + is-core-module "^2.2.0" path-parse "^1.0.6" restore-cursor@^1.0.1: @@ -3927,36 +3948,36 @@ run-async@^0.1.0: dependencies: once "^1.3.0" -run-async@^2.2.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" - integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA= - dependencies: - is-promise "^2.1.0" +run-async@^2.2.0, run-async@^2.4.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" + integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== run-parallel@^1.1.2: - version "1.1.9" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.1.9.tgz#c9dd3a7cf9f4b2c4b6244e173a6ed866e61dd679" - integrity sha512-DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q== + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" rx-lite@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI= -rxjs@^6.3.3, rxjs@^6.4.0, rxjs@^6.5.3: - version "6.5.4" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" - integrity sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q== +rxjs@^6.4.0, rxjs@^6.6.0, rxjs@^6.6.7: + version "6.6.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" + integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519" - integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg== +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: + version "5.2.1" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" + integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -3973,11 +3994,6 @@ semver-diff@^2.0.0: dependencies: semver "^5.0.3" -semver-regex@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338" - integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw== - "semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" @@ -4025,36 +4041,18 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -side-channel@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz#df5d1abadb4e4bf4af1cd8852bf132d2f7876947" - integrity sha512-7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA== - dependencies: - es-abstract "^1.17.0-next.1" - object-inspect "^1.7.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= +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" + integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== simple-git@^1.96.0: - version "1.131.0" - resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.131.0.tgz#68d85bf6a706e418b8a92cae765d2ad358781e21" - integrity sha512-z/art7YYtmPnnLItT/j+nKwJt6ap6nHZ4D8sYo9PdCKK/ug56SN6m/evfxJk7uDV3e9JuCa8qIyDU2P3cxmiNQ== + version "1.132.0" + resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.132.0.tgz#53ac4c5ec9e74e37c2fd461e23309f22fcdf09b1" + integrity sha512-xauHm1YqCTom1sC9eOjfq3/9RKiUA9iPnxBbrY2DdL8l4ADMu0jjM5l5lphQP5YWNqAL2aXC/OeuQ76vHtW5fg== dependencies: debug "^4.0.1" -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" - integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= - slice-ansi@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636" @@ -4064,6 +4062,24 @@ slice-ansi@^2.1.0: astral-regex "^1.0.0" is-fullwidth-code-point "^2.0.0" +slice-ansi@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787" + integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + snazzy@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/snazzy/-/snazzy-8.0.0.tgz#97a6d4173d03f6549b98a9dd88362765fac0ef88" @@ -4083,30 +4099,30 @@ source-map@^0.5.0: integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= spdx-correct@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4" - integrity sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q== + version "3.1.1" + resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" + integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w== dependencies: spdx-expression-parse "^3.0.0" spdx-license-ids "^3.0.0" spdx-exceptions@^2.1.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz#2ea450aee74f2a89bfb94519c07fcd6f41322977" - integrity sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA== + version "2.3.0" + resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d" + integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A== spdx-expression-parse@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz#99e119b7a5da00e05491c9fa338b7904823b41d0" - integrity sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg== + version "3.0.1" + resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679" + integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q== dependencies: spdx-exceptions "^2.1.0" spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - version "3.0.5" - resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz#3694b5804567a458d3c8045842a6358632f62654" - integrity sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q== + version "3.0.9" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f" + integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ== spex@3.2.0: version "3.2.0" @@ -4146,13 +4162,13 @@ stackframe@^0.3.1: integrity sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ= standard-engine@^12.0.0: - version "12.0.0" - resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-12.0.0.tgz#1643dceba96ca9c04c535a1fb28d79bfb21b3572" - integrity sha512-gJIIRb0LpL7AHyGbN9+hJ4UJns37lxmNTnMGRLC8CFrzQ+oB/K60IQjKNgPBCB2VP60Ypm6f8DFXvhVWdBOO+g== + version "12.1.0" + resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-12.1.0.tgz#b13dbae583de54c06805207b991ef48a582c0e62" + integrity sha512-DVJnWM1CGkag4ucFLGdiYWa5/kJURPONmMmk17p8FT5NE4UnPZB1vxWnXnRo2sPSL78pWJG8xEM+1Tu19z0deg== dependencies: - deglob "^4.0.0" + deglob "^4.0.1" get-stdin "^7.0.0" - minimist "^1.1.0" + minimist "^1.2.5" pkg-conf "^3.1.0" standard-json@^1.0.0: @@ -4163,12 +4179,12 @@ standard-json@^1.0.0: concat-stream "^2.0.0" standard@^14.3.1: - version "14.3.1" - resolved "https://registry.yarnpkg.com/standard/-/standard-14.3.1.tgz#f6a5d9244fbb6b76d0c2dbcc1048a03c863038b6" - integrity sha512-TUQwU7znlZLfgKH1Zwn/D84FitWZkUTfbxSiz/vFx+4c9GV+clSfG/qLiLZOlcdyzhw3oF5/pZydNjbNDfHPEw== + version "14.3.4" + resolved "https://registry.yarnpkg.com/standard/-/standard-14.3.4.tgz#748e80e8cd7b535844a85a12f337755a7e3a0f6e" + integrity sha512-+lpOkFssMkljJ6eaILmqxHQ2n4csuEABmcubLTb9almFi1ElDzXb1819fjf/5ygSyePCq4kU2wMdb2fBfb9P9Q== dependencies: - eslint "~6.4.0" - eslint-config-standard "14.1.0" + eslint "~6.8.0" + eslint-config-standard "14.1.1" eslint-config-standard-jsx "8.1.0" eslint-plugin-import "~2.18.0" eslint-plugin-node "~10.0.0" @@ -4213,42 +4229,30 @@ string-width@^3.0.0, string-width@^3.1.0: is-fullwidth-code-point "^2.0.0" strip-ansi "^5.1.0" -string-width@^4.1.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== +string-width@^4.1.0, string-width@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== dependencies: emoji-regex "^8.0.0" is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" -string.prototype.matchall@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.2.tgz#48bb510326fb9fdeb6a33ceaa81a6ea04ef7648e" - integrity sha512-N/jp6O5fMf9os0JU3E72Qhf590RSRZU/ungsL/qJUYVTNv7hTG0P/dbPjxINVN9jpscu3nzYwKESU3P3RY5tOg== - dependencies: - define-properties "^1.1.3" - es-abstract "^1.17.0" - has-symbols "^1.0.1" - internal-slot "^1.0.2" - regexp.prototype.flags "^1.3.0" - side-channel "^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== +string.prototype.trimend@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" + integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A== dependencies: + call-bind "^1.0.2" 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== +string.prototype.trimstart@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed" + integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw== dependencies: + call-bind "^1.0.2" define-properties "^1.1.3" - function-bind "^1.1.1" string_decoder@^1.1.1: version "1.3.0" @@ -4266,7 +4270,7 @@ stringify-object@^3.3.0: is-obj "^1.0.1" is-regexp "^1.0.0" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: +strip-ansi@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8= @@ -4324,9 +4328,9 @@ strip-indent@^1.0.1: get-stdin "^4.0.1" 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" - integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw== + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== strip-json-comments@~2.0.1: version "2.0.1" @@ -4346,17 +4350,12 @@ supports-color@^5.3.0: has-flag "^3.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== + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== dependencies: has-flag "^4.0.0" -symbol-observable@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" - integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== - table@^5.2.3: version "5.4.6" resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e" @@ -4389,7 +4388,7 @@ throat@^2.0.2: resolved "https://registry.yarnpkg.com/throat/-/throat-2.0.2.tgz#a9fce808b69e133a632590780f342c30a6249b02" integrity sha1-qfzoCLaeEzpjJZB4DzQsMKYkmwI= -through@^2.3.6: +through@^2.3.6, through@^2.3.8: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU= @@ -4431,10 +4430,19 @@ trim-newlines@^1.0.0: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613" integrity sha1-WIeWa7WCpFA6QetST301ARgVphM= +tsconfig-paths@^3.9.0: + version "3.10.1" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7" + integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q== + dependencies: + json5 "^2.2.0" + minimist "^1.2.0" + strip-bom "^3.0.0" + tslib@^1.9.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.0.tgz#f1f3528301621a53220d58373ae510ff747a66bc" - integrity sha512-BmndXUtiTn/VDDrJzQE7Mm22Ix3PxgLltW9bSNLoeCY31gnG2OPx0QqJnuc9oMIKioYrz487i6K9o4Pdn0j+Kg== + version "1.14.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" + integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== tunnel-agent@^0.6.0: version "0.6.0" @@ -4455,6 +4463,11 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" +type-fest@^0.21.3: + version "0.21.3" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37" + integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w== + type-fest@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.3.1.tgz#63d00d204e059474fe5e1b7c011112bbd1dc29e1" @@ -4470,6 +4483,16 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= +unbox-primitive@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471" + integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw== + dependencies: + function-bind "^1.1.1" + has-bigints "^1.0.1" + has-symbols "^1.0.2" + which-boxed-primitive "^1.0.2" + uniq@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" @@ -4509,9 +4532,9 @@ upper-case@^1.1.1: integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" @@ -4533,9 +4556,9 @@ uuid@^3.3.2: integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== v8-compile-cache@^2.0.3: - version "2.1.0" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" - integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== + version "2.3.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== validate-npm-package-license@^3.0.1: version "3.0.4" @@ -4555,9 +4578,9 @@ verror@1.10.0: extsprintf "^1.2.0" vue-template-compiler@^2.6.10: - version "2.6.11" - resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz#c04704ef8f498b153130018993e56309d4698080" - integrity sha512-KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA== + version "2.6.14" + resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763" + integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g== dependencies: de-indent "^1.0.2" he "^1.1.0" @@ -4575,20 +4598,26 @@ wcwidth@^1.0.1: defaults "^1.0.3" whatwg-fetch@>=0.10.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb" - integrity sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q== + version "3.6.2" + resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c" + integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA== + +which-boxed-primitive@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" + integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg== + dependencies: + is-bigint "^1.0.1" + is-boolean-object "^1.1.0" + is-number-object "^1.0.4" + is-string "^1.0.5" + is-symbol "^1.0.3" which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho= -which-pm-runs@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" - integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= - which-pm@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/which-pm/-/which-pm-1.1.0.tgz#5c0fc3f722f003707dea7b20cd17effd3ad2fc33" @@ -4623,14 +4652,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== -wrap-ansi@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-3.0.1.tgz#288a04d87eda5c286e060dfe8f135ce8d007f8ba" - integrity sha1-KIoE2H7aXChuBg3+jxNc6NAH+Lo= - dependencies: - 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" @@ -4640,6 +4661,24 @@ wrap-ansi@^5.1.0: string-width "^3.0.0" strip-ansi "^5.0.0" +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 "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -4689,34 +4728,32 @@ xtend@^4.0.0, xtend@^4.0.1: integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== y18n@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b" - integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w== + version "4.0.3" + resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf" + integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ== yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yaml@^1.7.2: - version "1.7.2" - resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2" - integrity sha512-qXROVp90sb83XtAoqE8bP9RwAkTTZbugRUTm5YeFCBfNRPEp2YzTeqWiz7m5OORHzEvrA/qcGS8hp/E+MMROYw== - dependencies: - "@babel/runtime" "^7.6.3" +yaml@^1.10.0: + version "1.10.2" + resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" + integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg== -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@^13.1.2: + version "13.1.2" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.2.tgz#130f09702ebaeef2650d54ce6e3e5706f7a4fb38" + integrity sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg== dependencies: camelcase "^5.0.0" decamelize "^1.2.0" yargs@^13.2.2: - version "13.3.0" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83" - integrity sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA== + version "13.3.2" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.2.tgz#ad7ffefec1aa59565ac915f82dccb38a9c31a2dd" + integrity sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw== dependencies: cliui "^5.0.0" find-up "^3.0.0" @@ -4727,4 +4764,4 @@ yargs@^13.2.2: string-width "^3.0.0" which-module "^2.0.0" y18n "^4.0.0" - yargs-parser "^13.1.1" + yargs-parser "^13.1.2" diff --git a/services/hasura/.gitignore b/services/hasura/.gitignore deleted file mode 100644 index a5394700..00000000 --- a/services/hasura/.gitignore +++ /dev/null @@ -1 +0,0 @@ -config.yaml \ No newline at end of file diff --git a/services/hasura/Dockerfile b/services/hasura/Dockerfile index bee5c8d7..41707eea 100644 --- a/services/hasura/Dockerfile +++ b/services/hasura/Dockerfile @@ -1,8 +1,10 @@ FROM hasura/graphql-engine:v1.3.3.cli-migrations-v2 ARG hasura_graphql_migrations_dir +ARG hasura_graphql_metadata_dir ENV HASURA_GRAPHQL_MIGRATIONS_DIR $hasura_graphql_migrations_dir +ENV HASURA_GRAPHQL_METADATA_DIR $hasura_graphql_metadata_dir ENV PORT_HASURA 8080 ARG HASURA_GRAPHQL_UNAUTHORIZED_ROLE @@ -14,6 +16,7 @@ ENV HASURA_GRAPHQL_ADMIN_SECRET ${HASURA_GRAPHQL_ADMIN_SECRET} EXPOSE $PORT_HASURA COPY migrations $HASURA_GRAPHQL_MIGRATIONS_DIR +COPY metadata $HASURA_GRAPHQL_METADATA_DIR CMD graphql-engine \ serve \ diff --git a/services/hasura/config.yaml b/services/hasura/config.yaml new file mode 100644 index 00000000..aae8bba7 --- /dev/null +++ b/services/hasura/config.yaml @@ -0,0 +1,2 @@ +version: 2 +metadata_directory: metadata diff --git a/services/hasura/makefile b/services/hasura/makefile index c64f9a93..6c8caf0b 100644 --- a/services/hasura/makefile +++ b/services/hasura/makefile @@ -4,16 +4,16 @@ LATEST_TAG ?= latest install: ##@local Install all dependencies install: - @npm install + @yarn clean-install: ##@local Reinstalls all dependencies clean-install: @rm -Rf node_modules - @npm install + @yarn run: ##@local Run the project locally (without docker) run: node_modules - @$(SHELL_EXPORT) npm run dev + @$(SHELL_EXPORT) yarn run dev build-docker: ##@devops Build the docker image build-docker: ./Dockerfile diff --git a/services/hasura/migrations/.env b/services/hasura/migrations/.env deleted file mode 100644 index b7125be9..00000000 --- a/services/hasura/migrations/.env +++ /dev/null @@ -1 +0,0 @@ -HASURA_GRAPHQL_ACTION_BASE_URL=http://hapi:9090 \ No newline at end of file From 98fddc217b6171099dbf066f7a3ffcd792a88bac Mon Sep 17 00:00:00 2001 From: Leister Francisco Alvarez Campos Date: Wed, 21 Jul 2021 11:27:26 -0600 Subject: [PATCH 02/54] Fix/proxy (#608) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * fix(backend): use envarioment variables * fix(backend): update .env.example variables * fix(backend): rename envarioment variables * fix(backend): minor change * fix(backend): update docker-compose * fix(backend): update .env.example values * fix(backend): refactor variables names * fix(backend): minor changes * fix(backend): add config.yaml file and remove .gitignore from it * fix(backend): update cryptolions to jungle.eosio * fix(sync-proxies): get code and scope from .env variables * fix(sync-proxies): get code and scope from .env variables * fix(proxy): fix envarioment variables merge conflicts Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez --- makefile | 9 ++++++--- services/hapi/src/libs/sync-bps.js | 12 +++++++----- services/hapi/src/libs/sync-proxies.js | 12 +++++++----- services/hapi/src/libs/sync-stats.js | 12 ++++++------ 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/makefile b/makefile index be48b5d9..9bc114c3 100644 --- a/makefile +++ b/makefile @@ -32,6 +32,7 @@ run-postgres: run-hapi: @docker-compose up -d --build hapi + @echo "done hapi" run-hasura: $(eval -include .env) @@ -50,11 +51,13 @@ run-hasura: run-hasura-cli: $(eval -include .env) @until \ - curl http://localhost:8080; \ + curl http://localhost:8080/v1/version; \ do echo "$(BLUE)$(STAGE)-$(APP_NAME)-hasura |$(RESET) ..."; \ sleep 5; done; - @echo "..." - @cd services/hasura && hasura console --endpoint http://localhost:8080 --skip-update-check; + @if [ $(STAGE) = "dev" ]; then\ + cd services/hasura;\ + hasura console --endpoint http://localhost:8080 --no-browser;\ + fi run-frontend: $(eval -include .env) diff --git a/services/hapi/src/libs/sync-bps.js b/services/hapi/src/libs/sync-bps.js index 0fad90e1..c8b4f9bc 100644 --- a/services/hapi/src/libs/sync-bps.js +++ b/services/hapi/src/libs/sync-bps.js @@ -5,8 +5,7 @@ const request = require('request-promise') const { massiveConfig } = require('../config') -const EOS_API_ENDPOINT = - process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const EOS_API_ENDPOINT = process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' // gets data from mainnet const getBlockProducersData = async () => { @@ -14,15 +13,17 @@ const getBlockProducersData = async () => { httpEndpoint: EOS_API_ENDPOINT, verbose: false }) + const { rows: producers } = await eos.getProducers({ json: true, limit: 1000 }) + // TODO: Change reduce function to map function const allProducers = producers.reduce((result, producer) => { if (!producer.is_active || !parseInt(producer.total_votes)) return result - console.log(producer.owner, ' TOTAL VOTES: ----> ', producer.total_votes) + console.log(`${producer.owner} TOTAL VOTES: ----> ${producer.total_votes}`) return [ ...result, @@ -34,6 +35,7 @@ const getBlockProducersData = async () => { ] }, []) + // TODO: Optimize filter functions and if statements const urls = allProducers .filter(({ bpJson, system }) => !Object.keys(bpJson).length && system.url) .map(({ system: { url } }) => { @@ -50,8 +52,6 @@ const getBlockProducersData = async () => { return result }) - console.log('urls', urls.length) - for (let i = 0; i < urls.length; i++) { try { let bp = await request({ @@ -84,7 +84,9 @@ const getBlockProducersData = async () => { } catch (error) { console.log(error) } + } + return allProducers } diff --git a/services/hapi/src/libs/sync-proxies.js b/services/hapi/src/libs/sync-proxies.js index 39bd3f3c..652197ce 100644 --- a/services/hapi/src/libs/sync-proxies.js +++ b/services/hapi/src/libs/sync-proxies.js @@ -6,8 +6,11 @@ const massive = require('massive') const { massiveConfig } = require('../config') -const EOS_API_ENDPOINT = - process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const EOS_API_ENDPOINT = process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' + +const PROXY_INFO_CONTRACT_CODE = process.env.PROXY_INFO_CONTRACT_CODE || 'proxyaccount' + +const PROXY_INFO_CONTRACT_SCOPE = process.env.PROXY_INFO_CONTRACT_SCOPE || 'proxyaccount' // gets data from blockchain const getProxiesData = async () => { @@ -20,8 +23,8 @@ const getProxiesData = async () => { const { rows: proxies } = await eos.get_table_rows({ json: true, - code: process.env.PROXY_INFO_CONTRACT_CODE, - scope: process.env.PROXY_INFO_CONTRACT_SCOPE, + code: PROXY_INFO_CONTRACT_CODE, + scope: PROXY_INFO_CONTRACT_SCOPE, table: 'proxies', limit: 1000, reverse: false, @@ -47,7 +50,6 @@ const getProxiesData = async () => { console.log('error', error) } } else { - //proxies.splice(i, 1) console.log(proxies[i].owner + ' is not a proxy') } } diff --git a/services/hapi/src/libs/sync-stats.js b/services/hapi/src/libs/sync-stats.js index 423e7eda..e87c0cb2 100644 --- a/services/hapi/src/libs/sync-stats.js +++ b/services/hapi/src/libs/sync-stats.js @@ -20,7 +20,7 @@ const getRatingsStats = async () => { reverse: false, show_payer: false }) - // console.log(ratings) + return ratings } @@ -31,8 +31,8 @@ const updateRatingsStats = async () => { const ratingsStats = await getRatingsStats() const saveRatings = async (rating) => { - // console.log('updating... ', rating) - + console.log('updating... ', rating) + try { const result = await db.ratings_stats.save(rating) if (!result) { @@ -42,7 +42,7 @@ const updateRatingsStats = async () => { return } } - // console.log(`succefully saved ${rating.bp}`) + console.log(`succefully saved ${rating.bp}`) } catch (error) { console.log('error', error) } @@ -57,9 +57,9 @@ const updateRatingsStats = async () => { (async () => { try { - // console.log('Updating Ratings Stats') + console.log('Updating Ratings Stats') await updateRatingsStats() - // console.log('OK') + console.log('OK') process.exit(0) } catch (err) { console.log('!!!!', err) From 9ae4241e742d1bc91adbde733c92d6293928d00a Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Wed, 21 Jul 2021 15:06:00 -0600 Subject: [PATCH 03/54] Fix bugs on BP page (#607) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * fix(backend): use envarioment variables * fix(backend): update .env.example variables * fix(backend): rename envarioment variables * fix(backend): minor change * fix(backend): update docker-compose * fix(backend): update .env.example values * fix(backend): refactor variables names * fix(backend): add config.yaml file and remove .gitignore from it * fix(backend): update cryptolions to jungle.eosio * fix(.env.example): update unauthorized role to anonymous * fix(push-enviroment): remove duplicated variable * fix(home page): fix show button vote * fix(design): Fix broken titles on card component * fix(conflicts) * delete(package) Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez Co-authored-by: Leister Francisco Alvarez Campos --- .../frontend/src/components/card/index.js | 7 ++++- .../src/routes/block-producers/index.js | 31 +++++++++---------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/services/frontend/src/components/card/index.js b/services/frontend/src/components/card/index.js index 0a6f3371..a483695e 100644 --- a/services/frontend/src/components/card/index.js +++ b/services/frontend/src/components/card/index.js @@ -4,6 +4,7 @@ import { makeStyles } from '@material-ui/styles' import { useTheme } from '@material-ui/core/styles' import useMediaQuery from '@material-ui/core/useMediaQuery' import Card from '@material-ui/core/Card' +import Box from '@material-ui/core/Box' import classNames from 'classnames' import CardHeader from '@material-ui/core/CardHeader' import { useTranslation } from 'react-i18next' @@ -85,7 +86,11 @@ const CardData = ({ } title={
- {title || owner} + + + {title || owner} + + {showOptions && (
{ ))} {selectedBPs && selectedBPs.length > 0 && ( - - + + + + )} From 8bca98c3e781bc29ffaca601a2b0e06488f0ed94 Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Thu, 22 Jul 2021 13:36:27 -0600 Subject: [PATCH 04/54] Link to network monitor (#606) --- .env.example | 3 +- .../workflows/push-master-environment.yaml | 2 ++ .../workflows/push-staging-environment.yaml | 2 ++ docker-compose.yml | 1 + services/frontend/Dockerfile | 2 ++ services/frontend/makefile | 1 + .../src/components/main-drawer/index.js | 14 +++++--- services/frontend/src/config/index.js | 3 +- services/frontend/src/language/en.json | 1 + services/frontend/src/language/es.json | 1 + services/frontend/src/routes/index.js | 36 +++++++++++++------ 11 files changed, 49 insertions(+), 17 deletions(-) diff --git a/.env.example b/.env.example index c699fb37..ff349396 100644 --- a/.env.example +++ b/.env.example @@ -33,4 +33,5 @@ REACT_APP_EOS_API_HOST=jungle.eosio.cr REACT_APP_EOS_API_PORT=443 REACT_APP_EOS_API_PROTOCOL=https REACT_APP_EOS_CHAIN_ID=2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840 -REACT_APP_BLOCK_EXPLORER=https://jungle3.bloks.io \ No newline at end of file +REACT_APP_BLOCK_EXPLORER=https://jungle3.bloks.io +REACT_APP_NETWORK_MONITOR_URL=https://jungle.eosio.online/ \ No newline at end of file diff --git a/.github/workflows/push-master-environment.yaml b/.github/workflows/push-master-environment.yaml index 089ab058..53c71110 100644 --- a/.github/workflows/push-master-environment.yaml +++ b/.github/workflows/push-master-environment.yaml @@ -51,6 +51,7 @@ jobs: REACT_APP_EOS_API_PROTOCOL: https REACT_APP_EOS_CHAIN_ID: aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906 REACT_APP_BLOCK_EXPLORER: https://bloks.io + REACT_APP_NETWORK_MONITOR_URL: https://jungle.eosio.online/ - name: Build kubernetes files id: build_kubernetes_files @@ -74,6 +75,7 @@ jobs: REACT_APP_EOS_API_PROTOCOL: https REACT_APP_EOS_CHAIN_ID: aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906 REACT_APP_BLOCK_EXPLORER: https://bloks.io + REACT_APP_NETWORK_MONITOR_URL: https://jungle.eosio.online/ # postgres DATABASE_DIRECTORY: database POSTGRES_DB: ${{ secrets.POSTGRES_DB }} diff --git a/.github/workflows/push-staging-environment.yaml b/.github/workflows/push-staging-environment.yaml index 3d46860c..6b723be2 100644 --- a/.github/workflows/push-staging-environment.yaml +++ b/.github/workflows/push-staging-environment.yaml @@ -51,6 +51,7 @@ jobs: REACT_APP_EOS_API_PROTOCOL: https REACT_APP_EOS_CHAIN_ID: 2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840 REACT_APP_BLOCK_EXPLORER: https://jungle3.bloks.io + REACT_APP_NETWORK_MONITOR_URL: https://jungle.eosio.online/ - name: Build kubernetes files id: build_kubernetes_files @@ -74,6 +75,7 @@ jobs: REACT_APP_EOS_API_PROTOCOL: https REACT_APP_EOS_CHAIN_ID: 2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840 REACT_APP_BLOCK_EXPLORER: https://jungle3.bloks.io + REACT_APP_NETWORK_MONITOR_URL: https://jungle.eosio.online/ # postgres DATABASE_DIRECTORY: database POSTGRES_DB: ${{ secrets.POSTGRES_DB }} diff --git a/docker-compose.yml b/docker-compose.yml index 2036de66..c0ef4193 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -119,5 +119,6 @@ services: REACT_APP_EOS_API_PROTOCOL: "${REACT_APP_EOS_API_PROTOCOL}" REACT_APP_EOS_CHAIN_ID: "${REACT_APP_EOS_CHAIN_ID}" REACT_APP_BLOCK_EXPLORER: "${REACT_APP_BLOCK_EXPLORER}" + REACT_APP_NETWORK_MONITOR_URL: "${REACT_APP_NETWORK_MONITOR_URL}" networks: default: diff --git a/services/frontend/Dockerfile b/services/frontend/Dockerfile index e91c0dbe..ddb81d98 100644 --- a/services/frontend/Dockerfile +++ b/services/frontend/Dockerfile @@ -10,6 +10,7 @@ ARG react_app_eos_api_port ARG react_app_eos_api_protocol ARG react_app_eos_chain_id ARG react_app_block_explorer +ARG react_network_monitor_url ENV REACT_APP_GRAPHQL_HTTP_URL $react_app_graphql_http_url ENV REACT_APP_GRAPHQL_WS_URL $react_app_graphql_ws_url @@ -19,6 +20,7 @@ ENV REACT_APP_EOS_API_PORT $react_app_eos_api_port ENV REACT_APP_EOS_API_PROTOCOL $react_app_eos_api_protocol ENV REACT_APP_EOS_CHAIN_ID $react_app_eos_chain_id ENV REACT_APP_BLOCK_EXPLORER $react_app_block_explorer +ENV REACT_APP_NETWORK_MONITOR_URL $react_network_monitor_url WORKDIR /usr/src/app diff --git a/services/frontend/makefile b/services/frontend/makefile index 3fff892b..93c3e7a6 100644 --- a/services/frontend/makefile +++ b/services/frontend/makefile @@ -30,6 +30,7 @@ build-docker: ./Dockerfile --build-arg react_app_eos_api_protocol="$(REACT_APP_EOS_API_PROTOCOL)" \ --build-arg react_app_eos_chain_id="$(REACT_APP_EOS_CHAIN_ID)" \ --build-arg react_app_block_explorer="$(REACT_APP_BLOCK_EXPLORER)" \ + --build-arg react_network_monitor_url="$(REACT_APP_NETWORK_MONITOR_URL)" \ --build-arg branch="$(BRANCH)" \ . diff --git a/services/frontend/src/components/main-drawer/index.js b/services/frontend/src/components/main-drawer/index.js index 71070d67..bf287f67 100644 --- a/services/frontend/src/components/main-drawer/index.js +++ b/services/frontend/src/components/main-drawer/index.js @@ -10,7 +10,7 @@ import { makeStyles } from '@material-ui/styles' import { useTheme } from '@material-ui/core/styles' import ListItem from '@material-ui/core/ListItem' import ListItemText from '@material-ui/core/ListItemText' -import { Link } from '@reach/router' +import Link from '@material-ui/core/Link' import { useTranslation } from 'react-i18next' import classnames from 'classnames' @@ -28,15 +28,17 @@ const Menu = ({ onClick, currentPathname, links, sortBy, setSortBy }) => { {links .filter(({ label }) => label) - .map(({ to, label, collapsedItems }) => { + .map(({ to, label, target, collapsedItems }) => { const isSelected = currentPathname === to return ( {label === 'About' && } onClick && onClick(!!collapsedItems)} > ({ to: route.path, label: t(route.drawerLabel), - collapsedItems: route.drawerComponents + collapsedItems: route.drawerComponents, + target: route.target }))} sortBy={sortBy} setSortBy={handleSortBy} @@ -138,7 +141,8 @@ const MainDrawer = ({ links={routes.map((route) => ({ to: route.path, label: t(route.drawerLabel), - collapsedItems: route.drawerComponents + collapsedItems: route.drawerComponents, + target: route.target }))} sortBy={sortBy} setSortBy={handleSortBy} diff --git a/services/frontend/src/config/index.js b/services/frontend/src/config/index.js index d75d360f..86672920 100644 --- a/services/frontend/src/config/index.js +++ b/services/frontend/src/config/index.js @@ -6,7 +6,8 @@ const config = { eosApiProtocol: process.env.REACT_APP_EOS_API_PROTOCOL, eosApiUri: `${process.env.REACT_APP_EOS_API_PROTOCOL}://${process.env.REACT_APP_EOS_API_HOST}:${process.env.REACT_APP_EOS_API_PORT}`, eosChainId: process.env.REACT_APP_EOS_CHAIN_ID, - blockExplorer: process.env.REACT_APP_BLOCK_EXPLORER + blockExplorer: process.env.REACT_APP_BLOCK_EXPLORER, + networkMonitor: process.env.REACT_APP_NETWORK_MONITOR_URL } export default config diff --git a/services/frontend/src/language/en.json b/services/frontend/src/language/en.json index fd4899f2..3b96c5d4 100644 --- a/services/frontend/src/language/en.json +++ b/services/frontend/src/language/en.json @@ -49,6 +49,7 @@ "drawerLinkHome": "Home", "drawerLinkAllBPs": "Block Producers", + "drawerLinkNetworkMonitor": "EOS Network Monitor", "drawerLinkSettings": "Settings", "drawerLinkAccount": "Account", "drawerLinkAllProxies": "Proxies", diff --git a/services/frontend/src/language/es.json b/services/frontend/src/language/es.json index b1329532..bf2e2fd2 100644 --- a/services/frontend/src/language/es.json +++ b/services/frontend/src/language/es.json @@ -49,6 +49,7 @@ "drawerLinkHome": "Página Principal", "drawerLinkAllBPs": "Productores de Bloques", + "drawerLinkNetworkMonitor": "Monitor de Red EOS", "drawerLinkSettings": "Configuración", "drawerLinkAccount": "Cuenta", "drawerLinkAllProxies": "Proxies", diff --git a/services/frontend/src/routes/index.js b/services/frontend/src/routes/index.js index f3f80cf1..9ed26eaa 100644 --- a/services/frontend/src/routes/index.js +++ b/services/frontend/src/routes/index.js @@ -8,54 +8,70 @@ import ProxyProfile from './proxies/proxy-profile' import Help from './help' import TermsOfUse from './termsOfUse' import About from './about' +import config from '../config' export default [ { path: '/', Component: Home, - drawerLabel: 'drawerLinkHome' + drawerLabel: 'drawerLinkHome', + target: '_self' }, { path: '/block-producers', Component: AllBps, drawerLabel: 'drawerLinkAllBPs', - drawerComponents: blockProducersDrawer + drawerComponents: blockProducersDrawer, + target: '_self' }, { path: 'block-producers/:account', - Component: BlockProducerProfile + Component: BlockProducerProfile, + target: '_self' }, { path: 'block-producers/:account/rate', - Component: BlockProducerRate + Component: BlockProducerRate, + target: '_self' }, { path: '/proxies', Component: AllProxies, drawerLabel: 'drawerLinkAllProxies', - drawerComponents: proxiesDrawer + drawerComponents: proxiesDrawer, + target: '_self' }, { path: 'proxies/:account', - Component: ProxyProfile + Component: ProxyProfile, + target: '_self' }, { path: '/account', - Component: Account + Component: Account, + target: '_self' + }, + { + path: config.networkMonitor, + drawerLabel: 'drawerLinkNetworkMonitor', + target: '_blank' }, { path: '/about', Component: About, - drawerLabel: 'drawerLinkAbout' + drawerLabel: 'drawerLinkAbout', + target: '_self' }, { path: '/ricardian-contract', Component: TermsOfUse, - drawerLabel: 'drawerLinkRicardianContract' + drawerLabel: 'drawerLinkRicardianContract', + target: '_self' }, { path: '/help', Component: Help, - drawerLabel: 'drawerLinkHelp' + drawerLabel: 'drawerLinkHelp', + target: '_self' } ] From 83c327cf50a85516f2b4c0c1559c5be74e279bb9 Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Fri, 23 Jul 2021 08:39:25 -0600 Subject: [PATCH 05/54] Broken design in certains densities (#615) * fix(design): Align BP cards in all screen resolutions * fix(bp page): Fix broke design in bp page --- .../frontend/src/components/card/index.js | 17 ++-------- .../frontend/src/components/card/styles.js | 33 +++++++++++++------ .../src/routes/block-producers/index.js | 12 +++++-- 3 files changed, 35 insertions(+), 27 deletions(-) diff --git a/services/frontend/src/components/card/index.js b/services/frontend/src/components/card/index.js index a483695e..1ecacf11 100644 --- a/services/frontend/src/components/card/index.js +++ b/services/frontend/src/components/card/index.js @@ -86,24 +86,11 @@ const CardData = ({ } title={
- - + + {title || owner} - {showOptions && ( -
- - {`${t('averageCard')}:`} - - {average} -
- )}
} subheader={ diff --git a/services/frontend/src/components/card/styles.js b/services/frontend/src/components/card/styles.js index 0af4ffe4..7be074d9 100644 --- a/services/frontend/src/components/card/styles.js +++ b/services/frontend/src/components/card/styles.js @@ -1,7 +1,7 @@ export default (theme) => ({ card: { backgroundColor: theme.palette.surface.dark, - minWidth: 320 + minWidth: 250 }, title: { textDecoration: 'none', @@ -58,20 +58,33 @@ export default (theme) => ({ height: 25, padding: theme.spacing(0, 1) }, - showOnlySm: { - display: 'flex', - + boxTitle: { + [theme.breakpoints.down('sm')]: { + width: '100%' + }, [theme.breakpoints.up('sm')]: { - display: 'none' + width: '250px' + }, + [theme.breakpoints.up('md')]: { + width: '260px' + }, + [theme.breakpoints.up('lg')]: { + width: '370px' } }, - showOnlyLg: { - display: 'flex', - - [theme.breakpoints.down('sm')]: { - display: 'none' + noWrap: { + [theme.breakpoints.up('sm')]: { + overflow: 'hidden', + whiteSpace: 'nowrap', + textOverflow: 'ellipsis' } }, + showOnlySm: { + display: 'flex' + }, + showOnlyLg: { + display: 'none' + }, mobileBox: { display: 'flex', alignItems: 'center', diff --git a/services/frontend/src/routes/block-producers/index.js b/services/frontend/src/routes/block-producers/index.js index 523eb67c..834c3a15 100644 --- a/services/frontend/src/routes/block-producers/index.js +++ b/services/frontend/src/routes/block-producers/index.js @@ -32,6 +32,9 @@ const AllBps = ({ ual }) => { const isDesktop = useMediaQuery('(min-width:600px)', { defaultMatches: false }) + const isTablet = useMediaQuery('(max-width:1024px)', { + defaultMatches: false + }) const [openDesktopVotingTool, setOpenDesktopVotingTool] = useState(isDesktop) const { list: blockProducers, @@ -166,13 +169,18 @@ const AllBps = ({ ual }) => {
{isDesktop && openDesktopVotingTool && cmprTool()} - + {(shownList || []).map((blockProducer) => ( Date: Thu, 29 Jul 2021 07:55:34 -0600 Subject: [PATCH 06/54] Refactor, env vars, and update packages (#598) * fix(webapp): update node modules * fix(hapi): update node modules * fix(package): update packages to lastest version * fix(eslint): update eslint minor change * fix(chart): improve design * standarize env var prefix names (#619) * fix(hapi): standarize env var prefix names * fix(webapp): standarize env var prefix names * fix(webapp): standarize env var prefix names * chore(refactor): reorder file structure * chore(refactor): remove unused files * fix(hapi): standarize env var prefix names * feat(hasura): update hasura to version 2 * fix(devops): fix minor bugs * devops(k8s): rename frontend service to webapp * devops(makefile): optimize dockerfiles * devops(dockerfile): optimize docker compose * fix(webapp): solve bad import routes * fix(webapp): rename variables with REACT_APP prefix * fix(env): change POSTGRES_HOST to HAPI_POSTGRES_HOST * fix(README): update Directory Structure Co-authored-by: Leister Francisco Alvarez Campos --- .env.example | 9 +- .../workflows/push-master-environment.yaml | 10 +- .../workflows/push-staging-environment.yaml | 10 +- .travis.yml | 14 - Dockerfile | 32 - licence => LICENSE | 0 {services/demux => demux}/.dockerignore | 0 {services/demux => demux}/.eslintrc.json | 0 {services/demux => demux}/Dockerfile | 0 {services/demux => demux}/README.md | 2 +- {services/demux => demux}/package-lock.json | 0 {services/demux => demux}/package.json | 0 .../src/ObjectActionHandler.js | 0 {services/demux => demux}/src/config/index.js | 0 .../src/config/massive.config.js | 0 .../src/handlerVersions/v1/dbConfig.js | 0 .../src/handlerVersions/v1/index.js | 0 {services/demux => demux}/src/index.js | 0 {services/demux => demux}/utils/wait | Bin {services/demux => demux}/yarn.lock | 0 docker-compose.staging.yml | 117 -- docker-compose.yml | 55 +- eosio.assert.json | 16 - hapi/.eslintrc.js | 20 + {services/hapi => hapi}/.gitignore | 0 {services/hapi => hapi}/.prettierignore | 0 hapi/Dockerfile | 25 + {services/hapi => hapi}/makefile | 2 +- hapi/package.json | 53 + .../frontend => hapi}/prettier.config.js | 0 {services/hapi => hapi}/readme.md | 0 {services/hapi => hapi}/src/config/index.js | 0 hapi/src/config/server.config.js | 8 + {services/hapi => hapi}/src/index.js | 0 .../hapi => hapi}/src/libs/add-bps-info.js | 0 .../hapi => hapi}/src/libs/sync-bp-stats.js | 2 +- {services/hapi => hapi}/src/libs/sync-bps.js | 8 +- .../hapi => hapi}/src/libs/sync-proxies.js | 6 +- .../hapi => hapi}/src/libs/sync-ratings.js | 4 +- .../hapi => hapi}/src/libs/sync-stats.js | 4 +- .../src/libs/sync-user-rating.js | 6 +- .../src/libs/valid-account-name.js | 0 {services/hapi => hapi}/yarn.lock | 1216 +++++++++-------- {services/hasura => hasura}/Dockerfile | 2 +- hasura/config.yaml | 19 + {services/hasura => hasura}/makefile | 2 +- hasura/metadata/actions.graphql | 2 + hasura/metadata/actions.yaml | 6 + .../metadata/allow_list.yaml | 0 .../metadata/cron_triggers.yaml | 0 hasura/metadata/databases/databases.yaml | 15 + .../default/functions/functions.yaml | 0 .../default/tables/public_producers.yaml | 3 + .../default/tables/public_producers_list.yaml | 3 + .../default/tables/public_proxies.yaml | 3 + .../default/tables/public_ratings_stats.yaml | 3 + .../default/tables/public_user_ratings.yaml | 3 + .../databases/default/tables/tables.yaml | 5 + .../metadata/inherited_roles.yaml | 0 .../metadata/query_collections.yaml | 0 .../metadata/remote_schemas.yaml | 0 .../metadata/rest_endpoints.yaml | 0 hasura/metadata/version.yaml | 1 + .../1548725474630_create_producers.down.yaml | 0 .../1548725474630_create_producers.up.sql | 0 ...30845804_create_producer_ratings.down.yaml | 0 ...48730845804_create_producer_ratings.up.sql | 0 ...8732282821_create_producers_list.down.yaml | 0 ...1548732282821_create_producers_list.up.sql | 0 .../down.yaml | 0 .../1580686687967_add_ratings_table/up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../1580754206808_add_extra_data}/down.yaml | 0 .../1580754206808_add_extra_data/up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.yaml | 1 + .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.yaml | 1 + .../up.sql | 0 .../down.yaml | 1 + .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 kubernetes/configmaps.yaml | 18 +- kubernetes/cronjob.yaml | 2 +- kubernetes/ingress.yaml | 4 +- kubernetes/postgres-statefulset.yaml | 2 +- ...deployment.yaml => webapp-deployment.yaml} | 10 +- ...ntend-service.yaml => webapp-service.yaml} | 6 +- makefile | 62 +- readme.md | 2 +- scripts/build.sh | 12 +- scripts/clean.sh | 6 +- scripts/deploy.sh | 12 +- scripts/fresh.sh | 2 +- scripts/migrate.sh | 2 +- scripts/pgweb.sh | 2 +- services/frontend/.eslintrc | 17 - services/frontend/Dockerfile | 42 - services/hapi/.eslintrc.js | 17 - services/hapi/Dockerfile | 27 - services/hapi/package.json | 46 - services/hapi/src/config/server.config.js | 8 - services/hasura/config.yaml | 2 - services/hasura/metadata/actions.graphql | 26 - services/hasura/metadata/actions.yaml | 15 - services/hasura/metadata/tables.yaml | 88 -- services/hasura/metadata/version.yaml | 1 - services/update-bps/websiteTexts.js | 387 ------ utils/meta.mk | 4 +- {services/frontend => webapp}/.dockerignore | 0 webapp/.eslintrc.js | 17 + {services/frontend => webapp}/.gitignore | 0 {services/frontend => webapp}/.node-version | 0 {services/frontend => webapp}/.prettierignore | 0 webapp/Dockerfile | 43 + .../frontend => webapp}/config-overrides.js | 0 {services/frontend => webapp}/jsconfig.json | 0 {services/frontend => webapp}/makefile | 22 +- {services/frontend => webapp}/nginx.conf | 0 {services/frontend => webapp}/package.json | 84 +- {services/hapi => webapp}/prettier.config.js | 0 .../public/EOS-Rate-Infographic.jpg | Bin .../animation/eosrate-animation-01.html | 0 .../images/eosrate_animation_01_atlas_.png | Bin .../public/app-metadata.json | 0 .../public/chain-manifests.json | 0 .../public/eoscostarica-logo.png | Bin .../public/eoscostarica-logo.svg | 0 .../public/eosio.assert.json | 0 .../public/favicon-16x16.png | Bin .../public/favicon-32x32.png | Bin .../frontend => webapp}/public/favicon.ico | Bin {services/frontend => webapp}/public/icon.png | Bin .../public/images/eosrate-256.png | Bin .../public/images/manifests/eos.png | Bin .../public/images/manifests/jungle.ico | Bin .../public/images/wallets/scatter.svg | 0 .../frontend => webapp}/public/index.html | 0 {services/frontend => webapp}/public/logo.png | Bin {services/frontend => webapp}/public/logo.svg | 0 .../frontend => webapp}/public/manifest.json | 0 .../frontend => webapp}/public/sitemap.xml | 0 {services/frontend => webapp}/readme.md | 5 +- {services/frontend => webapp}/src/app.js | 0 .../src/components/app-bar/index.js | 0 .../src/components/app-bar/styles.js | 0 .../src/components/bottom-navbar/index.js | 0 .../src/components/bottom-navbar/styles.js | 0 .../src/components/bp-chip-avatar/index.js | 0 .../src/components/bp-chip-avatar/styles.js | 0 .../src/components/button/index.js | 0 .../src/components/card/index.js | 0 .../src/components/card/styles.js | 0 .../src/components/checkbox/index.js | 0 .../compare-tool/compare-graph-view.js | 0 .../compare-tool/compare-slider-view.js | 0 .../src/components/compare-tool/index.js | 0 .../src/components/compare-tool/styles.js | 0 .../src/components/filter-select/index.js | 0 .../src/components/filter-select/styles.js | 0 .../src/components/formControl/index.js | 0 .../src/components/github-icon/index.js | 0 .../src/components/icon/communityIcon.js | 0 .../src/components/icon/developmentIcon.js | 0 .../src/components/icon/index.js | 0 .../src/components/icon/infrastructureIcon.js | 0 .../src/components/icon/menu.svg | 0 .../src/components/icon/styles.js | 0 .../src/components/icon/transparencyIcon.js | 0 .../src/components/icon/trustinessIcon.js | 0 .../components/input-autocomplete/index.js | 0 .../components/input-autocomplete/styles.js | 0 .../src/components/language-select/index.js | 0 .../src/components/language-select/styles.js | 0 .../src/components/layout/index.js | 0 .../src/components/layout/styles.js | 0 .../src/components/main-drawer/index.js | 0 .../src/components/main-drawer/styles.js | 0 .../src/components/main-footer/index.js | 0 .../src/components/main-footer/styles.js | 0 .../src/components/mobile-search/index.js | 0 .../src/components/mobile-search/styles.js | 0 .../parameter-range-selector/index.js | 0 .../parameter-range-selector/style.css | 0 .../src/components/radar/index.js | 32 +- .../src/components/rate-slider/index.js | 0 .../src/components/select/index.js | 0 .../src/components/sign-in-dialog/index.js | 0 .../src/components/sign-in-dialog/styles.js | 0 .../src/components/sign-in-menu/index.js | 0 .../src/components/spinner/index.js | 0 .../src/components/spinner/styles.js | 0 .../src/components/telegram-icon/index.js | 0 .../src/components/textField/index.js | 0 .../src/components/title-page/index.js | 0 .../src/components/video/index.js | 0 .../src/config/google-analitycs-module.js | 0 .../frontend => webapp}/src/config/index.js | 0 .../src/config/radar-color-palette.js | 0 .../frontend => webapp}/src/config/radar.js | 25 +- .../frontend => webapp}/src/config/theme.js | 0 .../src/config/wallet-providers.js | 0 {services/frontend => webapp}/src/i18n.js | 0 {services/frontend => webapp}/src/index.js | 0 .../frontend => webapp}/src/language/en.json | 0 .../frontend => webapp}/src/language/es.json | 0 .../frontend => webapp}/src/language/index.js | 0 {services/frontend => webapp}/src/mock/bps.js | 0 .../models/BlockProducer/blockProducers.js | 0 .../mutation_insert_user_rating.js | 0 .../BlockProducer/mutation_update_rate.js | 0 .../mutation_update_user_rating.js | 0 .../BlockProducer/query_get_bp_rating_by.js | 0 .../BlockProducer/query_get_producer_by.js | 0 .../src/models/Proxy/proxy.js | 0 .../src/models/Proxy/query_get_proxies.js | 0 .../models/Proxy/query_get_proxy_by_owner.js | 0 .../models/User/mutation_delete_user_rate.js | 0 .../src/models/User/query_get_rates.js | 0 .../src/models/User/user.js | 0 .../frontend => webapp}/src/models/home.js | 0 .../frontend => webapp}/src/models/index.js | 0 .../src/models/isLoading.js | 0 .../src/models/location.js | 0 .../src/models/settings.js | 0 .../src/routes/about/index.js | 0 .../src/routes/about/styles.js | 0 .../src/routes/account/index.js | 0 .../src/routes/account/styles.js | 0 .../block-producers/block-producer-profile.js | 0 .../block-producers/block-producer-rate.js | 0 .../bottom-sheet-selected-bps.js | 0 .../block-producers/compare-tool-toggle.js | 0 .../src/routes/block-producers/filter-box.js | 0 .../general-information-profile.js | 0 .../src/routes/block-producers/index.js | 0 .../block-producers/slider-rating-section.js | 0 .../src/routes/block-producers/styles.js | 0 .../src/routes/help/index.js | 0 .../src/routes/help/styles.js | 0 .../src/routes/home/cover.js | 0 .../src/routes/home/index.js | 0 .../src/routes/home/rateCategory.js | 0 .../src/routes/home/styles.js | 0 .../src/routes/home/subTopic.js | 0 .../frontend => webapp}/src/routes/index.js | 0 .../src/routes/login-deprecated/index.js | 0 .../src/routes/not-found/index.js | 0 .../src/routes/not-found/styles.js | 0 .../src/routes/proxies/compare-tool-toggle.js | 0 .../src/routes/proxies/filter-box.js | 0 .../proxies/general-information-profile.js | 0 .../src/routes/proxies/index.js | 0 .../src/routes/proxies/proxy-profile.js | 0 .../src/routes/proxies/styles.js | 0 .../src/routes/settings/index.js | 0 .../src/routes/settings/styles.js | 0 .../src/routes/termsOfUse/index.js | 0 .../src/routes/termsOfUse/styles.js | 0 .../frontend => webapp}/src/serviceWorker.js | 0 .../frontend => webapp}/src/services/api.js | 0 .../frontend => webapp}/src/services/bps.js | 0 .../src/services/eosjs-api.js | 0 .../src/services/graphql.js | 3 + {services/frontend => webapp}/src/store.js | 0 .../src/utils/convertVotesToEosVotes.js | 0 .../src/utils/eosjsUtils.js | 0 .../src/utils/formatNumber.js | 0 .../src/utils/getAverageValue.js | 0 .../src/utils/getBPRadarData.js | 0 .../src/utils/getColorFromName.js | 0 .../src/utils/getRadarLabelName.js | 0 .../src/utils/getRgbColorsFromHex.js | 2 +- .../frontend => webapp}/src/utils/sortedBy.js | 0 .../src/utils/ualAuthenticators.js | 0 {services/frontend => webapp}/yarn.lock | 513 +++---- 291 files changed, 1356 insertions(+), 1901 deletions(-) delete mode 100644 .travis.yml delete mode 100644 Dockerfile rename licence => LICENSE (100%) rename {services/demux => demux}/.dockerignore (100%) rename {services/demux => demux}/.eslintrc.json (100%) rename {services/demux => demux}/Dockerfile (100%) rename {services/demux => demux}/README.md (84%) rename {services/demux => demux}/package-lock.json (100%) rename {services/demux => demux}/package.json (100%) rename {services/demux => demux}/src/ObjectActionHandler.js (100%) rename {services/demux => demux}/src/config/index.js (100%) rename {services/demux => demux}/src/config/massive.config.js (100%) rename {services/demux => demux}/src/handlerVersions/v1/dbConfig.js (100%) rename {services/demux => demux}/src/handlerVersions/v1/index.js (100%) rename {services/demux => demux}/src/index.js (100%) rename {services/demux => demux}/utils/wait (100%) rename {services/demux => demux}/yarn.lock (100%) delete mode 100644 docker-compose.staging.yml delete mode 100644 eosio.assert.json create mode 100644 hapi/.eslintrc.js rename {services/hapi => hapi}/.gitignore (100%) rename {services/hapi => hapi}/.prettierignore (100%) create mode 100644 hapi/Dockerfile rename {services/hapi => hapi}/makefile (97%) create mode 100644 hapi/package.json rename {services/frontend => hapi}/prettier.config.js (100%) rename {services/hapi => hapi}/readme.md (100%) rename {services/hapi => hapi}/src/config/index.js (100%) create mode 100644 hapi/src/config/server.config.js rename {services/hapi => hapi}/src/index.js (100%) rename {services/hapi => hapi}/src/libs/add-bps-info.js (100%) rename {services/hapi => hapi}/src/libs/sync-bp-stats.js (96%) rename {services/hapi => hapi}/src/libs/sync-bps.js (92%) rename {services/hapi => hapi}/src/libs/sync-proxies.js (89%) rename {services/hapi => hapi}/src/libs/sync-ratings.js (92%) rename {services/hapi => hapi}/src/libs/sync-stats.js (90%) rename {services/hapi => hapi}/src/libs/sync-user-rating.js (93%) rename {services/hapi => hapi}/src/libs/valid-account-name.js (100%) rename {services/hapi => hapi}/yarn.lock (87%) rename {services/hasura => hasura}/Dockerfile (92%) create mode 100644 hasura/config.yaml rename {services/hasura => hasura}/makefile (97%) create mode 100644 hasura/metadata/actions.graphql create mode 100644 hasura/metadata/actions.yaml rename {services/hasura => hasura}/metadata/allow_list.yaml (100%) rename services/hasura/metadata/functions.yaml => hasura/metadata/cron_triggers.yaml (100%) create mode 100644 hasura/metadata/databases/databases.yaml rename services/hasura/metadata/query_collections.yaml => hasura/metadata/databases/default/functions/functions.yaml (100%) create mode 100644 hasura/metadata/databases/default/tables/public_producers.yaml create mode 100644 hasura/metadata/databases/default/tables/public_producers_list.yaml create mode 100644 hasura/metadata/databases/default/tables/public_proxies.yaml create mode 100644 hasura/metadata/databases/default/tables/public_ratings_stats.yaml create mode 100644 hasura/metadata/databases/default/tables/public_user_ratings.yaml create mode 100644 hasura/metadata/databases/default/tables/tables.yaml rename services/hasura/metadata/remote_schemas.yaml => hasura/metadata/inherited_roles.yaml (100%) rename services/hasura/migrations/1548725474630_create_producers.down.yaml => hasura/metadata/query_collections.yaml (100%) rename services/hasura/migrations/1548730845804_create_producer_ratings.down.yaml => hasura/metadata/remote_schemas.yaml (100%) rename services/hasura/migrations/1548732282821_create_producers_list.down.yaml => hasura/metadata/rest_endpoints.yaml (100%) create mode 100644 hasura/metadata/version.yaml rename services/hasura/migrations/1580686687967_add_ratings_table/down.yaml => hasura/migrations/default/1548725474630_create_producers.down.yaml (100%) rename {services/hasura/migrations => hasura/migrations/default}/1548725474630_create_producers.up.sql (100%) rename services/hasura/migrations/1580754206808_add_extra_data/down.yaml => hasura/migrations/default/1548730845804_create_producer_ratings.down.yaml (100%) rename {services/hasura/migrations => hasura/migrations/default}/1548730845804_create_producer_ratings.up.sql (100%) rename services/hasura/migrations/1581704802407_join_producer_ratings_stats/down.yaml => hasura/migrations/default/1548732282821_create_producers_list.down.yaml (100%) rename {services/hasura/migrations => hasura/migrations/default}/1548732282821_create_producers_list.up.sql (100%) rename {services/hasura/migrations/1583531471259_add_ratings_cntr_column => hasura/migrations/default/1580686687967_add_ratings_table}/down.yaml (100%) rename {services/hasura/migrations => hasura/migrations/default}/1580686687967_add_ratings_table/up.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql (100%) rename {services/hasura/migrations/1583953599516_add_general_info_column => hasura/migrations/default/1580754206808_add_extra_data}/down.yaml (100%) rename {services/hasura/migrations => hasura/migrations/default}/1580754206808_add_extra_data/up.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1580754274249_rename_table_public_ratings/down.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1580754274249_rename_table_public_ratings/up.sql (100%) create mode 100644 hasura/migrations/default/1581704802407_join_producer_ratings_stats/down.yaml rename {services/hasura/migrations => hasura/migrations/default}/1581704802407_join_producer_ratings_stats/up.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1582436829131_modify_primarykey_public_user_ratings/down.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1582436829131_modify_primarykey_public_user_ratings/up.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql (100%) create mode 100644 hasura/migrations/default/1583531471259_add_ratings_cntr_column/down.yaml rename {services/hasura/migrations => hasura/migrations/default}/1583531471259_add_ratings_cntr_column/up.sql (100%) create mode 100644 hasura/migrations/default/1583953599516_add_general_info_column/down.yaml rename {services/hasura/migrations => hasura/migrations/default}/1583953599516_add_general_info_column/up.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1584293813117_create_table_public_proxies/down.sql (100%) rename {services/hasura/migrations => hasura/migrations/default}/1584293813117_create_table_public_proxies/up.sql (100%) rename kubernetes/{frontend-deployment.yaml => webapp-deployment.yaml} (83%) rename kubernetes/{frontend-service.yaml => webapp-service.yaml} (72%) delete mode 100644 services/frontend/.eslintrc delete mode 100644 services/frontend/Dockerfile delete mode 100644 services/hapi/.eslintrc.js delete mode 100644 services/hapi/Dockerfile delete mode 100644 services/hapi/package.json delete mode 100644 services/hapi/src/config/server.config.js delete mode 100644 services/hasura/config.yaml delete mode 100644 services/hasura/metadata/actions.graphql delete mode 100644 services/hasura/metadata/actions.yaml delete mode 100644 services/hasura/metadata/tables.yaml delete mode 100644 services/hasura/metadata/version.yaml delete mode 100644 services/update-bps/websiteTexts.js rename {services/frontend => webapp}/.dockerignore (100%) create mode 100644 webapp/.eslintrc.js rename {services/frontend => webapp}/.gitignore (100%) rename {services/frontend => webapp}/.node-version (100%) rename {services/frontend => webapp}/.prettierignore (100%) create mode 100644 webapp/Dockerfile rename {services/frontend => webapp}/config-overrides.js (100%) rename {services/frontend => webapp}/jsconfig.json (100%) rename {services/frontend => webapp}/makefile (68%) rename {services/frontend => webapp}/nginx.conf (100%) rename {services/frontend => webapp}/package.json (57%) rename {services/hapi => webapp}/prettier.config.js (100%) rename {services/frontend => webapp}/public/EOS-Rate-Infographic.jpg (100%) rename {services/frontend => webapp}/public/animation/eosrate-animation-01.html (100%) rename {services/frontend => webapp}/public/animation/images/eosrate_animation_01_atlas_.png (100%) rename {services/frontend => webapp}/public/app-metadata.json (100%) rename {services/frontend => webapp}/public/chain-manifests.json (100%) rename {services/frontend => webapp}/public/eoscostarica-logo.png (100%) rename {services/frontend => webapp}/public/eoscostarica-logo.svg (100%) rename {services/frontend => webapp}/public/eosio.assert.json (100%) rename {services/frontend => webapp}/public/favicon-16x16.png (100%) rename {services/frontend => webapp}/public/favicon-32x32.png (100%) rename {services/frontend => webapp}/public/favicon.ico (100%) rename {services/frontend => webapp}/public/icon.png (100%) rename {services/frontend => webapp}/public/images/eosrate-256.png (100%) rename {services/frontend => webapp}/public/images/manifests/eos.png (100%) rename {services/frontend => webapp}/public/images/manifests/jungle.ico (100%) rename {services/frontend => webapp}/public/images/wallets/scatter.svg (100%) rename {services/frontend => webapp}/public/index.html (100%) rename {services/frontend => webapp}/public/logo.png (100%) rename {services/frontend => webapp}/public/logo.svg (100%) rename {services/frontend => webapp}/public/manifest.json (100%) rename {services/frontend => webapp}/public/sitemap.xml (100%) rename {services/frontend => webapp}/readme.md (95%) rename {services/frontend => webapp}/src/app.js (100%) rename {services/frontend => webapp}/src/components/app-bar/index.js (100%) rename {services/frontend => webapp}/src/components/app-bar/styles.js (100%) rename {services/frontend => webapp}/src/components/bottom-navbar/index.js (100%) rename {services/frontend => webapp}/src/components/bottom-navbar/styles.js (100%) rename {services/frontend => webapp}/src/components/bp-chip-avatar/index.js (100%) rename {services/frontend => webapp}/src/components/bp-chip-avatar/styles.js (100%) rename {services/frontend => webapp}/src/components/button/index.js (100%) rename {services/frontend => webapp}/src/components/card/index.js (100%) rename {services/frontend => webapp}/src/components/card/styles.js (100%) rename {services/frontend => webapp}/src/components/checkbox/index.js (100%) rename {services/frontend => webapp}/src/components/compare-tool/compare-graph-view.js (100%) rename {services/frontend => webapp}/src/components/compare-tool/compare-slider-view.js (100%) rename {services/frontend => webapp}/src/components/compare-tool/index.js (100%) rename {services/frontend => webapp}/src/components/compare-tool/styles.js (100%) rename {services/frontend => webapp}/src/components/filter-select/index.js (100%) rename {services/frontend => webapp}/src/components/filter-select/styles.js (100%) rename {services/frontend => webapp}/src/components/formControl/index.js (100%) rename {services/frontend => webapp}/src/components/github-icon/index.js (100%) rename {services/frontend => webapp}/src/components/icon/communityIcon.js (100%) rename {services/frontend => webapp}/src/components/icon/developmentIcon.js (100%) rename {services/frontend => webapp}/src/components/icon/index.js (100%) rename {services/frontend => webapp}/src/components/icon/infrastructureIcon.js (100%) rename {services/frontend => webapp}/src/components/icon/menu.svg (100%) rename {services/frontend => webapp}/src/components/icon/styles.js (100%) rename {services/frontend => webapp}/src/components/icon/transparencyIcon.js (100%) rename {services/frontend => webapp}/src/components/icon/trustinessIcon.js (100%) rename {services/frontend => webapp}/src/components/input-autocomplete/index.js (100%) rename {services/frontend => webapp}/src/components/input-autocomplete/styles.js (100%) rename {services/frontend => webapp}/src/components/language-select/index.js (100%) rename {services/frontend => webapp}/src/components/language-select/styles.js (100%) rename {services/frontend => webapp}/src/components/layout/index.js (100%) rename {services/frontend => webapp}/src/components/layout/styles.js (100%) rename {services/frontend => webapp}/src/components/main-drawer/index.js (100%) rename {services/frontend => webapp}/src/components/main-drawer/styles.js (100%) rename {services/frontend => webapp}/src/components/main-footer/index.js (100%) rename {services/frontend => webapp}/src/components/main-footer/styles.js (100%) rename {services/frontend => webapp}/src/components/mobile-search/index.js (100%) rename {services/frontend => webapp}/src/components/mobile-search/styles.js (100%) rename {services/frontend => webapp}/src/components/parameter-range-selector/index.js (100%) rename {services/frontend => webapp}/src/components/parameter-range-selector/style.css (100%) rename {services/frontend => webapp}/src/components/radar/index.js (81%) rename {services/frontend => webapp}/src/components/rate-slider/index.js (100%) rename {services/frontend => webapp}/src/components/select/index.js (100%) rename {services/frontend => webapp}/src/components/sign-in-dialog/index.js (100%) rename {services/frontend => webapp}/src/components/sign-in-dialog/styles.js (100%) rename {services/frontend => webapp}/src/components/sign-in-menu/index.js (100%) rename {services/frontend => webapp}/src/components/spinner/index.js (100%) rename {services/frontend => webapp}/src/components/spinner/styles.js (100%) rename {services/frontend => webapp}/src/components/telegram-icon/index.js (100%) rename {services/frontend => webapp}/src/components/textField/index.js (100%) rename {services/frontend => webapp}/src/components/title-page/index.js (100%) rename {services/frontend => webapp}/src/components/video/index.js (100%) rename {services/frontend => webapp}/src/config/google-analitycs-module.js (100%) rename {services/frontend => webapp}/src/config/index.js (100%) rename {services/frontend => webapp}/src/config/radar-color-palette.js (100%) rename {services/frontend => webapp}/src/config/radar.js (67%) rename {services/frontend => webapp}/src/config/theme.js (100%) rename {services/frontend => webapp}/src/config/wallet-providers.js (100%) rename {services/frontend => webapp}/src/i18n.js (100%) rename {services/frontend => webapp}/src/index.js (100%) rename {services/frontend => webapp}/src/language/en.json (100%) rename {services/frontend => webapp}/src/language/es.json (100%) rename {services/frontend => webapp}/src/language/index.js (100%) rename {services/frontend => webapp}/src/mock/bps.js (100%) rename {services/frontend => webapp}/src/models/BlockProducer/blockProducers.js (100%) rename {services/frontend => webapp}/src/models/BlockProducer/mutation_insert_user_rating.js (100%) rename {services/frontend => webapp}/src/models/BlockProducer/mutation_update_rate.js (100%) rename {services/frontend => webapp}/src/models/BlockProducer/mutation_update_user_rating.js (100%) rename {services/frontend => webapp}/src/models/BlockProducer/query_get_bp_rating_by.js (100%) rename {services/frontend => webapp}/src/models/BlockProducer/query_get_producer_by.js (100%) rename {services/frontend => webapp}/src/models/Proxy/proxy.js (100%) rename {services/frontend => webapp}/src/models/Proxy/query_get_proxies.js (100%) rename {services/frontend => webapp}/src/models/Proxy/query_get_proxy_by_owner.js (100%) rename {services/frontend => webapp}/src/models/User/mutation_delete_user_rate.js (100%) rename {services/frontend => webapp}/src/models/User/query_get_rates.js (100%) rename {services/frontend => webapp}/src/models/User/user.js (100%) rename {services/frontend => webapp}/src/models/home.js (100%) rename {services/frontend => webapp}/src/models/index.js (100%) rename {services/frontend => webapp}/src/models/isLoading.js (100%) rename {services/frontend => webapp}/src/models/location.js (100%) rename {services/frontend => webapp}/src/models/settings.js (100%) rename {services/frontend => webapp}/src/routes/about/index.js (100%) rename {services/frontend => webapp}/src/routes/about/styles.js (100%) rename {services/frontend => webapp}/src/routes/account/index.js (100%) rename {services/frontend => webapp}/src/routes/account/styles.js (100%) rename {services/frontend => webapp}/src/routes/block-producers/block-producer-profile.js (100%) rename {services/frontend => webapp}/src/routes/block-producers/block-producer-rate.js (100%) rename {services/frontend => webapp}/src/routes/block-producers/bottom-sheet-selected-bps.js (100%) rename {services/frontend => webapp}/src/routes/block-producers/compare-tool-toggle.js (100%) rename {services/frontend => webapp}/src/routes/block-producers/filter-box.js (100%) rename {services/frontend => webapp}/src/routes/block-producers/general-information-profile.js (100%) rename {services/frontend => webapp}/src/routes/block-producers/index.js (100%) rename {services/frontend => webapp}/src/routes/block-producers/slider-rating-section.js (100%) rename {services/frontend => webapp}/src/routes/block-producers/styles.js (100%) rename {services/frontend => webapp}/src/routes/help/index.js (100%) rename {services/frontend => webapp}/src/routes/help/styles.js (100%) rename {services/frontend => webapp}/src/routes/home/cover.js (100%) rename {services/frontend => webapp}/src/routes/home/index.js (100%) rename {services/frontend => webapp}/src/routes/home/rateCategory.js (100%) rename {services/frontend => webapp}/src/routes/home/styles.js (100%) rename {services/frontend => webapp}/src/routes/home/subTopic.js (100%) rename {services/frontend => webapp}/src/routes/index.js (100%) rename {services/frontend => webapp}/src/routes/login-deprecated/index.js (100%) rename {services/frontend => webapp}/src/routes/not-found/index.js (100%) rename {services/frontend => webapp}/src/routes/not-found/styles.js (100%) rename {services/frontend => webapp}/src/routes/proxies/compare-tool-toggle.js (100%) rename {services/frontend => webapp}/src/routes/proxies/filter-box.js (100%) rename {services/frontend => webapp}/src/routes/proxies/general-information-profile.js (100%) rename {services/frontend => webapp}/src/routes/proxies/index.js (100%) rename {services/frontend => webapp}/src/routes/proxies/proxy-profile.js (100%) rename {services/frontend => webapp}/src/routes/proxies/styles.js (100%) rename {services/frontend => webapp}/src/routes/settings/index.js (100%) rename {services/frontend => webapp}/src/routes/settings/styles.js (100%) rename {services/frontend => webapp}/src/routes/termsOfUse/index.js (100%) rename {services/frontend => webapp}/src/routes/termsOfUse/styles.js (100%) rename {services/frontend => webapp}/src/serviceWorker.js (100%) rename {services/frontend => webapp}/src/services/api.js (100%) rename {services/frontend => webapp}/src/services/bps.js (100%) rename {services/frontend => webapp}/src/services/eosjs-api.js (100%) rename {services/frontend => webapp}/src/services/graphql.js (87%) rename {services/frontend => webapp}/src/store.js (100%) rename {services/frontend => webapp}/src/utils/convertVotesToEosVotes.js (100%) rename {services/frontend => webapp}/src/utils/eosjsUtils.js (100%) rename {services/frontend => webapp}/src/utils/formatNumber.js (100%) rename {services/frontend => webapp}/src/utils/getAverageValue.js (100%) rename {services/frontend => webapp}/src/utils/getBPRadarData.js (100%) rename {services/frontend => webapp}/src/utils/getColorFromName.js (100%) rename {services/frontend => webapp}/src/utils/getRadarLabelName.js (100%) rename {services/frontend => webapp}/src/utils/getRgbColorsFromHex.js (95%) rename {services/frontend => webapp}/src/utils/sortedBy.js (100%) rename {services/frontend => webapp}/src/utils/ualAuthenticators.js (100%) rename {services/frontend => webapp}/yarn.lock (98%) diff --git a/.env.example b/.env.example index ff349396..52cdb360 100644 --- a/.env.example +++ b/.env.example @@ -12,11 +12,12 @@ POSTGRES_SCHEMA=public POSTGRES_DATA=./db_data # HAPI +HAPI_POSTGRES_HOST=eosrate_postgres HAPI_SERVER_PORT=9090 HAPI_SERVER_ADDRESS=0.0.0.0 -EOS_API_ENDPOINT=https://jungle.eosio.cr -PROXY_INFO_CONTRACT_CODE=proxyaccount -PROXY_INFO_CONTRACT_SCOPE=proxyaccount +HAPI_EOS_API_ENDPOINT=https://jungle.eosio.cr +HAPI_PROXY_INFO_CONTRACT_CODE=proxyaccount +HAPI_PROXY_INFO_CONTRACT_SCOPE=proxyaccount # HASURA HASURA_GRAPHQL_DATABASE_URL=postgres://user:password@eosrate_postgres:5432/localdb @@ -34,4 +35,4 @@ REACT_APP_EOS_API_PORT=443 REACT_APP_EOS_API_PROTOCOL=https REACT_APP_EOS_CHAIN_ID=2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840 REACT_APP_BLOCK_EXPLORER=https://jungle3.bloks.io -REACT_APP_NETWORK_MONITOR_URL=https://jungle.eosio.online/ \ No newline at end of file +REACT_APP_NETWORK_MONITOR_URL=https://jungle.eosio.online/ diff --git a/.github/workflows/push-master-environment.yaml b/.github/workflows/push-master-environment.yaml index 53c71110..61e7c586 100644 --- a/.github/workflows/push-master-environment.yaml +++ b/.github/workflows/push-master-environment.yaml @@ -25,9 +25,9 @@ jobs: - name: Install node module dependencies run: | - cd services/hapi + cd hapi yarn - cd ../frontend + cd ../webapp yarn cd ../.. @@ -85,11 +85,11 @@ jobs: POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }} POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }} POSTGRES_SCHEMA: ${{ secrets.POSTGRES_SCHEMA }} - EOS_API_ENDPOINT: https://api.eosio.cr + HAPI_EOS_API_ENDPOINT: https://api.eosio.cr HAPI_SERVER_ADDRESS: 0.0.0.0 HAPI_SERVER_PORT: 9090 - PROXY_INFO_CONTRACT_CODE: regproxyinfo - PROXY_INFO_CONTRACT_SCOPE: regproxyinfo + HAPI_PROXY_INFO_CONTRACT_CODE: regproxyinfo + HAPI_PROXY_INFO_CONTRACT_SCOPE: regproxyinfo # hasura HASURA_GRAPHQL_DATABASE_URL: ${{ secrets.HASURA_GRAPHQL_DATABASE_URL }} HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations diff --git a/.github/workflows/push-staging-environment.yaml b/.github/workflows/push-staging-environment.yaml index 6b723be2..bd54be5a 100644 --- a/.github/workflows/push-staging-environment.yaml +++ b/.github/workflows/push-staging-environment.yaml @@ -25,9 +25,9 @@ jobs: - name: Install node module dependencies run: | - cd services/hapi + cd hapi yarn - cd ../frontend + cd ../webapp yarn cd ../.. @@ -85,11 +85,11 @@ jobs: POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }} POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }} POSTGRES_SCHEMA: ${{ secrets.POSTGRES_SCHEMA }} - EOS_API_ENDPOINT: https://jungle3.cryptolions.io + HAPI_EOS_API_ENDPOINT: https://jungle3.cryptolions.io HAPI_SERVER_ADDRESS: 0.0.0.0 HAPI_SERVER_PORT: 9090 - PROXY_INFO_CONTRACT_CODE: proxyaccount - PROXY_INFO_CONTRACT_SCOPE: proxyaccount + HAPI_PROXY_INFO_CONTRACT_CODE: proxyaccount + HAPI_PROXY_INFO_CONTRACT_SCOPE: proxyaccount # hasura HASURA_GRAPHQL_DATABASE_URL: ${{ secrets.HASURA_GRAPHQL_DATABASE_URL }} HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 6e144db4..00000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -sudo: required - -services: - - docker - -install: - #- docker build -t eosrate/demux ./services/demux - - docker build -t eosrate/frontend ./services/frontend - - docker build -t eosrate/hapi ./services/hapi - -script: - #- docker run eosrate/demux yarn lint - - docker run eosrate/frontend yarn lint - - docker run eosrate/hapi yarn lint diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 350c204f..00000000 --- a/Dockerfile +++ /dev/null @@ -1,32 +0,0 @@ -FROM ubuntu:18.04 - -ARG ssh_prv_key -ARG ssh_pub_key -ARG branch - -# Make sure we have bash as our default shell -RUN rm /bin/sh && ln -s /bin/bash /bin/sh - -# Get the packages needed for Ubuntu -ENV DEBIAN_FRONTEND noninteractive -RUN apt-get -y update && \ - apt-get install -y \ - openssh-server \ - git - -# Authorize SSH Host -RUN mkdir -p /root/.ssh && \ - chmod 0700 /root/.ssh && \ - ssh-keyscan 190.171.41.51 > /root/.ssh/known_hosts - -# Add the keys and set permissions -RUN echo "$ssh_prv_key" > /root/.ssh/id_rsa && \ - chmod 600 /root/.ssh/id_rsa - -RUN git clone --branch "$branch" https://github.com/eoscostarica/eos-rate.git /opt/eos-rate - -WORKDIR /opt/eos-rate - -CMD eval `ssh-agent` && ssh-add \ - && export GIT_SSH_COMMAND="/usr/bin/ssh -i /root/.ssh/id_rsa" \ - && git push "ssh://${USER}@190.171.41.51/var/repo/eos-rate.git" HEAD:"$branch" diff --git a/licence b/LICENSE similarity index 100% rename from licence rename to LICENSE diff --git a/services/demux/.dockerignore b/demux/.dockerignore similarity index 100% rename from services/demux/.dockerignore rename to demux/.dockerignore diff --git a/services/demux/.eslintrc.json b/demux/.eslintrc.json similarity index 100% rename from services/demux/.eslintrc.json rename to demux/.eslintrc.json diff --git a/services/demux/Dockerfile b/demux/Dockerfile similarity index 100% rename from services/demux/Dockerfile rename to demux/Dockerfile diff --git a/services/demux/README.md b/demux/README.md similarity index 84% rename from services/demux/README.md rename to demux/README.md index 97046a99..a80b89f0 100644 --- a/services/demux/README.md +++ b/demux/README.md @@ -2,7 +2,7 @@ The demux service is made up of an event listener and an event handler. When a new rating is sent it will trigger an function that updates the rating on the postgres database . -To Start Demux Listener : `node ./services/demux/src/index.js` +To Start Demux Listener : `node ./demux/src/index.js` Make sure the database service is also running locally. diff --git a/services/demux/package-lock.json b/demux/package-lock.json similarity index 100% rename from services/demux/package-lock.json rename to demux/package-lock.json diff --git a/services/demux/package.json b/demux/package.json similarity index 100% rename from services/demux/package.json rename to demux/package.json diff --git a/services/demux/src/ObjectActionHandler.js b/demux/src/ObjectActionHandler.js similarity index 100% rename from services/demux/src/ObjectActionHandler.js rename to demux/src/ObjectActionHandler.js diff --git a/services/demux/src/config/index.js b/demux/src/config/index.js similarity index 100% rename from services/demux/src/config/index.js rename to demux/src/config/index.js diff --git a/services/demux/src/config/massive.config.js b/demux/src/config/massive.config.js similarity index 100% rename from services/demux/src/config/massive.config.js rename to demux/src/config/massive.config.js diff --git a/services/demux/src/handlerVersions/v1/dbConfig.js b/demux/src/handlerVersions/v1/dbConfig.js similarity index 100% rename from services/demux/src/handlerVersions/v1/dbConfig.js rename to demux/src/handlerVersions/v1/dbConfig.js diff --git a/services/demux/src/handlerVersions/v1/index.js b/demux/src/handlerVersions/v1/index.js similarity index 100% rename from services/demux/src/handlerVersions/v1/index.js rename to demux/src/handlerVersions/v1/index.js diff --git a/services/demux/src/index.js b/demux/src/index.js similarity index 100% rename from services/demux/src/index.js rename to demux/src/index.js diff --git a/services/demux/utils/wait b/demux/utils/wait similarity index 100% rename from services/demux/utils/wait rename to demux/utils/wait diff --git a/services/demux/yarn.lock b/demux/yarn.lock similarity index 100% rename from services/demux/yarn.lock rename to demux/yarn.lock diff --git a/docker-compose.staging.yml b/docker-compose.staging.yml deleted file mode 100644 index 16a5fe72..00000000 --- a/docker-compose.staging.yml +++ /dev/null @@ -1,117 +0,0 @@ -version: "3.5" - -services: - postgres: - container_name: eosrate_postgres - image: postgres:10.4 - volumes: - - eosrate-postgres:/var/lib/postgresql/data - ports: - - "5432:5432" - environment: - POSTGRES_USER: "${POSTGRES_USER}" - POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" - POSTGRES_DB: "${POSTGRES_DB}" - - pgweb: - container_name: eosrate_pgweb - image: sosedoff/pgweb:latest - restart: always - ports: - - "8082:8081" - environment: - DATABASE_URL: postgres://user:pass@postgres:5432/eosrate?sslmode=disable - depends_on: - - postgres - - hapi: - container_name: eosrate_hapi - build: - context: ./services/hapi - dockerfile: Dockerfile - volumes: - - ./services/hapi:/opt/application - - /opt/application/node_modules - ports: - - "3005:9090" - environment: - HAPI_SERVER_ADDRESS: "${HAPI_SERVER_ADDRESS}" - HAPI_SERVER_PORT: "${HAPI_SERVER_PORT}" - POSTGRES_USER: "${POSTGRES_USER}" - POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" - POSTGRES_PORT: "${POSTGRES_PORT}" - POSTGRES_DB: "${POSTGRES_DB}" - POSTGRES_HOST: "${POSTGRES_HOST}" - POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" - EOS_API_ENDPOINT: "${EOS_API_ENDPOINT}" - - depends_on: - - postgres - - demux: - container_name: eosrate_demux - build: - context: ./services/demux - dockerfile: ./Dockerfile - image: eosrate/demux - volumes: - - ./services/demux:/opt/application # mount demux service folder - - /opt/application/node_modules # prevents host/container conflicts - depends_on: - - postgres - - hasura - environment: - POSTGRES_USER: "${POSTGRES_USER}" - POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" - POSTGRES_PORT: "${POSTGRES_PORT}" - POSTGRES_DB: "${POSTGRES_DB}" - POSTGRES_HOST: postgres - POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" - EOS_API_ENDPOINT: "${EOS_API_ENDPOINT}" - WAIT_HOSTS: postgres:"${POSTGRES_PORT}" , hasura:8080 - WAIT_HOSTS_TIMEOUT: 60 - ports: - - "3030:3030" - networks: - default: - - hasura: - container_name: eosrate_hasura - image: hasura/graphql-engine:v1.3.3.cli-migrations-v2 - ports: - - "8088:8080" - depends_on: - - postgres - restart: always - environment: - HASURA_GRAPHQL_DATABASE_URL: postgres://user:pass@postgres:5432/eosrate?sslmode=disable - HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations - HAPI_SERVER_ADDRESS: staging.eosrate.io - HAPI_SERVER_PORT: 8088 - HASURA_GRAPHQL_ACTION_BASE_URL: http://hapi:9090 - volumes: - - ./services/hasura/migrations:/hasura-migrations # mount hasura migrations folder - - ./services/hasura/migrations:/hasura-metadata - command: - - graphql-engine - - serve - - --enable-console - - # nginx reverse proxy that allows accesing the services directly on the host machine - # the wildcard *.esolocal.io that points to 127.0.0.1, - # therefore as long as you can hit the dns server it will redirect all requests to your machine - # and nginx-proxy does the internal docker network routing to the right service - nginx: - container_name: eosrate_nginx - image: jwilder/nginx-proxy:alpine - ports: - - "80:80" - volumes: - - /var/run/docker.sock:/tmp/docker.sock:ro - -volumes: - eosrate-postgres: - -networks: - default: - name: eosrate diff --git a/docker-compose.yml b/docker-compose.yml index c0ef4193..409e01c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,9 +1,9 @@ -version: "3.5" +version: "3.6" services: postgres: container_name: eosrate_postgres - image: postgres:10.4 + image: postgres:13.3-alpine volumes: - ${POSTGRES_DATA}:/var/lib/postgresql/data ports: @@ -20,30 +20,30 @@ services: ports: - "8082:8081" environment: - DATABASE_URL: "${HASURA_GRAPHQL_DATABASE_URL}" + DATABASE_URL: "${HASURA_GRAPHQL_DATABASE_URL}?sslmode=disable" depends_on: - postgres hapi: container_name: eosrate_hapi build: - context: ./services/hapi + context: ./hapi dockerfile: Dockerfile volumes: - - ./services/hapi:/opt/application + - ./hapi:/opt/application - /opt/application/node_modules ports: - "9090:9090" environment: HAPI_SERVER_ADDRESS: "${HAPI_SERVER_ADDRESS}" HAPI_SERVER_PORT: "${HAPI_SERVER_PORT}" - POSTGRES_USER: "${POSTGRES_USER}" - POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" - POSTGRES_PORT: "${POSTGRES_PORT}" - POSTGRES_DB: "${POSTGRES_DB}" - POSTGRES_HOST: "${POSTGRES_HOST}" - POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" - EOS_API_ENDPOINT: "${EOS_API_ENDPOINT}" + HAPI_POSTGRES_USER: "${POSTGRES_USER}" + HAPI_POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" + HAPI_POSTGRES_PORT: "${POSTGRES_PORT}" + HAPI_POSTGRES_DB: "${POSTGRES_DB}" + HAPI_POSTGRES_HOST: "${HAPI_POSTGRES_HOST}" + HAPI_POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" + HAPI_EOS_API_ENDPOINT: "${HAPI_EOS_API_ENDPOINT}" depends_on: - postgres @@ -51,11 +51,11 @@ services: demux: container_name: eosrate_demux build: - context: ./services/demux + context: ./demux dockerfile: ./Dockerfile image: eosrate/demux volumes: - - ./services/demux:/opt/application + - ./demux:/opt/application - /opt/application/node_modules depends_on: - postgres @@ -67,7 +67,7 @@ services: POSTGRES_DB: "${POSTGRES_DB}" POSTGRES_HOST: "${POSTGRES_HOST}" POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" - EOS_API_ENDPOINT: "${EOS_API_ENDPOINT}" + HAPI_EOS_API_ENDPOINT: "${HAPI_EOS_API_ENDPOINT}" WAIT_HOSTS: postgres:"${POSTGRES_PORT}", hasura:8080 WAIT_HOSTS_TIMEOUT: 60 ports: @@ -77,14 +77,11 @@ services: hasura: container_name: eosrate_hasura - build: - context: ./services/hasura - dockerfile: ./Dockerfile - image: hasura/graphql-engine:v1.3.3.cli-migrations-v2 + image: hasura/graphql-engine:v2.0.3.cli-migrations-v3 ports: - - "8080:8080" + - "8080:8080" depends_on: - - postgres + - "postgres" restart: always environment: HASURA_GRAPHQL_DATABASE_URL: "${HASURA_GRAPHQL_DATABASE_URL}" @@ -93,18 +90,22 @@ services: HASURA_GRAPHQL_ACTION_BASE_URL: "${HASURA_GRAPHQL_ACTION_BASE_URL}" HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}" HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "${HASURA_GRAPHQL_UNAUTHORIZED_ROLE}" + HASURA_GRAPHQL_ENABLE_CONSOLE: "true" + ## enable debugging mode. It is recommended to disable this in production + HASURA_GRAPHQL_DEV_MODE: "true" + HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log volumes: - - ./services/hasura/migrations:/hasura-migrations - - ./services/hasura/metadata:/hasura-metadata + - ./hasura/migrations:/hasura-migrations + - ./hasura/metadata:/hasura-metadata - frontend: - container_name: eosrate_frontend + webapp: + container_name: eosrate_webapp build: - context: ./services/frontend + context: ./webapp dockerfile: ./Dockerfile target: server - image: eosrate/frontend + image: eosrate/webapp depends_on: - hasura - hapi diff --git a/eosio.assert.json b/eosio.assert.json deleted file mode 100644 index 7982d6fa..00000000 --- a/eosio.assert.json +++ /dev/null @@ -1,16 +0,0 @@ -//cleos -u https://api.jungle.alohaeos.com push transaction '{"delay_sec":0,"max_cpu_usage_ms":0,"actions":[{"account":"eosio.assert","name":"add.manifest","data":{"account":"rateproducer","domain":"https://eosrate.io","appmeta":"https://eosrate.io/app-metadata.json#dc6ee87c67231cac62f0b1ceacd8dc1f13770e5a7a3a6933579312a0942aefc8","whitelist":[{"contract":"eosio","action":"voteproducer"},{"contract":"rateproducer","action":"rate"}]},"authorization":[{"actor":"rateproducer","permission":"active"}]}]}' -{ - "account": "rateproducer", - "domain": "https://eosrate.io", - "appmeta": "https://eosrate.io/app-metadata.json#dc6ee87c67231cac62f0b1ceacd8dc1f13770e5a7a3a6933579312a0942aefc8", - "whitelist": [ - { - "contract": "eosio", - "action": "voteproducer" - }, - { - "contract": "rateproducer", - "action": "rate" - } - ] -} diff --git a/hapi/.eslintrc.js b/hapi/.eslintrc.js new file mode 100644 index 00000000..8cb45712 --- /dev/null +++ b/hapi/.eslintrc.js @@ -0,0 +1,20 @@ +module.exports = { + parser: 'babel-eslint', + env: { + 'commonjs': true, + 'es6': true, + 'node': true + }, + extends: ["standard", "prettier", "plugin:prettier/recommended"], + globals: { + 'Atomics': 'readonly', + 'SharedArrayBuffer': 'readonly' + }, + parserOptions: { + 'ecmaVersion': 2018 + }, + rules: { + 'multiline-ternary': 'off', + 'space-before-function-paren': 'off' + } +} diff --git a/services/hapi/.gitignore b/hapi/.gitignore similarity index 100% rename from services/hapi/.gitignore rename to hapi/.gitignore diff --git a/services/hapi/.prettierignore b/hapi/.prettierignore similarity index 100% rename from services/hapi/.prettierignore rename to hapi/.prettierignore diff --git a/hapi/Dockerfile b/hapi/Dockerfile new file mode 100644 index 00000000..08b780f3 --- /dev/null +++ b/hapi/Dockerfile @@ -0,0 +1,25 @@ +FROM node:12.16.2-alpine + +# Create app directory +WORKDIR /opt/application + +# Install dev tools +# Install global depedencies +RUN apk add --no-cache yarn &&\ + apk add --no-cache git &&\ + apk add --no-cache jq &&\ + apk add --no-cache curl &&\ + apk add --no-cache vim &&\ + yarn global add serve &&\ + yarn global add eslint &&\ + yarn --ignore-optional --frozen-lockfile global add nodemon + +# Install app dependencies +COPY package*.json ./ +COPY yarn.lock ./ + +# Bundle app source +COPY . . + +EXPOSE 9090 +CMD nodemon -L src/index.js diff --git a/services/hapi/makefile b/hapi/makefile similarity index 97% rename from services/hapi/makefile rename to hapi/makefile index 9bee732c..01206f40 100644 --- a/services/hapi/makefile +++ b/hapi/makefile @@ -1,4 +1,4 @@ -include ../../utils/meta.mk +include ../utils/meta.mk LATEST_TAG ?= latest diff --git a/hapi/package.json b/hapi/package.json new file mode 100644 index 00000000..ffb7e6a1 --- /dev/null +++ b/hapi/package.json @@ -0,0 +1,53 @@ +{ + "name": "eosrate-backend", + "version": "19.1.1", + "description": "EOS Rate Backend API Service", + "main": "index.js", + "scripts": { + "precommit": "pretty-quick --staged && lint-staged", + "lint": "eslint .", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } + }, + "author": "EOS Costa Rica", + "license": "MIT", + "dependencies": { + "@hapi/hapi": "^20.1.5", + "eosjs": "^22.1.0", + "eosjs-api": "^7.0.4", + "lint": "^0.7.0", + "massive": "^6.9.1", + "node-fetch": "^2.6.1", + "npm-check": "^5.9.2", + "request": "^2.88", + "request-promise": "^4.2.6" + }, + "devDependencies": { + "eslint": "^7.30.0", + "eslint-config-prettier": "^8.3.0", + "eslint-config-standard": "^16.0.3", + "eslint-config-standard-react": "^11.0.1", + "eslint-plugin-import": ">=2.23.4", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-promise": ">=5.1.0", + "eslint-plugin-react": ">=7.24.0", + "eslint-plugin-standard": "^5.0.0", + "husky": ">=4", + "lint-staged": ">=11", + "prettier": "^2.3.2", + "pretty-quick": "^3.1.1", + "snazzy": "^9.0.0", + "standard": "^16.0.3" + }, + "lint-staged": { + "*.js": [ + "eslint --fix", + "git add" + ], + "*.{js,css,md}": "prettier --write" + } +} diff --git a/services/frontend/prettier.config.js b/hapi/prettier.config.js similarity index 100% rename from services/frontend/prettier.config.js rename to hapi/prettier.config.js diff --git a/services/hapi/readme.md b/hapi/readme.md similarity index 100% rename from services/hapi/readme.md rename to hapi/readme.md diff --git a/services/hapi/src/config/index.js b/hapi/src/config/index.js similarity index 100% rename from services/hapi/src/config/index.js rename to hapi/src/config/index.js diff --git a/hapi/src/config/server.config.js b/hapi/src/config/server.config.js new file mode 100644 index 00000000..fe1d7c79 --- /dev/null +++ b/hapi/src/config/server.config.js @@ -0,0 +1,8 @@ + +module.exports = { + host: process.env.HAPI_POSTGRES_HOST || 'postgres', + port: process.env.HAPI_POSTGRES_PORT || 5432, + database: process.env.HAPI_POSTGRES_DB || 'eosrate', + user: process.env.HAPI_POSTGRES_USER || 'user', + password: process.env.HAPI_POSTGRES_PASSWORD || 'pass' +} \ No newline at end of file diff --git a/services/hapi/src/index.js b/hapi/src/index.js similarity index 100% rename from services/hapi/src/index.js rename to hapi/src/index.js diff --git a/services/hapi/src/libs/add-bps-info.js b/hapi/src/libs/add-bps-info.js similarity index 100% rename from services/hapi/src/libs/add-bps-info.js rename to hapi/src/libs/add-bps-info.js diff --git a/services/hapi/src/libs/sync-bp-stats.js b/hapi/src/libs/sync-bp-stats.js similarity index 96% rename from services/hapi/src/libs/sync-bp-stats.js rename to hapi/src/libs/sync-bp-stats.js index 9e3dccda..43c89e53 100644 --- a/services/hapi/src/libs/sync-bp-stats.js +++ b/hapi/src/libs/sync-bp-stats.js @@ -4,7 +4,7 @@ const eosjs = require('eosjs') const fetch = require('node-fetch') const rpc = new eosjs.JsonRpc( - process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr', + process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr', { fetch } ) diff --git a/services/hapi/src/libs/sync-bps.js b/hapi/src/libs/sync-bps.js similarity index 92% rename from services/hapi/src/libs/sync-bps.js rename to hapi/src/libs/sync-bps.js index c8b4f9bc..36b57411 100644 --- a/services/hapi/src/libs/sync-bps.js +++ b/hapi/src/libs/sync-bps.js @@ -5,12 +5,12 @@ const request = require('request-promise') const { massiveConfig } = require('../config') -const EOS_API_ENDPOINT = process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const HAPI_EOS_API_ENDPOINT = process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' // gets data from mainnet const getBlockProducersData = async () => { const eos = EosApi({ - httpEndpoint: EOS_API_ENDPOINT, + httpEndpoint: HAPI_EOS_API_ENDPOINT, verbose: false }) @@ -64,12 +64,12 @@ const getBlockProducersData = async () => { try { if (bp['producer_account_name'] && bp['producer_account_name'] !== '') { if ( - EOS_API_ENDPOINT !== 'https://jungle.eosio.cr' && + HAPI_EOS_API_ENDPOINT !== 'https://jungle.eosio.cr' && bp['producer_account_name'] === allProducers[i]['owner'] ) { console.log('add', urls[i]) allProducers[i]['bpJson'] = bp - } else if (EOS_API_ENDPOINT === 'https://jungle.eosio.cr') { + } else if (HAPI_EOS_API_ENDPOINT === 'https://jungle.eosio.cr') { console.log('add', urls[i], 'jungle') allProducers[i]['bpJson'] = bp } diff --git a/services/hapi/src/libs/sync-proxies.js b/hapi/src/libs/sync-proxies.js similarity index 89% rename from services/hapi/src/libs/sync-proxies.js rename to hapi/src/libs/sync-proxies.js index 652197ce..fffcf4aa 100644 --- a/services/hapi/src/libs/sync-proxies.js +++ b/hapi/src/libs/sync-proxies.js @@ -6,7 +6,7 @@ const massive = require('massive') const { massiveConfig } = require('../config') -const EOS_API_ENDPOINT = process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const HAPI_EOS_API_ENDPOINT = process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' const PROXY_INFO_CONTRACT_CODE = process.env.PROXY_INFO_CONTRACT_CODE || 'proxyaccount' @@ -15,9 +15,9 @@ const PROXY_INFO_CONTRACT_SCOPE = process.env.PROXY_INFO_CONTRACT_SCOPE || 'prox // gets data from blockchain const getProxiesData = async () => { const db = await massive(massiveConfig) - const eos = new JsonRpc(EOS_API_ENDPOINT, { fetch }) + const eos = new JsonRpc(HAPI_EOS_API_ENDPOINT, { fetch }) const eosApi = EosApi({ - httpEndpoint: EOS_API_ENDPOINT, + httpEndpoint: HAPI_EOS_API_ENDPOINT, verbose: false }) diff --git a/services/hapi/src/libs/sync-ratings.js b/hapi/src/libs/sync-ratings.js similarity index 92% rename from services/hapi/src/libs/sync-ratings.js rename to hapi/src/libs/sync-ratings.js index 1d23c249..4bc4500c 100644 --- a/services/hapi/src/libs/sync-ratings.js +++ b/hapi/src/libs/sync-ratings.js @@ -5,11 +5,11 @@ const massive = require('massive') const { massiveConfig } = require('../config') -const EOS_API_ENDPOINT = process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const HAPI_EOS_API_ENDPOINT = process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' // gets data from blockchain const getUserRatings = async () => { - const eos = new JsonRpc(EOS_API_ENDPOINT, { fetch }) + const eos = new JsonRpc(HAPI_EOS_API_ENDPOINT, { fetch }) let ratings = await eos.get_table_rows({ json: true, diff --git a/services/hapi/src/libs/sync-stats.js b/hapi/src/libs/sync-stats.js similarity index 90% rename from services/hapi/src/libs/sync-stats.js rename to hapi/src/libs/sync-stats.js index e87c0cb2..b9054448 100644 --- a/services/hapi/src/libs/sync-stats.js +++ b/hapi/src/libs/sync-stats.js @@ -5,11 +5,11 @@ const massive = require('massive') const { massiveConfig } = require('../config') -const EOS_API_ENDPOINT = process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const HAPI_EOS_API_ENDPOINT = process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' // gets data from blockchain const getRatingsStats = async () => { - const eos = new JsonRpc(EOS_API_ENDPOINT, { fetch }) + const eos = new JsonRpc(HAPI_EOS_API_ENDPOINT, { fetch }) const ratings = await eos.get_table_rows({ json: true, diff --git a/services/hapi/src/libs/sync-user-rating.js b/hapi/src/libs/sync-user-rating.js similarity index 93% rename from services/hapi/src/libs/sync-user-rating.js rename to hapi/src/libs/sync-user-rating.js index b36563b0..f20a33e8 100644 --- a/services/hapi/src/libs/sync-user-rating.js +++ b/hapi/src/libs/sync-user-rating.js @@ -5,12 +5,12 @@ const massive = require('massive') const { massiveConfig } = require('../config') -const EOS_API_ENDPOINT = - process.env.EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const HAPI_EOS_API_ENDPOINT = + process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' // gets data from blockchain const getUserRatings = async () => { - const eos = new JsonRpc(EOS_API_ENDPOINT, { fetch }) + const eos = new JsonRpc(HAPI_EOS_API_ENDPOINT, { fetch }) let ratings = await eos.get_table_rows({ json: true, diff --git a/services/hapi/src/libs/valid-account-name.js b/hapi/src/libs/valid-account-name.js similarity index 100% rename from services/hapi/src/libs/valid-account-name.js rename to hapi/src/libs/valid-account-name.js diff --git a/services/hapi/yarn.lock b/hapi/yarn.lock similarity index 87% rename from services/hapi/yarn.lock rename to hapi/yarn.lock index 931b370a..77e61c07 100644 --- a/services/hapi/yarn.lock +++ b/hapi/yarn.lock @@ -2,6 +2,13 @@ # yarn lockfile v1 +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb" @@ -53,7 +60,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c" integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow== -"@babel/highlight@^7.14.5": +"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== @@ -67,13 +74,6 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4" integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA== -"@babel/runtime@7.6.0": - version "7.6.0" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.6.0.tgz#4fc1d642a9fd0299754e8b5de62c631cf5568205" - integrity sha512-89eSBLJsxNxOERC0Op4vd+0Bqm6wRMqMbFtV3i0/fbaWw/mJ8Q3eBvgX0G4SyrOOLCtbu98HspF8o09MRT+KzQ== - dependencies: - regenerator-runtime "^0.13.2" - "@babel/template@^7.14.5": version "7.14.5" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4" @@ -106,6 +106,37 @@ "@babel/helper-validator-identifier" "^7.14.8" to-fast-properties "^2.0.0" +"@eslint/eslintrc@^0.2.1": + version "0.2.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.2.tgz#d01fc791e2fc33e88a29d6f3dc7e93d0cd784b76" + integrity sha512-EfB5OHNYp1F4px/LI/FEnGylop7nOqkQ1LRzCM0KccA2U8tvV8w01KBv37LbO7nW4H+YhKyo2LcJhRwjjV17QQ== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + lodash "^4.17.19" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + +"@eslint/eslintrc@^0.4.3": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c" + integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^13.9.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + "@hapi/accept@^5.0.1": version "5.0.2" resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-5.0.2.tgz#ab7043b037e68b722f93f376afb05e85c0699523" @@ -114,13 +145,6 @@ "@hapi/boom" "9.x.x" "@hapi/hoek" "9.x.x" -"@hapi/address@^4.0.1": - version "4.1.0" - resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.1.0.tgz#d60c5c0d930e77456fdcde2598e77302e2955e1d" - integrity sha512-SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ== - dependencies: - "@hapi/hoek" "^9.0.0" - "@hapi/ammo@^5.0.1": version "5.0.1" resolved "https://registry.yarnpkg.com/@hapi/ammo/-/ammo-5.0.1.tgz#9d34560f5c214eda563d838c01297387efaab490" @@ -135,14 +159,14 @@ dependencies: "@hapi/hoek" "9.x.x" -"@hapi/boom@9.x.x": +"@hapi/boom@9.x.x", "@hapi/boom@^9.1.0": version "9.1.3" resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.3.tgz#22cad56e39b7a4819161a99b1db19eaaa9b6cc6e" integrity sha512-RlrGyZ603hE/eRTZtTltocRm50HHmrmL3kGOP0SQ9MasazlW1mt/fkv4C5P/6rnpFXjwld/POFX1C8tMZE3ldg== dependencies: "@hapi/hoek" "9.x.x" -"@hapi/bounce@2.x.x": +"@hapi/bounce@2.x.x", "@hapi/bounce@^2.0.0": version "2.0.0" resolved "https://registry.yarnpkg.com/@hapi/bounce/-/bounce-2.0.0.tgz#e6ef56991c366b1e2738b2cd83b01354d938cf3d" integrity sha512-JesW92uyzOOyuzJKjoLHM1ThiOvHPOLDHw01YV8yh5nCso7sDwJho1h0Ad2N+E62bZyz46TG3xhAi/78Gsct6A== @@ -155,7 +179,7 @@ resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-2.0.0.tgz#5bb2193eb685c0007540ca61d166d4e1edaf918d" integrity sha512-WEezM1FWztfbzqIUbsDzFRVMxSoLy3HugVcux6KDDtTqzPsLE8NDRHfXvev66aH1i2oOKKar3/XDjbvh/OUBdg== -"@hapi/call@8.x.x": +"@hapi/call@^8.0.0": version "8.0.1" resolved "https://registry.yarnpkg.com/@hapi/call/-/call-8.0.1.tgz#9e64cd8ba6128eb5be6e432caaa572b1ed8cd7c0" integrity sha512-bOff6GTdOnoe5b8oXRV3lwkQSb/LAWylvDMae6RgEWWntd0SHtkYbQukDHKlfaYtVnSAgIavJ0kqszF/AIBb6g== @@ -163,7 +187,7 @@ "@hapi/boom" "9.x.x" "@hapi/hoek" "9.x.x" -"@hapi/catbox-memory@5.x.x": +"@hapi/catbox-memory@^5.0.0": version "5.0.1" resolved "https://registry.yarnpkg.com/@hapi/catbox-memory/-/catbox-memory-5.0.1.tgz#cb63fca0ded01d445a2573b38eb2688df67f70ac" integrity sha512-QWw9nOYJq5PlvChLWV8i6hQHJYfvdqiXdvTupJFh0eqLZ64Xir7mKNi96d5/ZMUAqXPursfNDIDxjFgoEDUqeQ== @@ -171,7 +195,7 @@ "@hapi/boom" "9.x.x" "@hapi/hoek" "9.x.x" -"@hapi/catbox@^11.1.0": +"@hapi/catbox@^11.1.1": version "11.1.1" resolved "https://registry.yarnpkg.com/@hapi/catbox/-/catbox-11.1.1.tgz#d277e2d5023fd69cddb33d05b224ea03065fec0c" integrity sha512-u/8HvB7dD/6X8hsZIpskSDo4yMKpHxFd7NluoylhGrL6cUfYxdQPnvUp9YU2C6F9hsyBVLGulBd9vBN1ebfXOQ== @@ -200,36 +224,31 @@ resolved "https://registry.yarnpkg.com/@hapi/file/-/file-2.0.0.tgz#2ecda37d1ae9d3078a67c13b7da86e8c3237dfb9" integrity sha512-WSrlgpvEqgPWkI18kkGELEZfXr0bYLtr16iIN4Krh9sRnzBZN6nnWxHFxtsnP684wueEySBbXPDg/WfA9xJdBQ== -"@hapi/formula@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-2.0.0.tgz#edade0619ed58c8e4f164f233cda70211e787128" - integrity sha512-V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A== - -"@hapi/hapi@^19.1.1": - version "19.2.0" - resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-19.2.0.tgz#a177f27d1d067f1fb23de9c0a0b4349502190a7b" - integrity sha512-Isf/BUPQMRMYK+xx4y2B05lrrGw6PSbJKytk1SlaXeV7tXm6m+6tFRBog6c/na0QNgojafb0bjMB+vBg64CwUA== +"@hapi/hapi@^20.1.5": + version "20.1.5" + resolved "https://registry.yarnpkg.com/@hapi/hapi/-/hapi-20.1.5.tgz#235dbc6bcc72960724696028c5145c0ecfe6962d" + integrity sha512-BhJ5XFR9uWPUBj/z5pPqXSk8OnvQQU/EbQjwpmjZy0ymNEiq7kIhXkAmzXcntbBHta9o7zpW8XMeXnfV4wudXw== dependencies: "@hapi/accept" "^5.0.1" "@hapi/ammo" "^5.0.1" - "@hapi/boom" "9.x.x" - "@hapi/bounce" "2.x.x" - "@hapi/call" "8.x.x" - "@hapi/catbox" "^11.1.0" - "@hapi/catbox-memory" "5.x.x" - "@hapi/heavy" "7.x.x" - "@hapi/hoek" "9.x.x" - "@hapi/joi" "17.x.x" - "@hapi/mimos" "5.x.x" - "@hapi/podium" "4.x.x" - "@hapi/shot" "5.x.x" - "@hapi/somever" "3.x.x" - "@hapi/statehood" "^7.0.2" + "@hapi/boom" "^9.1.0" + "@hapi/bounce" "^2.0.0" + "@hapi/call" "^8.0.0" + "@hapi/catbox" "^11.1.1" + "@hapi/catbox-memory" "^5.0.0" + "@hapi/heavy" "^7.0.1" + "@hapi/hoek" "^9.0.4" + "@hapi/mimos" "^6.0.0" + "@hapi/podium" "^4.1.1" + "@hapi/shot" "^5.0.5" + "@hapi/somever" "^3.0.0" + "@hapi/statehood" "^7.0.3" "@hapi/subtext" "^7.0.3" - "@hapi/teamwork" "4.x.x" - "@hapi/topo" "5.x.x" + "@hapi/teamwork" "^5.1.0" + "@hapi/topo" "^5.0.0" + "@hapi/validate" "^1.1.1" -"@hapi/heavy@7.x.x": +"@hapi/heavy@^7.0.1": version "7.0.1" resolved "https://registry.yarnpkg.com/@hapi/heavy/-/heavy-7.0.1.tgz#73315ae33b6e7682a0906b7a11e8ca70e3045874" integrity sha512-vJ/vzRQ13MtRzz6Qd4zRHWS3FaUc/5uivV2TIuExGTM9Qk+7Zzqj0e2G7EpE6KztO9SalTbiIkTh7qFKj/33cA== @@ -254,21 +273,10 @@ "@hapi/cryptiles" "5.x.x" "@hapi/hoek" "9.x.x" -"@hapi/joi@17.x.x": - version "17.1.1" - resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.1.tgz#9cc8d7e2c2213d1e46708c6260184b447c661350" - integrity sha512-p4DKeZAoeZW4g3u7ZeRo+vCDuSDgSvtsB/NpfjXEHTUjSeINAi/RrVOWiVQ1isaoLzMvFEhe8n5065mQq1AdQg== - dependencies: - "@hapi/address" "^4.0.1" - "@hapi/formula" "^2.0.0" - "@hapi/hoek" "^9.0.0" - "@hapi/pinpoint" "^2.0.0" - "@hapi/topo" "^5.0.0" - -"@hapi/mimos@5.x.x": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@hapi/mimos/-/mimos-5.0.0.tgz#245c6c98b1cc2c13395755c730321b913de074eb" - integrity sha512-EVS6wJYeE73InTlPWt+2e3Izn319iIvffDreci3qDNT+t3lA5ylJ0/SoTaID8e0TPNUkHUSsgJZXEmLHvoYzrA== +"@hapi/mimos@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@hapi/mimos/-/mimos-6.0.0.tgz#daa523d9c07222c7e8860cb7c9c5501fd6506484" + integrity sha512-Op/67tr1I+JafN3R3XN5DucVSxKRT/Tc+tUszDwENoNpolxeXkhrJ2Czt6B6AAqrespHoivhgZBWYSuANN9QXg== dependencies: "@hapi/hoek" "9.x.x" mime-db "1.x.x" @@ -292,12 +300,7 @@ "@hapi/hoek" "9.x.x" "@hapi/nigel" "4.x.x" -"@hapi/pinpoint@^2.0.0": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-2.0.0.tgz#805b40d4dbec04fc116a73089494e00f073de8df" - integrity sha512-vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw== - -"@hapi/podium@4.x.x": +"@hapi/podium@4.x.x", "@hapi/podium@^4.1.1": version "4.1.3" resolved "https://registry.yarnpkg.com/@hapi/podium/-/podium-4.1.3.tgz#91e20838fc2b5437f511d664aabebbb393578a26" integrity sha512-ljsKGQzLkFqnQxE7qeanvgGj4dejnciErYd30dbrYzUOF/FyS/DOF97qcrT3bhoVwCYmxa6PEMhxfCPlnUcD2g== @@ -306,7 +309,7 @@ "@hapi/teamwork" "5.x.x" "@hapi/validate" "1.x.x" -"@hapi/shot@5.x.x": +"@hapi/shot@^5.0.5": version "5.0.5" resolved "https://registry.yarnpkg.com/@hapi/shot/-/shot-5.0.5.tgz#a25c23d18973bec93c7969c51bf9579632a5bebd" integrity sha512-x5AMSZ5+j+Paa8KdfCoKh+klB78otxF+vcJR/IoN91Vo2e5ulXIW6HUsFTCU+4W6P/Etaip9nmdAx2zWDimB2A== @@ -314,7 +317,7 @@ "@hapi/hoek" "9.x.x" "@hapi/validate" "1.x.x" -"@hapi/somever@3.x.x": +"@hapi/somever@^3.0.0": version "3.0.1" resolved "https://registry.yarnpkg.com/@hapi/somever/-/somever-3.0.1.tgz#9961cd5bdbeb5bb1edc0b2acdd0bb424066aadcc" integrity sha512-4ZTSN3YAHtgpY/M4GOtHUXgi6uZtG9nEZfNI6QrArhK0XN/RDVgijlb9kOmXwCR5VclDSkBul9FBvhSuKXx9+w== @@ -322,7 +325,7 @@ "@hapi/bounce" "2.x.x" "@hapi/hoek" "9.x.x" -"@hapi/statehood@^7.0.2": +"@hapi/statehood@^7.0.3": version "7.0.3" resolved "https://registry.yarnpkg.com/@hapi/statehood/-/statehood-7.0.3.tgz#655166f3768344ed3c3b50375a303cdeca8040d9" integrity sha512-pYB+pyCHkf2Amh67QAXz7e/DN9jcMplIL7Z6N8h0K+ZTy0b404JKPEYkbWHSnDtxLjJB/OtgElxocr2fMH4G7w== @@ -348,24 +351,19 @@ "@hapi/pez" "^5.0.1" "@hapi/wreck" "17.x.x" -"@hapi/teamwork@4.x.x": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@hapi/teamwork/-/teamwork-4.0.0.tgz#4aadbb88de13bce39ab8431565cd50c7ecc6327f" - integrity sha512-V6xYOrr5aFv/IJqNPneaYCu8vuGTKisamqHVRS3JJnbZr18TrpXdsJOYk9pjPhFti+M2YETPebQLUr820N5NoQ== - -"@hapi/teamwork@5.x.x": +"@hapi/teamwork@5.x.x", "@hapi/teamwork@^5.1.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@hapi/teamwork/-/teamwork-5.1.0.tgz#7801a61fc727f702fd2196ef7625eb4e389f4124" integrity sha512-llqoQTrAJDTXxG3c4Kz/uzhBS1TsmSBa/XG5SPcVXgmffHE1nFtyLIK0hNJHCB3EuBKT84adzd1hZNY9GJLWtg== -"@hapi/topo@5.x.x", "@hapi/topo@^5.0.0": +"@hapi/topo@^5.0.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-5.1.0.tgz#dc448e332c6c6e37a4dc02fd84ba8d44b9afb012" integrity sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg== dependencies: "@hapi/hoek" "^9.0.0" -"@hapi/validate@1.x.x": +"@hapi/validate@1.x.x", "@hapi/validate@^1.1.1": version "1.1.3" resolved "https://registry.yarnpkg.com/@hapi/validate/-/validate-1.1.3.tgz#f750a07283929e09b51aa16be34affb44e1931ad" integrity sha512-/XMR0N0wjw0Twzq2pQOzPBZlDzkekGcoCtzO314BpIEsbXdYGthQUbxgkGDf4nhk1+IPDAsXqWjMohRQYO06UA== @@ -389,6 +387,20 @@ "@hapi/bourne" "2.x.x" "@hapi/hoek" "9.x.x" +"@humanwhocodes/config-array@^0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9" + integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg== + dependencies: + "@humanwhocodes/object-schema" "^1.2.0" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf" + integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w== + "@types/minimatch@^3.0.3": version "3.0.5" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" @@ -399,12 +411,12 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -acorn-jsx@^5.2.0: +acorn-jsx@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn@^7.1.1: +acorn@^7.4.0: version "7.4.1" resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== @@ -417,7 +429,7 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3: +ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -427,6 +439,16 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^8.0.1: + version "8.6.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571" + integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + ansi-align@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f" @@ -449,7 +471,7 @@ ansi-escapes@^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, ansi-escapes@^4.3.0: +ansi-escapes@^4.3.0: version "4.3.2" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e" integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ== @@ -517,7 +539,7 @@ array-find-index@^1.0.1: resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1" integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E= -array-includes@^3.0.3, array-includes@^3.1.1, array-includes@^3.1.3: +array-includes@^3.1.1, array-includes@^3.1.2, array-includes@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a" integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A== @@ -545,7 +567,7 @@ array-uniq@^1.0.1: resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6" integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY= -array.prototype.flat@^1.2.4: +array.prototype.flat@^1.2.3, array.prototype.flat@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123" integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg== @@ -554,6 +576,16 @@ array.prototype.flat@^1.2.4: define-properties "^1.1.3" es-abstract "^1.18.0-next.1" +array.prototype.flatmap@^1.2.3, array.prototype.flatmap@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.4.tgz#94cfd47cc1556ec0747d97f7c7738c58122004c9" + integrity sha512-r9Z0zYoxqHz60vvQbWEdXIEtCwHF0yxaWfno9qzXeNHvfyl3BZqygmGzb84dsubyaXLH4husF+NFgMSdpZhk2Q== + dependencies: + call-bind "^1.0.0" + define-properties "^1.1.3" + es-abstract "^1.18.0-next.1" + function-bind "^1.1.1" + arrify@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d" @@ -606,7 +638,7 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -babel-runtime@6.26.0, babel-runtime@^6.6.1: +babel-runtime@^6.6.1: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe" integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4= @@ -619,13 +651,6 @@ balanced-match@^1.0.0: resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee" integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw== -base-x@^3.0.2: - version "3.0.8" - resolved "https://registry.yarnpkg.com/base-x/-/base-x-3.0.8.tgz#1e1106c2537f0162e8b52474a557ebb09000018d" - integrity sha512-Rl/1AWP4J/zRrk54hhlxH4drNxPJXYUaKffODVI53/dAsV4t9fBxyxYKAVPU1XBHxYwOWP9h9H0hM2MVw4YfJA== - dependencies: - safe-buffer "^5.0.1" - bcrypt-pbkdf@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" @@ -633,16 +658,21 @@ bcrypt-pbkdf@^1.0.0: dependencies: tweetnacl "^0.14.3" -bigi@1.4.2, bigi@^1.1.0: - version "1.4.2" - resolved "https://registry.yarnpkg.com/bigi/-/bigi-1.4.2.tgz#9c665a95f88b8b08fc05cfd731f561859d725825" - integrity sha1-nGZalfiLiwj8Bc/XMfVhhZ1yWCU= - bluebird@^3.5.0: version "3.7.2" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f" integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg== +bn.js@5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" + integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== + +bn.js@^4.11.9: + version "4.12.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" + integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== + boxen@^1.2.1: version "1.3.0" resolved "https://registry.yarnpkg.com/boxen/-/boxen-1.3.0.tgz#55c6c39a8ba58d9c61ad22cd877532deb665a20b" @@ -671,23 +701,10 @@ braces@^3.0.1: dependencies: fill-range "^7.0.1" -browserify-aes@1.0.6: - version "1.0.6" - resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.0.6.tgz#5e7725dbdef1fd5930d4ebab48567ce451c48a0a" - integrity sha1-Xncl297x/Vkw1OurSFZ85FHEigo= - dependencies: - buffer-xor "^1.0.2" - cipher-base "^1.0.0" - create-hash "^1.1.0" - evp_bytestokey "^1.0.0" - inherits "^2.0.1" - -bs58@4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/bs58/-/bs58-4.0.1.tgz#be161e76c354f6f788ae4071f63f34e8c4f0a42a" - integrity sha1-vhYedsNU9veIrkBx9j806MTwpCo= - dependencies: - base-x "^3.0.2" +brorand@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" + integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= buffer-from@^1.0.0: version "1.1.1" @@ -699,23 +716,11 @@ buffer-writer@2.0.0: resolved "https://registry.yarnpkg.com/buffer-writer/-/buffer-writer-2.0.0.tgz#ce7eb81a38f7829db09c873f2fbb792c0c98ec04" integrity sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw== -buffer-xor@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" - integrity sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk= - builtin-modules@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.2.0.tgz#45d5db99e7ee5e6bc4f362e008bf917ab5049887" integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA== -bytebuffer@5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/bytebuffer/-/bytebuffer-5.0.1.tgz#582eea4b1a873b6d020a48d58df85f0bba6cfddd" - integrity sha1-WC7qSxqHO20CCkjVjfhfC7ps/d0= - dependencies: - long "~3" - call-bind@^1.0.0, call-bind@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c" @@ -798,7 +803,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.4.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" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -807,7 +812,15 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.0, chalk@^2.4 escape-string-regexp "^1.0.5" supports-color "^5.3.0" -chalk@^4.1.0, chalk@^4.1.1: +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" + +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== @@ -825,14 +838,6 @@ ci-info@^1.5.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497" integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A== -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" - integrity sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q== - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - clean-stack@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" @@ -894,11 +899,6 @@ cli-width@^2.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz#b0433d0b4e9c847ef18868a4ef16fd5fc8271c48" integrity sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw== -cli-width@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" - integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== - cliui@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-5.0.0.tgz#deefcfdb2e800784aa34f46fa08e06851c7bbbc5" @@ -1034,39 +1034,6 @@ create-error-class@^3.0.0: dependencies: capture-stack-trace "^1.0.0" -create-hash@1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd" - integrity sha1-YGBCrIuSYnUPSDyt2rD1gZFy2P0= - dependencies: - cipher-base "^1.0.1" - inherits "^2.0.1" - ripemd160 "^2.0.0" - sha.js "^2.4.0" - -create-hash@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" - integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg== - dependencies: - cipher-base "^1.0.1" - inherits "^2.0.1" - md5.js "^1.3.4" - ripemd160 "^2.0.1" - sha.js "^2.4.0" - -create-hmac@1.1.6: - version "1.1.6" - resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06" - integrity sha1-rLniIaThe9sHbpBlfEK5PjcmzwY= - dependencies: - cipher-base "^1.0.3" - create-hash "^1.1.0" - inherits "^2.0.1" - ripemd160 "^2.0.0" - safe-buffer "^5.0.1" - sha.js "^2.4.8" - cross-spawn-async@^2.1.1: version "2.2.5" resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc" @@ -1084,18 +1051,7 @@ cross-spawn@^5.0.1: shebang-command "^1.2.0" which "^1.2.9" -cross-spawn@^6.0.5: - version "6.0.5" - resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" - integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== - dependencies: - nice-try "^1.0.4" - path-key "^2.0.1" - semver "^5.5.0" - shebang-command "^1.2.0" - which "^1.2.9" - -cross-spawn@^7.0.0, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -1128,11 +1084,6 @@ de-indent@^1.0.2: resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d" integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= -debug-log@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/debug-log/-/debug-log-1.0.1.tgz#2307632d4c04382b8df8a32f70b895046d52745f" - integrity sha1-IwdjLUwEOCuN+KMvcLiVBG1SdF8= - debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -1147,7 +1098,7 @@ debug@^3.2.7: dependencies: ms "^2.1.1" -debug@^4.0.1, debug@^4.1.0, debug@^4.3.1: +debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== @@ -1169,7 +1120,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== -deep-is@~0.1.3: +deep-is@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= @@ -1188,18 +1139,6 @@ define-properties@^1.1.3: dependencies: object-keys "^1.0.12" -deglob@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/deglob/-/deglob-4.0.1.tgz#0685c6383992fd6009be10653a2b1116696fad55" - integrity sha512-/g+RDZ7yf2HvoW+E5Cy+K94YhgcFgr6C8LuHZD1O5HoNPkf3KY6RfXJ0DBGlB/NkLi5gml+G9zqRzk9S0mHZCg== - dependencies: - find-root "^1.0.0" - glob "^7.0.5" - ignore "^5.0.0" - pkg-config "^1.1.0" - run-parallel "^1.1.2" - uniq "^1.0.1" - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -1278,12 +1217,18 @@ ecc-jsbn@~0.1.1: jsbn "~0.1.0" safer-buffer "^2.1.0" -ecurve@1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/ecurve/-/ecurve-1.0.5.tgz#d148e8fe50a674f983bb5bae09da0ea23e10535e" - integrity sha1-0Ujo/lCmdPmDu1uuCdoOoj4QU14= +elliptic@6.5.4: + version "6.5.4" + resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" + integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== dependencies: - bigi "^1.1.0" + bn.js "^4.11.9" + brorand "^1.1.0" + hash.js "^1.0.0" + hmac-drbg "^1.0.1" + inherits "^2.0.4" + minimalistic-assert "^1.0.1" + minimalistic-crypto-utils "^1.0.1" emoji-regex@^7.0.1: version "7.0.3" @@ -1309,7 +1254,7 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enquirer@^2.3.6: +enquirer@^2.3.5, enquirer@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== @@ -1324,29 +1269,15 @@ eosjs-api@^7.0.4: camel-case "^3.0.0" isomorphic-fetch "^2.2.1" -eosjs-ecc@4.0.7: - version "4.0.7" - resolved "https://registry.yarnpkg.com/eosjs-ecc/-/eosjs-ecc-4.0.7.tgz#f5246da3b84839fcc237204768ef6e5ea56cc814" - integrity sha512-uuqhqnrDy9XTpKfkhiZqRDUTCCI9oWBalVK5IosL7kpYwA9I3lm68INYFLyWsHpF2xwHqPql8MrMYJ3zfOn5Qg== - dependencies: - "@babel/runtime" "7.6.0" - bigi "1.4.2" - browserify-aes "1.0.6" - bs58 "4.0.1" - bytebuffer "5.0.1" - create-hash "1.1.3" - create-hmac "1.1.6" - ecurve "1.0.5" - randombytes "2.0.5" - -eosjs@^20.0.3: - version "20.0.3" - resolved "https://registry.yarnpkg.com/eosjs/-/eosjs-20.0.3.tgz#f3ac1fa119b76dd07bf2825ad27342f6502a533b" - integrity sha512-h0WSxsDo7AHz5IzpbQDrzyT/CYmbBDtFiiolTdtGd2FdKXEa6LDER4WbNp4qxCY7kD65KeG3knkGmOOFGbPJxw== - dependencies: - babel-runtime "6.26.0" - eosjs-ecc "4.0.7" - text-encoding "0.7.0" +eosjs@^22.1.0: + version "22.1.0" + resolved "https://registry.yarnpkg.com/eosjs/-/eosjs-22.1.0.tgz#7ac40e2f1f959fab70539c30ac8ae46c9038aa3c" + integrity sha512-Ka8KO7akC3RxNdSg/3dkGWuUWUQESTzSUzQljBdVP16UG548vmQoBqSGnZdnjlZyfcab8VOu2iEt+JjyfYc5+A== + dependencies: + bn.js "5.2.0" + elliptic "6.5.4" + hash.js "1.1.7" + pako "2.0.3" error-ex@^1.2.0, error-ex@^1.3.1: version "1.3.2" @@ -1398,17 +1329,37 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= -eslint-config-standard-jsx@8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-8.1.0.tgz#314c62a0e6f51f75547f89aade059bec140edfc7" - integrity sha512-ULVC8qH8qCqbU792ZOO6DaiaZyHNS/5CZt3hKqHkEhVlhPEPN3nfBqqxJCyp59XrjIBZPu1chMYe9T2DXZ7TMw== +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +eslint-config-prettier@^8.3.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" + integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== + +eslint-config-standard-jsx@10.0.0: + version "10.0.0" + resolved "https://registry.yarnpkg.com/eslint-config-standard-jsx/-/eslint-config-standard-jsx-10.0.0.tgz#dc24992661325a2e480e2c3091d669f19034e18d" + integrity sha512-hLeA2f5e06W1xyr/93/QJulN/rLbUVUmqTlexv9PRKHFwEC9ffJcH2LvJhMoEqYQBEYafedgGZXH2W8NUpt5lA== + +eslint-config-standard-react@^11.0.1: + version "11.0.1" + resolved "https://registry.yarnpkg.com/eslint-config-standard-react/-/eslint-config-standard-react-11.0.1.tgz#1f488e0062c1e21c4c8584551619f11750658f55" + integrity sha512-4WlBynOqBZJRaX81CBcIGDHqUiqxvw4j/DbEIICz8QkMs3xEncoPgAoysiqCSsg71X92uhaBc8sgqB96smaMmg== + +eslint-config-standard@16.0.2: + version "16.0.2" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz#71e91727ac7a203782d0a5ca4d1c462d14e234f6" + integrity sha512-fx3f1rJDsl9bY7qzyX8SAtP8GBSk6MfXFaTfaGgk12aAYW4gJSyRm7dM790L6cbXv63fvjY4XeSzXnb4WM+SKw== -eslint-config-standard@14.1.1, eslint-config-standard@^14.1.0: - version "14.1.1" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz#830a8e44e7aef7de67464979ad06b406026c56ea" - integrity sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg== +eslint-config-standard@^16.0.3: + version "16.0.3" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516" + integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg== -eslint-import-resolver-node@^0.3.2, eslint-import-resolver-node@^0.3.4: +eslint-import-resolver-node@^0.3.4: version "0.3.4" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== @@ -1416,7 +1367,7 @@ eslint-import-resolver-node@^0.3.2, eslint-import-resolver-node@^0.3.4: debug "^2.6.9" resolve "^1.13.1" -eslint-module-utils@^2.4.0, eslint-module-utils@^2.6.1: +eslint-module-utils@^2.6.0, eslint-module-utils@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233" integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A== @@ -1424,14 +1375,6 @@ eslint-module-utils@^2.4.0, eslint-module-utils@^2.6.1: debug "^3.2.7" pkg-dir "^2.0.0" -eslint-plugin-es@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-2.0.0.tgz#0f5f5da5f18aa21989feebe8a73eadefb3432976" - integrity sha512-f6fceVtg27BR02EYnBhgWLFQfK6bN4Ll0nQFrBHOlCsAyxeZkn0NHns5O0YZOPrV1B3ramd6cgFwaoFLcSkwEQ== - dependencies: - eslint-utils "^1.4.2" - regexpp "^3.0.0" - eslint-plugin-es@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz#75a7cdfdccddc0589934aeeb384175f221c57893" @@ -1440,7 +1383,7 @@ eslint-plugin-es@^3.0.0: eslint-utils "^2.0.0" regexpp "^3.0.0" -eslint-plugin-import@>=2.20.1: +eslint-plugin-import@>=2.23.4: version "2.23.4" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz#8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97" integrity sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ== @@ -1461,24 +1404,26 @@ eslint-plugin-import@>=2.20.1: resolve "^1.20.0" tsconfig-paths "^3.9.0" -eslint-plugin-import@~2.18.0: - version "2.18.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6" - integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ== +eslint-plugin-import@~2.22.1: + version "2.22.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" + integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== dependencies: - array-includes "^3.0.3" + array-includes "^3.1.1" + array.prototype.flat "^1.2.3" contains-path "^0.1.0" debug "^2.6.9" doctrine "1.5.0" - eslint-import-resolver-node "^0.3.2" - eslint-module-utils "^2.4.0" + eslint-import-resolver-node "^0.3.4" + eslint-module-utils "^2.6.0" has "^1.0.3" minimatch "^3.0.4" - object.values "^1.1.0" + object.values "^1.1.1" read-pkg-up "^2.0.0" - resolve "^1.11.0" + resolve "^1.17.0" + tsconfig-paths "^3.9.0" -eslint-plugin-node@^11.0.0: +eslint-plugin-node@^11.1.0, eslint-plugin-node@~11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz#c95544416ee4ada26740a30474eefc5402dc671d" integrity sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g== @@ -1490,19 +1435,7 @@ eslint-plugin-node@^11.0.0: resolve "^1.10.1" semver "^6.1.0" -eslint-plugin-node@~10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-node/-/eslint-plugin-node-10.0.0.tgz#fd1adbc7a300cf7eb6ac55cf4b0b6fc6e577f5a6" - integrity sha512-1CSyM/QCjs6PXaT18+zuAXsjXGIGo5Rw630rSKwokSs2jrYURQc4R5JZpoanNCqwNmepg+0eZ9L7YiRUJb8jiQ== - dependencies: - eslint-plugin-es "^2.0.0" - eslint-utils "^1.4.2" - ignore "^5.1.1" - minimatch "^3.0.4" - resolve "^1.10.1" - semver "^6.1.0" - -eslint-plugin-promise@>=4.2.1: +eslint-plugin-promise@>=5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-5.1.0.tgz#fb2188fb734e4557993733b41aa1a688f46c6f24" integrity sha512-NGmI6BH5L12pl7ScQHbg7tvtk4wPxxj8yPHH47NvSmMtFneC077PSeY3huFj06ZWZvtbfxSPt3RuOQD5XcR4ng== @@ -1512,32 +1445,47 @@ eslint-plugin-promise@~4.2.1: resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== -eslint-plugin-react@~7.14.2: - version "7.14.3" - resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.14.3.tgz#911030dd7e98ba49e1b2208599571846a66bdf13" - integrity sha512-EzdyyBWC4Uz2hPYBiEJrKCUi2Fn+BJ9B/pJQcjw5X+x/H2Nm59S4MJIvL4O5NEE0+WbnQwEBxWY03oUk+Bc3FA== +eslint-plugin-react@>=7.24.0: + version "7.24.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz#eadedfa351a6f36b490aa17f4fa9b14e842b9eb4" + integrity sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q== dependencies: - array-includes "^3.0.3" + array-includes "^3.1.3" + array.prototype.flatmap "^1.2.4" doctrine "^2.1.0" has "^1.0.3" - jsx-ast-utils "^2.1.0" - object.entries "^1.1.0" - object.fromentries "^2.0.0" - object.values "^1.1.0" + jsx-ast-utils "^2.4.1 || ^3.0.0" + minimatch "^3.0.4" + object.entries "^1.1.4" + object.fromentries "^2.0.4" + object.values "^1.1.4" prop-types "^15.7.2" - resolve "^1.10.1" + resolve "^2.0.0-next.3" + string.prototype.matchall "^4.0.5" -eslint-plugin-standard@^4.0.1: - version "4.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.1.0.tgz#0c3bf3a67e853f8bbbc580fb4945fbf16f41b7c5" - integrity sha512-ZL7+QRixjTR6/528YNGyDotyffm5OQst/sGxKDwGb9Uqs4In5Egi4+jbobhqJoyoCM6/7v/1A5fhQ7ScMtDjaQ== +eslint-plugin-react@~7.21.5: + version "7.21.5" + resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.5.tgz#50b21a412b9574bfe05b21db176e8b7b3b15bff3" + integrity sha512-8MaEggC2et0wSF6bUeywF7qQ46ER81irOdWS4QWxnnlAEsnzeBevk1sWh7fhpCghPpXb+8Ks7hvaft6L/xsR6g== + dependencies: + array-includes "^3.1.1" + array.prototype.flatmap "^1.2.3" + doctrine "^2.1.0" + has "^1.0.3" + jsx-ast-utils "^2.4.1 || ^3.0.0" + object.entries "^1.1.2" + object.fromentries "^2.0.2" + object.values "^1.1.1" + prop-types "^15.7.2" + resolve "^1.18.1" + string.prototype.matchall "^4.0.2" -eslint-plugin-standard@~4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.2.tgz#021211a9f077e63a6847e7bb9ab4247327ac8e0c" - integrity sha512-nKptN8l7jksXkwFk++PhJB3cCDTcXOEyhISIN86Ue2feJ1LFyY3PrY3/xT2keXlJSY5bpmbiTG0f885/YKAvTA== +eslint-plugin-standard@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-5.0.0.tgz#c43f6925d669f177db46f095ea30be95476b1ee4" + integrity sha512-eSIXPc9wBM4BrniMzJRBm2uoVuXz2EPa+NXPk2+itrVt+r5SbKFERx/IgrK/HmfjddyKVz2f+j+7gBRvu19xLg== -eslint-scope@^5.0.0: +eslint-scope@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== @@ -1545,41 +1493,87 @@ eslint-scope@^5.0.0: esrecurse "^4.3.0" estraverse "^4.1.1" -eslint-utils@^1.4.2, eslint-utils@^1.4.3: - version "1.4.3" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f" - integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q== - dependencies: - eslint-visitor-keys "^1.1.0" - -eslint-utils@^2.0.0: +eslint-utils@^2.0.0, eslint-utils@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== dependencies: eslint-visitor-keys "^1.1.0" -eslint-visitor-keys@^1.1.0: +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== -eslint@^6.8.0, eslint@~6.8.0: - version "6.8.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" - integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig== +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint@^7.30.0: + version "7.31.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz#f972b539424bf2604907a970860732c5d99d3aca" + integrity sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.3" + "@humanwhocodes/config-array" "^0.5.0" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + escape-string-regexp "^4.0.0" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.1.2" + globals "^13.6.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.9" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +eslint@~7.13.0: + version "7.13.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.13.0.tgz#7f180126c0dcdef327bfb54b211d7802decc08da" + integrity sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ== dependencies: "@babel/code-frame" "^7.0.0" + "@eslint/eslintrc" "^0.2.1" ajv "^6.10.0" - chalk "^2.1.0" - cross-spawn "^6.0.5" + chalk "^4.0.0" + cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" - eslint-scope "^5.0.0" - eslint-utils "^1.4.3" - eslint-visitor-keys "^1.1.0" - espree "^6.1.2" - esquery "^1.0.1" + enquirer "^2.3.5" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.0" + esquery "^1.2.0" esutils "^2.0.2" file-entry-cache "^5.0.1" functional-red-black-tree "^1.0.1" @@ -1588,40 +1582,38 @@ eslint@^6.8.0, eslint@~6.8.0: ignore "^4.0.6" import-fresh "^3.0.0" imurmurhash "^0.1.4" - inquirer "^7.0.0" is-glob "^4.0.0" js-yaml "^3.13.1" json-stable-stringify-without-jsonify "^1.0.1" - levn "^0.3.0" - lodash "^4.17.14" + levn "^0.4.1" + lodash "^4.17.19" minimatch "^3.0.4" - mkdirp "^0.5.1" natural-compare "^1.4.0" - optionator "^0.8.3" + optionator "^0.9.1" progress "^2.0.0" - regexpp "^2.0.1" - semver "^6.1.2" - strip-ansi "^5.2.0" - strip-json-comments "^3.0.1" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" table "^5.2.3" text-table "^0.2.0" v8-compile-cache "^2.0.3" -espree@^6.1.2: - version "6.2.1" - resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a" - integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw== +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== dependencies: - acorn "^7.1.1" - acorn-jsx "^5.2.0" - eslint-visitor-keys "^1.1.0" + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" 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== -esquery@^1.0.1: +esquery@^1.2.0, esquery@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== @@ -1650,14 +1642,6 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== -evp_bytestokey@^1.0.0: - version "1.0.3" - resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" - integrity sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA== - dependencies: - md5.js "^1.3.4" - safe-buffer "^5.1.1" - execa@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/execa/-/execa-0.2.2.tgz#e2ead472c2c31aad6f73f1ac956eef45e12320cb" @@ -1682,18 +1666,18 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99" - integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw== +execa@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" + integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== 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 "^3.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" @@ -1755,7 +1739,7 @@ extsprintf@^1.2.0: resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f" integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= -fast-deep-equal@^3.1.1: +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== @@ -1765,7 +1749,7 @@ fast-json-stable-stringify@^2.0.0: resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== -fast-levenshtein@~2.0.6: +fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -1785,13 +1769,6 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" -figures@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" - integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== - dependencies: - escape-string-regexp "^1.0.5" - file-entry-cache@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c" @@ -1799,6 +1776,13 @@ file-entry-cache@^5.0.1: dependencies: flat-cache "^2.0.1" +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -1811,11 +1795,6 @@ find-parent-dir@^0.3.0: resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.1.tgz#c5c385b96858c3351f95d446cab866cbf9f11125" integrity sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A== -find-root@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/find-root/-/find-root-1.1.0.tgz#abcfc8ba76f708c42a97b3d685b7e9450bfb9ce4" - integrity sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng== - find-up@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f" @@ -1855,11 +1834,24 @@ flat-cache@^2.0.1: rimraf "2.6.3" write "1.0.3" +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + flatted@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138" integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== +flatted@^3.1.0: + version "3.2.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz#bbef080d95fca6709362c73044a1634f7c6e7d05" + integrity sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg== + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -1899,7 +1891,7 @@ get-caller-file@^2.0.1: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== @@ -1918,10 +1910,10 @@ get-stdin@^4.0.1: resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe" integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4= -get-stdin@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-7.0.0.tgz#8d5de98f15171a125c5e516643c7a6d0ea8a96f6" - integrity sha512-zRKcywvrXlXsA0v0i9Io4KDRaAw7+a1ZpjRwl9Wox8PFlVCCHra7E9c4kqXCoCM9nR5tBkaTTZRBoCm60bFqTQ== +get-stdin@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-8.0.0.tgz#cbad6a73feb75f6eeb22ba9e01f89aa28aa97a53" + integrity sha512-sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg== get-stream@^3.0.0: version "3.0.0" @@ -1952,14 +1944,14 @@ giturl@^1.0.0: resolved "https://registry.yarnpkg.com/giturl/-/giturl-1.0.1.tgz#926c69bda5c48a3d8f74254e99f826835e6a4aa0" integrity sha512-wQourBdI13n8tbjcZTDl6k+ZrCRMU6p9vfp9jknZq+zfWc8xXNztpZFM4XkPHVzHcMSUZxEMYYKZjIGkPlei6Q== -glob-parent@^5.0.0: +glob-parent@^5.0.0, glob-parent@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== dependencies: is-glob "^4.0.1" -glob@7.1.7, glob@^7.0.5, glob@^7.1.3: +glob@7.1.7, glob@^7.1.3: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== @@ -2021,6 +2013,13 @@ globals@^12.1.0: dependencies: type-fest "^0.8.1" +globals@^13.6.0, globals@^13.9.0: + version "13.10.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676" + integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g== + dependencies: + type-fest "^0.20.2" + globby@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-4.1.0.tgz#080f54549ec1b82a6c60e631fc82e1211dbe95f8" @@ -2102,14 +2101,13 @@ has@^1.0.3: dependencies: function-bind "^1.1.1" -hash-base@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz#55c381d9e06e1d2997a883b4a3fddfe7f0d3af33" - integrity sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA== +hash.js@1.1.7, hash.js@^1.0.0, hash.js@^1.0.3: + version "1.1.7" + resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.7.tgz#0babca538e8d4ee4a0f8988d68866537a003cf42" + integrity sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA== dependencies: - inherits "^2.0.4" - readable-stream "^3.6.0" - safe-buffer "^5.2.0" + inherits "^2.0.3" + minimalistic-assert "^1.0.1" he@^1.1.0: version "1.2.0" @@ -2125,6 +2123,15 @@ highlight-es@^1.0.0: is-es2016-keyword "^1.0.0" js-tokens "^3.0.0" +hmac-drbg@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/hmac-drbg/-/hmac-drbg-1.0.1.tgz#d2745701025a6c775a6c545793ed502fc0c649a1" + integrity sha1-0nRXAQJabHdabFRXk+1QL8DGSaE= + dependencies: + hash.js "^1.0.3" + minimalistic-assert "^1.0.0" + minimalistic-crypto-utils "^1.0.1" + homedir-polyfill@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" @@ -2146,6 +2153,11 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" +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== + human-signals@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" @@ -2175,7 +2187,7 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.0.0, ignore@^5.1.1, ignore@^5.1.4: +ignore@^5.1.1, ignore@^5.1.4: version "5.1.8" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57" integrity sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw== @@ -2218,7 +2230,7 @@ inflight@^1.0.4: once "^1.3.0" wrappy "1" -inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4: +inherits@2, inherits@^2.0.3, inherits@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== @@ -2266,24 +2278,14 @@ inquirer@^6.1.0: strip-ansi "^5.1.0" through "^2.3.6" -inquirer@^7.0.0: - version "7.3.3" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003" - integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA== +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== dependencies: - ansi-escapes "^4.2.1" - chalk "^4.1.0" - cli-cursor "^3.1.0" - cli-width "^3.0.0" - external-editor "^3.0.3" - figures "^3.0.0" - lodash "^4.17.19" - mute-stream "0.0.8" - run-async "^2.4.0" - rxjs "^6.6.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - through "^2.3.6" + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" is-arrayish@^0.2.1: version "0.2.1" @@ -2439,9 +2441,9 @@ is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0: integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== is-string@^1.0.5, is-string@^1.0.6: version "1.0.6" @@ -2548,6 +2550,11 @@ json-schema-traverse@^0.4.1: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + json-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" @@ -2580,13 +2587,13 @@ jsprim@^1.2.2: json-schema "0.2.3" verror "1.10.0" -jsx-ast-utils@^2.1.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz#1114a4c1209481db06c690c2b4f488cc665f657e" - integrity sha512-z1xSldJ6imESSzOjd3NNkieVJKRlKYSOtMG8SFyCj2FIrvSaSuli/WjpBkEzCBoR9bYYYFgqJw61Xhu7Lcgk+w== +"jsx-ast-utils@^2.4.1 || ^3.0.0": + version "3.2.0" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82" + integrity sha512-EIsmt3O3ljsU6sot/J4E1zDRxfBNrhjyf/OKjlydwgEimQuznlM4Wv7U+ueONJMyEn1WRE0K8dhi3dVAXYT24Q== dependencies: - array-includes "^3.1.1" - object.assign "^4.1.0" + array-includes "^3.1.2" + object.assign "^4.1.2" latest-version@^3.0.0: version "3.1.0" @@ -2595,23 +2602,23 @@ latest-version@^3.0.0: dependencies: package-json "^4.0.0" -levn@^0.3.0, levn@~0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" - integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4= +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== dependencies: - prelude-ls "~1.1.2" - type-check "~0.3.2" + prelude-ls "^1.2.1" + type-check "~0.4.0" 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" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -lint-staged@>=10: - version "11.0.1" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.0.1.tgz#1b8ae8ed5a52ed87252db95fe008c2618c85f55a" - integrity sha512-RkTA1ulE6jAGFskxpGAwxfVRXjHp7D9gFg/+KMARUWMPiVFP0t28Em2u0gL8sA0w3/ck3TC57F2v2RNeQ5XPnw== +lint-staged@>=11: + version "11.1.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.1.1.tgz#9c2018b872654cf80b2b1ff5a10b6b74aef6e300" + integrity sha512-eTNGe6i78PSUUH2BZi1gZmGmNfb8IeN4z2OzMYxSZ1qnP1WXKn1E7D+OHwLbRDm/wQINnzIj0bsKJ6lLVSuZiQ== dependencies: chalk "^4.1.1" cli-truncate "^2.1.0" @@ -2649,9 +2656,9 @@ lint@^0.7.0: write-yaml "^1.0.0" listr2@^3.8.2: - version "3.10.0" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.10.0.tgz#58105a53ed7fa1430d1b738c6055ef7bb006160f" - integrity sha512-eP40ZHihu70sSmqFNbNy2NL1YwImmlMmPh9WO5sLmPDleurMHt3n+SwEWNu2kzKScexZnkyFtc1VI0z/TGlmpw== + version "3.11.0" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.11.0.tgz#9771b02407875aa78e73d6e0ff6541bbec0aaee9" + integrity sha512-XLJVe2JgXCyQTa3FbSv11lkKExYmEyA4jltVo8z4FX10Vt1Yj8IMekBfwim0BSOM9uj1QMTJvDQQpHyuPbB/dQ== dependencies: cli-truncate "^2.1.0" colorette "^1.2.2" @@ -2741,11 +2748,26 @@ locate-path@^5.0.0: 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" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + lodash.toarray@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" integrity sha1-JMS/zWsvuji/0FlNsRedjptlZWE= +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + lodash@4.17.21, "lodash@4.6.1 || ^4.16.1", lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.3.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -2776,11 +2798,6 @@ log-update@^4.0.0: slice-ansi "^4.0.0" wrap-ansi "^6.2.0" -long@~3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b" - integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s= - loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" @@ -2814,6 +2831,13 @@ lru-cache@^4.0.0, lru-cache@^4.0.1: pseudomap "^1.0.2" yallist "^2.1.2" +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + make-dir@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -2826,7 +2850,7 @@ map-obj@^1.0.0, map-obj@^1.0.1: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d" integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0= -massive@^6.2.0: +massive@^6.9.1: version "6.10.0" resolved "https://registry.yarnpkg.com/massive/-/massive-6.10.0.tgz#1d22853672de527e0ebb4c9afb376915d5d6025a" integrity sha512-k30P9qc06MrBXIQc8noSIFN4HiJnMAkMRpfgEtDmyfrRsektey+UJU6/QNdETnQNBJcSHvnaJBCKhAZY4Z4Ufg== @@ -2838,15 +2862,6 @@ massive@^6.2.0: pg-promise "^10.10.2" pg-query-stream "^4.1.0" -md5.js@^1.3.4: - version "1.3.5" - resolved "https://registry.yarnpkg.com/md5.js/-/md5.js-1.3.5.tgz#b5d07b8e3216e3e27cd728d72f70d1e6a342005f" - integrity sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg== - dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" - safe-buffer "^5.1.2" - meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" @@ -2876,11 +2891,16 @@ micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.48.0, mime-db@1.x.x: +mime-db@1.48.0: version "1.48.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== +mime-db@1.x.x: + version "1.49.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" + integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== + mime-types@^2.1.12, mime-types@~2.1.19: version "2.1.31" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" @@ -2898,6 +2918,16 @@ mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== + +minimalistic-crypto-utils@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a" + integrity sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo= + "minimatch@2 || 3", minimatch@^3.0.2, minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" @@ -2905,7 +2935,7 @@ mimic-fn@^2.1.0: dependencies: brace-expansion "^1.1.7" -minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: +minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== @@ -2922,7 +2952,7 @@ moment@^2.22.2: resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3" integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ== -mri@^1.1.4: +mri@^1.1.5: version "1.1.6" resolved "https://registry.yarnpkg.com/mri/-/mri-1.1.6.tgz#49952e1044db21dbf90f6cd92bc9c9a777d415a6" integrity sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ== @@ -2968,21 +2998,11 @@ mute-stream@0.0.7: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab" integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s= -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= -nice-try@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366" - integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ== - no-case@^2.2.0: version "2.3.2" resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" @@ -3005,7 +3025,7 @@ node-fetch@^1.0.1: encoding "^0.1.11" is-stream "^1.0.1" -node-fetch@^2.6.0: +node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== @@ -3078,14 +3098,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npm-run-path@^3.0.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5" - integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg== - dependencies: - path-key "^3.0.0" - -npm-run-path@^4.0.1: +npm-run-path@^4.0.0, npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -3107,7 +3120,7 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -object-inspect@^1.10.3: +object-inspect@^1.10.3, object-inspect@^1.9.0: version "1.11.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== @@ -3117,7 +3130,7 @@ object-keys@^1.0.12, object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object.assign@^4.1.0, object.assign@^4.1.2: +object.assign@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940" integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ== @@ -3127,7 +3140,7 @@ object.assign@^4.1.0, object.assign@^4.1.2: has-symbols "^1.0.1" object-keys "^1.1.1" -object.entries@^1.1.0: +object.entries@^1.1.2, object.entries@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.4.tgz#43ccf9a50bc5fd5b649d45ab1a579f24e088cafd" integrity sha512-h4LWKWE+wKQGhtMjZEBud7uLGhqyLwj8fpHOarZhD2uY3C9cRtk57VQ89ke3moByLXMedqs3XCHzyb4AmA2DjA== @@ -3136,7 +3149,7 @@ object.entries@^1.1.0: define-properties "^1.1.3" es-abstract "^1.18.2" -object.fromentries@^2.0.0: +object.fromentries@^2.0.2, object.fromentries@^2.0.4: version "2.0.4" resolved "https://registry.yarnpkg.com/object.fromentries/-/object.fromentries-2.0.4.tgz#26e1ba5c4571c5c6f0890cef4473066456a120b8" integrity sha512-EsFBshs5RUUpQEY1D4q/m59kMfz4YJvxuNCJcv/jWwOJr34EaVnG11ZrZa0UHB3wnzV1wx8m58T4hQL8IuNXlQ== @@ -3146,7 +3159,7 @@ object.fromentries@^2.0.0: es-abstract "^1.18.0-next.2" has "^1.0.3" -object.values@^1.1.0, object.values@^1.1.3: +object.values@^1.1.1, object.values@^1.1.3, object.values@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30" integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg== @@ -3181,17 +3194,17 @@ onetime@^5.1.0, onetime@^5.1.2: dependencies: mimic-fn "^2.1.0" -optionator@^0.8.3: - version "0.8.3" - resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495" - integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA== +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== dependencies: - deep-is "~0.1.3" - fast-levenshtein "~2.0.6" - levn "~0.3.0" - prelude-ls "~1.1.2" - type-check "~0.3.2" - word-wrap "~1.2.3" + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" ora@^0.2.1: version "0.2.3" @@ -3225,11 +3238,6 @@ p-finally@^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" @@ -3297,6 +3305,11 @@ packet-reader@1.0.0: resolved "https://registry.yarnpkg.com/packet-reader/-/packet-reader-1.0.0.tgz#9238e5480dedabacfe1fe3f2771063f164157d74" integrity sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ== +pako@2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.3.tgz#cdf475e31b678565251406de9e759196a0ea7a43" + integrity sha512-WjR1hOeg+kki3ZIOjaf4b5WVcay1jaliKSYiEaB1XzwhMQZJxRdQRv0V31EKBYlxb4T7SK3hjfc/jxyU64BoSw== + parent-module@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" @@ -3366,7 +3379,7 @@ path-key@^1.0.0: resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af" integrity sha1-XVPVeAGWRsDWiADbThRua9wqx68= -path-key@^2.0.0, path-key@^2.0.1: +path-key@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40" integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A= @@ -3532,15 +3545,6 @@ pkg-conf@^3.1.0: find-up "^3.0.0" load-json-file "^5.2.0" -pkg-config@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/pkg-config/-/pkg-config-1.1.1.tgz#557ef22d73da3c8837107766c52eadabde298fe4" - integrity sha1-VX7yLXPaPIg3EHdmxS6tq94pj+Q= - dependencies: - debug-log "^1.0.0" - find-root "^1.0.0" - xtend "^4.0.1" - pkg-dir@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4" @@ -3599,31 +3603,36 @@ preferred-pm@^1.0.1: path-exists "^3.0.0" which-pm "^1.0.1" -prelude-ls@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" - integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== prepend-http@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prettier@^1.15.3, prettier@^1.19.1: +prettier@^1.15.3: version "1.19.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb" integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew== -pretty-quick@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-2.0.2.tgz#4e44d6489ed513ef111bee501f63688d854584e6" - integrity sha512-aLb6vtOTEfJDwi1w+MBTeE20GwPVUYyn6IqNg6TtGpiOB1W3y6vKcsGFjqGeaaEtQgMLSPXTWONqh33UBuwG8A== +prettier@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" + integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== + +pretty-quick@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.1.1.tgz#93ca4e2dd38cc4e970e3f54a0ead317a25454688" + integrity sha512-ZYLGiMoV2jcaas3vTJrLvKAYsxDoXQBUn8OSTxkl67Fyov9lyXivJTl0+2WVh+y6EovGcw7Lm5ThYpH+Sh3XxQ== dependencies: - chalk "^2.4.2" - execa "^2.1.0" + chalk "^3.0.0" + execa "^4.0.0" find-up "^4.1.0" ignore "^5.1.4" - mri "^1.1.4" + mri "^1.1.5" multimatch "^4.0.0" progress@^2.0.0: @@ -3668,18 +3677,6 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== -queue-microtask@^1.2.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" - integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== - -randombytes@2.0.5: - version "2.0.5" - resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.0.5.tgz#dc009a246b8d09a177b4b7a0ae77bc570f4b1b79" - integrity sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg== - dependencies: - safe-buffer "^5.1.0" - rc@^1.0.1, rc@^1.1.6: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" @@ -3777,17 +3774,15 @@ regenerator-runtime@^0.11.0: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9" integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== -regenerator-runtime@^0.13.2: - version "0.13.7" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" - integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== - -regexpp@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" - integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== +regexp.prototype.flags@^1.3.1: + version "1.3.1" + resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.3.1.tgz#7ef352ae8d159e758c0eadca6f8fcb4eef07be26" + integrity sha512-JiBdRBq91WlY7uRJ0ds7R+dU02i6LKi8r3BuQhNXn+kmeLN+EfHhfjqMRis1zJxnlu88hq/4dx0P2OP3APRTOA== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" -regexpp@^3.0.0: +regexpp@^3.0.0, regexpp@^3.1.0: version "3.2.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== @@ -3830,7 +3825,7 @@ request-promise-core@1.1.4: dependencies: lodash "^4.17.19" -request-promise@^4.2.5: +request-promise@^4.2.6: version "4.2.6" resolved "https://registry.yarnpkg.com/request-promise/-/request-promise-4.2.6.tgz#7e7e5b9578630e6f598e3813c0f8eb342a27f0a2" integrity sha512-HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ== @@ -3871,6 +3866,11 @@ require-directory@^2.1.1: resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I= +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + require-main-filename@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b" @@ -3894,7 +3894,7 @@ resolve-from@^4.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== -resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.13.1, resolve@^1.20.0: +resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.20.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -3902,6 +3902,14 @@ resolve@^1.10.0, resolve@^1.10.1, resolve@^1.11.0, resolve@^1.13.1, resolve@^1.2 is-core-module "^2.2.0" path-parse "^1.0.6" +resolve@^2.0.0-next.3: + version "2.0.0-next.3" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-2.0.0-next.3.tgz#d41016293d4a8586a39ca5d9b5f15cbea1f55e46" + integrity sha512-W8LucSynKUIDu9ylraa7ueVZ7hc0uAgJBxVsQSKOXOyle8a93qXhcz+XAXZ8bIq2d6i4Ehddn6Evt+0/UwKk6Q== + dependencies: + is-core-module "^2.2.0" + path-parse "^1.0.6" + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -3933,13 +3941,12 @@ rimraf@2.6.3: 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" - integrity sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA== +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== dependencies: - hash-base "^3.0.0" - inherits "^2.0.1" + glob "^7.1.3" run-async@^0.1.0: version "0.1.0" @@ -3948,31 +3955,24 @@ run-async@^0.1.0: dependencies: once "^1.3.0" -run-async@^2.2.0, run-async@^2.4.0: +run-async@^2.2.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== -run-parallel@^1.1.2: - version "1.2.0" - resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" - integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== - dependencies: - queue-microtask "^1.2.2" - rx-lite@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102" integrity sha1-Gc5QLKVyZl87ZHsQk5+X/RYV8QI= -rxjs@^6.4.0, rxjs@^6.6.0, rxjs@^6.6.7: +rxjs@^6.4.0, rxjs@^6.6.7: version "6.6.7" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9" integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ== dependencies: tslib "^1.9.0" -safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: +safe-buffer@^5.0.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -3994,29 +3994,28 @@ semver-diff@^2.0.0: dependencies: semver "^5.0.3" -"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0, semver@^5.5.0: +"semver@2 || 3 || 4 || 5", semver@^5.0.1, semver@^5.0.3, semver@^5.1.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== -semver@^6.1.0, semver@^6.1.2: +semver@^6.1.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.2.1: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + set-blocking@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7" integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc= -sha.js@^2.4.0, sha.js@^2.4.8: - version "2.4.11" - resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" - integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ== - dependencies: - inherits "^2.0.1" - safe-buffer "^5.0.1" - shebang-command@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea" @@ -4041,6 +4040,15 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== +side-channel@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" + integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw== + dependencies: + call-bind "^1.0.0" + get-intrinsic "^1.0.2" + object-inspect "^1.9.0" + signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" @@ -4080,17 +4088,17 @@ slice-ansi@^4.0.0: astral-regex "^2.0.0" is-fullwidth-code-point "^3.0.0" -snazzy@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/snazzy/-/snazzy-8.0.0.tgz#97a6d4173d03f6549b98a9dd88362765fac0ef88" - integrity sha512-59GS69hQD8FvJoNGeDz8aZtbYhkCFxCPQB1BFzAWiVVwPmS/J6Vjaku0k6tGNsdSxQ0kAlButdkn8bPR2hLcBw== +snazzy@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/snazzy/-/snazzy-9.0.0.tgz#663639d059efd96c89f2aa63272acfacc5feda1f" + integrity sha512-8QZmJb11OiYaUP90Nnjqcj/LEpO8CLgChnP87Wqjv5tNB4djwHaz27VO2usSRR0NmViapeGW04p0aWAMhxxLXg== dependencies: - chalk "^2.3.0" - inherits "^2.0.1" - minimist "^1.1.1" - readable-stream "^3.0.2" - standard-json "^1.0.0" - strip-ansi "^4.0.0" + chalk "^4.1.0" + inherits "^2.0.4" + minimist "^1.2.5" + readable-stream "^3.6.0" + standard-json "^1.1.0" + strip-ansi "^6.0.0" text-table "^0.2.0" source-map@^0.5.0: @@ -4161,37 +4169,36 @@ stackframe@^0.3.1: resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-0.3.1.tgz#33aa84f1177a5548c8935533cbfeb3420975f5a4" integrity sha1-M6qE8Rd6VUjIk1Uzy/6zQgl19aQ= -standard-engine@^12.0.0: - version "12.1.0" - resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-12.1.0.tgz#b13dbae583de54c06805207b991ef48a582c0e62" - integrity sha512-DVJnWM1CGkag4ucFLGdiYWa5/kJURPONmMmk17p8FT5NE4UnPZB1vxWnXnRo2sPSL78pWJG8xEM+1Tu19z0deg== +standard-engine@^14.0.1: + version "14.0.1" + resolved "https://registry.yarnpkg.com/standard-engine/-/standard-engine-14.0.1.tgz#fe568e138c3d9768fc59ff81001f7049908a8156" + integrity sha512-7FEzDwmHDOGva7r9ifOzD3BGdTbA7ujJ50afLVdW/tK14zQEptJjbFuUfn50irqdHDcTbNh0DTIoMPynMCXb0Q== dependencies: - deglob "^4.0.1" - get-stdin "^7.0.0" + get-stdin "^8.0.0" minimist "^1.2.5" pkg-conf "^3.1.0" + xdg-basedir "^4.0.0" -standard-json@^1.0.0: +standard-json@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/standard-json/-/standard-json-1.1.0.tgz#33ac0d2eccaddb0556f5ae28c43a35624cf1fb25" integrity sha512-nkonX+n5g3pyVBvJZmvRlFtT/7JyLbNh4CtrYC3Qfxihgs8PKX52f6ONKQXORStuBWJ5PI83EUrNXme7LKfiTQ== dependencies: concat-stream "^2.0.0" -standard@^14.3.1: - version "14.3.4" - resolved "https://registry.yarnpkg.com/standard/-/standard-14.3.4.tgz#748e80e8cd7b535844a85a12f337755a7e3a0f6e" - integrity sha512-+lpOkFssMkljJ6eaILmqxHQ2n4csuEABmcubLTb9almFi1ElDzXb1819fjf/5ygSyePCq4kU2wMdb2fBfb9P9Q== +standard@^16.0.3: + version "16.0.3" + resolved "https://registry.yarnpkg.com/standard/-/standard-16.0.3.tgz#a854c0dd2dea6b9f0b8d20c65260210bd0cee619" + integrity sha512-70F7NH0hSkNXosXRltjSv6KpTAOkUkSfyu3ynyM5dtRUiLtR+yX9EGZ7RKwuGUqCJiX/cnkceVM6HTZ4JpaqDg== dependencies: - eslint "~6.8.0" - eslint-config-standard "14.1.1" - eslint-config-standard-jsx "8.1.0" - eslint-plugin-import "~2.18.0" - eslint-plugin-node "~10.0.0" + eslint "~7.13.0" + eslint-config-standard "16.0.2" + eslint-config-standard-jsx "10.0.0" + eslint-plugin-import "~2.22.1" + eslint-plugin-node "~11.1.0" eslint-plugin-promise "~4.2.1" - eslint-plugin-react "~7.14.2" - eslint-plugin-standard "~4.0.0" - standard-engine "^12.0.0" + eslint-plugin-react "~7.21.5" + standard-engine "^14.0.1" stealthy-require@^1.1.1: version "1.1.1" @@ -4238,6 +4245,20 @@ string-width@^4.1.0, string-width@^4.2.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.0" +string.prototype.matchall@^4.0.2, string.prototype.matchall@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.5.tgz#59370644e1db7e4c0c045277690cf7b01203c4da" + integrity sha512-Z5ZaXO0svs0M2xd/6By3qpeKpLKd9mO4v4q3oMEQrk8Ck4xOD5d5XeBOOjGrmVZZ/AHB1S0CgG4N5r1G9N3E2Q== + dependencies: + call-bind "^1.0.2" + define-properties "^1.1.3" + es-abstract "^1.18.2" + get-intrinsic "^1.1.1" + has-symbols "^1.0.2" + internal-slot "^1.0.3" + regexp.prototype.flags "^1.3.1" + side-channel "^1.0.4" + string.prototype.trimend@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80" @@ -4327,7 +4348,7 @@ strip-indent@^1.0.1: dependencies: get-stdin "^4.0.1" -strip-json-comments@^3.0.1: +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== @@ -4366,6 +4387,18 @@ table@^5.2.3: slice-ansi "^2.1.0" string-width "^3.0.0" +table@^6.0.9: + version "6.7.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" + integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== + dependencies: + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.0" + strip-ansi "^6.0.0" + term-size@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69" @@ -4373,11 +4406,6 @@ term-size@^1.2.0: dependencies: execa "^0.7.0" -text-encoding@0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/text-encoding/-/text-encoding-0.7.0.tgz#f895e836e45990624086601798ea98e8f36ee643" - integrity sha512-oJQ3f1hrOnbRLOcwKz0Liq2IcrvDeZRHXhd9RgLrsT+DjWY/nty1Hi7v3dtkaEYbPYe0mUoOfzRrMwfXXwgPUA== - text-table@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" @@ -4456,12 +4484,17 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= -type-check@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" - integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I= +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== dependencies: - prelude-ls "~1.1.2" + prelude-ls "^1.2.1" + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== type-fest@^0.21.3: version "0.21.3" @@ -4493,11 +4526,6 @@ unbox-primitive@^1.0.1: has-symbols "^1.0.2" which-boxed-primitive "^1.0.2" -uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= - unique-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" @@ -4647,7 +4675,7 @@ widest-line@^2.0.0: dependencies: string-width "^2.1.1" -word-wrap@~1.2.3: +word-wrap@^1.2.3: version "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== @@ -4722,6 +4750,11 @@ xdg-basedir@^3.0.0: resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= +xdg-basedir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== + xtend@^4.0.0, xtend@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" @@ -4737,6 +4770,11 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + yaml@^1.10.0: version "1.10.2" resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b" diff --git a/services/hasura/Dockerfile b/hasura/Dockerfile similarity index 92% rename from services/hasura/Dockerfile rename to hasura/Dockerfile index 41707eea..d12cae7b 100644 --- a/services/hasura/Dockerfile +++ b/hasura/Dockerfile @@ -1,4 +1,4 @@ -FROM hasura/graphql-engine:v1.3.3.cli-migrations-v2 +FROM hasura/graphql-engine:v2.0.3.cli-migrations-v2 ARG hasura_graphql_migrations_dir ARG hasura_graphql_metadata_dir diff --git a/hasura/config.yaml b/hasura/config.yaml new file mode 100644 index 00000000..3d5c67ad --- /dev/null +++ b/hasura/config.yaml @@ -0,0 +1,19 @@ +version: 3 +endpoint: http://localhost:8080/ +api_paths: + v1_query: v1/query + v2_query: v2/query + v1_metadata: v1/metadata + graphql: v1/graphql + config: v1alpha1/config + pg_dump: v1alpha1/pg_dump + version: v1/version +metadata_directory: metadata +migrations_directory: migrations +seeds_directory: seeds +actions: + kind: synchronous + handler_webhook_baseurl: http://localhost:3000 + codegen: + framework: "" + output_dir: "" diff --git a/services/hasura/makefile b/hasura/makefile similarity index 97% rename from services/hasura/makefile rename to hasura/makefile index 6c8caf0b..3db4beff 100644 --- a/services/hasura/makefile +++ b/hasura/makefile @@ -1,4 +1,4 @@ -include ../../utils/meta.mk +include ../utils/meta.mk LATEST_TAG ?= latest diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql new file mode 100644 index 00000000..139597f9 --- /dev/null +++ b/hasura/metadata/actions.graphql @@ -0,0 +1,2 @@ + + diff --git a/hasura/metadata/actions.yaml b/hasura/metadata/actions.yaml new file mode 100644 index 00000000..1edb4c2f --- /dev/null +++ b/hasura/metadata/actions.yaml @@ -0,0 +1,6 @@ +actions: [] +custom_types: + enums: [] + input_objects: [] + objects: [] + scalars: [] diff --git a/services/hasura/metadata/allow_list.yaml b/hasura/metadata/allow_list.yaml similarity index 100% rename from services/hasura/metadata/allow_list.yaml rename to hasura/metadata/allow_list.yaml diff --git a/services/hasura/metadata/functions.yaml b/hasura/metadata/cron_triggers.yaml similarity index 100% rename from services/hasura/metadata/functions.yaml rename to hasura/metadata/cron_triggers.yaml diff --git a/hasura/metadata/databases/databases.yaml b/hasura/metadata/databases/databases.yaml new file mode 100644 index 00000000..e0f5d8a9 --- /dev/null +++ b/hasura/metadata/databases/databases.yaml @@ -0,0 +1,15 @@ +- name: default + kind: postgres + configuration: + connection_info: + database_url: + from_env: HASURA_GRAPHQL_DATABASE_URL + isolation_level: read-committed + pool_settings: + connection_lifetime: 600 + idle_timeout: 180 + max_connections: 50 + retries: 1 + use_prepared_statements: true + tables: "!include default/tables/tables.yaml" + functions: "!include default/functions/functions.yaml" diff --git a/services/hasura/metadata/query_collections.yaml b/hasura/metadata/databases/default/functions/functions.yaml similarity index 100% rename from services/hasura/metadata/query_collections.yaml rename to hasura/metadata/databases/default/functions/functions.yaml diff --git a/hasura/metadata/databases/default/tables/public_producers.yaml b/hasura/metadata/databases/default/tables/public_producers.yaml new file mode 100644 index 00000000..942d9243 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_producers.yaml @@ -0,0 +1,3 @@ +table: + name: producers + schema: public diff --git a/hasura/metadata/databases/default/tables/public_producers_list.yaml b/hasura/metadata/databases/default/tables/public_producers_list.yaml new file mode 100644 index 00000000..6be1900e --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_producers_list.yaml @@ -0,0 +1,3 @@ +table: + name: producers_list + schema: public diff --git a/hasura/metadata/databases/default/tables/public_proxies.yaml b/hasura/metadata/databases/default/tables/public_proxies.yaml new file mode 100644 index 00000000..6a3c96c4 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_proxies.yaml @@ -0,0 +1,3 @@ +table: + name: proxies + schema: public diff --git a/hasura/metadata/databases/default/tables/public_ratings_stats.yaml b/hasura/metadata/databases/default/tables/public_ratings_stats.yaml new file mode 100644 index 00000000..1aa10c1f --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_ratings_stats.yaml @@ -0,0 +1,3 @@ +table: + name: ratings_stats + schema: public diff --git a/hasura/metadata/databases/default/tables/public_user_ratings.yaml b/hasura/metadata/databases/default/tables/public_user_ratings.yaml new file mode 100644 index 00000000..d01ce050 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_user_ratings.yaml @@ -0,0 +1,3 @@ +table: + name: user_ratings + schema: public diff --git a/hasura/metadata/databases/default/tables/tables.yaml b/hasura/metadata/databases/default/tables/tables.yaml new file mode 100644 index 00000000..e3fc7110 --- /dev/null +++ b/hasura/metadata/databases/default/tables/tables.yaml @@ -0,0 +1,5 @@ +- "!include public_producers.yaml" +- "!include public_producers_list.yaml" +- "!include public_proxies.yaml" +- "!include public_ratings_stats.yaml" +- "!include public_user_ratings.yaml" diff --git a/services/hasura/metadata/remote_schemas.yaml b/hasura/metadata/inherited_roles.yaml similarity index 100% rename from services/hasura/metadata/remote_schemas.yaml rename to hasura/metadata/inherited_roles.yaml diff --git a/services/hasura/migrations/1548725474630_create_producers.down.yaml b/hasura/metadata/query_collections.yaml similarity index 100% rename from services/hasura/migrations/1548725474630_create_producers.down.yaml rename to hasura/metadata/query_collections.yaml diff --git a/services/hasura/migrations/1548730845804_create_producer_ratings.down.yaml b/hasura/metadata/remote_schemas.yaml similarity index 100% rename from services/hasura/migrations/1548730845804_create_producer_ratings.down.yaml rename to hasura/metadata/remote_schemas.yaml diff --git a/services/hasura/migrations/1548732282821_create_producers_list.down.yaml b/hasura/metadata/rest_endpoints.yaml similarity index 100% rename from services/hasura/migrations/1548732282821_create_producers_list.down.yaml rename to hasura/metadata/rest_endpoints.yaml diff --git a/hasura/metadata/version.yaml b/hasura/metadata/version.yaml new file mode 100644 index 00000000..0a70affa --- /dev/null +++ b/hasura/metadata/version.yaml @@ -0,0 +1 @@ +version: 3 diff --git a/services/hasura/migrations/1580686687967_add_ratings_table/down.yaml b/hasura/migrations/default/1548725474630_create_producers.down.yaml similarity index 100% rename from services/hasura/migrations/1580686687967_add_ratings_table/down.yaml rename to hasura/migrations/default/1548725474630_create_producers.down.yaml diff --git a/services/hasura/migrations/1548725474630_create_producers.up.sql b/hasura/migrations/default/1548725474630_create_producers.up.sql similarity index 100% rename from services/hasura/migrations/1548725474630_create_producers.up.sql rename to hasura/migrations/default/1548725474630_create_producers.up.sql diff --git a/services/hasura/migrations/1580754206808_add_extra_data/down.yaml b/hasura/migrations/default/1548730845804_create_producer_ratings.down.yaml similarity index 100% rename from services/hasura/migrations/1580754206808_add_extra_data/down.yaml rename to hasura/migrations/default/1548730845804_create_producer_ratings.down.yaml diff --git a/services/hasura/migrations/1548730845804_create_producer_ratings.up.sql b/hasura/migrations/default/1548730845804_create_producer_ratings.up.sql similarity index 100% rename from services/hasura/migrations/1548730845804_create_producer_ratings.up.sql rename to hasura/migrations/default/1548730845804_create_producer_ratings.up.sql diff --git a/services/hasura/migrations/1581704802407_join_producer_ratings_stats/down.yaml b/hasura/migrations/default/1548732282821_create_producers_list.down.yaml similarity index 100% rename from services/hasura/migrations/1581704802407_join_producer_ratings_stats/down.yaml rename to hasura/migrations/default/1548732282821_create_producers_list.down.yaml diff --git a/services/hasura/migrations/1548732282821_create_producers_list.up.sql b/hasura/migrations/default/1548732282821_create_producers_list.up.sql similarity index 100% rename from services/hasura/migrations/1548732282821_create_producers_list.up.sql rename to hasura/migrations/default/1548732282821_create_producers_list.up.sql diff --git a/services/hasura/migrations/1583531471259_add_ratings_cntr_column/down.yaml b/hasura/migrations/default/1580686687967_add_ratings_table/down.yaml similarity index 100% rename from services/hasura/migrations/1583531471259_add_ratings_cntr_column/down.yaml rename to hasura/migrations/default/1580686687967_add_ratings_table/down.yaml diff --git a/services/hasura/migrations/1580686687967_add_ratings_table/up.sql b/hasura/migrations/default/1580686687967_add_ratings_table/up.sql similarity index 100% rename from services/hasura/migrations/1580686687967_add_ratings_table/up.sql rename to hasura/migrations/default/1580686687967_add_ratings_table/up.sql diff --git a/services/hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql b/hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql similarity index 100% rename from services/hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql rename to hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql diff --git a/services/hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql b/hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql similarity index 100% rename from services/hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql rename to hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql diff --git a/services/hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql b/hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql similarity index 100% rename from services/hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql rename to hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql diff --git a/services/hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql b/hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql similarity index 100% rename from services/hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql rename to hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql diff --git a/services/hasura/migrations/1583953599516_add_general_info_column/down.yaml b/hasura/migrations/default/1580754206808_add_extra_data/down.yaml similarity index 100% rename from services/hasura/migrations/1583953599516_add_general_info_column/down.yaml rename to hasura/migrations/default/1580754206808_add_extra_data/down.yaml diff --git a/services/hasura/migrations/1580754206808_add_extra_data/up.sql b/hasura/migrations/default/1580754206808_add_extra_data/up.sql similarity index 100% rename from services/hasura/migrations/1580754206808_add_extra_data/up.sql rename to hasura/migrations/default/1580754206808_add_extra_data/up.sql diff --git a/services/hasura/migrations/1580754274249_rename_table_public_ratings/down.sql b/hasura/migrations/default/1580754274249_rename_table_public_ratings/down.sql similarity index 100% rename from services/hasura/migrations/1580754274249_rename_table_public_ratings/down.sql rename to hasura/migrations/default/1580754274249_rename_table_public_ratings/down.sql diff --git a/services/hasura/migrations/1580754274249_rename_table_public_ratings/up.sql b/hasura/migrations/default/1580754274249_rename_table_public_ratings/up.sql similarity index 100% rename from services/hasura/migrations/1580754274249_rename_table_public_ratings/up.sql rename to hasura/migrations/default/1580754274249_rename_table_public_ratings/up.sql diff --git a/hasura/migrations/default/1581704802407_join_producer_ratings_stats/down.yaml b/hasura/migrations/default/1581704802407_join_producer_ratings_stats/down.yaml new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/hasura/migrations/default/1581704802407_join_producer_ratings_stats/down.yaml @@ -0,0 +1 @@ +[] diff --git a/services/hasura/migrations/1581704802407_join_producer_ratings_stats/up.sql b/hasura/migrations/default/1581704802407_join_producer_ratings_stats/up.sql similarity index 100% rename from services/hasura/migrations/1581704802407_join_producer_ratings_stats/up.sql rename to hasura/migrations/default/1581704802407_join_producer_ratings_stats/up.sql diff --git a/services/hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql b/hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql similarity index 100% rename from services/hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql rename to hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql diff --git a/services/hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql b/hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql similarity index 100% rename from services/hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql rename to hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql diff --git a/services/hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql b/hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql similarity index 100% rename from services/hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql rename to hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql diff --git a/services/hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql b/hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql similarity index 100% rename from services/hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql rename to hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql diff --git a/services/hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/down.sql b/hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/down.sql similarity index 100% rename from services/hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/down.sql rename to hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/down.sql diff --git a/services/hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/up.sql b/hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/up.sql similarity index 100% rename from services/hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/up.sql rename to hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/up.sql diff --git a/services/hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql b/hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql similarity index 100% rename from services/hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql rename to hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql diff --git a/services/hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql b/hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql similarity index 100% rename from services/hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql rename to hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql diff --git a/services/hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql b/hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql similarity index 100% rename from services/hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql rename to hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql diff --git a/services/hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql b/hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql similarity index 100% rename from services/hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql rename to hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql diff --git a/hasura/migrations/default/1583531471259_add_ratings_cntr_column/down.yaml b/hasura/migrations/default/1583531471259_add_ratings_cntr_column/down.yaml new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/hasura/migrations/default/1583531471259_add_ratings_cntr_column/down.yaml @@ -0,0 +1 @@ +[] diff --git a/services/hasura/migrations/1583531471259_add_ratings_cntr_column/up.sql b/hasura/migrations/default/1583531471259_add_ratings_cntr_column/up.sql similarity index 100% rename from services/hasura/migrations/1583531471259_add_ratings_cntr_column/up.sql rename to hasura/migrations/default/1583531471259_add_ratings_cntr_column/up.sql diff --git a/hasura/migrations/default/1583953599516_add_general_info_column/down.yaml b/hasura/migrations/default/1583953599516_add_general_info_column/down.yaml new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/hasura/migrations/default/1583953599516_add_general_info_column/down.yaml @@ -0,0 +1 @@ +[] diff --git a/services/hasura/migrations/1583953599516_add_general_info_column/up.sql b/hasura/migrations/default/1583953599516_add_general_info_column/up.sql similarity index 100% rename from services/hasura/migrations/1583953599516_add_general_info_column/up.sql rename to hasura/migrations/default/1583953599516_add_general_info_column/up.sql diff --git a/services/hasura/migrations/1584293813117_create_table_public_proxies/down.sql b/hasura/migrations/default/1584293813117_create_table_public_proxies/down.sql similarity index 100% rename from services/hasura/migrations/1584293813117_create_table_public_proxies/down.sql rename to hasura/migrations/default/1584293813117_create_table_public_proxies/down.sql diff --git a/services/hasura/migrations/1584293813117_create_table_public_proxies/up.sql b/hasura/migrations/default/1584293813117_create_table_public_proxies/up.sql similarity index 100% rename from services/hasura/migrations/1584293813117_create_table_public_proxies/up.sql rename to hasura/migrations/default/1584293813117_create_table_public_proxies/up.sql diff --git a/kubernetes/configmaps.yaml b/kubernetes/configmaps.yaml index e6c94067..32790bf7 100644 --- a/kubernetes/configmaps.yaml +++ b/kubernetes/configmaps.yaml @@ -15,17 +15,17 @@ metadata: name: hapi-config data: # hapi - POSTGRES_HOST: "${POSTGRES_HOST}" - POSTGRES_DB: "${POSTGRES_DB}" - POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" - POSTGRES_PORT: "${POSTGRES_PORT}" - POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" - POSTGRES_USER: "${POSTGRES_USER}" - EOS_API_ENDPOINT: "${EOS_API_ENDPOINT}" + HAPI_POSTGRES_HOST: "${POSTGRES_HOST}" + HAPI_POSTGRES_DB: "${POSTGRES_DB}" + HAPI_POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" + HAPI_POSTGRES_PORT: "${POSTGRES_PORT}" + HAPI_POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" + HAPI_POSTGRES_USER: "${POSTGRES_USER}" + HAPI_EOS_API_ENDPOINT: "${HAPI_EOS_API_ENDPOINT}" HAPI_SERVER_ADDRESS: "${HAPI_SERVER_ADDRESS}" HAPI_SERVER_PORT: "${HAPI_SERVER_PORT}" - PROXY_INFO_CONTRACT_CODE: "${PROXY_INFO_CONTRACT_CODE}" - PROXY_INFO_CONTRACT_SCOPE: "${PROXY_INFO_CONTRACT_SCOPE}" + HAPI_PROXY_INFO_CONTRACT_CODE: "${HAPI_PROXY_INFO_CONTRACT_CODE}" + HAPI_PROXY_INFO_CONTRACT_SCOPE: "${HAPI_PROXY_INFO_CONTRACT_SCOPE}" --- apiVersion: v1 kind: ConfigMap diff --git a/kubernetes/cronjob.yaml b/kubernetes/cronjob.yaml index bc35d82e..995aad09 100644 --- a/kubernetes/cronjob.yaml +++ b/kubernetes/cronjob.yaml @@ -28,7 +28,7 @@ spec: value: "${POSTGRES_SCHEMA}" - name: POSTGRES_USER value: "${POSTGRES_USER}" - - name: EOS_API_ENDPOINT + - name: HAPI_EOS_API_ENDPOINT value: https://api.eosio.cr - name: HAPI_SERVER_ADDRESS value: 0.0.0.0 diff --git a/kubernetes/ingress.yaml b/kubernetes/ingress.yaml index 75d29d9d..d007d53b 100644 --- a/kubernetes/ingress.yaml +++ b/kubernetes/ingress.yaml @@ -10,7 +10,7 @@ spec: match: Host(`${INGRESS_HOST}`) services: - kind: Service - name: frontend + name: webapp port: 80 --- apiVersion: traefik.containo.us/v1alpha1 @@ -25,7 +25,7 @@ spec: match: Host(`${INGRESS_HOST}`) services: - kind: Service - name: frontend + name: webapp port: 80 tls: secretName: tls-secret diff --git a/kubernetes/postgres-statefulset.yaml b/kubernetes/postgres-statefulset.yaml index 99c8219d..d7709cf2 100644 --- a/kubernetes/postgres-statefulset.yaml +++ b/kubernetes/postgres-statefulset.yaml @@ -16,7 +16,7 @@ spec: app: postgres spec: containers: - - image: postgres:10.4 + - image: postgres:13.3-alpine imagePullPolicy: "Always" name: eosrate-postgres envFrom: diff --git a/kubernetes/frontend-deployment.yaml b/kubernetes/webapp-deployment.yaml similarity index 83% rename from kubernetes/frontend-deployment.yaml rename to kubernetes/webapp-deployment.yaml index bb8e7289..a9dc0810 100644 --- a/kubernetes/frontend-deployment.yaml +++ b/kubernetes/webapp-deployment.yaml @@ -2,22 +2,22 @@ apiVersion: apps/v1 kind: Deployment metadata: labels: - app: frontend - name: frontend + app: webapp + name: webapp spec: replicas: 1 selector: matchLabels: - app: frontend + app: webapp template: metadata: labels: - app: frontend + app: webapp spec: containers: - image: ${DOCKER_REGISTRY}/${IMAGE_NAME_WEBAPP}:${VERSION} imagePullPolicy: "Always" - name: eosrate-frontend + name: eosrate-webapp env: - name: REACT_APP_GRAPHQL_HTTP_URL value: http://hasura:8080/v1/graphql diff --git a/kubernetes/frontend-service.yaml b/kubernetes/webapp-service.yaml similarity index 72% rename from kubernetes/frontend-service.yaml rename to kubernetes/webapp-service.yaml index 9107650a..ad31d402 100644 --- a/kubernetes/frontend-service.yaml +++ b/kubernetes/webapp-service.yaml @@ -2,8 +2,8 @@ apiVersion: v1 kind: Service metadata: labels: - app: frontend - name: frontend + app: webapp + name: webapp spec: ports: - name: http @@ -11,4 +11,4 @@ spec: targetPort: 80 protocol: TCP selector: - app: frontend + app: webapp diff --git a/makefile b/makefile index 9bc114c3..6cf83090 100644 --- a/makefile +++ b/makefile @@ -11,7 +11,15 @@ K8S_BUILD_DIR ?= ./build_k8s K8S_FILES := $(shell find ./kubernetes -name '*.yaml' | sed 's:./kubernetes/::g') stop: - @docker-compose stop + @docker compose stop + +clean: + @docker compose stop + @rm -rf db_data + @rm -rf webapp/node_modules + @rm -rf webapp/yarn.lock + @rm -rf hapi/node_modules + @rm -rf hapi/yarn.lock ## MAKE SURE YOU HAVE INITIALIZED THE PROJECT (make run) BEFORE RUN THIS fresh: scripts/fresh.sh @@ -19,62 +27,62 @@ fresh: scripts/fresh.sh install: ##@local Install hapi dependencies install: - @cd ./services/hapi && yarn + @cd ./hapi && yarn + @cd ./webapp && yarn run: make -B run-postgres make -B run-hapi make -B run-hasura - make -B -j 3 run-hasura-cli run-logs run-frontend + make -B -j 3 run-hasura-cli run-logs run-webapp run-postgres: - @docker-compose up -d --build postgres + mkdir -p $(POSTGRES_DATA) + @docker compose up -d --build postgres run-hapi: - @docker-compose up -d --build hapi + @docker compose up -d --build hapi @echo "done hapi" run-hasura: $(eval -include .env) @until \ - docker-compose exec -T postgres pg_isready; \ - do echo "$(BLUE)$(STAGE)-$(APP_NAME)-hasura |$(RESET) waiting for postgres service"; \ + docker compose exec -T postgres pg_isready; \ + do echo "$(BLUE)hasura |$(RESET) waiting for postgres service"; \ sleep 5; done; @until \ - curl http://localhost:9090; \ - do echo "$(BLUE)$(STAGE)-$(APP_NAME)-hasura |$(RESET) waiting for hapi service"; \ + curl -s -o /dev/null -w 'hapi status %{http_code}\n' http://localhost:9090/healthz; \ + do echo "$(BLUE)hasura |$(RESET) waiting for hapi service"; \ sleep 5; done; - @echo "..." - @docker-compose stop hasura - @docker-compose up -d --build hasura + @docker compose stop hasura + @docker compose up -d --build hasura + @echo "done hasura" run-hasura-cli: $(eval -include .env) @until \ - curl http://localhost:8080/v1/version; \ - do echo "$(BLUE)$(STAGE)-$(APP_NAME)-hasura |$(RESET) ..."; \ + curl -s -o /dev/null -w 'hasura status %{http_code}\n' http://localhost:8080/healthz; \ + do echo "$(BLUE)hasura |$(RESET) waiting for hasura service"; \ sleep 5; done; - @if [ $(STAGE) = "dev" ]; then\ - cd services/hasura;\ - hasura console --endpoint http://localhost:8080 --no-browser;\ - fi + @cd hasura && hasura seeds apply --database-name default --admin-secret $(HASURA_GRAPHQL_ADMIN_SECRET) && echo "success!" || echo "failure!"; + @cd hasura && hasura console --endpoint http://localhost:8080 --skip-update-check --no-browser --admin-secret $(HASURA_GRAPHQL_ADMIN_SECRET); -run-frontend: +run-webapp: $(eval -include .env) @until \ - curl -s -o /dev/null -w 'hasura status %{http_code}\n' http://localhost:8080; \ - do echo "$(BLUE)$(STAGE)-$(APP_NAME)-frontend |$(RESET) waiting for hasura service"; \ + curl -s -o /dev/null -w 'hasura status %{http_code}\n' http://localhost:8080/healthz; \ + do echo "$(BLUE)webapp |$(RESET) waiting for webapp service"; \ sleep 5; done; - @cd services/frontend && yarn && yarn start | cat - @echo "done frontend start" + @cd webapp && yarn && yarn start:local | cat + @echo "done webapp" run-logs: - @docker-compose logs -f hapi frontend + @docker compose logs -f hapi webapp migrate: scripts/migrate.sh ./scripts/migrate.sh -pgweb: scripts/pgweb.sh +run-pgweb: scripts/pgweb.sh ./scripts/pgweb.sh push-staging: @@ -111,7 +119,7 @@ build-docker-images: ##@devops Build docker images build-docker-images: @echo "Building docker containers..." @for dir in $(SUBDIRS); do \ - $(MAKE) build-docker -C services/$$dir; \ + $(MAKE) build-docker -C $$dir; \ done push-docker-images: ##@devops Publish docker images @@ -120,5 +128,5 @@ push-docker-images: --username $(DOCKER_USERNAME) \ --password-stdin for dir in $(SUBDIRS); do \ - $(MAKE) push-image -C services/$$dir; \ + $(MAKE) push-image -C $$dir; \ done diff --git a/readme.md b/readme.md index d78c5652..aca75c8e 100644 --- a/readme.md +++ b/readme.md @@ -101,7 +101,7 @@ We are running the application infrastructure on premises in San Jose, Costa Ric ## App Services -- **frontend:** http://localhost:3000 +- **webapp:** http://localhost:3000 A React JS Web Client based on create-react-app that starts up at the available port (default is 3000). - **[hasura](https://hasura.io)** http://localhost:8088 diff --git a/scripts/build.sh b/scripts/build.sh index e0d48969..1927bc9e 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -8,13 +8,13 @@ fi echo "Building docker containers..." if [ "$1" == "production" ]; then - docker build -t eoscostarica506/demux services/demux/ + docker build -t eoscostarica506/demux demux/ docker push eoscostarica506/demux - docker build -t eoscostarica506/hapi services/hapi/ + docker build -t eoscostarica506/hapi hapi/ docker push eoscostarica506/hapi - docker build -t eoscostarica506/frontend:latest --build-arg branch="production" --target server services/frontend/ - docker push eoscostarica506/frontend:latest + docker build -t eoscostarica506/webapp:latest --build-arg branch="production" --target server webapp/ + docker push eoscostarica506/webapp:latest elif [ "$1" == "testing" ]; then - docker build -t eoscostarica506/frontend:staging --build-arg branch="staging" --target server services/frontend/ - docker push eoscostarica506/frontend:staging + docker build -t eoscostarica506/webapp:staging --build-arg branch="staging" --target server webapp/ + docker push eoscostarica506/webapp:staging fi diff --git a/scripts/clean.sh b/scripts/clean.sh index aaf07c49..5bab7e24 100755 --- a/scripts/clean.sh +++ b/scripts/clean.sh @@ -7,9 +7,9 @@ if [ $# -eq 0 ] fi kubectl delete --namespace ${1} deployment demux hapi \ - hasura pgweb postgres frontend + hasura pgweb postgres webapp kubectl delete --namespace ${1} svc demux hapi hasura \ - pgweb postgres frontend frontend-port-http \ - frontend-port-https hasura-port + pgweb postgres webapp webapp-port-http \ + webapp-port-https hasura-port kubectl delete --namespace ${1} networkpolicy default kubectl delete cronjob hapi-cronjob --namespace ${1} diff --git a/scripts/deploy.sh b/scripts/deploy.sh index 218d5134..8036824f 100755 --- a/scripts/deploy.sh +++ b/scripts/deploy.sh @@ -9,13 +9,13 @@ fi if [ "$1" == "production" ]; then kubectl create -f kubernetes/common/ --namespace="$1" kubectl create -f kubernetes/production/ --namespace="$1" - kubectl expose deployment frontend --namespace="$1"\ - --name=frontend-port-http --port=80 --target-port=80 --type=ClusterIP --external-ip="$2" - kubectl expose deployment frontend --namespace="$1"\ - --name=frontend-port-https --port=443 --target-port=443 --type=ClusterIP --external-ip="$2" + kubectl expose deployment webapp --namespace="$1"\ + --name=webapp-port-http --port=80 --target-port=80 --type=ClusterIP --external-ip="$2" + kubectl expose deployment webapp --namespace="$1"\ + --name=webapp-port-https --port=443 --target-port=443 --type=ClusterIP --external-ip="$2" elif [ "$1" == "testing" ]; then kubectl create -f kubernetes/common/ --namespace="$1" kubectl create -f kubernetes/testing/ --namespace="$1" - kubectl expose deployment frontend --namespace="$1"\ - --name=frontend-port-http --port=8080 --target-port=8080 --type=ClusterIP --external-ip="$2" + kubectl expose deployment webapp --namespace="$1"\ + --name=webapp-port-http --port=8080 --target-port=8080 --type=ClusterIP --external-ip="$2" fi diff --git a/scripts/fresh.sh b/scripts/fresh.sh index e1eb681a..d1518d18 100755 --- a/scripts/fresh.sh +++ b/scripts/fresh.sh @@ -1,6 +1,6 @@ #!/bin/bash echo "Seeding Database and Syncing with Blockchain Tables" -cd services/hapi/src/libs/ +cd hapi/src/libs/ pwd node sync-bps.js node sync-proxies.js diff --git a/scripts/migrate.sh b/scripts/migrate.sh index adb8e3a2..c9ac63cc 100755 --- a/scripts/migrate.sh +++ b/scripts/migrate.sh @@ -1,6 +1,6 @@ #!/bin/bash echo "Applying hasura migrations" -cd ./services/hasura +cd ./hasura hasura migrate apply cd ../.. diff --git a/scripts/pgweb.sh b/scripts/pgweb.sh index f736c858..acf60a7b 100755 --- a/scripts/pgweb.sh +++ b/scripts/pgweb.sh @@ -1,3 +1,3 @@ #!/bin/bash echo "Starting up pgweb console at localhost:8082 ..." -docker-compose up --build pgweb +docker compose up --build pgweb diff --git a/services/frontend/.eslintrc b/services/frontend/.eslintrc deleted file mode 100644 index ec671bfa..00000000 --- a/services/frontend/.eslintrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parser": "babel-eslint", - "extends": [ - "standard", - "standard-react", - "plugin:react/recommended", - "plugin:prettier/recommended" - ], - "env": { - "browser": true, - "node": true - }, - "rules": { - "multiline-ternary": "off", - "space-before-function-paren": "off" - } -} diff --git a/services/frontend/Dockerfile b/services/frontend/Dockerfile deleted file mode 100644 index ddb81d98..00000000 --- a/services/frontend/Dockerfile +++ /dev/null @@ -1,42 +0,0 @@ -FROM node:12-slim as builder - -ARG branch -ARG react_app_graphql_http_url -ARG react_app_api_url -ARG react_app_graphql_ws_url -ARG react_app_eos_api_url -ARG react_app_eos_api_host -ARG react_app_eos_api_port -ARG react_app_eos_api_protocol -ARG react_app_eos_chain_id -ARG react_app_block_explorer -ARG react_network_monitor_url - -ENV REACT_APP_GRAPHQL_HTTP_URL $react_app_graphql_http_url -ENV REACT_APP_GRAPHQL_WS_URL $react_app_graphql_ws_url -ENV REACT_APP_EOS_API_URL $react_app_eos_api_url -ENV REACT_APP_EOS_API_HOST $react_app_eos_api_host -ENV REACT_APP_EOS_API_PORT $react_app_eos_api_port -ENV REACT_APP_EOS_API_PROTOCOL $react_app_eos_api_protocol -ENV REACT_APP_EOS_CHAIN_ID $react_app_eos_chain_id -ENV REACT_APP_BLOCK_EXPLORER $react_app_block_explorer -ENV REACT_APP_NETWORK_MONITOR_URL $react_network_monitor_url - -WORKDIR /usr/src/app - -COPY package.json . - -COPY yarn*.lock . - -RUN yarn --frozen-lockfile - -COPY . . - -ENV GENERATE_SOURCEMAP false - -RUN yarn build - -FROM nginx:1.16.1-alpine as server - -COPY --from=builder /usr/src/app/build /usr/share/nginx/html -COPY --from=builder /usr/src/app/nginx.conf /etc/nginx/conf.d/default.conf diff --git a/services/hapi/.eslintrc.js b/services/hapi/.eslintrc.js deleted file mode 100644 index 5f63b0c3..00000000 --- a/services/hapi/.eslintrc.js +++ /dev/null @@ -1,17 +0,0 @@ -module.exports = { - "env": { - "commonjs": true, - "es6": true, - "node": true - }, - "extends": "eslint:recommended", - "globals": { - "Atomics": "readonly", - "SharedArrayBuffer": "readonly" - }, - "parserOptions": { - "ecmaVersion": 2018 - }, - "rules": { - } -}; \ No newline at end of file diff --git a/services/hapi/Dockerfile b/services/hapi/Dockerfile deleted file mode 100644 index 0747f94e..00000000 --- a/services/hapi/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -FROM node:12.16.2-alpine - -# Create app directory -WORKDIR /opt/application - -# Install dev tools -# Install global depedencies -RUN apk add --no-cache yarn -RUN apk add --no-cache git -RUN apk add --no-cache jq -RUN apk add --no-cache curl -RUN apk add --no-cache vim -RUN yarn global add serve -RUN yarn global add eslint - -# Install nodemon for dev -RUN yarn --ignore-optional --frozen-lockfile global add nodemon - -# Install app dependencies -COPY package*.json ./ -COPY yarn.lock ./ - -# Bundle app source -COPY . . - -EXPOSE 9090 -CMD nodemon -L src/index.js diff --git a/services/hapi/package.json b/services/hapi/package.json deleted file mode 100644 index 48ff936a..00000000 --- a/services/hapi/package.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "name": "eosrate-backend", - "version": "19.1.1", - "description": "EOS Rate Backend API Service", - "main": "index.js", - "scripts": { - "lint": "eslint .", - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "EOS Costa Rica", - "license": "MIT", - "dependencies": { - "@hapi/hapi": "^19.1.1", - "eosjs": "^20.0.3", - "eosjs-api": "^7.0.4", - "lint": "^0.7.0", - "massive": "^6.2.0", - "node-fetch": "^2.6.0", - "npm-check": "^5.9.2", - "request": "^2.88", - "request-promise": "^4.2.5" - }, - "devDependencies": { - "eslint": "^6.8.0", - "eslint-config-standard": "^14.1.0", - "eslint-plugin-import": ">=2.20.1", - "eslint-plugin-node": "^11.0.0", - "eslint-plugin-promise": ">=4.2.1", - "eslint-plugin-standard": "^4.0.1", - "husky": ">=4", - "lint-staged": ">=10", - "prettier": "^1.19.1", - "pretty-quick": "^2.0.1", - "snazzy": "^8.0.0", - "standard": "^14.3.1" - }, - "lint-staged": { - "*.js": "eslint --cache --fix", - "*.{js,css,md}": "prettier --write" - }, - "husky": { - "hooks": { - "pre-commit": "lint-staged" - } - } -} diff --git a/services/hapi/src/config/server.config.js b/services/hapi/src/config/server.config.js deleted file mode 100644 index 2a594511..00000000 --- a/services/hapi/src/config/server.config.js +++ /dev/null @@ -1,8 +0,0 @@ - -module.exports = { - host: process.env.POSTGRES_HOST || 'localhost', - port: process.env.POSTGRES_PORT || 5432, - database: process.env.POSTGRES_DB || 'eosrate', - user: process.env.POSTGRES_USER || 'user', - password: process.env.POSTGRES_PASSWORD || 'pass' -} \ No newline at end of file diff --git a/services/hasura/config.yaml b/services/hasura/config.yaml deleted file mode 100644 index aae8bba7..00000000 --- a/services/hasura/config.yaml +++ /dev/null @@ -1,2 +0,0 @@ -version: 2 -metadata_directory: metadata diff --git a/services/hasura/metadata/actions.graphql b/services/hasura/metadata/actions.graphql deleted file mode 100644 index 8c4d53f6..00000000 --- a/services/hasura/metadata/actions.graphql +++ /dev/null @@ -1,26 +0,0 @@ -type Mutation { - rateProducer ( - ratingInput: RatingInput! - ): RatingOutput -} - - - - -input RatingInput { - user : String! - producer : String! -} - -type RatingOutput { - message : String! - uniq_rating : String - user : String - bp : String - ratings : jsonb -} - -type deleteUserRateOutput { - message : String! -} - diff --git a/services/hasura/metadata/actions.yaml b/services/hasura/metadata/actions.yaml deleted file mode 100644 index 5c44de47..00000000 --- a/services/hasura/metadata/actions.yaml +++ /dev/null @@ -1,15 +0,0 @@ -actions: -- name: rateProducer - definition: - kind: synchronous - handler: '{{HASURA_GRAPHQL_ACTION_BASE_URL}}/ratebp' - permissions: - - role: anonymous -custom_types: - enums: [] - input_objects: - - name: RatingInput - objects: - - name: RatingOutput - - name: deleteUserRateOutput - scalars: [] diff --git a/services/hasura/metadata/tables.yaml b/services/hasura/metadata/tables.yaml deleted file mode 100644 index 9ff443a2..00000000 --- a/services/hasura/metadata/tables.yaml +++ /dev/null @@ -1,88 +0,0 @@ -- table: - schema: public - name: producers - select_permissions: - - role: anonymous - permission: - columns: - - bpjson - - general_info - - owner - - system - filter: {} -- table: - schema: public - name: producers_list - select_permissions: - - role: anonymous - permission: - columns: - - owner - - bpjson - - system - - candidate_name - - total_votes - - average - - transparency - - infrastructure - - trustiness - - community - - development - - ratings_cntr - - general_info - filter: {} -- table: - schema: public - name: proxies - select_permissions: - - role: anonymous - permission: - columns: - - owner - - name - - website - - slogan - - philosophy - - background - - logo_256 - - telegram - - steemit - - twitter - - wechat - - voter_info - filter: {} -- table: - schema: public - name: ratings_stats - select_permissions: - - role: anonymous - permission: - columns: - - bp - - ratings_cntr - - average - - transparency - - infrastructure - - trustiness - - community - - development - - created_at - - updated_at - filter: {} -- table: - schema: public - name: user_ratings - select_permissions: - - role: anonymous - permission: - columns: - - ratings - - tx_data - - bp - - uniq_rating - - user - filter: {} - delete_permissions: - - role: anonymous - permission: - filter: {} diff --git a/services/hasura/metadata/version.yaml b/services/hasura/metadata/version.yaml deleted file mode 100644 index 22817d2a..00000000 --- a/services/hasura/metadata/version.yaml +++ /dev/null @@ -1 +0,0 @@ -version: 2 diff --git a/services/update-bps/websiteTexts.js b/services/update-bps/websiteTexts.js deleted file mode 100644 index e9118bb2..00000000 --- a/services/update-bps/websiteTexts.js +++ /dev/null @@ -1,387 +0,0 @@ -const mainnetBPinfo = [ - { - owner: "eoscafeblock", - general_info: { - websiteText: - "EOS Cafe Block is a leading block producer on the EOS blockchain focused on creating value through innovation, technology, and education. Our team is maximizing adoption of the world’s fastest blockchain by adding tangible value to the EOS ecosystem." - } - }, - { - owner: "costaricaeos", - general_info: { - websiteText: - "We envision a community fostered by democratic values, that promotes an environment of innovation, responsible growth, and prosperity. Our goal is to build a strong EOS ecosystem to promote a culture that encourages learning and sharing of knowledge among people. Also, we are strong believers that technology facilitates collaborating and connecting ideas." - } - }, - { - owner: "eosvolgabpru", - general_info: { - websiteText: - "The team of EOS Volga consists of highly supportive individuals that do believe in EOS. Each member is striving to make this project great. The company is going to focus on sharing the idea to the public through social media, traditional media, and offline meetups" - } - }, - { - owner: "alohaeosprod", - general_info: { - websiteText: - "We are committed to the EOSIO blockchain protocol that enables the development of commercial-scale decentralized applications. We promote the community tenets of integrity, transparency, benefit to the community, and the overall success of EOS and EOSIO. Our unique geographic location helps to diversify block production networks as we help bridge the East and West." - } - }, - { - owner: "eosdotwikibp", - general_info: { - websiteText: - "eosdotwikibp is a independent block producer who dedicate to provide stable and reliable services for EOS community. eosdotwikibp is currently running multiple geo-distributed servers with high-end configuration and high speed internet connection to provide block producing, p2p and API services." - } - }, - { - owner: "starteosiobp", - general_info: { - websiteText: - "Starteos is a company committed to promoting the blockchain industry and better applications to serve our real economy." - } - }, - { - owner: "eoshuobipool", - general_info: { - websiteText: - "Huobi Mining Pool is the first mining pool platform that integrates digital currency mining and trading. We are committed to providing users with one-stop services for convenient transactions and efficient returns. The Huobi brand has an excellent reputation and a good reputation in the global blockchain field." - } - }, - { - owner: "zbeosbp11111", - general_info: { - websiteText: "Promoting EOS ecosystem and promoting EOS development and value circulation." - } - }, - { - owner: "atticlabeosb", - general_info: { - websiteText: - "The future decentralized financial system needs arbitrage. That is why we believe in approach that EOS team sticks to. To facilitate the development of EOS ecosystem, Attic Lab as EOS Block Producer strives to share its expertise and resources with the global community." - } - }, - { - owner: "helloeoscnbp", - general_info: { - websiteText: - "HelloEOS is a strong competitor of the EOS Witness Node. It has comprehensive graphene network development capabilities and maintenance capabilities, and has a community of more than 30,000 people. HelloEOS is committed to building the best EOS community and the best witness node." - } - }, - { - owner: "eosnewyorkio", - general_info: { - websiteText: - "We are EOS New York, a self-funded and self-owned top 21 Block Producer on the EOS blockchain. Our mission is to always add value back into the EOS platform through enabling community organization, advancing the technology, and providing EOS education materials." - } - }, - { - owner: "bitfinexeos1", - general_info: { - websiteText: - "The focus of Bitfinex as an EOS Block Producer is on pioneering open-source development of EOSIO technology, sharing openly with other projects in the space to facilitate a stable ecosystem of support, collaboration and innovation. The entirety of our development efforts go towards ensuring the security, scalability and adoption of the EOS ecosystem." - } - }, - { - owner: "eosiosg11111", - general_info: { - websiteText: - "EOSIO.SG has strong technical research and development capabilities and is a famous technical block producer.eosiosg11111 is Looking forward to your votes" - } - }, - { - owner: "jedaaaaaaaaa", - general_info: { - websiteText: - "The EOS Developers Association is based in Japan and supports the development of the EOS ecosystem in Japan. We will build an EOS ecosystem, propose online and offline events, gather EOS developers, develop attractive DAPPs, and develop multiple EOS-based services." - } - }, - { - owner: "eos42freedom", - general_info: { - websiteText: - "EOS42 is a consultancy team for EOSIO applications and block production. We run nodes on all major EOSIO blockchains, build DeFi applications, provide trusted smart contract audits and advise projects on everything from technical development to tokenomic design." - } - }, - { - owner: "eoscannonchn", - general_info: { - websiteText: - "As the most effective community with well-known credibility, we are willing to connect and promote sharing between overseas and Chinese EOS communities. We are happy to lead the majority of domestic token holders to participate in global EOS community growth." - } - }, - { - owner: "eosswedenorg", - general_info: { - websiteText: - "EOS sw/eden and its team members main priority is in building blocks for the Blockchain. Maintaining and upgrading infrastructure and security will always be the first priority because without safe block production there is no chain. Our system is designed to scale up and down quickly and securely." - } - }, - { - owner: "eosauthority", - general_info: { - websiteText: - "Official EOS block Explorer and Wallet of EOS Authority. Search EOS transactions, blocks, accounts, tokens, rex, prices with alerts." - } - }, - { - owner: "eosriobrazil", - general_info: { - websiteText: - "We believe EOS has the potential to positively impact the lives of billions of people around the world through scalable, secure and robust distributed applications. EOS Rio team is committed to contribute its best to fulfill EOS potential." - } - }, - { - owner: "argentinaeos", - general_info: { - websiteText: - "EOS Argentina's efforts focus in encouraging the use of the EOS Blockchain. To accomplish his task we will work on the following objectives: Community Building, EOS Tech Promotion, Dapps Support, Infrastructure." - } - }, - { - owner: "cochainworld", - general_info: { - websiteText: - "EOS Cochain is a homogeneous parallel chain of EOS, helping EOS connect the multi-chain interconnected ecosystem. As the first parallel chain that can interoperate with the EOS main chain, EOS Cochain strives to achieve safe, reliable, fast and convenient cross-chain asset transfer and cross-chain smart contract invocation. Anyone can develop or use cross-chain DAPP on the EOS Cochain parallel chain." - } - }, - { - owner: "eosbeijingbp", - general_info: { - websiteText: - "In recent years, the development of blockchain technology has advanced faster than its practical applications. The balance of EOS performance and decentralization has led us to see the possibility of bridging this gap. The EOS Beijing team is composed of experienced digital currency professionals and investors who are eager to participate in this new cutting-edge technology." - } - }, - { - owner: "eoscanadacom", - general_info: { - websiteText: - "EOS Canada is a top global EOS block producer. Leading through technology, EOS Canada is founded by a team of serial tech entrepreneurs who is deeply committed to contribute to the growth of the EOS ecosystem." - } - }, - { - owner: "eos.fish", - general_info: { - websiteText: - "Our mission is to ensure the success of the EOS ecosystem and build a decentralized future together. Bridging the gap between blockchain protocols is an important part of working towards this mission. The first step is to grow the EOS community by attracting active community members, including project teams, developers, voters, and end users." - } - }, - { - owner: "eosnationftw", - general_info: { - websiteText: - "Our mission is to secure EOSIO blockchains with reliable infrastructure and to build a global community equipped with the tools and resources to thrive. We’re committed to leading and contributing to projects that add value to the ecosystem." - } - }, - { - owner: "cypherglasss", - general_info: { - websiteText: - "Cypherglass is an independent blockchain infrastructure company. We design, build, and maintain infrastructure for the world’s leading blockchains, like EOS and the DAPP Network. Our mission is to increase adoption of decentralized blockchain technologies and help enable a more distributed world." - } - }, - { - owner: "eossv12eossv", - general_info: { - websiteText: - "Providing world class Silicon Valley talent to oversee, govern and maximize growth to the EOS ecosystem. We act as a leading block producer, staying ahead of the curve by providing infrastructure that scales and community & growth focused governance. We act as as EOS leaders by supporting the community through education and incubating decentralized applications for the masses." - } - }, - { - owner: "teamgreymass", - general_info: { - websiteText: - "We are TeamGreymass! Our world-class block production infrastructure ensures that your data is always secure, and available when you need it. Block rewards not only power our infrastructure, but also fuel the development of decentralized applications, services, and frameworks. These projects enrich blockchain ecosystems and deepen the engagement of creators and regular users alike." - } - }, - { - owner: "eostitanprod", - general_info: { - websiteText: - "EOS Titan is a group of individuals involved in software development, telecommunications, encryption and blockchain technologies. Our team is composed of early adopters of cryptocurrencies who share the ethos of the ecosystem and we are looking forward to bringing the industry one step further towards the goal of massively decentralized governance and financial structures." - } - }, - { - owner: "eosdacserver", - general_info: { - websiteText: - "It is the vision of eosDAC that EOS.IO block production should be open for everyone to contribute and benefit. To realise this vision, eosDAC is an evolving Decentralised Autonomous Community (DAC) focused on EOS.IO Block Production serving the EOS communities worldwide. In doing this, eosDAC is creating the tools and smart contracts it needs to function. It will share these with the EOS communities to help other DACs thrive on the EOS.IO blockchains." - } - }, - { - owner: "libertyblock", - general_info: { - websiteText: - "LibertyBlock is an EOS Block Producer focused on delivering security and technical expertise to the ecosystem." - } - }, - { - owner: "eospacificbp", - general_info: { - websiteText: - "Node Pacific is The Heart of the Blockchain, The community Governance Organizer, The Technical Solutions Provider and The Link of the Blockchain Eco-System" - } - }, - { - owner: "eosasia11111", - general_info: { - websiteText: - "We will bring world-class technical expertise and international representation to make EOS the ultimate blockchain infrastructure for real applications. More importantly, our goal is to keep EOS a healthy community-driven decentralized prototol, and we will fight anyone who aims to privatize the ecosystem for their own benefit." - } - }, - { - owner: "cryptolions1", - general_info: { - websiteText: "Building our decentralized future, one block at a time. EOSIO block producer based in Ukraine." - } - }, - { - owner: "eospaceioeos", - general_info: { - websiteText: - "With the leading blockchain, sidechain, dapp, and contract developing ability, EOSpace is committed to be the best BP. EOSpace set up and maintain dozens of communities of EOS. We have built a distributed blockchain lab, including related business like traffic center, news center, overseas operation, investment banking service, project center and exchange center(Australia, Singapore, Korea) etc. We hope to continue to contribute to the EOS ecosystem." - } - }, - { - owner: "eosinfstones", - general_info: { - websiteText: - "Infinity Stones is a silicon valley-based company, providing cloud management services and security solutions for Blockchains. We are blockchain infrastructure architects with proven track records in the industry. Our team is composed of tech leads, management experts, and financial professionals from tech giants like Google, Oracle, and Intel." - } - }, - { - owner: "oraclegogogo", - general_info: { - websiteText: - "The secure random number scheme is a commercial-level random number solution initiated by OracleChain, which is provided by multiple trusted organizations to generate random numbers. Any third-party applications (smart contract) can easily get random numbers by subscribing random service." - } - }, - { - owner: "eostribeprod", - general_info: { - websiteText: - "EOS Tribe, LLC is a Blockchain company that designs and develops technological solutions for the latest Blockchain smart platforms to solve challenges for real World businesses and serve as catalyst for mass adoption of Blockchain technology Worldwide." - } - }, - { - owner: "eosyskoreabp", - general_info: { - websiteText: "" - } - }, - { - owner: "eosgenblockp", - general_info: { - websiteText: - "A mining as a service company who built the first mining farm in Eastern Europe. Since our founding, we have grown tremendously and a lot has happened, but one thing remains constant: We are all strong believers in the future of digital currencies and we love being part of this growing community." - } - }, - { - owner: "eosiomeetone", - general_info: { - websiteText: - "MEET.ONE Chain is designed to facilitate the liquidity of everyone’s values，lower the threshold and cost of access to EOSIO layer. Meanwhile, MEET.ONE Chain is committed to make a joint effort with Block Producers and developers, aiming to promote the development of trustworthy Internet and utilize blockchain technology to empower Internet." - } - }, - { - owner: "eosrapidprod", - general_info: { - websiteText: - "EOS Rapid is a next generation block producer candidate looking to provide both transparency and performance to the EOS community." - } - }, - { - owner: "eoslaomaocom", - general_info: { - websiteText: - "EOSLaoMao is an EOS Block Producer dedicated to maintaining a fair and stable BP node. We aim to maximize the potential of EOS with the dynamic community around the world." - } - }, - { - owner: "eosliquideos", - general_info: { - websiteText: - "LiquidEOS is built by passionate blockchain entrepreneurs who believe that the EOS blockchain is pushing the envelope of innovation and will usher in an era of mass user adoption of decentralized applications. We are an R&D center, an EOS Block Producer, & a think tank that’s dedicated to enhancing the EOS network through new ideas, tools, & content. We develop critical EOS infrastructure, build scalable decentralized technologies & engage the global EOS ecosystem through a range of community building initiatives." - } - } -]; - -const jungleBPinfo = [ - { - owner: "junglemorpho", - general_info: { - websiteText: - "We envision a community fostered by democratic values, that promotes an environment of innovation, responsible growth, and prosperity. Our goal is to build a strong EOS ecosystem to promote a culture that encourages learning and sharing of knowledge among people. Also, we are strong believers that technology facilitates collaborating and connecting ideas." - } - }, - { - owner: "lioninjungle", - general_info: { - websiteText: - "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Praesent in condimentum libero. Ut ultricies mattis risus, et tempus libero lacinia in. Praesent aliquet elementum urna, at commodo tortor varius eget. Integer sodales vitae quam sit amet sodales. Cras vel sapien ac ligula ullamcorper commodo. Pellentesque dui mi, bibendum et turpis et, placerat scelerisque eros. Donec molestie dui sem, nec consectetur sapien vehicula ut. Vestibulum vitae tempor ipsum. Nullam tortor felis, viverra ac consequat sed, porta quis nisl. Phasellus quam diam, tristique nec lacus eu, pellentesque efficitur sapien. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Quisque et justo turpis. Pellentesque porta felis metus, a volutpat est fermentum ac." - } - }, - { - owner: "eosdacserval", - general_info: { - websiteText: - "Donec quam lacus, molestie in lacinia aliquam, convallis non leo. Nulla enim lacus, auctor et urna vitae, congue vestibulum arcu. Nulla consectetur, tellus id ullamcorper euismod, tellus lectus iaculis turpis, quis feugiat nisl nisi vitae eros. Nam bibendum tristique dolor et pretium. Morbi non tempus nulla. Nam dolor purus, bibendum eu neque non, pellentesque pretium mauris. Vestibulum et dolor ante." - } - }, - { - owner: "junglesweden", - general_info: { - websiteText: - "Etiam in nunc nisi. Nunc pharetra ultricies porttitor. Vestibulum malesuada, tortor nec blandit mollis, nisi purus lacinia quam, eget vestibulum dui nisl id justo. Aenean facilisis accumsan efficitur. Nam sodales nec lacus quis faucibus. Mauris auctor placerat velit in suscipit. Duis sed libero ut nibh hendrerit finibus. Fusce ultricies risus magna." - } - }, - { - owner: "eosbarcelona", - general_info: { - websiteText: - "We are committed to the EOSIO blockchain protocol that enables the development of commercial-scale decentralized applications. We promote the community tenets of integrity, transparency, benefit to the community, and the overall success of EOS and EOSIO. Our unique geographic location helps to diversify block production networks as we help bridge the East and West." - } - }, - { - owner: "eosphereiobp", - general_info: { - websiteText: - "Sed maximus neque velit, at pharetra sapien vestibulum ut. Phasellus ac placerat neque, et lobortis ante. Morbi non arcu iaculis ex scelerisque molestie eu a tortor. Donec convallis fermentum dolor. In hac habitasse platea dictumst. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia Curae; Mauris id sapien rhoncus, placerat turpis eu, dictum neque." - } - }, - { - owner: "atticlabjbpn", - general_info: { - websiteText: - "Duis diam orci, vehicula non bibendum non, interdum ac neque. Fusce cursus arcu quis ligula accumsan ultrices. Pellentesque rutrum, libero vitae tincidunt lobortis, dolor sapien pulvinar dui, nec iaculis massa metus quis nunc. Curabitur vitae felis ut quam condimentum fermentum. Cras et laoreet nisl, eget placerat nibh. Etiam molestie velit condimentum nunc fringilla, porta posuere ex consectetur. Fusce et malesuada metus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Duis quis nunc blandit, blandit tellus nec, tempor leo. Vestibulum eleifend metus orci. Morbi pretium, ipsum non accumsan lobortis, nisi ex facilisis lorem, at aliquam justo est id velit. Praesent a tempus est, in sagittis turpis. Interdum et malesuada fames ac ante ipsum primis in faucibus." - } - }, -]; - -const massive = require("massive"); -const dbConfig = require("./dbConfig"); - -const updateGeneralInfo = async (bpInfo, db) => { - await db.producers.save(bpInfo) - console.log('Saved') - console.log(bpInfo) -}; - -const updateBps = async (bpInfoObj) => { - if (Array.isArray(bpInfoObj)) { - const db = await massive(dbConfig) - console.log('db', db.listTables()) - for (var i = 0; i < bpInfoObj.length; i++) { - await updateGeneralInfo(bpInfoObj[i], db); - } - } else { - console.log("Cannot save Block Producer Info object."); - } -}; - -(async () => { - - await updateBps(jungleBPinfo); - await updateBps(mainnetBPinfo); - -})(); diff --git a/utils/meta.mk b/utils/meta.mk index 90be8fe0..c03204ca 100644 --- a/utils/meta.mk +++ b/utils/meta.mk @@ -3,12 +3,12 @@ VERSION ?= $(shell git rev-parse --short HEAD) CURRENT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) -IMAGE_NAME_WEBAPP=frontend +IMAGE_NAME_WEBAPP=webapp IMAGE_NAME_HAPI=hapi IMAGE_NAME_HASURA=hasura DOCKER_REGISTRY=eoscostarica506 -SUBDIRS = frontend hapi hasura +SUBDIRS = webapp hapi hasura MAKE_ENV += DOCKER_REGISTRY VERSION IMAGE_NAME_WEBAPP IMAGE_NAME_HAPI IMAGE_NAME_HASURA diff --git a/services/frontend/.dockerignore b/webapp/.dockerignore similarity index 100% rename from services/frontend/.dockerignore rename to webapp/.dockerignore diff --git a/webapp/.eslintrc.js b/webapp/.eslintrc.js new file mode 100644 index 00000000..fcf6c8c8 --- /dev/null +++ b/webapp/.eslintrc.js @@ -0,0 +1,17 @@ +module.exports = { + parser: 'babel-eslint', + extends: [ + 'standard', + 'standard-react', + 'plugin:react/recommended', + 'plugin:prettier/recommended' + ], + env: { + browser: true, + node: true + }, + rules: { + 'multiline-ternary': 'off', + 'space-before-function-paren': 'off' + } +} diff --git a/services/frontend/.gitignore b/webapp/.gitignore similarity index 100% rename from services/frontend/.gitignore rename to webapp/.gitignore diff --git a/services/frontend/.node-version b/webapp/.node-version similarity index 100% rename from services/frontend/.node-version rename to webapp/.node-version diff --git a/services/frontend/.prettierignore b/webapp/.prettierignore similarity index 100% rename from services/frontend/.prettierignore rename to webapp/.prettierignore diff --git a/webapp/Dockerfile b/webapp/Dockerfile new file mode 100644 index 00000000..71e42241 --- /dev/null +++ b/webapp/Dockerfile @@ -0,0 +1,43 @@ +FROM node:12-slim as builder + +ARG branch +ARG REACT_APP_GRAPHQL_HTTP_URL +ARG REACT_APP_API_URL +ARG REACT_APP_GRAPHQL_WS_URL +ARG REACT_APP_EOS_API_URL +ARG REACT_APP_EOS_API_HOST +ARG REACT_APP_EOS_API_PORT +ARG REACT_APP_EOS_API_PROTOCOL +ARG REACT_APP_EOS_CHAIN_ID +ARG REACT_APP_BLOCK_EXPLORER +ARG REACT_APP_NETWORK_MONITOR_URL + +ENV REACT_APP_GRAPHQL_HTTP_URL $REACT_APP_GRAPHQL_HTTP_URL +ENV REACT_APP_API_URL $REACT_APP_API_URL +ENV REACT_APP_GRAPHQL_WS_URL $REACT_APP_GRAPHQL_WS_URL +ENV REACT_APP_EOS_API_URL $REACT_APP_EOS_API_URL +ENV REACT_APP_EOS_API_HOST $REACT_APP_EOS_API_HOST +ENV REACT_APP_EOS_API_PORT $REACT_APP_EOS_API_PORT +ENV REACT_APP_EOS_API_PROTOCOL $REACT_APP_EOS_API_PROTOCOL +ENV REACT_APP_EOS_CHAIN_ID $REACT_APP_EOS_CHAIN_ID +ENV REACT_APP_BLOCK_EXPLORER $REACT_APP_BLOCK_EXPLORER +ENV REACT_APP_NETWORK_MONITOR_URL $REACT_APP_NETWORK_MONITOR_URL + +WORKDIR /usr/src/app + +COPY package.json . + +COPY yarn*.lock . + +RUN yarn --frozen-lockfile + +COPY . . + +ENV GENERATE_SOURCEMAP false + +RUN yarn build + +FROM nginx:1.16.1-alpine as server + +COPY --from=builder /usr/src/app/build /usr/share/nginx/html +COPY --from=builder /usr/src/app/nginx.conf /etc/nginx/conf.d/default.conf diff --git a/services/frontend/config-overrides.js b/webapp/config-overrides.js similarity index 100% rename from services/frontend/config-overrides.js rename to webapp/config-overrides.js diff --git a/services/frontend/jsconfig.json b/webapp/jsconfig.json similarity index 100% rename from services/frontend/jsconfig.json rename to webapp/jsconfig.json diff --git a/services/frontend/makefile b/webapp/makefile similarity index 68% rename from services/frontend/makefile rename to webapp/makefile index 93c3e7a6..43d2c277 100644 --- a/services/frontend/makefile +++ b/webapp/makefile @@ -1,4 +1,4 @@ -include ../../utils/meta.mk +include ../utils/meta.mk LATEST_TAG ?= latest @@ -13,24 +13,26 @@ clean-install: run: ##@local Run the project locally (without docker) run: node_modules + @echo "DOCKER WEBAPP RUN" @$(SHELL_EXPORT) yarn run dev build-docker: ##@devops Build the docker image build-docker: ./Dockerfile + @echo "DOCKER WEBAPP" echo "Building containers..." @docker pull $(DOCKER_REGISTRY)/$(IMAGE_NAME_WEBAPP):$(LATEST_TAG) || true @docker build \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_WEBAPP):$(VERSION) --target server \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_WEBAPP):$(LATEST_TAG) --target server \ - --build-arg react_app_graphql_http_url="$(REACT_APP_GRAPHQL_HTTP_URL)" \ - --build-arg react_app_graphql_ws_url="$(REACT_APP_GRAPHQL_WS_URL)" \ - --build-arg react_app_eos_api_url="$(REACT_APP_EOS_API_URL)" \ - --build-arg react_app_eos_api_host="$(REACT_APP_EOS_API_HOST)" \ - --build-arg react_app_eos_api_port="$(REACT_APP_EOS_API_PORT)" \ - --build-arg react_app_eos_api_protocol="$(REACT_APP_EOS_API_PROTOCOL)" \ - --build-arg react_app_eos_chain_id="$(REACT_APP_EOS_CHAIN_ID)" \ - --build-arg react_app_block_explorer="$(REACT_APP_BLOCK_EXPLORER)" \ - --build-arg react_network_monitor_url="$(REACT_APP_NETWORK_MONITOR_URL)" \ + --build-arg REACT_APP_GRAPHQL_HTTP_URL="$(REACT_APP_GRAPHQL_HTTP_URL)" \ + --build-arg REACT_APP_GRAPHQL_WS_URL="$(REACT_APP_GRAPHQL_WS_URL)" \ + --build-arg REACT_APP_EOS_API_URL="$(REACT_APP_EOS_API_URL)" \ + --build-arg REACT_APP_EOS_API_HOST="$(REACT_APP_EOS_API_HOST)" \ + --build-arg REACT_APP_EOS_API_PORT="$(REACT_APP_EOS_API_PORT)" \ + --build-arg REACT_APP_EOS_API_PROTOCOL="$(REACT_APP_EOS_API_PROTOCOL)" \ + --build-arg REACT_APP_EOS_CHAIN_ID="$(REACT_APP_EOS_CHAIN_ID)" \ + --build-arg REACT_APP_BLOCK_EXPLORER="$(REACT_APP_BLOCK_EXPLORER)" \ + --build-arg REACT_APP_NETWORK_MONITOR_URL="$(REACT_APP_NETWORK_MONITOR_URL)" \ --build-arg branch="$(BRANCH)" \ . diff --git a/services/frontend/nginx.conf b/webapp/nginx.conf similarity index 100% rename from services/frontend/nginx.conf rename to webapp/nginx.conf diff --git a/services/frontend/package.json b/webapp/package.json similarity index 57% rename from services/frontend/package.json rename to webapp/package.json index 9243692a..d0b0cd78 100644 --- a/services/frontend/package.json +++ b/webapp/package.json @@ -9,19 +9,22 @@ "scripts": { "precommit": "pretty-quick --staged && lint-staged", "lint": "eslint .", - "start": "env-cmd -f ../../.env react-scripts start", - "prod": "serve -l 9000 --single ./build", + "start": "react-scripts start", + "start:local": "env-cmd -f ../.env react-scripts start", "build": "react-scripts build", - "test": "env-cmd -f .env react-scripts test --env=jsdom", - "eject": "react-scripts eject", - "now": "now --public --npm && now alias", - "now-start": "serve --single ./build" + "test": "env-cmd -f ../.env react-scripts test --env=jsdom", + "eject": "react-scripts eject" + }, + "husky": { + "hooks": { + "pre-commit": "lint-staged" + } }, "dependencies": { - "@eoscostarica/eoscr-components": "^3.1.0", - "@material-ui/core": "^4.9.12", + "@eoscostarica/eoscr-components": "^3.1.4", + "@material-ui/core": "^4.12.1", "@material-ui/icons": "^4.9.1", - "@material-ui/lab": "^4.0.0-alpha.51", + "@material-ui/lab": "^4.0.0-alpha.60", "@reach/router": "^1.3.3", "@rematch/core": "^2.0.0", "@rematch/persist": "^2.0.0", @@ -31,42 +34,41 @@ "apollo-link-http": "^1.5.16", "apollo-link-ws": "^1.0.19", "apollo-utilities": "^1.3.3", - "babel-loader": "~8.1.0", - "chart.js": "^2.9.3", - "classnames": "^2.2.6", + "chart.js": "^3.4.1", + "classnames": "^2.3.1", "env-cmd": "^10.1.0", - "eosjs": "^21.0.3", + "eosjs": "^22.1.0", "filter-objects": "^2.1.1", - "graphql": "^15.5.0", - "graphql-tag": "^2.10.3", - "i18n-iso-countries": "^6.5.0", - "i18next": "^19.3.2", - "i18next-browser-languagedetector": "^6.0.1", + "graphql": "^15.5.1", + "graphql-tag": "^2.12.5", + "i18n-iso-countries": "^6.8.0", + "i18next": "^20.3.3", + "i18next-browser-languagedetector": "^6.1.2", "lodash.get": "^4.4.2", "lodash.isempty": "^4.4.0", "lodash.set": "^4.3.2", "lodash.uniq": "^4.5.0", "node-fetch": "^2.6.0", - "qs": "^6.9.1", + "qs": "^6.10.1", "random-color-rgb": "^1.1.1", - "rc-slider": "^9.2.2", - "react": "17.0.1", + "rc-slider": "^9.7.2", + "react": "17.0.2", "react-apollo": "^3.1.3", "react-autosuggest": "^10.1.0", - "react-chartjs-2": "^2.9.0", - "react-dom": "17.0.1", + "react-chartjs-2": "^3.0.4", + "react-dom": "17.0.2", "react-ga": "^3.3.0", "react-helmet": "^6.1.0", "react-highlighter": "^0.4.3", - "react-i18next": "^11.3.3", + "react-i18next": "^11.11.2", "react-placeholder": "^4.0.0", - "react-redux": "^7.2.0", - "redux": "^4.0.5", + "react-redux": "^7.2.4", + "redux": "^4.1.0", "redux-persist": "^6.0.0", - "serve": "^11.3.0", - "subscriptions-transport-ws": "^0.9.16", + "serve": "^12.0.0", + "subscriptions-transport-ws": "^0.9.19", "text-encoding": "^0.7.0", - "ual-anchor": "^1.0.0", + "ual-anchor": "^1.0.6", "ual-ledger": "^0.3.0", "ual-lynx": "^0.4.0", "ual-meetone": "^0.1.1", @@ -76,25 +78,25 @@ "yup": "0.32.9" }, "devDependencies": { - "eslint-config-prettier": "^8.0.0", - "eslint-config-standard": "^16.0.2", + "eslint-config-prettier": "^8.3.0", + "eslint-config-standard": "^16.0.3", "eslint-config-standard-react": "^11.0.1", "eslint-plugin-node": "^11.0.0", - "eslint-plugin-prettier": "^3.3.1", + "eslint-plugin-prettier": "^3.4.0", "eslint-plugin-standard": "^5.0.0", - "husky": "^5.1.1", - "lint-staged": "^10.0.8", - "prettier": "^2.2.1", - "pretty-quick": "^3.1.0", - "react-scripts": "4.0.2", + "husky": "^7.0.1", + "lint-staged": "^11.0.1", + "prettier": "^2.3.2", + "pretty-quick": "^3.1.1", + "react-scripts": "4.0.3", "snazzy": "^9.0.0", "standard": "^16.0.3" }, "resolutions": { - "react": "17.0.1", - "react-dom": "17.0.1", - "**/react": "17.0.1", - "**/react-dom": "17.0.1" + "react": "17.0.2", + "react-dom": "17.0.2", + "**/react": "17.0.2", + "**/react-dom": "17.0.2" }, "lint-staged": { "*.js": [ diff --git a/services/hapi/prettier.config.js b/webapp/prettier.config.js similarity index 100% rename from services/hapi/prettier.config.js rename to webapp/prettier.config.js diff --git a/services/frontend/public/EOS-Rate-Infographic.jpg b/webapp/public/EOS-Rate-Infographic.jpg similarity index 100% rename from services/frontend/public/EOS-Rate-Infographic.jpg rename to webapp/public/EOS-Rate-Infographic.jpg diff --git a/services/frontend/public/animation/eosrate-animation-01.html b/webapp/public/animation/eosrate-animation-01.html similarity index 100% rename from services/frontend/public/animation/eosrate-animation-01.html rename to webapp/public/animation/eosrate-animation-01.html diff --git a/services/frontend/public/animation/images/eosrate_animation_01_atlas_.png b/webapp/public/animation/images/eosrate_animation_01_atlas_.png similarity index 100% rename from services/frontend/public/animation/images/eosrate_animation_01_atlas_.png rename to webapp/public/animation/images/eosrate_animation_01_atlas_.png diff --git a/services/frontend/public/app-metadata.json b/webapp/public/app-metadata.json similarity index 100% rename from services/frontend/public/app-metadata.json rename to webapp/public/app-metadata.json diff --git a/services/frontend/public/chain-manifests.json b/webapp/public/chain-manifests.json similarity index 100% rename from services/frontend/public/chain-manifests.json rename to webapp/public/chain-manifests.json diff --git a/services/frontend/public/eoscostarica-logo.png b/webapp/public/eoscostarica-logo.png similarity index 100% rename from services/frontend/public/eoscostarica-logo.png rename to webapp/public/eoscostarica-logo.png diff --git a/services/frontend/public/eoscostarica-logo.svg b/webapp/public/eoscostarica-logo.svg similarity index 100% rename from services/frontend/public/eoscostarica-logo.svg rename to webapp/public/eoscostarica-logo.svg diff --git a/services/frontend/public/eosio.assert.json b/webapp/public/eosio.assert.json similarity index 100% rename from services/frontend/public/eosio.assert.json rename to webapp/public/eosio.assert.json diff --git a/services/frontend/public/favicon-16x16.png b/webapp/public/favicon-16x16.png similarity index 100% rename from services/frontend/public/favicon-16x16.png rename to webapp/public/favicon-16x16.png diff --git a/services/frontend/public/favicon-32x32.png b/webapp/public/favicon-32x32.png similarity index 100% rename from services/frontend/public/favicon-32x32.png rename to webapp/public/favicon-32x32.png diff --git a/services/frontend/public/favicon.ico b/webapp/public/favicon.ico similarity index 100% rename from services/frontend/public/favicon.ico rename to webapp/public/favicon.ico diff --git a/services/frontend/public/icon.png b/webapp/public/icon.png similarity index 100% rename from services/frontend/public/icon.png rename to webapp/public/icon.png diff --git a/services/frontend/public/images/eosrate-256.png b/webapp/public/images/eosrate-256.png similarity index 100% rename from services/frontend/public/images/eosrate-256.png rename to webapp/public/images/eosrate-256.png diff --git a/services/frontend/public/images/manifests/eos.png b/webapp/public/images/manifests/eos.png similarity index 100% rename from services/frontend/public/images/manifests/eos.png rename to webapp/public/images/manifests/eos.png diff --git a/services/frontend/public/images/manifests/jungle.ico b/webapp/public/images/manifests/jungle.ico similarity index 100% rename from services/frontend/public/images/manifests/jungle.ico rename to webapp/public/images/manifests/jungle.ico diff --git a/services/frontend/public/images/wallets/scatter.svg b/webapp/public/images/wallets/scatter.svg similarity index 100% rename from services/frontend/public/images/wallets/scatter.svg rename to webapp/public/images/wallets/scatter.svg diff --git a/services/frontend/public/index.html b/webapp/public/index.html similarity index 100% rename from services/frontend/public/index.html rename to webapp/public/index.html diff --git a/services/frontend/public/logo.png b/webapp/public/logo.png similarity index 100% rename from services/frontend/public/logo.png rename to webapp/public/logo.png diff --git a/services/frontend/public/logo.svg b/webapp/public/logo.svg similarity index 100% rename from services/frontend/public/logo.svg rename to webapp/public/logo.svg diff --git a/services/frontend/public/manifest.json b/webapp/public/manifest.json similarity index 100% rename from services/frontend/public/manifest.json rename to webapp/public/manifest.json diff --git a/services/frontend/public/sitemap.xml b/webapp/public/sitemap.xml similarity index 100% rename from services/frontend/public/sitemap.xml rename to webapp/public/sitemap.xml diff --git a/services/frontend/readme.md b/webapp/readme.md similarity index 95% rename from services/frontend/readme.md rename to webapp/readme.md index 84530461..dee48f2f 100644 --- a/services/frontend/readme.md +++ b/webapp/readme.md @@ -1,6 +1,6 @@ -# EOS Rate FrontEnd +# EOS Rate webapp -EOS React.js based dApp frontend. +EOS React.js based dApp webapp. ## Code Standards @@ -18,7 +18,6 @@ We use [standardjs code style](https://standardjs.com) and we favor [functional | |── language/ .................................... i18n translations | |── models/ ...................................... rematch models | |── routes/ ...................................... route components -| |── services/ .................................... singleton services ( vanillajs ) | |── utils/ ....................................... utilities folder ( vanillajs ) | |── app.js ....................................... main app container | |── serviceWorker.js ............................. cra service worker diff --git a/services/frontend/src/app.js b/webapp/src/app.js similarity index 100% rename from services/frontend/src/app.js rename to webapp/src/app.js diff --git a/services/frontend/src/components/app-bar/index.js b/webapp/src/components/app-bar/index.js similarity index 100% rename from services/frontend/src/components/app-bar/index.js rename to webapp/src/components/app-bar/index.js diff --git a/services/frontend/src/components/app-bar/styles.js b/webapp/src/components/app-bar/styles.js similarity index 100% rename from services/frontend/src/components/app-bar/styles.js rename to webapp/src/components/app-bar/styles.js diff --git a/services/frontend/src/components/bottom-navbar/index.js b/webapp/src/components/bottom-navbar/index.js similarity index 100% rename from services/frontend/src/components/bottom-navbar/index.js rename to webapp/src/components/bottom-navbar/index.js diff --git a/services/frontend/src/components/bottom-navbar/styles.js b/webapp/src/components/bottom-navbar/styles.js similarity index 100% rename from services/frontend/src/components/bottom-navbar/styles.js rename to webapp/src/components/bottom-navbar/styles.js diff --git a/services/frontend/src/components/bp-chip-avatar/index.js b/webapp/src/components/bp-chip-avatar/index.js similarity index 100% rename from services/frontend/src/components/bp-chip-avatar/index.js rename to webapp/src/components/bp-chip-avatar/index.js diff --git a/services/frontend/src/components/bp-chip-avatar/styles.js b/webapp/src/components/bp-chip-avatar/styles.js similarity index 100% rename from services/frontend/src/components/bp-chip-avatar/styles.js rename to webapp/src/components/bp-chip-avatar/styles.js diff --git a/services/frontend/src/components/button/index.js b/webapp/src/components/button/index.js similarity index 100% rename from services/frontend/src/components/button/index.js rename to webapp/src/components/button/index.js diff --git a/services/frontend/src/components/card/index.js b/webapp/src/components/card/index.js similarity index 100% rename from services/frontend/src/components/card/index.js rename to webapp/src/components/card/index.js diff --git a/services/frontend/src/components/card/styles.js b/webapp/src/components/card/styles.js similarity index 100% rename from services/frontend/src/components/card/styles.js rename to webapp/src/components/card/styles.js diff --git a/services/frontend/src/components/checkbox/index.js b/webapp/src/components/checkbox/index.js similarity index 100% rename from services/frontend/src/components/checkbox/index.js rename to webapp/src/components/checkbox/index.js diff --git a/services/frontend/src/components/compare-tool/compare-graph-view.js b/webapp/src/components/compare-tool/compare-graph-view.js similarity index 100% rename from services/frontend/src/components/compare-tool/compare-graph-view.js rename to webapp/src/components/compare-tool/compare-graph-view.js diff --git a/services/frontend/src/components/compare-tool/compare-slider-view.js b/webapp/src/components/compare-tool/compare-slider-view.js similarity index 100% rename from services/frontend/src/components/compare-tool/compare-slider-view.js rename to webapp/src/components/compare-tool/compare-slider-view.js diff --git a/services/frontend/src/components/compare-tool/index.js b/webapp/src/components/compare-tool/index.js similarity index 100% rename from services/frontend/src/components/compare-tool/index.js rename to webapp/src/components/compare-tool/index.js diff --git a/services/frontend/src/components/compare-tool/styles.js b/webapp/src/components/compare-tool/styles.js similarity index 100% rename from services/frontend/src/components/compare-tool/styles.js rename to webapp/src/components/compare-tool/styles.js diff --git a/services/frontend/src/components/filter-select/index.js b/webapp/src/components/filter-select/index.js similarity index 100% rename from services/frontend/src/components/filter-select/index.js rename to webapp/src/components/filter-select/index.js diff --git a/services/frontend/src/components/filter-select/styles.js b/webapp/src/components/filter-select/styles.js similarity index 100% rename from services/frontend/src/components/filter-select/styles.js rename to webapp/src/components/filter-select/styles.js diff --git a/services/frontend/src/components/formControl/index.js b/webapp/src/components/formControl/index.js similarity index 100% rename from services/frontend/src/components/formControl/index.js rename to webapp/src/components/formControl/index.js diff --git a/services/frontend/src/components/github-icon/index.js b/webapp/src/components/github-icon/index.js similarity index 100% rename from services/frontend/src/components/github-icon/index.js rename to webapp/src/components/github-icon/index.js diff --git a/services/frontend/src/components/icon/communityIcon.js b/webapp/src/components/icon/communityIcon.js similarity index 100% rename from services/frontend/src/components/icon/communityIcon.js rename to webapp/src/components/icon/communityIcon.js diff --git a/services/frontend/src/components/icon/developmentIcon.js b/webapp/src/components/icon/developmentIcon.js similarity index 100% rename from services/frontend/src/components/icon/developmentIcon.js rename to webapp/src/components/icon/developmentIcon.js diff --git a/services/frontend/src/components/icon/index.js b/webapp/src/components/icon/index.js similarity index 100% rename from services/frontend/src/components/icon/index.js rename to webapp/src/components/icon/index.js diff --git a/services/frontend/src/components/icon/infrastructureIcon.js b/webapp/src/components/icon/infrastructureIcon.js similarity index 100% rename from services/frontend/src/components/icon/infrastructureIcon.js rename to webapp/src/components/icon/infrastructureIcon.js diff --git a/services/frontend/src/components/icon/menu.svg b/webapp/src/components/icon/menu.svg similarity index 100% rename from services/frontend/src/components/icon/menu.svg rename to webapp/src/components/icon/menu.svg diff --git a/services/frontend/src/components/icon/styles.js b/webapp/src/components/icon/styles.js similarity index 100% rename from services/frontend/src/components/icon/styles.js rename to webapp/src/components/icon/styles.js diff --git a/services/frontend/src/components/icon/transparencyIcon.js b/webapp/src/components/icon/transparencyIcon.js similarity index 100% rename from services/frontend/src/components/icon/transparencyIcon.js rename to webapp/src/components/icon/transparencyIcon.js diff --git a/services/frontend/src/components/icon/trustinessIcon.js b/webapp/src/components/icon/trustinessIcon.js similarity index 100% rename from services/frontend/src/components/icon/trustinessIcon.js rename to webapp/src/components/icon/trustinessIcon.js diff --git a/services/frontend/src/components/input-autocomplete/index.js b/webapp/src/components/input-autocomplete/index.js similarity index 100% rename from services/frontend/src/components/input-autocomplete/index.js rename to webapp/src/components/input-autocomplete/index.js diff --git a/services/frontend/src/components/input-autocomplete/styles.js b/webapp/src/components/input-autocomplete/styles.js similarity index 100% rename from services/frontend/src/components/input-autocomplete/styles.js rename to webapp/src/components/input-autocomplete/styles.js diff --git a/services/frontend/src/components/language-select/index.js b/webapp/src/components/language-select/index.js similarity index 100% rename from services/frontend/src/components/language-select/index.js rename to webapp/src/components/language-select/index.js diff --git a/services/frontend/src/components/language-select/styles.js b/webapp/src/components/language-select/styles.js similarity index 100% rename from services/frontend/src/components/language-select/styles.js rename to webapp/src/components/language-select/styles.js diff --git a/services/frontend/src/components/layout/index.js b/webapp/src/components/layout/index.js similarity index 100% rename from services/frontend/src/components/layout/index.js rename to webapp/src/components/layout/index.js diff --git a/services/frontend/src/components/layout/styles.js b/webapp/src/components/layout/styles.js similarity index 100% rename from services/frontend/src/components/layout/styles.js rename to webapp/src/components/layout/styles.js diff --git a/services/frontend/src/components/main-drawer/index.js b/webapp/src/components/main-drawer/index.js similarity index 100% rename from services/frontend/src/components/main-drawer/index.js rename to webapp/src/components/main-drawer/index.js diff --git a/services/frontend/src/components/main-drawer/styles.js b/webapp/src/components/main-drawer/styles.js similarity index 100% rename from services/frontend/src/components/main-drawer/styles.js rename to webapp/src/components/main-drawer/styles.js diff --git a/services/frontend/src/components/main-footer/index.js b/webapp/src/components/main-footer/index.js similarity index 100% rename from services/frontend/src/components/main-footer/index.js rename to webapp/src/components/main-footer/index.js diff --git a/services/frontend/src/components/main-footer/styles.js b/webapp/src/components/main-footer/styles.js similarity index 100% rename from services/frontend/src/components/main-footer/styles.js rename to webapp/src/components/main-footer/styles.js diff --git a/services/frontend/src/components/mobile-search/index.js b/webapp/src/components/mobile-search/index.js similarity index 100% rename from services/frontend/src/components/mobile-search/index.js rename to webapp/src/components/mobile-search/index.js diff --git a/services/frontend/src/components/mobile-search/styles.js b/webapp/src/components/mobile-search/styles.js similarity index 100% rename from services/frontend/src/components/mobile-search/styles.js rename to webapp/src/components/mobile-search/styles.js diff --git a/services/frontend/src/components/parameter-range-selector/index.js b/webapp/src/components/parameter-range-selector/index.js similarity index 100% rename from services/frontend/src/components/parameter-range-selector/index.js rename to webapp/src/components/parameter-range-selector/index.js diff --git a/services/frontend/src/components/parameter-range-selector/style.css b/webapp/src/components/parameter-range-selector/style.css similarity index 100% rename from services/frontend/src/components/parameter-range-selector/style.css rename to webapp/src/components/parameter-range-selector/style.css diff --git a/services/frontend/src/components/radar/index.js b/webapp/src/components/radar/index.js similarity index 81% rename from services/frontend/src/components/radar/index.js rename to webapp/src/components/radar/index.js index 90a9e83b..098a0c53 100644 --- a/services/frontend/src/components/radar/index.js +++ b/webapp/src/components/radar/index.js @@ -15,11 +15,28 @@ const RadarData = ({ bpData, height, showLabel, ...props }) => { return ( { strokeColor: '#e5e5e5', lineWidth: 4 }, - scale: { - ticks: { - display: false, - min: 0, - max: 10, - stepSize: 2 - }, - gridLines: { lineWidth: 4, circular: true }, - angleLines: { color: '#e5e5e5', lineWidth: 4 }, - pointLabels: { fontColor: '#443F5B', fontSize: 14 } - }, tooltips: { enabled: true, callbacks: { diff --git a/services/frontend/src/components/rate-slider/index.js b/webapp/src/components/rate-slider/index.js similarity index 100% rename from services/frontend/src/components/rate-slider/index.js rename to webapp/src/components/rate-slider/index.js diff --git a/services/frontend/src/components/select/index.js b/webapp/src/components/select/index.js similarity index 100% rename from services/frontend/src/components/select/index.js rename to webapp/src/components/select/index.js diff --git a/services/frontend/src/components/sign-in-dialog/index.js b/webapp/src/components/sign-in-dialog/index.js similarity index 100% rename from services/frontend/src/components/sign-in-dialog/index.js rename to webapp/src/components/sign-in-dialog/index.js diff --git a/services/frontend/src/components/sign-in-dialog/styles.js b/webapp/src/components/sign-in-dialog/styles.js similarity index 100% rename from services/frontend/src/components/sign-in-dialog/styles.js rename to webapp/src/components/sign-in-dialog/styles.js diff --git a/services/frontend/src/components/sign-in-menu/index.js b/webapp/src/components/sign-in-menu/index.js similarity index 100% rename from services/frontend/src/components/sign-in-menu/index.js rename to webapp/src/components/sign-in-menu/index.js diff --git a/services/frontend/src/components/spinner/index.js b/webapp/src/components/spinner/index.js similarity index 100% rename from services/frontend/src/components/spinner/index.js rename to webapp/src/components/spinner/index.js diff --git a/services/frontend/src/components/spinner/styles.js b/webapp/src/components/spinner/styles.js similarity index 100% rename from services/frontend/src/components/spinner/styles.js rename to webapp/src/components/spinner/styles.js diff --git a/services/frontend/src/components/telegram-icon/index.js b/webapp/src/components/telegram-icon/index.js similarity index 100% rename from services/frontend/src/components/telegram-icon/index.js rename to webapp/src/components/telegram-icon/index.js diff --git a/services/frontend/src/components/textField/index.js b/webapp/src/components/textField/index.js similarity index 100% rename from services/frontend/src/components/textField/index.js rename to webapp/src/components/textField/index.js diff --git a/services/frontend/src/components/title-page/index.js b/webapp/src/components/title-page/index.js similarity index 100% rename from services/frontend/src/components/title-page/index.js rename to webapp/src/components/title-page/index.js diff --git a/services/frontend/src/components/video/index.js b/webapp/src/components/video/index.js similarity index 100% rename from services/frontend/src/components/video/index.js rename to webapp/src/components/video/index.js diff --git a/services/frontend/src/config/google-analitycs-module.js b/webapp/src/config/google-analitycs-module.js similarity index 100% rename from services/frontend/src/config/google-analitycs-module.js rename to webapp/src/config/google-analitycs-module.js diff --git a/services/frontend/src/config/index.js b/webapp/src/config/index.js similarity index 100% rename from services/frontend/src/config/index.js rename to webapp/src/config/index.js diff --git a/services/frontend/src/config/radar-color-palette.js b/webapp/src/config/radar-color-palette.js similarity index 100% rename from services/frontend/src/config/radar-color-palette.js rename to webapp/src/config/radar-color-palette.js diff --git a/services/frontend/src/config/radar.js b/webapp/src/config/radar.js similarity index 67% rename from services/frontend/src/config/radar.js rename to webapp/src/config/radar.js index efb129a8..ddef67a0 100644 --- a/services/frontend/src/config/radar.js +++ b/webapp/src/config/radar.js @@ -2,8 +2,10 @@ import { Chart } from 'react-chartjs-2' import get from 'lodash.get' const renderBackgroundColor = (chart) => { - const { ctx, scale, config } = chart - const { xCenter, yCenter, drawingArea: radius } = scale + const { ctx, config, scales } = chart + const { + r: { xCenter, yCenter, drawingArea: radius } + } = scales const backgroundColor = get( config, 'options.chartArea.backgroundColor', @@ -20,9 +22,11 @@ const renderBackgroundColor = (chart) => { } const renderCenterDot = (ctx, config, scale) => { - const { xCenter, yCenter, drawingArea: radius } = scale + const { + r: { xCenter, yCenter, drawingArea: radius } + } = scale - const centerDotColor = get(config, 'options.scale.gridLines.color', false) + const centerDotColor = get(config, 'options.scales.gridLines.color', false) ctx.save() ctx.arc(xCenter, yCenter, radius / 16, 0, Math.PI * 2) @@ -34,7 +38,9 @@ const renderCenterDot = (ctx, config, scale) => { } const renderPerimeter = (ctx, config, scale) => { - const { xCenter, yCenter, drawingArea: radius } = scale + const { + r: { xCenter, yCenter, drawingArea: radius } + } = scale const strokeColor = get(config, 'options.chartArea.strokeColor', false) const lineWidth = get(config, 'options.chartArea.lineWidth', 0) @@ -49,12 +55,13 @@ const renderPerimeter = (ctx, config, scale) => { ctx.restore() } -Chart.pluginService.register({ +Chart.register({ + id: Chart.name, beforeDraw: renderBackgroundColor, beforeDatasetsDraw: (chart) => { - const { ctx, config, scale } = chart + const { ctx, config } = chart - renderCenterDot(ctx, config, scale) - renderPerimeter(ctx, config, scale) + renderCenterDot(ctx, config, config.options.scales) + renderPerimeter(ctx, config, config.options.scales) } }) diff --git a/services/frontend/src/config/theme.js b/webapp/src/config/theme.js similarity index 100% rename from services/frontend/src/config/theme.js rename to webapp/src/config/theme.js diff --git a/services/frontend/src/config/wallet-providers.js b/webapp/src/config/wallet-providers.js similarity index 100% rename from services/frontend/src/config/wallet-providers.js rename to webapp/src/config/wallet-providers.js diff --git a/services/frontend/src/i18n.js b/webapp/src/i18n.js similarity index 100% rename from services/frontend/src/i18n.js rename to webapp/src/i18n.js diff --git a/services/frontend/src/index.js b/webapp/src/index.js similarity index 100% rename from services/frontend/src/index.js rename to webapp/src/index.js diff --git a/services/frontend/src/language/en.json b/webapp/src/language/en.json similarity index 100% rename from services/frontend/src/language/en.json rename to webapp/src/language/en.json diff --git a/services/frontend/src/language/es.json b/webapp/src/language/es.json similarity index 100% rename from services/frontend/src/language/es.json rename to webapp/src/language/es.json diff --git a/services/frontend/src/language/index.js b/webapp/src/language/index.js similarity index 100% rename from services/frontend/src/language/index.js rename to webapp/src/language/index.js diff --git a/services/frontend/src/mock/bps.js b/webapp/src/mock/bps.js similarity index 100% rename from services/frontend/src/mock/bps.js rename to webapp/src/mock/bps.js diff --git a/services/frontend/src/models/BlockProducer/blockProducers.js b/webapp/src/models/BlockProducer/blockProducers.js similarity index 100% rename from services/frontend/src/models/BlockProducer/blockProducers.js rename to webapp/src/models/BlockProducer/blockProducers.js diff --git a/services/frontend/src/models/BlockProducer/mutation_insert_user_rating.js b/webapp/src/models/BlockProducer/mutation_insert_user_rating.js similarity index 100% rename from services/frontend/src/models/BlockProducer/mutation_insert_user_rating.js rename to webapp/src/models/BlockProducer/mutation_insert_user_rating.js diff --git a/services/frontend/src/models/BlockProducer/mutation_update_rate.js b/webapp/src/models/BlockProducer/mutation_update_rate.js similarity index 100% rename from services/frontend/src/models/BlockProducer/mutation_update_rate.js rename to webapp/src/models/BlockProducer/mutation_update_rate.js diff --git a/services/frontend/src/models/BlockProducer/mutation_update_user_rating.js b/webapp/src/models/BlockProducer/mutation_update_user_rating.js similarity index 100% rename from services/frontend/src/models/BlockProducer/mutation_update_user_rating.js rename to webapp/src/models/BlockProducer/mutation_update_user_rating.js diff --git a/services/frontend/src/models/BlockProducer/query_get_bp_rating_by.js b/webapp/src/models/BlockProducer/query_get_bp_rating_by.js similarity index 100% rename from services/frontend/src/models/BlockProducer/query_get_bp_rating_by.js rename to webapp/src/models/BlockProducer/query_get_bp_rating_by.js diff --git a/services/frontend/src/models/BlockProducer/query_get_producer_by.js b/webapp/src/models/BlockProducer/query_get_producer_by.js similarity index 100% rename from services/frontend/src/models/BlockProducer/query_get_producer_by.js rename to webapp/src/models/BlockProducer/query_get_producer_by.js diff --git a/services/frontend/src/models/Proxy/proxy.js b/webapp/src/models/Proxy/proxy.js similarity index 100% rename from services/frontend/src/models/Proxy/proxy.js rename to webapp/src/models/Proxy/proxy.js diff --git a/services/frontend/src/models/Proxy/query_get_proxies.js b/webapp/src/models/Proxy/query_get_proxies.js similarity index 100% rename from services/frontend/src/models/Proxy/query_get_proxies.js rename to webapp/src/models/Proxy/query_get_proxies.js diff --git a/services/frontend/src/models/Proxy/query_get_proxy_by_owner.js b/webapp/src/models/Proxy/query_get_proxy_by_owner.js similarity index 100% rename from services/frontend/src/models/Proxy/query_get_proxy_by_owner.js rename to webapp/src/models/Proxy/query_get_proxy_by_owner.js diff --git a/services/frontend/src/models/User/mutation_delete_user_rate.js b/webapp/src/models/User/mutation_delete_user_rate.js similarity index 100% rename from services/frontend/src/models/User/mutation_delete_user_rate.js rename to webapp/src/models/User/mutation_delete_user_rate.js diff --git a/services/frontend/src/models/User/query_get_rates.js b/webapp/src/models/User/query_get_rates.js similarity index 100% rename from services/frontend/src/models/User/query_get_rates.js rename to webapp/src/models/User/query_get_rates.js diff --git a/services/frontend/src/models/User/user.js b/webapp/src/models/User/user.js similarity index 100% rename from services/frontend/src/models/User/user.js rename to webapp/src/models/User/user.js diff --git a/services/frontend/src/models/home.js b/webapp/src/models/home.js similarity index 100% rename from services/frontend/src/models/home.js rename to webapp/src/models/home.js diff --git a/services/frontend/src/models/index.js b/webapp/src/models/index.js similarity index 100% rename from services/frontend/src/models/index.js rename to webapp/src/models/index.js diff --git a/services/frontend/src/models/isLoading.js b/webapp/src/models/isLoading.js similarity index 100% rename from services/frontend/src/models/isLoading.js rename to webapp/src/models/isLoading.js diff --git a/services/frontend/src/models/location.js b/webapp/src/models/location.js similarity index 100% rename from services/frontend/src/models/location.js rename to webapp/src/models/location.js diff --git a/services/frontend/src/models/settings.js b/webapp/src/models/settings.js similarity index 100% rename from services/frontend/src/models/settings.js rename to webapp/src/models/settings.js diff --git a/services/frontend/src/routes/about/index.js b/webapp/src/routes/about/index.js similarity index 100% rename from services/frontend/src/routes/about/index.js rename to webapp/src/routes/about/index.js diff --git a/services/frontend/src/routes/about/styles.js b/webapp/src/routes/about/styles.js similarity index 100% rename from services/frontend/src/routes/about/styles.js rename to webapp/src/routes/about/styles.js diff --git a/services/frontend/src/routes/account/index.js b/webapp/src/routes/account/index.js similarity index 100% rename from services/frontend/src/routes/account/index.js rename to webapp/src/routes/account/index.js diff --git a/services/frontend/src/routes/account/styles.js b/webapp/src/routes/account/styles.js similarity index 100% rename from services/frontend/src/routes/account/styles.js rename to webapp/src/routes/account/styles.js diff --git a/services/frontend/src/routes/block-producers/block-producer-profile.js b/webapp/src/routes/block-producers/block-producer-profile.js similarity index 100% rename from services/frontend/src/routes/block-producers/block-producer-profile.js rename to webapp/src/routes/block-producers/block-producer-profile.js diff --git a/services/frontend/src/routes/block-producers/block-producer-rate.js b/webapp/src/routes/block-producers/block-producer-rate.js similarity index 100% rename from services/frontend/src/routes/block-producers/block-producer-rate.js rename to webapp/src/routes/block-producers/block-producer-rate.js diff --git a/services/frontend/src/routes/block-producers/bottom-sheet-selected-bps.js b/webapp/src/routes/block-producers/bottom-sheet-selected-bps.js similarity index 100% rename from services/frontend/src/routes/block-producers/bottom-sheet-selected-bps.js rename to webapp/src/routes/block-producers/bottom-sheet-selected-bps.js diff --git a/services/frontend/src/routes/block-producers/compare-tool-toggle.js b/webapp/src/routes/block-producers/compare-tool-toggle.js similarity index 100% rename from services/frontend/src/routes/block-producers/compare-tool-toggle.js rename to webapp/src/routes/block-producers/compare-tool-toggle.js diff --git a/services/frontend/src/routes/block-producers/filter-box.js b/webapp/src/routes/block-producers/filter-box.js similarity index 100% rename from services/frontend/src/routes/block-producers/filter-box.js rename to webapp/src/routes/block-producers/filter-box.js diff --git a/services/frontend/src/routes/block-producers/general-information-profile.js b/webapp/src/routes/block-producers/general-information-profile.js similarity index 100% rename from services/frontend/src/routes/block-producers/general-information-profile.js rename to webapp/src/routes/block-producers/general-information-profile.js diff --git a/services/frontend/src/routes/block-producers/index.js b/webapp/src/routes/block-producers/index.js similarity index 100% rename from services/frontend/src/routes/block-producers/index.js rename to webapp/src/routes/block-producers/index.js diff --git a/services/frontend/src/routes/block-producers/slider-rating-section.js b/webapp/src/routes/block-producers/slider-rating-section.js similarity index 100% rename from services/frontend/src/routes/block-producers/slider-rating-section.js rename to webapp/src/routes/block-producers/slider-rating-section.js diff --git a/services/frontend/src/routes/block-producers/styles.js b/webapp/src/routes/block-producers/styles.js similarity index 100% rename from services/frontend/src/routes/block-producers/styles.js rename to webapp/src/routes/block-producers/styles.js diff --git a/services/frontend/src/routes/help/index.js b/webapp/src/routes/help/index.js similarity index 100% rename from services/frontend/src/routes/help/index.js rename to webapp/src/routes/help/index.js diff --git a/services/frontend/src/routes/help/styles.js b/webapp/src/routes/help/styles.js similarity index 100% rename from services/frontend/src/routes/help/styles.js rename to webapp/src/routes/help/styles.js diff --git a/services/frontend/src/routes/home/cover.js b/webapp/src/routes/home/cover.js similarity index 100% rename from services/frontend/src/routes/home/cover.js rename to webapp/src/routes/home/cover.js diff --git a/services/frontend/src/routes/home/index.js b/webapp/src/routes/home/index.js similarity index 100% rename from services/frontend/src/routes/home/index.js rename to webapp/src/routes/home/index.js diff --git a/services/frontend/src/routes/home/rateCategory.js b/webapp/src/routes/home/rateCategory.js similarity index 100% rename from services/frontend/src/routes/home/rateCategory.js rename to webapp/src/routes/home/rateCategory.js diff --git a/services/frontend/src/routes/home/styles.js b/webapp/src/routes/home/styles.js similarity index 100% rename from services/frontend/src/routes/home/styles.js rename to webapp/src/routes/home/styles.js diff --git a/services/frontend/src/routes/home/subTopic.js b/webapp/src/routes/home/subTopic.js similarity index 100% rename from services/frontend/src/routes/home/subTopic.js rename to webapp/src/routes/home/subTopic.js diff --git a/services/frontend/src/routes/index.js b/webapp/src/routes/index.js similarity index 100% rename from services/frontend/src/routes/index.js rename to webapp/src/routes/index.js diff --git a/services/frontend/src/routes/login-deprecated/index.js b/webapp/src/routes/login-deprecated/index.js similarity index 100% rename from services/frontend/src/routes/login-deprecated/index.js rename to webapp/src/routes/login-deprecated/index.js diff --git a/services/frontend/src/routes/not-found/index.js b/webapp/src/routes/not-found/index.js similarity index 100% rename from services/frontend/src/routes/not-found/index.js rename to webapp/src/routes/not-found/index.js diff --git a/services/frontend/src/routes/not-found/styles.js b/webapp/src/routes/not-found/styles.js similarity index 100% rename from services/frontend/src/routes/not-found/styles.js rename to webapp/src/routes/not-found/styles.js diff --git a/services/frontend/src/routes/proxies/compare-tool-toggle.js b/webapp/src/routes/proxies/compare-tool-toggle.js similarity index 100% rename from services/frontend/src/routes/proxies/compare-tool-toggle.js rename to webapp/src/routes/proxies/compare-tool-toggle.js diff --git a/services/frontend/src/routes/proxies/filter-box.js b/webapp/src/routes/proxies/filter-box.js similarity index 100% rename from services/frontend/src/routes/proxies/filter-box.js rename to webapp/src/routes/proxies/filter-box.js diff --git a/services/frontend/src/routes/proxies/general-information-profile.js b/webapp/src/routes/proxies/general-information-profile.js similarity index 100% rename from services/frontend/src/routes/proxies/general-information-profile.js rename to webapp/src/routes/proxies/general-information-profile.js diff --git a/services/frontend/src/routes/proxies/index.js b/webapp/src/routes/proxies/index.js similarity index 100% rename from services/frontend/src/routes/proxies/index.js rename to webapp/src/routes/proxies/index.js diff --git a/services/frontend/src/routes/proxies/proxy-profile.js b/webapp/src/routes/proxies/proxy-profile.js similarity index 100% rename from services/frontend/src/routes/proxies/proxy-profile.js rename to webapp/src/routes/proxies/proxy-profile.js diff --git a/services/frontend/src/routes/proxies/styles.js b/webapp/src/routes/proxies/styles.js similarity index 100% rename from services/frontend/src/routes/proxies/styles.js rename to webapp/src/routes/proxies/styles.js diff --git a/services/frontend/src/routes/settings/index.js b/webapp/src/routes/settings/index.js similarity index 100% rename from services/frontend/src/routes/settings/index.js rename to webapp/src/routes/settings/index.js diff --git a/services/frontend/src/routes/settings/styles.js b/webapp/src/routes/settings/styles.js similarity index 100% rename from services/frontend/src/routes/settings/styles.js rename to webapp/src/routes/settings/styles.js diff --git a/services/frontend/src/routes/termsOfUse/index.js b/webapp/src/routes/termsOfUse/index.js similarity index 100% rename from services/frontend/src/routes/termsOfUse/index.js rename to webapp/src/routes/termsOfUse/index.js diff --git a/services/frontend/src/routes/termsOfUse/styles.js b/webapp/src/routes/termsOfUse/styles.js similarity index 100% rename from services/frontend/src/routes/termsOfUse/styles.js rename to webapp/src/routes/termsOfUse/styles.js diff --git a/services/frontend/src/serviceWorker.js b/webapp/src/serviceWorker.js similarity index 100% rename from services/frontend/src/serviceWorker.js rename to webapp/src/serviceWorker.js diff --git a/services/frontend/src/services/api.js b/webapp/src/services/api.js similarity index 100% rename from services/frontend/src/services/api.js rename to webapp/src/services/api.js diff --git a/services/frontend/src/services/bps.js b/webapp/src/services/bps.js similarity index 100% rename from services/frontend/src/services/bps.js rename to webapp/src/services/bps.js diff --git a/services/frontend/src/services/eosjs-api.js b/webapp/src/services/eosjs-api.js similarity index 100% rename from services/frontend/src/services/eosjs-api.js rename to webapp/src/services/eosjs-api.js diff --git a/services/frontend/src/services/graphql.js b/webapp/src/services/graphql.js similarity index 87% rename from services/frontend/src/services/graphql.js rename to webapp/src/services/graphql.js index 8984deda..ccd5b118 100644 --- a/services/frontend/src/services/graphql.js +++ b/webapp/src/services/graphql.js @@ -5,6 +5,9 @@ import { split } from 'apollo-link' import { getMainDefinition } from 'apollo-utilities' import { InMemoryCache } from 'apollo-cache-inmemory' +const REACT_APP_GRAPHQL_HTTP_URL = process.env.REACT_APP_GRAPHQL_HTTP_URL +console.log(`REACT_APP_GRAPHQL_HTTP_URL: ${REACT_APP_GRAPHQL_HTTP_URL}`) + // Create an http link: const httpLink = new HttpLink({ uri: process.env.REACT_APP_GRAPHQL_HTTP_URL, diff --git a/services/frontend/src/store.js b/webapp/src/store.js similarity index 100% rename from services/frontend/src/store.js rename to webapp/src/store.js diff --git a/services/frontend/src/utils/convertVotesToEosVotes.js b/webapp/src/utils/convertVotesToEosVotes.js similarity index 100% rename from services/frontend/src/utils/convertVotesToEosVotes.js rename to webapp/src/utils/convertVotesToEosVotes.js diff --git a/services/frontend/src/utils/eosjsUtils.js b/webapp/src/utils/eosjsUtils.js similarity index 100% rename from services/frontend/src/utils/eosjsUtils.js rename to webapp/src/utils/eosjsUtils.js diff --git a/services/frontend/src/utils/formatNumber.js b/webapp/src/utils/formatNumber.js similarity index 100% rename from services/frontend/src/utils/formatNumber.js rename to webapp/src/utils/formatNumber.js diff --git a/services/frontend/src/utils/getAverageValue.js b/webapp/src/utils/getAverageValue.js similarity index 100% rename from services/frontend/src/utils/getAverageValue.js rename to webapp/src/utils/getAverageValue.js diff --git a/services/frontend/src/utils/getBPRadarData.js b/webapp/src/utils/getBPRadarData.js similarity index 100% rename from services/frontend/src/utils/getBPRadarData.js rename to webapp/src/utils/getBPRadarData.js diff --git a/services/frontend/src/utils/getColorFromName.js b/webapp/src/utils/getColorFromName.js similarity index 100% rename from services/frontend/src/utils/getColorFromName.js rename to webapp/src/utils/getColorFromName.js diff --git a/services/frontend/src/utils/getRadarLabelName.js b/webapp/src/utils/getRadarLabelName.js similarity index 100% rename from services/frontend/src/utils/getRadarLabelName.js rename to webapp/src/utils/getRadarLabelName.js diff --git a/services/frontend/src/utils/getRgbColorsFromHex.js b/webapp/src/utils/getRgbColorsFromHex.js similarity index 95% rename from services/frontend/src/utils/getRgbColorsFromHex.js rename to webapp/src/utils/getRgbColorsFromHex.js index ef9d8967..c7070334 100644 --- a/services/frontend/src/utils/getRgbColorsFromHex.js +++ b/webapp/src/utils/getRgbColorsFromHex.js @@ -1,7 +1,7 @@ const getColorHashByString = (inputString = 'defaultString') => { let inputStringSum = 0 - for (var i in inputString) { + for (const i in inputString) { inputStringSum += inputString.charCodeAt(i) } diff --git a/services/frontend/src/utils/sortedBy.js b/webapp/src/utils/sortedBy.js similarity index 100% rename from services/frontend/src/utils/sortedBy.js rename to webapp/src/utils/sortedBy.js diff --git a/services/frontend/src/utils/ualAuthenticators.js b/webapp/src/utils/ualAuthenticators.js similarity index 100% rename from services/frontend/src/utils/ualAuthenticators.js rename to webapp/src/utils/ualAuthenticators.js diff --git a/services/frontend/yarn.lock b/webapp/yarn.lock similarity index 98% rename from services/frontend/yarn.lock rename to webapp/yarn.lock index d85e8ff9..11d0962d 100644 --- a/services/frontend/yarn.lock +++ b/webapp/yarn.lock @@ -1375,7 +1375,7 @@ resolved "https://registry.yarnpkg.com/@emotion/unitless/-/unitless-0.7.5.tgz#77211291c1900a700b8a78cfafda3160d76949ed" integrity sha512-OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg== -"@eoscostarica/eoscr-components@^3.1.0": +"@eoscostarica/eoscr-components@^3.1.4": version "3.1.4" resolved "https://registry.yarnpkg.com/@eoscostarica/eoscr-components/-/eoscr-components-3.1.4.tgz#037f205c2e521e693d9ed8026fec1e1a7de7feff" integrity sha512-HmqfGeM24KQRD0JsOBuJT1vZuPjUwTMa4ekl9EfR6j08mO+nkKeTCuxuk2gQFTyJ8cXnft4NQMDjzntLV6GMvA== @@ -1728,7 +1728,7 @@ resolved "https://registry.yarnpkg.com/@ledgerhq/logs/-/logs-4.72.0.tgz#43df23af013ad1135407e5cf33ca6e4c4c7708d5" integrity sha512-o+TYF8vBcyySRsb2kqBDv/KMeme8a2nwWoG+lAWzbDmWfb2/MrVWYCVYDYvjXdSoI/Cujqy1i0gIDrkdxa9chA== -"@material-ui/core@^4.11.0", "@material-ui/core@^4.9.12": +"@material-ui/core@^4.11.0", "@material-ui/core@^4.12.1": version "4.12.2" resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.2.tgz#59a8b19f16b8c218d912f37f5ae70473c3c82c73" integrity sha512-Q1npB8V73IC+eV2X6as+g71MpEGQwqKHUI2iujY62npk35V8nMx/bUXAHjv5kKG1BZ8s8XUWoG6s/VkjYPjjQA== @@ -1753,7 +1753,7 @@ dependencies: "@babel/runtime" "^7.4.4" -"@material-ui/lab@^4.0.0-alpha.51", "@material-ui/lab@^4.0.0-alpha.56": +"@material-ui/lab@^4.0.0-alpha.56", "@material-ui/lab@^4.0.0-alpha.60": version "4.0.0-alpha.60" resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.60.tgz#5ad203aed5a8569b0f1753945a21a05efa2234d2" integrity sha512-fadlYsPJF+0fx2lRuyqAuJj7hAS1tLDdIEEdov5jlrpb5pp4b+mRDUqQTUxi4inRZHS1bEXpU8QWUhO6xX88aA== @@ -2190,9 +2190,9 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/node@*", "@types/node@>=6": - version "16.3.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.3.3.tgz#0c30adff37bbbc7a50eb9b58fae2a504d0d88038" - integrity sha512-8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ== + version "16.4.3" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.3.tgz#c01c1a215721f6dec71b47d88b4687463601ba48" + integrity sha512-GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -2237,9 +2237,9 @@ "@types/react" "*" "@types/react@*": - version "17.0.14" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.14.tgz#f0629761ca02945c4e8fea99b8177f4c5c61fb0f" - integrity sha512-0WwKHUbWuQWOce61UexYuWTGuGY/8JvtUe/dtQ6lR4sZ3UiylHotJeWpf3ArP9+DSGUoLY3wbU59VyMrJps5VQ== + version "17.0.15" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.15.tgz#c7533dc38025677e312606502df7656a6ea626d0" + integrity sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2318,27 +2318,27 @@ integrity sha512-fbF6oTd4sGGy0xjHPKAt+eS2CrxJ3+6gQ3FGcBoIJR2TLAyCkCyI8JqZNy+FeON0AhVgNJoUumVoZQjBFUqHkw== "@typescript-eslint/eslint-plugin@^4.5.0": - version "4.28.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.4.tgz#e73c8cabbf3f08dee0e1bda65ed4e622ae8f8921" - integrity sha512-s1oY4RmYDlWMlcV0kKPBaADn46JirZzvvH7c2CtAqxCY96S538JRBAzt83RrfkDheV/+G/vWNK0zek+8TB3Gmw== + version "4.28.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.5.tgz#8197f1473e7da8218c6a37ff308d695707835684" + integrity sha512-m31cPEnbuCqXtEZQJOXAHsHvtoDi9OVaeL5wZnO2KZTnkvELk+u6J6jHg+NzvWQxk+87Zjbc4lJS4NHmgImz6Q== dependencies: - "@typescript-eslint/experimental-utils" "4.28.4" - "@typescript-eslint/scope-manager" "4.28.4" + "@typescript-eslint/experimental-utils" "4.28.5" + "@typescript-eslint/scope-manager" "4.28.5" debug "^4.3.1" functional-red-black-tree "^1.0.1" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.28.4", "@typescript-eslint/experimental-utils@^4.0.1": - version "4.28.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.4.tgz#9c70c35ebed087a5c70fb0ecd90979547b7fec96" - integrity sha512-OglKWOQRWTCoqMSy6pm/kpinEIgdcXYceIcH3EKWUl4S8xhFtN34GQRaAvTIZB9DD94rW7d/U7tUg3SYeDFNHA== +"@typescript-eslint/experimental-utils@4.28.5", "@typescript-eslint/experimental-utils@^4.0.1": + version "4.28.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.5.tgz#66c28bef115b417cf9d80812a713e0e46bb42a64" + integrity sha512-bGPLCOJAa+j49hsynTaAtQIWg6uZd8VLiPcyDe4QPULsvQwLHGLSGKKcBN8/lBxIX14F74UEMK2zNDI8r0okwA== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.28.4" - "@typescript-eslint/types" "4.28.4" - "@typescript-eslint/typescript-estree" "4.28.4" + "@typescript-eslint/scope-manager" "4.28.5" + "@typescript-eslint/types" "4.28.5" + "@typescript-eslint/typescript-estree" "4.28.5" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -2354,32 +2354,32 @@ eslint-utils "^2.0.0" "@typescript-eslint/parser@^4.5.0": - version "4.28.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.4.tgz#bc462dc2779afeefdcf49082516afdc3e7b96fab" - integrity sha512-4i0jq3C6n+og7/uCHiE6q5ssw87zVdpUj1k6VlVYMonE3ILdFApEzTWgppSRG4kVNB/5jxnH+gTeKLMNfUelQA== + version "4.28.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.5.tgz#9c971668f86d1b5c552266c47788a87488a47d1c" + integrity sha512-NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw== dependencies: - "@typescript-eslint/scope-manager" "4.28.4" - "@typescript-eslint/types" "4.28.4" - "@typescript-eslint/typescript-estree" "4.28.4" + "@typescript-eslint/scope-manager" "4.28.5" + "@typescript-eslint/types" "4.28.5" + "@typescript-eslint/typescript-estree" "4.28.5" debug "^4.3.1" -"@typescript-eslint/scope-manager@4.28.4": - version "4.28.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.4.tgz#bdbce9b6a644e34f767bd68bc17bb14353b9fe7f" - integrity sha512-ZJBNs4usViOmlyFMt9X9l+X0WAFcDH7EdSArGqpldXu7aeZxDAuAzHiMAeI+JpSefY2INHrXeqnha39FVqXb8w== +"@typescript-eslint/scope-manager@4.28.5": + version "4.28.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz#3a1b70c50c1535ac33322786ea99ebe403d3b923" + integrity sha512-PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ== dependencies: - "@typescript-eslint/types" "4.28.4" - "@typescript-eslint/visitor-keys" "4.28.4" + "@typescript-eslint/types" "4.28.5" + "@typescript-eslint/visitor-keys" "4.28.5" "@typescript-eslint/types@3.10.1": version "3.10.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727" integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ== -"@typescript-eslint/types@4.28.4": - version "4.28.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.4.tgz#41acbd79b5816b7c0dd7530a43d97d020d3aeb42" - integrity sha512-3eap4QWxGqkYuEmVebUGULMskR6Cuoc/Wii0oSOddleP4EGx1tjLnZQ0ZP33YRoMDCs5O3j56RBV4g14T4jvww== +"@typescript-eslint/types@4.28.5": + version "4.28.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.5.tgz#d33edf8e429f0c0930a7c3d44e9b010354c422e9" + integrity sha512-MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA== "@typescript-eslint/typescript-estree@3.10.1": version "3.10.1" @@ -2395,13 +2395,13 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/typescript-estree@4.28.4": - version "4.28.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.4.tgz#252e6863278dc0727244be9e371eb35241c46d00" - integrity sha512-z7d8HK8XvCRyN2SNp+OXC2iZaF+O2BTquGhEYLKLx5k6p0r05ureUtgEfo5f6anLkhCxdHtCf6rPM1p4efHYDQ== +"@typescript-eslint/typescript-estree@4.28.5": + version "4.28.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz#4906d343de693cf3d8dcc301383ed638e0441cd1" + integrity sha512-FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw== dependencies: - "@typescript-eslint/types" "4.28.4" - "@typescript-eslint/visitor-keys" "4.28.4" + "@typescript-eslint/types" "4.28.5" + "@typescript-eslint/visitor-keys" "4.28.5" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" @@ -2415,12 +2415,12 @@ dependencies: eslint-visitor-keys "^1.1.0" -"@typescript-eslint/visitor-keys@4.28.4": - version "4.28.4" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.4.tgz#92dacfefccd6751cbb0a964f06683bfd72d0c4d3" - integrity sha512-NIAXAdbz1XdOuzqkJHjNKXKj8QQ4cv5cxR/g0uQhCYf/6//XrmfpaYsM7PnBcNbfvTDLUkqQ5TPNm1sozDdTWg== +"@typescript-eslint/visitor-keys@4.28.5": + version "4.28.5" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz#ffee2c602762ed6893405ee7c1144d9cc0a29675" + integrity sha512-dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg== dependencies: - "@typescript-eslint/types" "4.28.4" + "@typescript-eslint/types" "4.28.5" eslint-visitor-keys "^2.0.0" "@webassemblyjs/ast@1.9.0": @@ -2682,17 +2682,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@6.5.3: - version "6.5.3" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9" - integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg== - dependencies: - fast-deep-equal "^2.0.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: +ajv@6.12.6, ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -2717,17 +2707,17 @@ alphanum-sort@^1.0.0: resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= -anchor-link-browser-transport@^3.1.3: - version "3.1.3" - resolved "https://registry.yarnpkg.com/anchor-link-browser-transport/-/anchor-link-browser-transport-3.1.3.tgz#eb65dbcba9380885f36b08b2a9d05bf9cdeb4e46" - integrity sha512-r5S7r/NkkBQaUydh0Q3MOZZ7oQo1KZZ72LHtJzW5PX1v2dIW76/hxsKVE9IjwmIIeHvB6jqgHgTk0Rm3YVdqYw== +anchor-link-browser-transport@^3.2.3: + version "3.2.3" + resolved "https://registry.yarnpkg.com/anchor-link-browser-transport/-/anchor-link-browser-transport-3.2.3.tgz#a4770ae1fd42d362e513f04198ec298a87d8ed53" + integrity sha512-nLWcB2gCY95R3F54RiPltuOUssK9hry+Z8GXziRxj+HX9GNyb2f0lQ3YG3+U+yhJvQbXwIU9O5ssllZF2zpZPA== dependencies: tslib "^2.0.3" -anchor-link@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/anchor-link/-/anchor-link-3.2.3.tgz#ed57b54050a74ae3fb391bdb67f78c7196d8a343" - integrity sha512-1AnQLwO6tKWAP7l9/dwQ4iRT8RvNFBDPb7mxdqS2hURJa6zXEI9UdIMKCVKP64iiu2Jekf8/TSXnFKJFVXIPog== +anchor-link@^3.3.2: + version "3.3.2" + resolved "https://registry.yarnpkg.com/anchor-link/-/anchor-link-3.3.2.tgz#7165b7d28cfe26ce2f7db959e8971bb13c029c20" + integrity sha512-JDsI2Xwy4Y4D1AzfgSOioOBb5GfDPteQZOSu+cs2hT8gdRg4Asfhnxj8qDwpZX5RWdxP2NyHJEqBW5xDWH93kw== dependencies: "@greymass/eosio" "^0.4.0" asmcrypto.js "^2.3.2" @@ -2902,7 +2892,7 @@ aproba@^1.1.1: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== -arch@^2.1.0: +arch@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11" integrity sha512-Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ== @@ -3165,7 +3155,7 @@ babel-jest@^26.6.0, babel-jest@^26.6.3: graceful-fs "^4.2.4" slash "^3.0.0" -babel-loader@8.1.0, babel-loader@~8.1.0: +babel-loader@8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz#c611d5112bd5209abe8b9fa84c3e4da25275f1c3" integrity sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw== @@ -3838,9 +3828,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001219: - version "1.0.30001245" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001245.tgz#45b941bbd833cb0fa53861ff2bae746b3c6ca5d4" - integrity sha512-768fM9j1PKXpOCKws6eTo3RHmvTUsG9UrpT4WoREFeZgJBTi4/X9g565azS/rVUGtqb8nt7FjLeF5u4kukERnA== + version "1.0.30001247" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001247.tgz#105be7a8fb30cdd303275e769a9dfb87d4b3577a" + integrity sha512-4rS7co+7+AoOSPRPOPUt5/GdaqZc0EsUpWk66ofE3HJTAajUK2Ss2VwoNzVN69ghg8lYYlh0an0Iy4LIHHo9UQ== capture-exit@^2.0.0: version "2.0.0" @@ -3880,7 +3870,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4.0.0, chalk@^4.1.0: +chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== @@ -3916,6 +3906,11 @@ chart.js@^2.9.3: chartjs-color "^2.1.0" moment "^2.10.2" +chart.js@^3.4.1: + version "3.5.0" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.5.0.tgz#6eb075332d4ebbbb20a94e5a07a234052ed6c4fb" + integrity sha512-J1a4EAb1Gi/KbhwDRmoovHTRuqT8qdF0kZ4XgwxpGethJHUdDrkqyPYwke0a+BuvSeUxPf8Cos6AX2AB8H8GLA== + chartjs-color-string@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71" @@ -4013,7 +4008,7 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -classnames@2.x, classnames@^2.2.1, classnames@^2.2.5, classnames@^2.2.6: +classnames@2.x, classnames@^2.2.1, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== @@ -4050,13 +4045,14 @@ cli-truncate@^2.1.0: slice-ansi "^3.0.0" string-width "^4.2.0" -clipboardy@1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-1.2.3.tgz#0526361bf78724c1f20be248d428e365433c07ef" - integrity sha512-2WNImOvCRe6r63Gk9pShfkwXsVtKCroMAevIbiae021mS850UkWPbevxsBz3tnvjZIEGvlwaqCPsw+4ulzNgJA== +clipboardy@2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/clipboardy/-/clipboardy-2.3.0.tgz#3c2903650c68e46a91b388985bc2774287dba290" + integrity sha512-mKhiIL2DrQIsuXMgBgnfEHOZOryC7kY7YO//TN6c63wlEm3NG5tz+YgY5rVi29KCmq/QQjKYvM7a19+MDOTHOQ== dependencies: - arch "^2.1.0" - execa "^0.8.0" + arch "^2.1.1" + execa "^1.0.0" + is-wsl "^2.1.1" cliui@^5.0.0: version "5.0.0" @@ -4175,10 +4171,10 @@ commander@^4.0.0, commander@^4.1.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -commander@^6.2.0: - version "6.2.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c" - integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA== +commander@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== common-tags@^1.8.0: version "1.8.0" @@ -4494,7 +4490,7 @@ cross-fetch@^3.0.4: dependencies: node-fetch "2.6.1" -cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2: +cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -4541,9 +4537,9 @@ crypto-browserify@^3.11.0: randomfill "^1.0.3" crypto-js@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.0.0.tgz#2904ab2677a9d042856a2ea2ef80de92e4a36dcc" - integrity sha512-bzHZN8Pn+gS7DQA6n+iUmBfl0hO5DJq++QP3U6uTucDtk/0iGpXd/Gg7CGR0p8tJhofJyaKoWBuJI4eAO00BBg== + version "4.1.1" + resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-4.1.1.tgz#9e485bcf03521041bd85844786b83fb7619736cf" + integrity sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw== crypto-random-string@^1.0.0: version "1.0.0" @@ -4838,14 +4834,14 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9: dependencies: ms "2.0.0" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0, debug@^4.3.1: +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw== dependencies: ms "2.1.2" -debug@^3.1.1, debug@^3.2.5, debug@^3.2.7: +debug@^3.1.1, debug@^3.2.6, debug@^3.2.7: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ== @@ -5224,9 +5220,9 @@ ejs@^2.6.1: integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.723: - version "1.3.780" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.780.tgz#f946e10dc0005a3b59b9afa2d2c92f5c421f7fc5" - integrity sha512-2KQ9OYm9WMUNpAPA/4aerURl3hwRc9tNlpsiEj3Y8Gf7LVf26NzyLIX2v0hSagQwrS9+cWab+28A2GPKDoVNRA== + version "1.3.788" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.788.tgz#7a304c8ebb11d30916a1a1c1b4a9bad3983ef232" + integrity sha512-dbMIpX4E4/Gk4gzOh1GYS7ls1vGsByWKpIqLviJi1mSmSt5BvrWLLtSqpFE5BaC7Ef4NnI0GMaiddNX2Brw6zA== elliptic@6.5.0: version "6.5.0" @@ -5444,6 +5440,16 @@ eosjs@^21.0.3: hash.js "1.1.7" pako "2.0.3" +eosjs@^22.1.0: + version "22.1.0" + resolved "https://registry.yarnpkg.com/eosjs/-/eosjs-22.1.0.tgz#7ac40e2f1f959fab70539c30ac8ae46c9038aa3c" + integrity sha512-Ka8KO7akC3RxNdSg/3dkGWuUWUQESTzSUzQljBdVP16UG548vmQoBqSGnZdnjlZyfcab8VOu2iEt+JjyfYc5+A== + dependencies: + bn.js "5.2.0" + elliptic "6.5.4" + hash.js "1.1.7" + pako "2.0.3" + errno@^0.1.3, errno@~0.1.7: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" @@ -5564,7 +5570,7 @@ escodegen@^2.0.0: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^8.0.0: +eslint-config-prettier@^8.3.0: version "8.3.0" resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a" integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew== @@ -5591,7 +5597,7 @@ eslint-config-standard@16.0.2: resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz#71e91727ac7a203782d0a5ca4d1c462d14e234f6" integrity sha512-fx3f1rJDsl9bY7qzyX8SAtP8GBSk6MfXFaTfaGgk12aAYW4gJSyRm7dM790L6cbXv63fvjY4XeSzXnb4WM+SKw== -eslint-config-standard@^16.0.2: +eslint-config-standard@^16.0.3: version "16.0.3" resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.3.tgz#6c8761e544e96c531ff92642eeb87842b8488516" integrity sha512-x4fmJL5hGqNJKGHSjnLdgA6U6h1YW/G2dW9fA+cyVur4SK6lyue8+UgNKWlZtUDTXvgKDD/Oa3GQjmB5kjtVvg== @@ -5621,9 +5627,9 @@ eslint-plugin-es@^3.0.0: regexpp "^3.0.0" eslint-plugin-flowtype@^5.2.0: - version "5.8.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.8.0.tgz#35b55e4ce559b90efbe913ed33630e391e301481" - integrity sha512-feK1xnUTsMSNTOw9jFw7aVgZl7Ep+ghpta/YEoaV6jbXU6Yso30B7BIj9ObHLzZ5TFJL7D98az080wfykLCrcw== + version "5.8.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.8.2.tgz#e8c4429f2d39d93ccb0732f581b159da16fa0bda" + integrity sha512-/aPTnNKNAYJbEU07HwvohnXp0itBT+P0r+7s80IG5eqfsrx4NLN+0rXNztJBc56u1RJegSn0GMt1cZnGZpCThw== dependencies: lodash "^4.17.15" string-natural-compare "^3.0.1" @@ -5669,9 +5675,9 @@ eslint-plugin-import@~2.22.1: tsconfig-paths "^3.9.0" eslint-plugin-jest@^24.1.0: - version "24.3.6" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.3.6.tgz#5f0ca019183c3188c5ad3af8e80b41de6c8e9173" - integrity sha512-WOVH4TIaBLIeCX576rLcOgjNXqP+jNlCiEmRgFTfQtJ52DpwnIQKAVGlGPAN7CZ33bW6eNfHD6s8ZbEUTQubJg== + version "24.4.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.4.0.tgz#fa4b614dbd46a98b652d830377971f097bda9262" + integrity sha512-8qnt/hgtZ94E9dA6viqfViKBfkJwFHXgJmTWlMGDgunw1XJEGqm3eiPjDsTanM3/u/3Az82nyQM9GX7PM/QGmg== dependencies: "@typescript-eslint/experimental-utils" "^4.0.1" @@ -5704,7 +5710,7 @@ eslint-plugin-node@^11.0.0, eslint-plugin-node@~11.1.0: resolve "^1.10.1" semver "^6.1.0" -eslint-plugin-prettier@^3.3.1: +eslint-plugin-prettier@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz#cdbad3bf1dbd2b177e9825737fe63b476a08f0c7" integrity sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw== @@ -5808,7 +5814,7 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== -eslint-webpack-plugin@^2.1.0: +eslint-webpack-plugin@^2.5.2: version "2.5.4" resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.5.4.tgz#473b84932f1a8e2c2b8e66a402d0497bf440b986" integrity sha512-7rYh0m76KyKSDE+B+2PUQrlNS4HJ51t3WKpkJg6vo2jFMbEPTG99cBV0Dm7LXSHucN4WGCG65wQcRiTFrj7iWw== @@ -6015,19 +6021,6 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" - integrity sha1-2NdrvBtVIX7RkP1t1J08d07PyNo= - dependencies: - cross-spawn "^5.0.1" - get-stream "^3.0.0" - is-stream "^1.1.0" - npm-run-path "^2.0.0" - p-finally "^1.0.0" - signal-exit "^3.0.0" - strip-eof "^1.0.0" - execa@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8" @@ -6041,7 +6034,7 @@ execa@^1.0.0: signal-exit "^3.0.0" strip-eof "^1.0.0" -execa@^4.0.0, execa@^4.1.0: +execa@^4.0.0: version "4.1.0" resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a" integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA== @@ -6056,6 +6049,21 @@ execa@^4.0.0, execa@^4.1.0: signal-exit "^3.0.2" strip-final-newline "^2.0.0" +execa@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" + integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg== + dependencies: + cross-spawn "^7.0.3" + get-stream "^6.0.0" + human-signals "^2.1.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^4.0.1" + onetime "^5.1.2" + signal-exit "^3.0.3" + 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" @@ -6163,11 +6171,6 @@ extglob@^2.0.4: snapdragon "^0.8.1" to-regex "^3.0.1" -fast-deep-equal@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" - integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk= - fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" @@ -6213,14 +6216,7 @@ fastq@^1.6.0: dependencies: reusify "^1.0.4" -faye-websocket@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4" - integrity sha1-TkkvjQTftviQA1B/btvy1QHnxvQ= - dependencies: - websocket-driver ">=0.5.1" - -faye-websocket@~0.11.1: +faye-websocket@^0.11.3: version "0.11.4" resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da" integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g== @@ -6623,6 +6619,11 @@ get-stream@^5.0.0: dependencies: pump "^3.0.0" +get-stream@^6.0.0: + version "6.0.1" + resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7" + integrity sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg== + 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" @@ -6738,14 +6739,14 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6 resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== -graphql-tag@^2.10.3: +graphql-tag@^2.12.5: version "2.12.5" resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.5.tgz#5cff974a67b417747d05c8d9f5f3cb4495d0db8f" integrity sha512-5xNhP4063d16Pz3HBtKprutsPrmHZi5IdUGOWRxA2B6VF7BIRGOHZ5WQvDmJXZuPcBg7rYwaFxvQYjqkSdR3TQ== dependencies: tslib "^2.1.0" -graphql@^15.5.0: +graphql@^15.5.1: version "15.5.1" resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.5.1.tgz#f2f84415d8985e7b84731e7f3536f8bb9d383aad" integrity sha512-FeTRX67T3LoE3LWAxxOlW2K3Bz+rMYAC18rRguK4wgXaTZMiJwSUwDmPFo3UadAKbzirKIg5Qy+sNJXbpPRnQw== @@ -7079,17 +7080,22 @@ human-signals@^1.1.1: resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3" integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw== -husky@^5.1.1: - version "5.2.0" - resolved "https://registry.yarnpkg.com/husky/-/husky-5.2.0.tgz#fc5e1c2300d34855d47de4753607d00943fc0802" - integrity sha512-AM8T/auHXRBxlrfPVLKP6jt49GCM2Zz47m8G3FOMsLmTv8Dj/fKVWE0Rh2d4Qrvmy131xEsdQnb3OXRib67PGg== +human-signals@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0" + integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw== + +husky@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.1.tgz#579f4180b5da4520263e8713cc832942b48e1f1c" + integrity sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA== hyphenate-style-name@^1.0.3: version "1.0.4" resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== -i18n-iso-countries@^6.5.0: +i18n-iso-countries@^6.8.0: version "6.8.0" resolved "https://registry.yarnpkg.com/i18n-iso-countries/-/i18n-iso-countries-6.8.0.tgz#eebbc75594c6832aff86176c1bb38daa133d6dfd" integrity sha512-jJs/+CA6+VUICFxqGcB0vFMERGfhfvyNk+8Vb9EagSZkl7kSpm/kT0VyhvzM/zixDWEV/+oN9L7v/GT9BwzoGg== @@ -7101,7 +7107,7 @@ i18next-browser-languagedetector@2.2.4: resolved "https://registry.yarnpkg.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-2.2.4.tgz#b02412d7ab15d7d74e1b1317d67d8a244b219ee3" integrity sha512-wPbtH18FdOuB245I8Bhma5/XSDdN/HpYlX+wga1eMy+slhaFQSnrWX6fp+aYSL2eEuj0RlfHeEVz6Fo/lxAj6A== -i18next-browser-languagedetector@^6.0.1: +i18next-browser-languagedetector@^6.1.2: version "6.1.2" resolved "https://registry.yarnpkg.com/i18next-browser-languagedetector/-/i18next-browser-languagedetector-6.1.2.tgz#68565a28b929cbc98ab6a56826ef2faf0e927ff8" integrity sha512-YDzIGHhMRvr7M+c8B3EQUKyiMBhfqox4o1qkFvt4QXuu5V2cxf74+NCr+VEkUuU0y+RwcupA238eeolW1Yn80g== @@ -7113,10 +7119,10 @@ i18next@14.0.1: resolved "https://registry.yarnpkg.com/i18next/-/i18next-14.0.1.tgz#c5f0292ea6389394b6056f597b75f1f9aa03124f" integrity sha512-wsKfQuYsy4RdCaqqN71eDjWMhizhTfQSIBGttEA7vcboQrUfpQlCezrSzrtmoW9F9tmVyNs38iBgLYLMhRSeIQ== -i18next@^19.3.2: - version "19.9.2" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.9.2.tgz#ea5a124416e3c5ab85fddca2c8e3c3669a8da397" - integrity sha512-0i6cuo6ER6usEOtKajUUDj92zlG+KArFia0857xxiEHAQcUwh/RtOQocui1LPJwunSYT574Pk64aNva1kwtxZg== +i18next@^20.3.3: + version "20.3.5" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-20.3.5.tgz#14308b79a3f1cafb24fdcd8e182d3673baf1e979" + integrity sha512-//MGeU6n4TencJmCgG+TCrpdgAD/NDEU/KfKQekYbJX6QV7sD/NjWQdVdBi+bkT0snegnSoB7QhjSeatrk3a0w== dependencies: "@babel/runtime" "^7.12.0" @@ -7632,9 +7638,9 @@ is-stream@^1.0.1, is-stream@^1.1.0: integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ= is-stream@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3" - integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw== + version "2.0.1" + resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" + integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== is-string@^1.0.5, is-string@^1.0.6: version "1.0.6" @@ -8292,7 +8298,7 @@ json-stable-stringify-without-jsonify@^1.0.1: resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= -json3@^3.3.2: +json3@^3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/json3/-/json3-3.3.3.tgz#7fc10e375fc5ae42c4705a5cc0aa6f62be305b81" integrity sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA== @@ -8490,31 +8496,31 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -lint-staged@^10.0.8: - version "10.5.4" - resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-10.5.4.tgz#cd153b5f0987d2371fc1d2847a409a2fe705b665" - integrity sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg== +lint-staged@^11.0.1: + version "11.1.1" + resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-11.1.1.tgz#9c2018b872654cf80b2b1ff5a10b6b74aef6e300" + integrity sha512-eTNGe6i78PSUUH2BZi1gZmGmNfb8IeN4z2OzMYxSZ1qnP1WXKn1E7D+OHwLbRDm/wQINnzIj0bsKJ6lLVSuZiQ== dependencies: - chalk "^4.1.0" + chalk "^4.1.1" cli-truncate "^2.1.0" - commander "^6.2.0" + commander "^7.2.0" cosmiconfig "^7.0.0" - debug "^4.2.0" + debug "^4.3.1" dedent "^0.7.0" enquirer "^2.3.6" - execa "^4.1.0" - listr2 "^3.2.2" - log-symbols "^4.0.0" - micromatch "^4.0.2" + execa "^5.0.0" + listr2 "^3.8.2" + log-symbols "^4.1.0" + micromatch "^4.0.4" normalize-path "^3.0.0" please-upgrade-node "^3.2.0" string-argv "0.3.1" stringify-object "^3.3.0" -listr2@^3.2.2: - version "3.10.0" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.10.0.tgz#58105a53ed7fa1430d1b738c6055ef7bb006160f" - integrity sha512-eP40ZHihu70sSmqFNbNy2NL1YwImmlMmPh9WO5sLmPDleurMHt3n+SwEWNu2kzKScexZnkyFtc1VI0z/TGlmpw== +listr2@^3.8.2: + version "3.11.0" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.11.0.tgz#9771b02407875aa78e73d6e0ff6541bbec0aaee9" + integrity sha512-XLJVe2JgXCyQTa3FbSv11lkKExYmEyA4jltVo8z4FX10Vt1Yj8IMekBfwim0BSOM9uj1QMTJvDQQpHyuPbB/dQ== dependencies: cli-truncate "^2.1.0" colorette "^1.2.2" @@ -8700,7 +8706,7 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -log-symbols@^4.0.0: +log-symbols@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503" integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg== @@ -8939,11 +8945,16 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.48.0, "mime-db@>= 1.43.0 < 2": +mime-db@1.48.0: version "1.48.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== +"mime-db@>= 1.43.0 < 2": + version "1.49.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" + integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== + mime-db@~1.33.0: version "1.33.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" @@ -9357,7 +9368,7 @@ npm-run-path@^2.0.0: dependencies: path-key "^2.0.0" -npm-run-path@^4.0.0: +npm-run-path@^4.0.0, npm-run-path@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea" integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw== @@ -9510,7 +9521,7 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" -onetime@^5.1.0: +onetime@^5.1.0, onetime@^5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== @@ -10624,9 +10635,9 @@ postcss@7.0.36, postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, pos supports-color "^6.1.0" postcss@^8.1.0: - version "8.3.5" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.5.tgz#982216b113412bc20a86289e91eb994952a5b709" - integrity sha512-NxTuJocUhYGsMiMFHDUkmjSKT3EdH4/WbGF6GCi1NDGk+vbcUTun4fpbOqaPtD8IIsztA2ilZm2DhYCuyN58gA== + version "8.3.6" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea" + integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A== dependencies: colorette "^1.2.2" nanoid "^3.1.23" @@ -10654,7 +10665,7 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.2.1: +prettier@^2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d" integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ== @@ -10682,7 +10693,7 @@ pretty-format@^26.6.0, pretty-format@^26.6.2: ansi-styles "^4.0.0" react-is "^17.0.1" -pretty-quick@^3.1.0: +pretty-quick@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/pretty-quick/-/pretty-quick-3.1.1.tgz#93ca4e2dd38cc4e970e3f54a0ead317a25454688" integrity sha512-ZYLGiMoV2jcaas3vTJrLvKAYsxDoXQBUn8OSTxkl67Fyov9lyXivJTl0+2WVh+y6EovGcw7Lm5ThYpH+Sh3XxQ== @@ -10848,7 +10859,7 @@ qs@6.7.0: resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== -qs@^6.9.1: +qs@^6.10.1: version "6.10.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" integrity sha512-M528Hph6wsSVOBiYUnGf+K/7w0hNshs/duGsNXPUCLH5XAqjEtiPGwNONLV0tBH8NoGb0mvD5JubnUTrujKDTg== @@ -10967,7 +10978,7 @@ rc-motion@^2.0.0: classnames "^2.2.1" rc-util "^5.2.1" -rc-slider@^9.2.2: +rc-slider@^9.7.2: version "9.7.2" resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-9.7.2.tgz#282f571f7582752ebaa33964e441184f4e79ad74" integrity sha512-mVaLRpDo6otasBs6yVnG02ykI3K6hIrLTNfT5eyaqduFv95UODI9PDS6fWuVVehVpdS4ENgOSwsTjrPVun+k9g== @@ -11076,7 +11087,14 @@ react-chartjs-2@^2.9.0: lodash "^4.17.19" prop-types "^15.7.2" -react-dev-utils@^11.0.2: +react-chartjs-2@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/react-chartjs-2/-/react-chartjs-2-3.0.4.tgz#88e14c6b4d577941c736f0657b071c8273916652" + integrity sha512-pcbFNpkPMTkGXXJ7k7hnukbRD0ZV01qB6JQY1ontITc2IYvhGlK6BBDy28VeydYs1Dl/c5ZpRgRVEtT5GUnxcQ== + dependencies: + lodash "^4.17.19" + +react-dev-utils@^11.0.3: version "11.0.4" resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-11.0.4.tgz#a7ccb60257a1ca2e0efe7a83e38e6700d17aa37a" integrity sha512-dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A== @@ -11106,14 +11124,14 @@ react-dev-utils@^11.0.2: strip-ansi "6.0.0" text-table "0.2.0" -react-dom@16.13.0, react-dom@17.0.1, react-dom@^16.13.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6" - integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug== +react-dom@16.13.0, react-dom@17.0.2, react-dom@^16.13.1: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23" + integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - scheduler "^0.20.1" + scheduler "^0.20.2" react-dropzone@^11.0.1: version "11.3.4" @@ -11172,10 +11190,10 @@ react-highlighter@^0.4.3: escape-string-regexp "^1.0.5" prop-types "^15.6.0" -react-i18next@^11.3.3: - version "11.11.3" - resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.11.3.tgz#38d083bb079c3e6ee376b3321b0d6e409d798f68" - integrity sha512-upzG5/SpyOlYP5oSF4K8TZBvDWVhnCo38JNV+KnWjrg0+IaJCBltyh6lRGZDO5ovLyA4dU6Ip0bwbUCjb6Yyxw== +react-i18next@^11.11.2: + version "11.11.4" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.11.4.tgz#f6f9a1c827e7a5271377de2bf14db04cb1c9e5ce" + integrity sha512-ayWFlu8Sc7GAxW1PzMaPtzq+yiozWMxs0P1WeITNVzXAVRhC0Httkzw/IiODBta6seJRBCLrtUeFUSXhAIxlRg== dependencies: "@babel/runtime" "^7.14.5" html-parse-stringify "^3.0.1" @@ -11236,7 +11254,7 @@ react-placeholder@^4.0.0: resolved "https://registry.yarnpkg.com/react-placeholder/-/react-placeholder-4.1.0.tgz#943128820b3b0a6f94371655aadec18d306e05e3" integrity sha512-z1HGD86NWJTYTQumHsmGH9jkozv4QHa9dju/vHVUd4f1svu23pf5v7QoBLBfs3kA1S9GLJaCeRMHLbO2SCdz5A== -react-redux@^7.2.0: +react-redux@^7.2.4: version "7.2.4" resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.4.tgz#1ebb474032b72d806de2e0519cd07761e222e225" integrity sha512-hOQ5eOSkEJEXdpIKbnRyl04LhaWabkDPV+Ix97wqQX3T3d2NQ8DUblNXXtNMavc7DpswyQM6xfaN4HQDKNY2JA== @@ -11253,10 +11271,10 @@ react-refresh@^0.8.3: resolved "https://registry.yarnpkg.com/react-refresh/-/react-refresh-0.8.3.tgz#721d4657672d400c5e3c75d063c4a85fb2d5d68f" integrity sha512-X8jZHc7nCMjaCqoU+V2I0cOhNW+QMBwSUkeXnTi8IPe6zaRWfn60ZzvFDZqWPfmSJfjub7dDW1SP0jaHWLu/hg== -react-scripts@4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-4.0.2.tgz#530fd934dfdf31c355e366df40bf488347c28de7" - integrity sha512-okaWNaGDGtnXyM2CLMUl8gYZnAubgxEulC40FYjsxn5bbj+G/mDINdy24wHz4Vypb/LWtIe8rdBU78k/74v8Mw== +react-scripts@4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/react-scripts/-/react-scripts-4.0.3.tgz#b1cafed7c3fa603e7628ba0f187787964cb5d345" + integrity sha512-S5eO4vjUzUisvkIPB7jVsKtuH2HhWcASREYWHAQ1FP5HyCv3xgn+wpILAEWkmy+A+tTNbSZClhxjT3qz6g4L1A== dependencies: "@babel/core" "7.12.3" "@pmmmwh/react-refresh-webpack-plugin" "0.4.3" @@ -11283,7 +11301,7 @@ react-scripts@4.0.2: eslint-plugin-react "^7.21.5" eslint-plugin-react-hooks "^4.2.0" eslint-plugin-testing-library "^3.9.2" - eslint-webpack-plugin "^2.1.0" + eslint-webpack-plugin "^2.5.2" file-loader "6.1.1" fs-extra "^9.0.1" html-webpack-plugin "4.5.0" @@ -11302,7 +11320,7 @@ react-scripts@4.0.2: postcss-safe-parser "5.0.2" prompts "2.4.0" react-app-polyfill "^2.0.0" - react-dev-utils "^11.0.2" + react-dev-utils "^11.0.3" react-refresh "^0.8.3" resolve "1.18.1" resolve-url-loader "^3.1.2" @@ -11313,7 +11331,7 @@ react-scripts@4.0.2: ts-pnp "1.2.0" url-loader "4.1.1" webpack "4.44.2" - webpack-dev-server "3.11.0" + webpack-dev-server "3.11.1" webpack-manifest-plugin "2.2.0" workbox-webpack-plugin "5.1.4" optionalDependencies: @@ -11370,10 +11388,10 @@ react-virtualized@^9.21.2: prop-types "^15.7.2" react-lifecycles-compat "^3.0.4" -react@16.13.0, react@17.0.1, react@^16.13.1: - version "17.0.1" - resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" - integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== +react@16.13.0, react@17.0.2, react@^16.13.1: + version "17.0.2" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037" + integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" @@ -11481,7 +11499,7 @@ redux-persist@^6.0.0: resolved "https://registry.yarnpkg.com/redux-persist/-/redux-persist-6.0.0.tgz#b4d2972f9859597c130d40d4b146fecdab51b3a8" integrity sha512-71LLMbUq2r02ng2We9S215LtPu3fY0KgaGE0k8WRgl6RkqxtGfl7HUozz1Dftwsb0D/5mZ8dwAaPbtnzfvbEwQ== -redux@^4.0.0, redux@^4.0.5: +redux@^4.0.0, redux@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.0.tgz#eb049679f2f523c379f1aff345c8612f294c88d4" integrity sha512-uI2dQN43zqLWCt6B/BMGRMY6db7TTY4qeHHfGeKb3EOhmOKjU3KdWvNLJyqaHRksv/ErdNH7cFZWg9jXtewy4g== @@ -11506,9 +11524,9 @@ regenerator-runtime@^0.11.0: integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg== regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4, regenerator-runtime@^0.13.7: - version "0.13.7" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" - integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== + version "0.13.9" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" + integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== regenerator-transform@^0.14.2: version "0.14.5" @@ -11939,7 +11957,7 @@ saxes@^5.0.1: dependencies: xmlchars "^2.2.0" -scheduler@^0.20.1: +scheduler@^0.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91" integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ== @@ -11984,7 +12002,7 @@ select-hose@^2.0.0: resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca" integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo= -selfsigned@^1.10.7: +selfsigned@^1.10.8: version "1.10.11" resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9" integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA== @@ -12093,17 +12111,17 @@ serve-static@1.14.1: parseurl "~1.3.3" send "0.17.1" -serve@^11.3.0: - version "11.3.2" - resolved "https://registry.yarnpkg.com/serve/-/serve-11.3.2.tgz#b905e980616feecd170e51c8f979a7b2374098f5" - integrity sha512-yKWQfI3xbj/f7X1lTBg91fXBP0FqjJ4TEi+ilES5yzH0iKJpN5LjNb1YzIfQg9Rqn4ECUS2SOf2+Kmepogoa5w== +serve@^12.0.0: + version "12.0.0" + resolved "https://registry.yarnpkg.com/serve/-/serve-12.0.0.tgz#122962f712b57660059de9d109c82599280e4949" + integrity sha512-BkTsETQYynAZ7rXX414kg4X6EvuZQS3UVs1NY0VQYdRHSTYWPYcH38nnDh48D0x6ONuislgjag8uKlU2gTBImA== dependencies: "@zeit/schemas" "2.6.0" - ajv "6.5.3" + ajv "6.12.6" arg "2.0.0" boxen "1.3.0" chalk "2.4.1" - clipboardy "1.2.3" + clipboardy "2.3.0" compression "1.7.3" serve-handler "6.1.3" update-check "1.5.2" @@ -12207,7 +12225,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.0, signal-exit@^3.0.2: +signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c" integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA== @@ -12299,26 +12317,26 @@ snazzy@^9.0.0: strip-ansi "^6.0.0" text-table "^0.2.0" -sockjs-client@1.4.0: - version "1.4.0" - resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.4.0.tgz#c9f2568e19c8fd8173b4997ea3420e0bb306c7d5" - integrity sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g== +sockjs-client@^1.5.0: + version "1.5.1" + resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz#256908f6d5adfb94dabbdbd02c66362cca0f9ea6" + integrity sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ== dependencies: - debug "^3.2.5" + debug "^3.2.6" eventsource "^1.0.7" - faye-websocket "~0.11.1" - inherits "^2.0.3" - json3 "^3.3.2" - url-parse "^1.4.3" + faye-websocket "^0.11.3" + inherits "^2.0.4" + json3 "^3.3.3" + url-parse "^1.5.1" -sockjs@0.3.20: - version "0.3.20" - resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz#b26a283ec562ef8b2687b44033a4eeceac75d855" - integrity sha512-SpmVOVpdq0DJc0qArhF3E5xsxvaiqGNb73XfgBpK1y3UD5gs8DSo8aCTsuT5pX8rssdc2NDIzANwP9eCAiSdTA== +sockjs@^0.3.21: + version "0.3.21" + resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.21.tgz#b34ffb98e796930b60a0cfa11904d6a339a7d417" + integrity sha512-DhbPFGpxjc6Z3I+uX07Id5ZO2XwYsWOrYjaSeieES78cq+JaJvVe5q/m1uvjIQhXinhIeCFRH6JgXe+mvVMyXw== dependencies: - faye-websocket "^0.10.0" + faye-websocket "^0.11.3" uuid "^3.4.0" - websocket-driver "0.6.5" + websocket-driver "^0.7.4" sort-keys@^1.0.0: version "1.1.2" @@ -12768,7 +12786,7 @@ stylis@^3.5.0: resolved "https://registry.yarnpkg.com/stylis/-/stylis-3.5.4.tgz#f665f25f5e299cf3d64654ab949a57c768b73fbe" integrity sha512-8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q== -subscriptions-transport-ws@^0.9.16: +subscriptions-transport-ws@^0.9.19: version "0.9.19" resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz#10ca32f7e291d5ee8eb728b9c02e43c52606cdcf" integrity sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw== @@ -12870,9 +12888,9 @@ tapable@^1.0.0, tapable@^1.1.3: integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA== tar@^6.0.2: - version "6.1.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" - integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== + version "6.1.2" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz#1f045a90a6eb23557a603595f41a16c57d47adc6" + integrity sha512-EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -13254,14 +13272,14 @@ ua-parser-js@^0.7.18: resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== -ual-anchor@^1.0.0: - version "1.0.6" - resolved "https://registry.yarnpkg.com/ual-anchor/-/ual-anchor-1.0.6.tgz#55c0214cc2cb21abf103ab30cf9e23705a106aab" - integrity sha512-rtyCgmY7zf3BSFdiZx6y18e04kjLud6/vZibEwVmbN5XHywM/QhuD20986TQwMcvhS7vZ/pLExUcQEc3ycN+3w== +ual-anchor@^1.0.6: + version "1.0.8" + resolved "https://registry.yarnpkg.com/ual-anchor/-/ual-anchor-1.0.8.tgz#4be584fd088490422d1be4881540b864c88f687b" + integrity sha512-N2BnzDbQlLSP32+IhUYGXASR956wmgIRhmCwnaKyzM5xo4S1jmxikYKI+6XG+XlkDvGKTwSMkykA9PorQp4GlQ== dependencies: "@greymass/eosio" "^0.4.3" - anchor-link "^3.2.3" - anchor-link-browser-transport "^3.1.3" + anchor-link "^3.3.2" + anchor-link-browser-transport "^3.2.3" elliptic "6.5.4" eosio-signing-request "^2.2.1" eosjs "^21.0.3" @@ -13533,10 +13551,10 @@ url-loader@4.1.1: mime-types "^2.1.27" schema-utils "^3.0.0" -url-parse@^1.4.3: - version "1.5.1" - resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.1.tgz#d5fa9890af8a5e1f274a2c98376510f6425f6e3b" - integrity sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q== +url-parse@^1.4.3, url-parse@^1.5.1: + version "1.5.3" + resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862" + integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ== dependencies: querystringify "^2.1.1" requires-port "^1.0.0" @@ -13768,10 +13786,10 @@ webpack-dev-middleware@^3.7.2: range-parser "^1.2.1" webpack-log "^2.0.0" -webpack-dev-server@3.11.0: - version "3.11.0" - resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz#8f154a3bce1bcfd1cc618ef4e703278855e7ff8c" - integrity sha512-PUxZ+oSTxogFQgkTtFndEtJIPNmml7ExwufBZ9L2/Xyyd5PnOL5UreWe5ZT7IU25DSdykL9p1MLQzmLh2ljSeg== +webpack-dev-server@3.11.1: + version "3.11.1" + resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.1.tgz#c74028bf5ba8885aaf230e48a20e8936ab8511f0" + integrity sha512-u4R3mRzZkbxQVa+MBWi2uVpB5W59H3ekZAJsQlKUTdl7Elcah2EhygTPLmeFXybQkf9i2+L0kn7ik9SnXa6ihQ== dependencies: ansi-html "0.0.7" bonjour "^3.5.0" @@ -13793,11 +13811,11 @@ webpack-dev-server@3.11.0: p-retry "^3.0.1" portfinder "^1.0.26" schema-utils "^1.0.0" - selfsigned "^1.10.7" + selfsigned "^1.10.8" semver "^6.3.0" serve-index "^1.9.1" - sockjs "0.3.20" - sockjs-client "1.4.0" + sockjs "^0.3.21" + sockjs-client "^1.5.0" spdy "^4.0.2" strip-ansi "^3.0.1" supports-color "^6.1.0" @@ -13862,14 +13880,7 @@ webpack@4.44.2: watchpack "^1.7.4" webpack-sources "^1.4.1" -websocket-driver@0.6.5: - version "0.6.5" - resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz#5cb2556ceb85f4373c6d8238aa691c8454e13a36" - integrity sha1-XLJVbOuF9Dc8bYI4qmkchFThOjY= - dependencies: - websocket-extensions ">=0.1.1" - -websocket-driver@>=0.5.1: +websocket-driver@>=0.5.1, websocket-driver@^0.7.4: version "0.7.4" resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760" integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg== From 4e4ff4dc09a68f155becc75f92b84d5a79a34795 Mon Sep 17 00:00:00 2001 From: Leister Francisco Alvarez Campos Date: Thu, 29 Jul 2021 20:41:29 -0600 Subject: [PATCH 07/54] fix(sync-bps): optimizing function performance (#617) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * fix(sync-bps): optimizing function performance * fix(sync-bps): optimizing function performance * perf(proxies): optimize code perfomance * perf(sync-ratings): reduce code logic * perf(sync-stats): minor change * fix(add-bps-info): solve warning duplicate database * fix(add-bps-info): solve warning duplicate database * fix(env): add variables to sync files * fix(env): remove no needed envarioment variables * fix(docker-compose): implement independent variables Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez --- .env.example | 9 +- .../workflows/push-master-environment.yaml | 4 +- .../workflows/push-staging-environment.yaml | 4 +- docker-compose.yml | 10 +- hapi/src/config/server.config.js | 2 +- hapi/src/libs/add-bps-info.js | 43 ++++--- hapi/src/libs/sync-bp-stats.js | 6 +- hapi/src/libs/sync-bps.js | 118 +++++------------- hapi/src/libs/sync-proxies.js | 43 ++----- hapi/src/libs/sync-ratings.js | 77 ++++-------- hapi/src/libs/sync-stats.js | 51 ++------ hapi/src/libs/sync-user-rating.js | 8 +- kubernetes/configmaps.yaml | 4 +- .../block-producers/block-producer-rate.js | 4 +- 14 files changed, 126 insertions(+), 257 deletions(-) diff --git a/.env.example b/.env.example index 52cdb360..89131e7d 100644 --- a/.env.example +++ b/.env.example @@ -13,11 +13,16 @@ POSTGRES_DATA=./db_data # HAPI HAPI_POSTGRES_HOST=eosrate_postgres +HAPI_POSTGRES_PORT=5432 +HAPI_POSTGRES_USER=user +HAPI_POSTGRES_PASSWORD=password +HAPI_POSTGRES_DB=localdb +HAPI_POSTGRES_SCHEMA=public HAPI_SERVER_PORT=9090 HAPI_SERVER_ADDRESS=0.0.0.0 HAPI_EOS_API_ENDPOINT=https://jungle.eosio.cr -HAPI_PROXY_INFO_CONTRACT_CODE=proxyaccount -HAPI_PROXY_INFO_CONTRACT_SCOPE=proxyaccount +HAPI_PROXY_CONTRACT=proxyaccount +HAPI_RATING_CONTRACT=rateproducer # HASURA HASURA_GRAPHQL_DATABASE_URL=postgres://user:password@eosrate_postgres:5432/localdb diff --git a/.github/workflows/push-master-environment.yaml b/.github/workflows/push-master-environment.yaml index 61e7c586..a4380b1e 100644 --- a/.github/workflows/push-master-environment.yaml +++ b/.github/workflows/push-master-environment.yaml @@ -88,8 +88,8 @@ jobs: HAPI_EOS_API_ENDPOINT: https://api.eosio.cr HAPI_SERVER_ADDRESS: 0.0.0.0 HAPI_SERVER_PORT: 9090 - HAPI_PROXY_INFO_CONTRACT_CODE: regproxyinfo - HAPI_PROXY_INFO_CONTRACT_SCOPE: regproxyinfo + HAPI_PROXY_CONTRACT: ${{ secrets.HAPI_PROXY_CONTRACT }} + HAPI_RATING_CONTRACT: ${{ secrets.HAPI_RATING_CONTRACT }} # hasura HASURA_GRAPHQL_DATABASE_URL: ${{ secrets.HASURA_GRAPHQL_DATABASE_URL }} HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations diff --git a/.github/workflows/push-staging-environment.yaml b/.github/workflows/push-staging-environment.yaml index bd54be5a..13e140f9 100644 --- a/.github/workflows/push-staging-environment.yaml +++ b/.github/workflows/push-staging-environment.yaml @@ -88,8 +88,8 @@ jobs: HAPI_EOS_API_ENDPOINT: https://jungle3.cryptolions.io HAPI_SERVER_ADDRESS: 0.0.0.0 HAPI_SERVER_PORT: 9090 - HAPI_PROXY_INFO_CONTRACT_CODE: proxyaccount - HAPI_PROXY_INFO_CONTRACT_SCOPE: proxyaccount + HAPI_PROXY_CONTRACT: ${{ secrets.HAPI_PROXY_CONTRACT }} + HAPI_RATING_CONTRACT: ${{ secrets.HAPI_RATING_CONTRACT }} # hasura HASURA_GRAPHQL_DATABASE_URL: ${{ secrets.HASURA_GRAPHQL_DATABASE_URL }} HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations diff --git a/docker-compose.yml b/docker-compose.yml index 409e01c7..2fcfdc40 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -37,12 +37,12 @@ services: environment: HAPI_SERVER_ADDRESS: "${HAPI_SERVER_ADDRESS}" HAPI_SERVER_PORT: "${HAPI_SERVER_PORT}" - HAPI_POSTGRES_USER: "${POSTGRES_USER}" - HAPI_POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" - HAPI_POSTGRES_PORT: "${POSTGRES_PORT}" - HAPI_POSTGRES_DB: "${POSTGRES_DB}" + HAPI_POSTGRES_USER: "${HAPI_POSTGRES_USER}" + HAPI_POSTGRES_PASSWORD: "${HAPI_POSTGRES_PASSWORD}" + HAPI_POSTGRES_PORT: "${HAPI_POSTGRES_PORT}" + HAPI_POSTGRES_DB: "${HAPI_POSTGRES_DB}" HAPI_POSTGRES_HOST: "${HAPI_POSTGRES_HOST}" - HAPI_POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" + HAPI_POSTGRES_SCHEMA: "${HAPI_POSTGRES_SCHEMA}" HAPI_EOS_API_ENDPOINT: "${HAPI_EOS_API_ENDPOINT}" depends_on: diff --git a/hapi/src/config/server.config.js b/hapi/src/config/server.config.js index fe1d7c79..1a698b28 100644 --- a/hapi/src/config/server.config.js +++ b/hapi/src/config/server.config.js @@ -4,5 +4,5 @@ module.exports = { port: process.env.HAPI_POSTGRES_PORT || 5432, database: process.env.HAPI_POSTGRES_DB || 'eosrate', user: process.env.HAPI_POSTGRES_USER || 'user', - password: process.env.HAPI_POSTGRES_PASSWORD || 'pass' + password: process.env.HAPI_POSTGRES_PASSWORD || 'password' } \ No newline at end of file diff --git a/hapi/src/libs/add-bps-info.js b/hapi/src/libs/add-bps-info.js index d6b61a97..4ed72806 100644 --- a/hapi/src/libs/add-bps-info.js +++ b/hapi/src/libs/add-bps-info.js @@ -365,30 +365,29 @@ const jungleBPinfo = [ }, ]; -const massive = require("massive"); -const { massiveConfig } = require("../config"); +const massive = require("massive") +const { massiveConfig } = require("../config") -const updateGeneralInfo = async (bpInfo, db) => { - await db.producers.save(bpInfo) - console.log('Saved') - console.log(bpInfo) -}; -const updateBps = async (bpInfoObj) => { - if (Array.isArray(bpInfoObj)) { - const db = await massive(massiveConfig) - console.log('db', db.listTables()) - for (var i = 0; i < bpInfoObj.length; i++) { - await updateGeneralInfo(bpInfoObj[i], db); - } - } else { - console.log("Cannot save Block Producer Info object."); - } -}; +const updateBps = async () => { + const db = await massive(massiveConfig) -(async () => { + console.log('UPDATING JUNGLE-BP-INFO') + jungleBPinfo.forEach(async (bpInfo) => { + try { + const dbResult = await db.producers.save(bpInfo) + console.log(`Save of ${bpInfo.owner} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + } catch(err) { console.log(`Error: ${err}`) } + }) - await updateBps(jungleBPinfo); - await updateBps(mainnetBPinfo); + console.log('UPDATING MAINNET-BP-INFO') + mainnetBPinfo.forEach(async (bpInfo) => { + try { + const dbResult = await db.producers.save(bpInfo) + console.log(`Save of ${bpInfo.owner} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + } catch(err) { console.log(`Error: ${err}`) } + }) +}; -})(); +(async () => { await updateBps() }) +(); diff --git a/hapi/src/libs/sync-bp-stats.js b/hapi/src/libs/sync-bp-stats.js index 43c89e53..dbb622a0 100644 --- a/hapi/src/libs/sync-bp-stats.js +++ b/hapi/src/libs/sync-bp-stats.js @@ -8,14 +8,16 @@ const rpc = new eosjs.JsonRpc( { fetch } ) +const HAPI_RATING_CONTRACT = process.env.HAPI_RATING_CONTRACT || 'rateproducer' + // Read from Blockchain const getBpStats = async bp => { let result try { result = await rpc.get_table_rows({ json: true, // Get the response as json - code: 'rateproducer', // Contract that we target - scope: 'rateproducer', // Account that owns the data + code: HAPI_RATING_CONTRACT, // Contract that we target + scope: HAPI_RATING_CONTRACT, // Account that owns the data table: 'stats', // Table name lower_bound: bp, // block producer PK limit: 1, // Maximum number of rows that we want to get diff --git a/hapi/src/libs/sync-bps.js b/hapi/src/libs/sync-bps.js index 36b57411..94e4d61c 100644 --- a/hapi/src/libs/sync-bps.js +++ b/hapi/src/libs/sync-bps.js @@ -2,12 +2,11 @@ const EosApi = require('eosjs-api') const massive = require('massive') const request = require('request-promise') - const { massiveConfig } = require('../config') const HAPI_EOS_API_ENDPOINT = process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' -// gets data from mainnet + const getBlockProducersData = async () => { const eos = EosApi({ httpEndpoint: HAPI_EOS_API_ENDPOINT, @@ -19,9 +18,11 @@ const getBlockProducersData = async () => { limit: 1000 }) - // TODO: Change reduce function to map function const allProducers = producers.reduce((result, producer) => { - if (!producer.is_active || !parseInt(producer.total_votes)) return result + if (!producer.is_active || !parseInt(producer.total_votes) || !producer.url) return result + + if (!producer.url.startsWith('https://') && !producer.url.startsWith('http://')) producer.url = `http://${producer.url}` + if (!producer.url.endsWith('.json')) producer.url = `${producer.url}/bp.json` console.log(`${producer.owner} TOTAL VOTES: ----> ${producer.total_votes}`) @@ -35,108 +36,47 @@ const getBlockProducersData = async () => { ] }, []) - // TODO: Optimize filter functions and if statements - const urls = allProducers - .filter(({ bpJson, system }) => !Object.keys(bpJson).length && system.url) - .map(({ system: { url } }) => { - let result = url - if (url.startsWith('https://') || url.startsWith('http://')) { - result = `${url}` - } - if (!url.startsWith('http')) { - result = `http://${url}` - } - if (!url.endsWith('.json')) { - result = `${result}/bp.json` - } - return result - }) + console.log('Getting bpJson information for BPs...') - for (let i = 0; i < urls.length; i++) { + const producersBPJSON = [] + for (const producer of allProducers) { try { - let bp = await request({ - url: urls[i], + const bp = await request({ + url: producer.system.url, method: 'get', json: true, timeout: 10000 }) - console.log('result bp', i, bp['producer_account_name']) - try { - if (bp['producer_account_name'] && bp['producer_account_name'] !== '') { - if ( - HAPI_EOS_API_ENDPOINT !== 'https://jungle.eosio.cr' && - bp['producer_account_name'] === allProducers[i]['owner'] - ) { - console.log('add', urls[i]) - allProducers[i]['bpJson'] = bp - } else if (HAPI_EOS_API_ENDPOINT === 'https://jungle.eosio.cr') { - console.log('add', urls[i], 'jungle') - allProducers[i]['bpJson'] = bp - } - } else { - console.log('skip', i) - console.log(urls[i]) - } - } catch (e) { - console.log('skip', i) - console.log(urls[i]) + if (bp['producer_account_name'] && bp['producer_account_name'] !== '') { + producer['bpJson'] = bp + producersBPJSON.push(producer) } } catch (error) { - console.log(error) + console.log(`Failed to add bpJson info for ${producer.owner}`) } - } - return allProducers + console.log(`Incoming total producers ${allProducers.length}`) + console.log(`Outgoing total producers ${producersBPJSON.length}`) + + return producersBPJSON } -// updates the postgresdb const updateBlockProducersData = async () => { - console.log('==== updating block producer info ====') + console.log('==== Updating block producer info ====') const db = await massive(massiveConfig) const producersData = await getBlockProducersData() - const saveBP = async ({ owner, system, bpJson: bpjson }) => { - const bpData = { - owner, - system, - bpjson - } - - if (!Object.keys(bpjson).length) { - console.log('skipping blank result for ' + owner) - return - } - + producersData.forEach(async (bp) => { + const { owner, system, bpJson: bpjson } = bp + const bpData = { owner, system, bpjson } + try { - const result = await db.producers.save(bpData) - if (!result) { - const insertResult = await db.producers.insert(bpData) - if (!insertResult) { - console.log(`couldnt save or insert ${owner}`) - return - } - } - console.log(`succefully saved ${owner}`) - } catch (error) { - console.log('error', error) - } - } - - for (let bp of producersData) { - await saveBP(bp) - } - - // TODO : better error handling, report and retry unfulffilled + const saveBPResult = await db.producers.save(bpData) + const dbResult = saveBPResult ? saveBPResult : await db.producers.insert(bpData) + console.log(`Save or insert of ${owner} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + } catch (err) { console.log(`Error: ${err}`) } + }) } -;(async () => { - try { - console.log('updateBlockProducersData') - await updateBlockProducersData() - console.log('OK') - process.exit(0) - } catch (err) { - console.log('!!!!', err) - } -})() +updateBlockProducersData() diff --git a/hapi/src/libs/sync-proxies.js b/hapi/src/libs/sync-proxies.js index fffcf4aa..29e71fbb 100644 --- a/hapi/src/libs/sync-proxies.js +++ b/hapi/src/libs/sync-proxies.js @@ -3,16 +3,12 @@ const { JsonRpc } = require('eosjs') const EosApi = require('eosjs-api') const fetch = require('node-fetch') const massive = require('massive') - const { massiveConfig } = require('../config') const HAPI_EOS_API_ENDPOINT = process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const HAPI_PROXY_CONTRACT = process.env.HAPI_PROXY_CONTRACT || 'proxyaccount' -const PROXY_INFO_CONTRACT_CODE = process.env.PROXY_INFO_CONTRACT_CODE || 'proxyaccount' - -const PROXY_INFO_CONTRACT_SCOPE = process.env.PROXY_INFO_CONTRACT_SCOPE || 'proxyaccount' -// gets data from blockchain const getProxiesData = async () => { const db = await massive(massiveConfig) const eos = new JsonRpc(HAPI_EOS_API_ENDPOINT, { fetch }) @@ -23,39 +19,26 @@ const getProxiesData = async () => { const { rows: proxies } = await eos.get_table_rows({ json: true, - code: PROXY_INFO_CONTRACT_CODE, - scope: PROXY_INFO_CONTRACT_SCOPE, + code: HAPI_PROXY_CONTRACT, + scope: HAPI_PROXY_CONTRACT, table: 'proxies', limit: 1000, reverse: false, show_payer: false }) - const getProxyAccount = async (proxy, i) => { - let account = await eosApi.getAccount({ account_name: proxy.owner }) + proxies.forEach(async (proxy) => { + const account = await eosApi.getAccount({ account_name: proxy.owner }) - if (account.voter_info.is_proxy) { - proxies[i].voter_info = account.voter_info + if (account && account.voter_info && account.voter_info.is_proxy) { + proxy.voter_info = account.voter_info try { - const result = await db.proxies.save(proxies[i]) - if (!result) { - const insertResult = await db.proxies.insert(proxies[i]) - if (!insertResult) { - console.log(`couldnt save or insert ${proxies[i].owner}`) - return - } - } - console.log(`succefully saved ${proxies[i].owner}`) - } catch (error) { - console.log('error', error) - } - } else { - console.log(proxies[i].owner + ' is not a proxy') - } - } - - proxies.forEach(getProxyAccount) - return proxies + const resultProxySave = await db.proxies.save(proxy) + const dbResult = resultProxySave ? resultProxySave : await db.proxies.insert(proxy) + console.log(`Save or insert of ${proxy.owner} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + } catch (err) { console.log(`Error: ${err}`) } + } else console.log(`${proxy.owner} is not a proxy`) + }) } getProxiesData() diff --git a/hapi/src/libs/sync-ratings.js b/hapi/src/libs/sync-ratings.js index 4bc4500c..51f988a4 100644 --- a/hapi/src/libs/sync-ratings.js +++ b/hapi/src/libs/sync-ratings.js @@ -2,84 +2,51 @@ const { JsonRpc } = require('eosjs') const fetch = require('node-fetch') const massive = require('massive') - const { massiveConfig } = require('../config') const HAPI_EOS_API_ENDPOINT = process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const HAPI_RATING_CONTRACT = process.env.HAPI_RATING_CONTRACT || 'rateproducer' -// gets data from blockchain const getUserRatings = async () => { const eos = new JsonRpc(HAPI_EOS_API_ENDPOINT, { fetch }) let ratings = await eos.get_table_rows({ json: true, - code: 'rateproducer', - scope: 'rateproducer', + code: HAPI_RATING_CONTRACT, + scope: HAPI_RATING_CONTRACT, table: 'ratings', limit: 1000, reverse: false, show_payer: false }) - //console.log(ratings) return ratings } -// updates the postgresdb const updateUserRatings = async () => { - console.log('==== updating user ratings ====') + console.log('==== Updating user ratings ====') const db = await massive(massiveConfig) const userRatings = await getUserRatings() - const saveRatings = async (rating) => { - //console.log('updating... ', rating) - - let ratings = { - transparency: rating.transparency || 0, - infrastructure: rating.infrastructure || 0, - trustiness: rating.trustiness || 0, - development: rating.development || 0, - community: rating.community || 0 - } - - try { - const result = await db.user_ratings.save({ - uniq_rating: rating.uniq_rating, - user: rating.user, - bp: rating.bp, - ratings: ratings - }) - if (!result) { - const insertResult = await db.user_ratings.insert({ - uniq_rating: rating.uniq_rating, - user: rating.user, - bp: rating.bp, - ratings - }) - if (!insertResult) { - console.log(`could not save or insert ${rating.uniq_rating}`) - return - } + userRatings.rows.forEach(async (rating) => { + const ratingsCore = { + uniq_rating: rating.uniq_rating, + user: rating.user, + bp: rating.bp, + ratings: { + transparency: rating.transparency || 0, + infrastructure: rating.infrastructure || 0, + trustiness: rating.trustiness || 0, + development: rating.development || 0, + community: rating.community || 0 } - console.log(`succefully saved ${rating.uniq_rating}`) - } catch (error) { - console.log('error', error) } - } - - for (let rating of userRatings.rows) { - await saveRatings(rating) - } - // TODO : better error handling, report and retry unfulffilled + try { + const resultRatingsSave = await db.user_ratings.save(ratingsCore) + const dbResult = resultRatingsSave ? resultRatingsSave : await db.user_ratings.insert(ratingsCore) + console.log(`Save or insert of ${ratingsCore.uniq_rating} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + } catch (err) { console.log(`Error: ${err}`) } + }) }; -(async () => { - try { - console.log('Updating User Ratings') - await updateUserRatings() - console.log('OK') - process.exit(0) - } catch (err) { - console.log('!!!!', err) - } -})() +updateUserRatings() diff --git a/hapi/src/libs/sync-stats.js b/hapi/src/libs/sync-stats.js index b9054448..621cab56 100644 --- a/hapi/src/libs/sync-stats.js +++ b/hapi/src/libs/sync-stats.js @@ -2,19 +2,18 @@ const { JsonRpc } = require('eosjs') const fetch = require('node-fetch') const massive = require('massive') - const { massiveConfig } = require('../config') const HAPI_EOS_API_ENDPOINT = process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const HAPI_RATING_CONTRACT = process.env.HAPI_RATING_CONTRACT || 'rateproducer' -// gets data from blockchain const getRatingsStats = async () => { const eos = new JsonRpc(HAPI_EOS_API_ENDPOINT, { fetch }) const ratings = await eos.get_table_rows({ json: true, - code: 'rateproducer', - scope: 'rateproducer', + code: HAPI_RATING_CONTRACT, + scope: HAPI_RATING_CONTRACT, table: 'stats', limit: 1000, reverse: false, @@ -24,44 +23,18 @@ const getRatingsStats = async () => { return ratings } -// updates the postgresdb const updateRatingsStats = async () => { - console.log('==== updating ratings stats ====') + console.log('==== Updating ratings stats ====') const db = await massive(massiveConfig) const ratingsStats = await getRatingsStats() - const saveRatings = async (rating) => { - console.log('updating... ', rating) - + ratingsStats.rows.forEach(async (rating) => { try { - const result = await db.ratings_stats.save(rating) - if (!result) { - const insertResult = await db.ratings_stats.insert(rating) - if (!insertResult) { - console.log(`couldnt save or insert ${rating.bp}`) - return - } - } - console.log(`succefully saved ${rating.bp}`) - } catch (error) { - console.log('error', error) - } - } - - for (let rating of ratingsStats.rows) { - await saveRatings(rating) - } - - // TODO : better error handling, report and retry unfulffilled -}; + const resultRatingStatsSave = await db.ratings_stats.save(rating) + const dbResult = resultRatingStatsSave ? resultRatingStatsSave : await db.ratings_stats.insert(rating) + console.log(`Save or insert of ${rating.bp} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + } catch (err) { console.log(`Error: ${err}`) } + }) +} -(async () => { - try { - console.log('Updating Ratings Stats') - await updateRatingsStats() - console.log('OK') - process.exit(0) - } catch (err) { - console.log('!!!!', err) - } -})() +updateRatingsStats() diff --git a/hapi/src/libs/sync-user-rating.js b/hapi/src/libs/sync-user-rating.js index f20a33e8..abda874b 100644 --- a/hapi/src/libs/sync-user-rating.js +++ b/hapi/src/libs/sync-user-rating.js @@ -5,8 +5,8 @@ const massive = require('massive') const { massiveConfig } = require('../config') -const HAPI_EOS_API_ENDPOINT = - process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const HAPI_EOS_API_ENDPOINT = process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const HAPI_RATING_CONTRACT = process.env.HAPI_RATING_CONTRACT || 'rateproducer' // gets data from blockchain const getUserRatings = async () => { @@ -14,8 +14,8 @@ const getUserRatings = async () => { let ratings = await eos.get_table_rows({ json: true, - code: 'rateproducer', - scope: 'rateproducer', + code: HAPI_RATING_CONTRACT, + scope: HAPI_RATING_CONTRACT, table: 'ratings', limit: 1000, reverse: false, diff --git a/kubernetes/configmaps.yaml b/kubernetes/configmaps.yaml index 32790bf7..000ca503 100644 --- a/kubernetes/configmaps.yaml +++ b/kubernetes/configmaps.yaml @@ -24,8 +24,8 @@ data: HAPI_EOS_API_ENDPOINT: "${HAPI_EOS_API_ENDPOINT}" HAPI_SERVER_ADDRESS: "${HAPI_SERVER_ADDRESS}" HAPI_SERVER_PORT: "${HAPI_SERVER_PORT}" - HAPI_PROXY_INFO_CONTRACT_CODE: "${HAPI_PROXY_INFO_CONTRACT_CODE}" - HAPI_PROXY_INFO_CONTRACT_SCOPE: "${HAPI_PROXY_INFO_CONTRACT_SCOPE}" + HAPI_PROXY_CONTRACT: "${HAPI_PROXY_CONTRACT}" + HAPI_RATING_CONTRACT: "${HAPI_STATS_CONTRACT_CODE}" --- apiVersion: v1 kind: ConfigMap diff --git a/webapp/src/routes/block-producers/block-producer-rate.js b/webapp/src/routes/block-producers/block-producer-rate.js index c64eabbf..b93faf80 100644 --- a/webapp/src/routes/block-producers/block-producer-rate.js +++ b/webapp/src/routes/block-producers/block-producer-rate.js @@ -165,14 +165,14 @@ const BlockProducerRate = ({ account, ual }) => { const transaction = { actions: [ { - account: config.contract, - name: 'rate', authorization: [ { actor: accountName, permission: 'active' } ], + account: config.contractName, + name: 'rate', data: { user: accountName, bp: account, ...getRatingData(true) } } ] From 47c654ccaf040e7ed4a846c76e41bc604722a0e6 Mon Sep 17 00:00:00 2001 From: Leister Francisco Alvarez Campos Date: Thu, 29 Jul 2021 20:59:03 -0600 Subject: [PATCH 08/54] Fix/bp load (#625) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * fix(sync-bps): optimizing function performance * fix(sync-bps): optimizing function performance * perf(proxies): optimize code perfomance * perf(sync-ratings): reduce code logic * perf(sync-stats): minor change * fix(add-bps-info): solve warning duplicate database * fix(add-bps-info): solve warning duplicate database * fix(env): add variables to sync files * fix(env): remove no needed envarioment variables * fix(docker-compose): implement independent variables * fix(hasura): add missing user permissions * fix(hasura): add missing rateProducer action * fix(hasura): add missing hasura action Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez --- hasura/metadata/actions.graphql | 24 +++++++++++++++++++ hasura/metadata/actions.yaml | 15 +++++++++--- .../default/tables/public_producers.yaml | 9 +++++++ .../default/tables/public_producers_list.yaml | 18 ++++++++++++++ .../default/tables/public_proxies.yaml | 17 +++++++++++++ .../default/tables/public_ratings_stats.yaml | 15 ++++++++++++ .../default/tables/public_user_ratings.yaml | 10 ++++++++ webapp/src/services/graphql.js | 3 --- 8 files changed, 105 insertions(+), 6 deletions(-) diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql index 139597f9..8c4d53f6 100644 --- a/hasura/metadata/actions.graphql +++ b/hasura/metadata/actions.graphql @@ -1,2 +1,26 @@ +type Mutation { + rateProducer ( + ratingInput: RatingInput! + ): RatingOutput +} + + +input RatingInput { + user : String! + producer : String! +} + +type RatingOutput { + message : String! + uniq_rating : String + user : String + bp : String + ratings : jsonb +} + +type deleteUserRateOutput { + message : String! +} + diff --git a/hasura/metadata/actions.yaml b/hasura/metadata/actions.yaml index 1edb4c2f..5c44de47 100644 --- a/hasura/metadata/actions.yaml +++ b/hasura/metadata/actions.yaml @@ -1,6 +1,15 @@ -actions: [] +actions: +- name: rateProducer + definition: + kind: synchronous + handler: '{{HASURA_GRAPHQL_ACTION_BASE_URL}}/ratebp' + permissions: + - role: anonymous custom_types: enums: [] - input_objects: [] - objects: [] + input_objects: + - name: RatingInput + objects: + - name: RatingOutput + - name: deleteUserRateOutput scalars: [] diff --git a/hasura/metadata/databases/default/tables/public_producers.yaml b/hasura/metadata/databases/default/tables/public_producers.yaml index 942d9243..eae54aac 100644 --- a/hasura/metadata/databases/default/tables/public_producers.yaml +++ b/hasura/metadata/databases/default/tables/public_producers.yaml @@ -1,3 +1,12 @@ +select_permissions: +- permission: + columns: + - bpjson + - general_info + - owner + - system + filter: {} + role: anonymous table: name: producers schema: public diff --git a/hasura/metadata/databases/default/tables/public_producers_list.yaml b/hasura/metadata/databases/default/tables/public_producers_list.yaml index 6be1900e..9b092074 100644 --- a/hasura/metadata/databases/default/tables/public_producers_list.yaml +++ b/hasura/metadata/databases/default/tables/public_producers_list.yaml @@ -1,3 +1,21 @@ +select_permissions: +- permission: + columns: + - average + - bpjson + - candidate_name + - community + - development + - general_info + - infrastructure + - owner + - ratings_cntr + - system + - total_votes + - transparency + - trustiness + filter: {} + role: anonymous table: name: producers_list schema: public diff --git a/hasura/metadata/databases/default/tables/public_proxies.yaml b/hasura/metadata/databases/default/tables/public_proxies.yaml index 6a3c96c4..cfa32048 100644 --- a/hasura/metadata/databases/default/tables/public_proxies.yaml +++ b/hasura/metadata/databases/default/tables/public_proxies.yaml @@ -1,3 +1,20 @@ +select_permissions: +- permission: + columns: + - background + - logo_256 + - name + - owner + - philosophy + - slogan + - steemit + - telegram + - twitter + - voter_info + - website + - wechat + filter: {} + role: anonymous table: name: proxies schema: public diff --git a/hasura/metadata/databases/default/tables/public_ratings_stats.yaml b/hasura/metadata/databases/default/tables/public_ratings_stats.yaml index 1aa10c1f..9e898a7b 100644 --- a/hasura/metadata/databases/default/tables/public_ratings_stats.yaml +++ b/hasura/metadata/databases/default/tables/public_ratings_stats.yaml @@ -1,3 +1,18 @@ +select_permissions: +- permission: + columns: + - average + - bp + - community + - created_at + - development + - infrastructure + - ratings_cntr + - transparency + - trustiness + - updated_at + filter: {} + role: anonymous table: name: ratings_stats schema: public diff --git a/hasura/metadata/databases/default/tables/public_user_ratings.yaml b/hasura/metadata/databases/default/tables/public_user_ratings.yaml index d01ce050..7ab3fc1a 100644 --- a/hasura/metadata/databases/default/tables/public_user_ratings.yaml +++ b/hasura/metadata/databases/default/tables/public_user_ratings.yaml @@ -1,3 +1,13 @@ +select_permissions: +- permission: + columns: + - bp + - ratings + - tx_data + - uniq_rating + - user + filter: {} + role: anonymous table: name: user_ratings schema: public diff --git a/webapp/src/services/graphql.js b/webapp/src/services/graphql.js index ccd5b118..8984deda 100644 --- a/webapp/src/services/graphql.js +++ b/webapp/src/services/graphql.js @@ -5,9 +5,6 @@ import { split } from 'apollo-link' import { getMainDefinition } from 'apollo-utilities' import { InMemoryCache } from 'apollo-cache-inmemory' -const REACT_APP_GRAPHQL_HTTP_URL = process.env.REACT_APP_GRAPHQL_HTTP_URL -console.log(`REACT_APP_GRAPHQL_HTTP_URL: ${REACT_APP_GRAPHQL_HTTP_URL}`) - // Create an http link: const httpLink = new HttpLink({ uri: process.env.REACT_APP_GRAPHQL_HTTP_URL, From c04cb59a6cee402bc938f50c7672e7b7e261ea01 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Thu, 29 Jul 2021 22:16:36 -0600 Subject: [PATCH 09/54] fix(devops): create namespace if it dosent exist (#626) --- makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/makefile b/makefile index 6cf83090..79f16d45 100644 --- a/makefile +++ b/makefile @@ -104,6 +104,7 @@ build-kubernetes: ./kubernetes deploy-kubernetes: ##@devops Publish the build k8s files deploy-kubernetes: $(K8S_BUILD_DIR) + @kubectl create ns $(NAMESPACE) || echo "Namespace '$(NAMESPACE)' already exists."; @echo "Creating SSL certificates..." kubectl create secret tls \ tls-secret \ From f481eb44eebe254e87cef9d49d5bd2d4443f26e6 Mon Sep 17 00:00:00 2001 From: Leister Francisco Alvarez Campos Date: Fri, 30 Jul 2021 19:09:06 -0600 Subject: [PATCH 10/54] Refactor/smart-contract (#621) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * refactor(smart-contract): separe logic into hpp and cpp * refactor(smart-contract): format code Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez --- .../rateproducer/include/rateproducer.hpp | 367 +++++++++ contracts/rateproducer/rateproducer.cpp | 766 ------------------ contracts/rateproducer/src/rateproducer.cpp | 452 +++++++++++ contracts/scripts/compile.sh | 3 + 4 files changed, 822 insertions(+), 766 deletions(-) create mode 100644 contracts/rateproducer/include/rateproducer.hpp delete mode 100644 contracts/rateproducer/rateproducer.cpp create mode 100644 contracts/rateproducer/src/rateproducer.cpp create mode 100755 contracts/scripts/compile.sh diff --git a/contracts/rateproducer/include/rateproducer.hpp b/contracts/rateproducer/include/rateproducer.hpp new file mode 100644 index 00000000..5d3037f6 --- /dev/null +++ b/contracts/rateproducer/include/rateproducer.hpp @@ -0,0 +1,367 @@ +/* + * @file + * @author (C) 2020 by eoscostarica [ https://eoscostarica.io ] + * @version 1.1.0 + * + * @section DESCRIPTION + * + * Smart contract rateproducer + * + * WebSite: https://eosrate.io/ + * GitHub: https://github.com/eoscostarica/eos-rate + * + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define MINVAL 0 +#define MAXVAL 10 +#define MIN_VOTERS 21 + +using namespace std; +using namespace eosio; +using eosio::public_key; + +/* +* this namespace is used to map producer_info and voter_info tables +* within the local scope of this contract, the follow functions :is_blockproducer, +* get_voters, get_proxy, is_active_proxy relay on these tables. +* this approaches came from this thread : +* https://eosio.stackexchange.com/questions/4676/check-within-smart-contract-if-an-account-is-a-proxy +*/ +namespace eosio { + constexpr name system_account{"eosio"_n}; + + /* + * EOSIO producer_info table + */ + struct producer_info { + name owner; + double total_votes = 0; + eosio::public_key producer_key; /// a packed public key object + bool is_active = true; + std::string url; + uint32_t unpaid_blocks = 0; + time_point last_claim_time; + uint16_t location = 0; + + uint64_t primary_key()const { return owner.value; } + double by_votes()const { return is_active ? -total_votes : total_votes; } + bool active()const { return is_active; } + void deactivate() { producer_key = public_key(); is_active = false; } + + // explicit serialization macro is not necessary, used here only to improve compilation time + EOSLIB_SERIALIZE( producer_info, (owner)(total_votes)(producer_key)(is_active)(url) + (unpaid_blocks)(last_claim_time)(location) ) + }; + typedef eosio::multi_index< "producers"_n, producer_info, + indexed_by<"prototalvote"_n, const_mem_fun> + > producers_table; + + /** + * + * Verify is an account is a block producer + * + * @param bp_name - Contains the name of the account that we want to verify as bp + * + * @return true is the account is a block producer, otherwise returns false + */ + bool is_blockproducer(name bp_name){ + producers_table bp(system_account, system_account.value); + auto it = bp.find(bp_name.value); + if(it==bp.end()){ + return false; + } + return it->is_active; + } + + /* + * EOSIO voter_info table + */ + struct voter_info { + name owner; + name proxy; + std::vector producers; + int64_t staked = 0; + double last_vote_weight = 0; + double proxied_vote_weight= 0; + bool is_proxy = 0; + uint32_t flags1 = 0; + uint32_t reserved2 = 0; + eosio::asset reserved3; + + uint64_t primary_key()const { return owner.value; } + + EOSLIB_SERIALIZE( voter_info, (owner)(proxy)(producers)(staked)(last_vote_weight)(proxied_vote_weight)(is_proxy)(flags1)(reserved2)(reserved3) ) + }; + typedef eosio::multi_index< "voters"_n, voter_info > voters_table; + + /** + * + * returns the number of votes made + * + * @param name - Contains the name of the account that we wish to obtain the number of votes + * + * @return the amount of votes + */ + int get_voters (name name) { + voters_table _voters(system_account, system_account.value); + auto it = _voters.find(name.value); + if(it==_voters.end()){ + return 0; + } + return it->producers.size(); + } + + /** + * + * Returns the proxy name for an especific account + * + * @param name - Contains the name of the account that we want to obtain its proxy + * + * @return the proxy name, returns "" in case of non proxy + */ + eosio::name get_proxy ( eosio::name name) { + voters_table _voters(system_account, system_account.value); + auto it = _voters.find(name.value); + if(it==_voters.end()){ + eosio::name result(""); + return result; + } + return it->proxy; + } + + /** + * + * Verify is an account is an active proxy + * + * @param name - Contains the name of the account that we want to verify as an active proxy + * + * @return true is the account is an antiVe proxy, otherwise returns false + */ + bool is_active_proxy(name name) { + voters_table _voters(system_account, system_account.value); + auto it = _voters.find(name.value); + return it != _voters.end() && it->is_proxy; + } + +} // namespace eosio + + +CONTRACT rateproducer : public contract { + public: + using contract::contract; + + /** + * + * Saves the info related with a sponsor within a community + * + * @param user - Voter account name, + * @param bp - Block Producer account name + * @param transparency - Rate for transparency category + * @param infrastructure - Rate for infrastructure category + * @param trustiness - Rate for trustiness category + * @param community - Rate for community category + * @param development - Rate for development category + * + * @pre all rate category's vales must be an integer value + * @pre all rate category's vales must be between 1 -10 + * + * @memo the account especific in user parameter is the ram payor + * @memo user account must voted for at least 21 blockproducer + * or vote for a proxy with at least 21 votes + */ + ACTION rate( + name user, + name bp, + int8_t transparency, + int8_t infrastructure, + int8_t trustiness, + int8_t community, + int8_t development); + + /** + * + * Stores the rate stats within stats table + * for a specific block producer + * + * @param user - Voter account name, + * @param bp_name - Block Producer account name + * @param transparency - Rate for transparency category + * @param infrastructure - Rate for infrastructure category + * @param trustiness - Rate for trustiness category + * @param community - Rate for community category + * @param development - Rate for development category + * + * @memo this function is called for the first-time rate made + * by the tuple {user,bp} + * + */ + void save_bp_stats ( + name user, + name bp_name, + float transparency, + float infrastructure, + float trustiness, + float community, + float development); + + /** + * + * Calculates the value for all categories + * for a specified block producer, this fucntion + * iterates on ratings table + * + * @param bp_name - Block Producer account name + * @param transparency - Calculated value for transparency category + * @param infrastructure - Calculated value for infrastructure category + * @param trustiness - Calculated value for trustiness category + * @param community - Calculated value for community category + * @param development - Calculated value for development category + * @param ratings_cntr - Calculated value for rates counter + * @param average - Calculated average for categories + * + * @memo zero values are ignored, see the unit test script test_averaje.js + * in order to learn more details about the average calculation + * + * @memo variables transparency, infrastructure, trustiness, community + * development, ratings_cntr, average are passed by reference + * + * @return calculated values for: transparency, infrastructure, trustiness, community + * development, ratings_cntr + */ + void calculate_bp_stats ( + name bp_name, + float * transparency, + float * infrastructure, + float * trustiness, + float * community, + float * development, + uint32_t * ratings_cntr, + float * average); + + /** + * + * Updates the stats table, with the new + * categories values for a specific block producer + * + * @param user - Voter account name, + * @param bp_name - Block Producer account name + * @param transparency - Rate for transparency category + * @param infrastructure - Rate for infrastructure category + * @param trustiness - Rate for trustiness category + * @param community - Rate for community category + * @param development - Rate for development category + * + */ + void update_bp_stats ( + name * user, + name * bp_name, + float * transparency, + float * infrastructure, + float * trustiness, + float * community, + float * development, + uint32_t * ratings_cntr, + float * average); + + /** + * + * Erase all data related for a specific block producer + * + * @param bp_name - Block Producer account name + * + */ + ACTION erase(name bp_name); + + + /** + * + * Erase all data related for a set of block producer + * + * @param bps_to_clean - List of Block Producer accounts + * + */ + void erase_bp_info(std::set * bps_to_clean); + + + /** + * + * Clean all data store within the tables + * + */ + ACTION wipe(); + + /** + * + * Erase all data for inactive block producers + * + */ + ACTION rminactive(); + + /** + * + * Erase a rate made for a specific account + * to a specific block producer + * + * @param user - Voter account name, + * @param bp - Block Producer account name + * + */ + + ACTION rmrate(name user, name bp); + + + private: + /* + * Stores the rate average stats for a block producer + */ + TABLE stats { + name bp; + uint32_t ratings_cntr; + float average; + float transparency; + float infrastructure; + float trustiness; + float development; + float community; + uint64_t primary_key() const { return bp.value; } + }; + + typedef eosio::multi_index<"stats"_n, stats > _stats; + + /* + * Stores the rate vote for a block producer + */ + TABLE ratings { + uint64_t id; + uint128_t uniq_rating; + name user; + name bp; + float transparency; + float infrastructure; + float trustiness; + float development; + float community; + uint64_t primary_key() const { return id; } + uint128_t by_uniq_rating() const { return uniq_rating; } + uint64_t by_user() const { return user.value; } + uint64_t by_bp() const { return bp.value; } + }; + + typedef eosio::multi_index<"ratings"_n, ratings, + indexed_by<"uniqrating"_n, const_mem_fun>, + indexed_by<"user"_n, const_mem_fun>, + indexed_by<"bp"_n, const_mem_fun> + > _ratings; + +}; + +EOSIO_DISPATCH(rateproducer,(rate)(erase)(wipe)(rminactive)(rmrate)); \ No newline at end of file diff --git a/contracts/rateproducer/rateproducer.cpp b/contracts/rateproducer/rateproducer.cpp deleted file mode 100644 index 4761c98d..00000000 --- a/contracts/rateproducer/rateproducer.cpp +++ /dev/null @@ -1,766 +0,0 @@ -/* - * @file - * @author (C) 2020 by eoscostarica [ https://eoscostarica.io ] - * @version 1.1.0 - * - * @section DESCRIPTION - * - * Smart contract rateproducer - * - * WebSite: https://eosrate.io/ - * GitHub: https://github.com/eoscostarica/eos-rate - * - */ -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define MINVAL 0 -#define MAXVAL 10 -#define MIN_VOTERS 21 - -using namespace std; -using namespace eosio; -using eosio::public_key; - -/* -* this namespace is used to map producer_info and voter_info tables -* within the local scope of this contract, the follow functions :is_blockproducer, -* get_voters, get_proxy, is_active_proxy relay on thiese tables. -* this approaches came from this thread : -* https://eosio.stackexchange.com/questions/4676/check-within-smart-contract-if-an-account-is-a-proxy -*/ -namespace eosio { - constexpr name system_account{"eosio"_n}; - - /* - * EOSIO producer_info table - */ - struct producer_info { - name owner; - double total_votes = 0; - eosio::public_key producer_key; /// a packed public key object - bool is_active = true; - std::string url; - uint32_t unpaid_blocks = 0; - time_point last_claim_time; - uint16_t location = 0; - - uint64_t primary_key()const { return owner.value; } - double by_votes()const { return is_active ? -total_votes : total_votes; } - bool active()const { return is_active; } - void deactivate() { producer_key = public_key(); is_active = false; } - - // explicit serialization macro is not necessary, used here only to improve compilation time - EOSLIB_SERIALIZE( producer_info, (owner)(total_votes)(producer_key)(is_active)(url) - (unpaid_blocks)(last_claim_time)(location) ) - }; - typedef eosio::multi_index< "producers"_n, producer_info, - indexed_by<"prototalvote"_n, const_mem_fun> - > producers_table; - - /** - * - * Verify is an account is a block producer - * - * @param bp_name - Contains the name of the account that we want to verify as bp - * - * @return true is the account is a block producer, otherwise returns false - */ - bool is_blockproducer(name bp_name){ - producers_table bp(system_account, system_account.value); - auto it = bp.find(bp_name.value); - if(it==bp.end()){ - return false; - } - return it->is_active; - } - - /* - * EOSIO voter_info table - */ - struct voter_info { - name owner; - name proxy; - std::vector producers; - int64_t staked = 0; - double last_vote_weight = 0; - double proxied_vote_weight= 0; - bool is_proxy = 0; - uint32_t flags1 = 0; - uint32_t reserved2 = 0; - eosio::asset reserved3; - - uint64_t primary_key()const { return owner.value; } - - EOSLIB_SERIALIZE( voter_info, (owner)(proxy)(producers)(staked)(last_vote_weight)(proxied_vote_weight)(is_proxy)(flags1)(reserved2)(reserved3) ) - }; - typedef eosio::multi_index< "voters"_n, voter_info > voters_table; - - /** - * - * returns the number of votes made - * - * @param name - Contains the name of the account that we wish to obtain the number of votes - * - * @return the amount of votes - */ - int get_voters (name name) { - voters_table _voters(system_account, system_account.value); - auto it = _voters.find(name.value); - if(it==_voters.end()){ - return 0; - } - return it->producers.size(); - } - - /** - * - * Returns the proxy name for an especific account - * - * @param name - Contains the name of the account that we want to obtain its proxy - * - * @return the proxy name, returns "" in case of non proxy - */ - eosio::name get_proxy ( eosio::name name) { - voters_table _voters(system_account, system_account.value); - auto it = _voters.find(name.value); - if(it==_voters.end()){ - eosio::name result(""); - return result; - } - return it->proxy; - } - - /** - * - * Verify is an account is an active proxy - * - * @param name - Contains the name of the account that we want to verify as an active proxy - * - * @return true is the account is an antiVe proxy, otherwise returns false - */ - bool is_active_proxy(name name) { - voters_table _voters(system_account, system_account.value); - auto it = _voters.find(name.value); - return it != _voters.end() && it->is_proxy; - } - -} /// namespace eosio - -CONTRACT rateproducer : public contract { - public: - using contract::contract; - - /** - * - * Saves the info related with a sponsor within a community - * - * @param user - Voter account name, - * @param bp - Block Producer account name - * @param transparency - Rate for transparency category - * @param infrastructure - Rate for infrastructure category - * @param trustiness - Rate for trustiness category - * @param community - Rate for community category - * @param development - Rate for development category - * - * @pre all rate category's vales must be an integer value - * @pre all rate category's vales must be between 1 -10 - * - * @memo the account especific in user parameter is the ram payor - * @memo user account must voted for at least 21 blockproducer - * or vote for a proxy with at least 21 votes - */ - ACTION rate(name user, - name bp, - int8_t transparency, - int8_t infrastructure, - int8_t trustiness, - int8_t community, - int8_t development) { - check( (transparency+infrastructure+trustiness+community+development), "Error vote must have value for at least one category"); - check( (MINVAL<= transparency && transparency<=MAXVAL ), "Error transparency value out of range"); - check( (MINVAL<= infrastructure && infrastructure<=MAXVAL ), "Error infrastructure value out of range" ); - check( (MINVAL<= trustiness && trustiness<=MAXVAL ), "Error trustiness value out of range" ); - check( (MINVAL<= development && development <=MAXVAL ), "Error development value out of range" ); - check( (MINVAL<= community && community<=MAXVAL ), "Error community value out of range" ); - - //checks if the bp is active - check(is_blockproducer(bp),"votes are allowed only for registered block producers"); - - eosio::name proxy_name = get_proxy(user); - if(proxy_name.length()){ - //active proxy?? - check(is_active_proxy(proxy_name), "votes are allowed only for active proxies" ); - //account votes through a proxy - check(!(MIN_VOTERS > get_voters(proxy_name)), "delegated proxy does not have enough voters" ); - }else{ - // acount must vote for at least 21 bp - check(!(MIN_VOTERS > get_voters(user)), "account does not have enough voters" ); - } - - // upsert bp rating - _ratings bps(_self, _self.value); - auto uniq_rating = (static_cast(user.value) << 64) | bp.value; - - auto uniq_rating_index = bps.get_index(); - auto existing_rating = uniq_rating_index.find(uniq_rating); - - if( existing_rating == uniq_rating_index.end() ) { - bps.emplace(user, [&]( auto& row ) { - row.id = bps.available_primary_key(); - row.uniq_rating = uniq_rating; - row.user = user; - row.bp = bp; - row.transparency = transparency; - row.infrastructure = infrastructure; - row.trustiness = trustiness; - row.community = community; - row.development = development ; - }); - //save stats - save_bp_stats(user, - bp, - transparency, - infrastructure, - trustiness, - community, - development); - - - } else { - //the voter update its vote - uniq_rating_index.modify(existing_rating, user, [&]( auto& row ) { - row.user = user; - row.bp = bp; - row.transparency = transparency; - row.infrastructure = infrastructure; - row.trustiness = trustiness; - row.community = community; - row.development = development ; - }); - //update bp stats - float bp_transparency = 0; - float bp_infrastructure = 0; - float bp_trustiness = 0; - float bp_community = 0; - float bp_development = 0; - uint32_t bp_ratings_cntr = 0; - float bp_average = 0; - calculate_bp_stats (bp, - &bp_transparency, - &bp_infrastructure, - &bp_trustiness, - &bp_community, - &bp_development, - &bp_ratings_cntr, - &bp_average); - update_bp_stats (&user, - &bp, - &bp_transparency, - &bp_infrastructure, - &bp_trustiness, - &bp_community, - &bp_development, - &bp_ratings_cntr, - &bp_average); - } - } - - /** - * - * Stores the rate stats within stats table - * for a specific block producer - * - * @param user - Voter account name, - * @param bp_name - Block Producer account name - * @param transparency - Rate for transparency category - * @param infrastructure - Rate for infrastructure category - * @param trustiness - Rate for trustiness category - * @param community - Rate for community category - * @param development - Rate for development category - * - * @memo this function is called for the first-time rate made - * by the tuple {user,bp} - * - */ - void save_bp_stats (name user, - name bp_name, - float transparency, - float infrastructure, - float trustiness, - float community, - float development - ){ - _stats bps_stats(_self, _self.value); - auto itr = bps_stats.find(bp_name.value); - float counter =0; - float sum = 0; - if(itr == bps_stats.end()){ - //new entry - bps_stats.emplace(user, [&]( auto& row ) { - - if (transparency){ - row.transparency = transparency; - counter++; - sum += transparency; - } - - if (infrastructure){ - row.infrastructure = infrastructure; - counter++; - sum += infrastructure; - } - - if (trustiness){ - row.trustiness = trustiness; - counter++; - sum += trustiness; - } - - if (development){ - row.development = development; - counter++; - sum += development; - } - - if (community){ - row.community = community; - counter++; - sum += community; - } - - if(counter){ - row.bp = bp_name; - row.ratings_cntr = 1; - row.average =sum/counter; - - } - }); - }else{ - //update the entry - bps_stats.modify(itr,user, [&]( auto& row ) { - if (transparency){ - sum += transparency; - if(row.transparency){ - transparency = (transparency + row.transparency)/2; - } - row.transparency = transparency; - counter++; - } - - if (infrastructure){ - sum += infrastructure; - if(row.infrastructure){ - infrastructure = (infrastructure + row.infrastructure)/2; - } - row.infrastructure = infrastructure; - counter++; - } - - if (trustiness){ - sum += trustiness; - if(row.trustiness){ - trustiness = (trustiness + row.trustiness)/2; - } - row.trustiness = trustiness; - counter++; - } - - if (development){ - sum += development; - if(row.development){ - development = (development + row.development)/2; - } - row.development = development; - counter++; - } - - if (community){ - sum += community; - if(row.community){ - community = (community + row.community)/2; - } - row.community = community; - counter++; - } - - if(counter){ - row.ratings_cntr++; - row.average =( (sum/counter) + row.average ) /2; - } - }); - } - } - - /** - * - * Calculates the value for all categories - * for a specified block producer, this fucntion - * iterates on ratings table - * - * @param bp_name - Block Producer account name - * @param transparency - Calculated value for transparency category - * @param infrastructure - Calculated value for infrastructure category - * @param trustiness - Calculated value for trustiness category - * @param community - Calculated value for community category - * @param development - Calculated value for development category - * @param ratings_cntr - Calculated value for rates counter - * @param average - Calculated average for categories - * - * @memo zero values are ignored, see the unit test script test_averaje.js - * in order to learn more details about the average calculation - * - * @memo variables transparency, infrastructure, trustiness, community - * development, ratings_cntr, average are passed by reference - * - * @return calculated values for: transparency, infrastructure, trustiness, community - * development, ratings_cntr - */ - void calculate_bp_stats ( name bp_name, - float * transparency, - float * infrastructure, - float * trustiness, - float * community, - float * development, - uint32_t * ratings_cntr, - float * average - ){ - - float category_counter = 0; - - float transparency_total = 0; - float infrastructure_total = 0; - float trustiness_total = 0; - float community_total = 0; - float development_total = 0; - - float transparency_cntr = 0; - float infrastructure_cntr = 0; - float trustiness_cntr = 0; - float community_cntr = 0; - float development_cntr = 0; - uint32_t voters_cntr = 0; - - _ratings bps(_self, _self.value); - auto bps_index = bps.get_index(); - auto bps_it = bps_index.find(bp_name.value); - - while(bps_it != bps_index.end()){ - if(bp_name == bps_it->bp){ - if(bps_it->transparency){ - transparency_total+=bps_it->transparency; - transparency_cntr++; - } - - if(bps_it->infrastructure){ - infrastructure_total+=bps_it->infrastructure; - infrastructure_cntr++; - } - - if(bps_it->trustiness){ - trustiness_total+=bps_it->trustiness; - trustiness_cntr++; - } - - if(bps_it->community){ - community_total+=bps_it->community; - community_cntr++; - } - - if(bps_it->development){ - development_total+=bps_it->development; - development_cntr++; - } - voters_cntr++; - } - bps_it ++; - } - - if(transparency_cntr){ - *transparency = transparency_total/transparency_cntr; - category_counter++; - } - - if(infrastructure_cntr){ - *infrastructure =infrastructure_total/infrastructure_cntr; - category_counter++; - } - - if(trustiness_cntr){ - *trustiness = trustiness_total/trustiness_cntr; - category_counter++; - } - - if(community_cntr){ - *community = community_total/community_cntr; - category_counter++; - } - - if(development_cntr){ - *development = development_total/development_cntr; - category_counter++; - } - *average = (*transparency + *infrastructure + *trustiness + *community +*development)/category_counter; - *ratings_cntr = voters_cntr; - } - - /** - * - * Updates the stats table, with the new - * categories values for a specific block producer - * - * @param user - Voter account name, - * @param bp_name - Block Producer account name - * @param transparency - Rate for transparency category - * @param infrastructure - Rate for infrastructure category - * @param trustiness - Rate for trustiness category - * @param community - Rate for community category - * @param development - Rate for development category - * - */ - void update_bp_stats (name * user, - name * bp_name, - float * transparency, - float * infrastructure, - float * trustiness, - float * community, - float * development, - uint32_t * ratings_cntr, - float * average - ){ - - _stats bps_stats(_self, _self.value); - auto itr = bps_stats.find(bp_name->value); - if(itr != bps_stats.end()){ - //if rate categories are more than zero - // we store, otherwise remove the entry - if( *transparency + - *infrastructure + - *trustiness + - *community + - *development){ - - bps_stats.modify(itr,*user, [&]( auto& row ) { - row.transparency = *transparency; - row.infrastructure = *infrastructure; - row.trustiness = *trustiness; - row.development = *development; - row.community = *community; - row.ratings_cntr= *ratings_cntr; - row.average = *average; - }); - }else{ - bps_stats.erase(itr); - } - } - } - - /** - * - * Erase all data related for a specific block producer - * - * @param bp_name - Block Producer account name - * - */ - ACTION erase(name bp_name) { - - require_auth(_self); - - _ratings bps(_self, _self.value); - auto itr = bps.begin(); - while ( itr != bps.end()) { - if(itr->bp == bp_name){ - itr = bps.erase(itr); - }else{ - itr++; - } - } - - //clean the stats summary - _stats bps_stats(_self, _self.value); - auto itr_stats = bps_stats.find(bp_name.value); - if (itr_stats != bps_stats.end()) bps_stats.erase(itr_stats); - } - - - /** - * - * Erase all data related for a set of block producer - * - * @param bps_to_clean - List of Block Producer accounts - * - */ - void erase_bp_info(std::set * bps_to_clean){ - _ratings bps(_self, _self.value); - _stats bps_stats(_self, _self.value); - - std::set::iterator it; - for (it = bps_to_clean->begin(); it != bps_to_clean->end(); ++it) { - //clean all ratings related to an bp - auto itr = bps.begin(); - while ( itr != bps.end()) { - if(itr->bp == *it){ - itr = bps.erase(itr); - }else{ - itr++; - } - } - //clean the stats summary - auto itr_stats = bps_stats.find((*it).value); - if (itr_stats != bps_stats.end()) bps_stats.erase(itr_stats); - } - } - - - /** - * - * Clean all data store within the tables - * - */ - ACTION wipe() { - - require_auth(_self); - _ratings bps(_self, _self.value); - auto itr = bps.begin(); - while ( itr != bps.end()) { - itr = bps.erase(itr); - } - - _stats bps_stats(_self, _self.value); - auto itr_stats = bps_stats.begin(); - while ( itr_stats != bps_stats.end()) { - itr_stats = bps_stats.erase(itr_stats); - } - } - - /** - * - * Erase all data for inactive block producers - * - */ - ACTION rminactive() { - - require_auth(_self); - std::set noupdated_bps; - _stats bps_stats(_self, _self.value); - auto itr_stats = bps_stats.begin(); - while ( itr_stats != bps_stats.end()) { - if (!is_blockproducer(itr_stats->bp)){ - noupdated_bps.insert(itr_stats->bp); - } - itr_stats++; - } - if(noupdated_bps.size()) erase_bp_info(&noupdated_bps); - print("bps deleted:",noupdated_bps.size()); - } - - /** - * - * Erase a rate made for a specific account - * to a specific block producer - * - * @param user - Voter account name, - * @param bp - Block Producer account name - * - */ - - ACTION rmrate(name user, - name bp){ - require_auth(user); - - _ratings bps(_self, _self.value); - auto uniq_rating = (static_cast(user.value) << 64) | bp.value; - - auto uniq_rating_index = bps.get_index(); - auto existing_rating = uniq_rating_index.find(uniq_rating); - - if( existing_rating != uniq_rating_index.end() ) { - - //delete rate info - auto itr = uniq_rating_index.erase(existing_rating); - - //update bp stats - float bp_transparency = 0; - float bp_infrastructure = 0; - float bp_trustiness = 0; - float bp_community = 0; - float bp_development = 0; - uint32_t bp_ratings_cntr = 0; - float bp_average = 0; - //re-calculate stats for the bp - calculate_bp_stats (bp, - &bp_transparency, - &bp_infrastructure, - &bp_trustiness, - &bp_community, - &bp_development, - &bp_ratings_cntr, - &bp_average); - //save the re-calcualtes stats - update_bp_stats (&user, - &bp, - &bp_transparency, - &bp_infrastructure, - &bp_trustiness, - &bp_community, - &bp_development, - &bp_ratings_cntr, - &bp_average); - - } - } - - - private: - /* - * Stores the rate average stats for a block producer - */ - TABLE stats { - name bp; - uint32_t ratings_cntr; - float average; - float transparency; - float infrastructure; - float trustiness; - float development; - float community; - uint64_t primary_key() const { return bp.value; } - }; - - typedef eosio::multi_index<"stats"_n, stats > _stats; - - /* - * Stores the rate vote for a block producer - */ - TABLE ratings { - uint64_t id; - uint128_t uniq_rating; - name user; - name bp; - float transparency; - float infrastructure; - float trustiness; - float development; - float community; - uint64_t primary_key() const { return id; } - uint128_t by_uniq_rating() const { return uniq_rating; } - uint64_t by_user() const { return user.value; } - uint64_t by_bp() const { return bp.value; } - }; - - typedef eosio::multi_index<"ratings"_n, ratings, - indexed_by<"uniqrating"_n, const_mem_fun>, - indexed_by<"user"_n, const_mem_fun>, - indexed_by<"bp"_n, const_mem_fun> - > _ratings; - -}; - -EOSIO_DISPATCH(rateproducer,(rate)(erase)(wipe)(rminactive)(rmrate)); diff --git a/contracts/rateproducer/src/rateproducer.cpp b/contracts/rateproducer/src/rateproducer.cpp new file mode 100644 index 00000000..7d3892b3 --- /dev/null +++ b/contracts/rateproducer/src/rateproducer.cpp @@ -0,0 +1,452 @@ +#include + + +ACTION rateproducer::rate( + name user, + name bp, + int8_t transparency, + int8_t infrastructure, + int8_t trustiness, + int8_t community, + int8_t development) { + check( (transparency+infrastructure+trustiness+community+development), "Error vote must have value for at least one category"); + check( (MINVAL<= transparency && transparency<=MAXVAL ), "Error transparency value out of range"); + check( (MINVAL<= infrastructure && infrastructure<=MAXVAL ), "Error infrastructure value out of range" ); + check( (MINVAL<= trustiness && trustiness<=MAXVAL ), "Error trustiness value out of range" ); + check( (MINVAL<= development && development <=MAXVAL ), "Error development value out of range" ); + check( (MINVAL<= community && community<=MAXVAL ), "Error community value out of range" ); + + //checks if the bp is active + check( is_blockproducer(bp), "votes are allowed only for registered block producers" ); + + eosio::name proxy_name = get_proxy(user); + if(proxy_name.length()) { + //active proxy?? + check(is_active_proxy(proxy_name), "votes are allowed only for active proxies" ); + //account votes through a proxy + check(!(MIN_VOTERS > get_voters(proxy_name)), "delegated proxy does not have enough voters" ); + } else { + // acount must vote for at least 21 bp + check(!(MIN_VOTERS > get_voters(user)), "account does not have enough voters" ); + } + + // upsert bp rating + _ratings bps(_self, _self.value); + auto uniq_rating = (static_cast(user.value) << 64) | bp.value; + + auto uniq_rating_index = bps.get_index(); + auto existing_rating = uniq_rating_index.find(uniq_rating); + + if( existing_rating == uniq_rating_index.end() ) { + bps.emplace(user, [&]( auto& row ) { + row.id = bps.available_primary_key(); + row.uniq_rating = uniq_rating; + row.user = user; + row.bp = bp; + row.transparency = transparency; + row.infrastructure = infrastructure; + row.trustiness = trustiness; + row.community = community; + row.development = development ; + }); + //save stats + save_bp_stats(user, + bp, + transparency, + infrastructure, + trustiness, + community, + development); + + + } else { + //the voter update its vote + uniq_rating_index.modify(existing_rating, user, [&]( auto& row ) { + row.user = user; + row.bp = bp; + row.transparency = transparency; + row.infrastructure = infrastructure; + row.trustiness = trustiness; + row.community = community; + row.development = development ; + }); + //update bp stats + float bp_transparency = 0; + float bp_infrastructure = 0; + float bp_trustiness = 0; + float bp_community = 0; + float bp_development = 0; + uint32_t bp_ratings_cntr = 0; + float bp_average = 0; + calculate_bp_stats (bp, + &bp_transparency, + &bp_infrastructure, + &bp_trustiness, + &bp_community, + &bp_development, + &bp_ratings_cntr, + &bp_average); + update_bp_stats (&user, + &bp, + &bp_transparency, + &bp_infrastructure, + &bp_trustiness, + &bp_community, + &bp_development, + &bp_ratings_cntr, + &bp_average); + } +} + +void rateproducer::save_bp_stats ( + name user, + name bp_name, + float transparency, + float infrastructure, + float trustiness, + float community, + float development) { + _stats bps_stats(_self, _self.value); + auto itr = bps_stats.find(bp_name.value); + float counter =0; + float sum = 0; + if(itr == bps_stats.end()) { + //new entry + bps_stats.emplace(user, [&]( auto& row ) { + if (transparency) { + row.transparency = transparency; + counter++; + sum += transparency; + } + + if (infrastructure) { + row.infrastructure = infrastructure; + counter++; + sum += infrastructure; + } + + if (trustiness) { + row.trustiness = trustiness; + counter++; + sum += trustiness; + } + + if (development) { + row.development = development; + counter++; + sum += development; + } + + if (community) { + row.community = community; + counter++; + sum += community; + } + + if(counter) { + row.bp = bp_name; + row.ratings_cntr = 1; + row.average =sum/counter; + + } + }); + } else { + //update the entry + bps_stats.modify(itr,user, [&]( auto& row ) { + if (transparency) { + sum += transparency; + if(row.transparency) { + transparency = (transparency + row.transparency)/2; + } + row.transparency = transparency; + counter++; + } + + if (infrastructure) { + sum += infrastructure; + if(row.infrastructure) { + infrastructure = (infrastructure + row.infrastructure)/2; + } + row.infrastructure = infrastructure; + counter++; + } + + if (trustiness) { + sum += trustiness; + if(row.trustiness) { + trustiness = (trustiness + row.trustiness) / 2; + } + row.trustiness = trustiness; + counter++; + } + + if (development) { + sum += development; + if(row.development) { + development = (development + row.development) / 2; + } + row.development = development; + counter++; + } + + if (community) { + sum += community; + if(row.community) { + community = (community + row.community) / 2; + } + row.community = community; + counter++; + } + + if(counter) { + row.ratings_cntr++; + row.average =( (sum/counter) + row.average ) / 2; + } + }); + } +} + +void rateproducer::calculate_bp_stats ( + name bp_name, + float * transparency, + float * infrastructure, + float * trustiness, + float * community, + float * development, + uint32_t * ratings_cntr, + float * average) { + + float category_counter = 0; + + float transparency_total = 0; + float infrastructure_total = 0; + float trustiness_total = 0; + float community_total = 0; + float development_total = 0; + + float transparency_cntr = 0; + float infrastructure_cntr = 0; + float trustiness_cntr = 0; + float community_cntr = 0; + float development_cntr = 0; + uint32_t voters_cntr = 0; + + _ratings bps(_self, _self.value); + auto bps_index = bps.get_index(); + auto bps_it = bps_index.find(bp_name.value); + + while(bps_it != bps_index.end()) { + if(bp_name == bps_it->bp) { + if(bps_it->transparency) { + transparency_total+=bps_it->transparency; + transparency_cntr++; + } + + if(bps_it->infrastructure) { + infrastructure_total+=bps_it->infrastructure; + infrastructure_cntr++; + } + + if(bps_it->trustiness) { + trustiness_total+=bps_it->trustiness; + trustiness_cntr++; + } + + if(bps_it->community) { + community_total+=bps_it->community; + community_cntr++; + } + + if(bps_it->development) { + development_total+=bps_it->development; + development_cntr++; + } + voters_cntr++; + } + bps_it ++; + } + + if(transparency_cntr) { + *transparency = transparency_total/transparency_cntr; + category_counter++; + } + + if(infrastructure_cntr) { + *infrastructure =infrastructure_total/infrastructure_cntr; + category_counter++; + } + + if(trustiness_cntr) { + *trustiness = trustiness_total/trustiness_cntr; + category_counter++; + } + + if(community_cntr) { + *community = community_total/community_cntr; + category_counter++; + } + + if(development_cntr) { + *development = development_total/development_cntr; + category_counter++; + } + *average = (*transparency + *infrastructure + *trustiness + *community +*development)/category_counter; + *ratings_cntr = voters_cntr; +} + +void rateproducer::update_bp_stats ( + name * user, + name * bp_name, + float * transparency, + float * infrastructure, + float * trustiness, + float * community, + float * development, + uint32_t * ratings_cntr, + float * average) { + + _stats bps_stats(_self, _self.value); + auto itr = bps_stats.find(bp_name->value); + if(itr != bps_stats.end()) { + //if rate categories are more than zero + // we store, otherwise remove the entry + if( *transparency + + *infrastructure + + *trustiness + + *community + + *development) { + + bps_stats.modify(itr,*user, [&]( auto& row ) { + row.transparency = *transparency; + row.infrastructure = *infrastructure; + row.trustiness = *trustiness; + row.development = *development; + row.community = *community; + row.ratings_cntr= *ratings_cntr; + row.average = *average; + }); + } else { + bps_stats.erase(itr); + } + } +} + +ACTION rateproducer::erase(name bp_name) { + + require_auth(_self); + + _ratings bps(_self, _self.value); + auto itr = bps.begin(); + while (itr != bps.end()) { + if(itr->bp == bp_name) { + itr = bps.erase(itr); + } else { + itr++; + } + } + + //clean the stats summary + _stats bps_stats(_self, _self.value); + auto itr_stats = bps_stats.find(bp_name.value); + if (itr_stats != bps_stats.end()) bps_stats.erase(itr_stats); +} + +void rateproducer::erase_bp_info(std::set * bps_to_clean){ + _ratings bps(_self, _self.value); + _stats bps_stats(_self, _self.value); + + std::set::iterator it; + for (it = bps_to_clean->begin(); it != bps_to_clean->end(); ++it) { + //clean all ratings related to an bp + auto itr = bps.begin(); + while (itr != bps.end()) { + if(itr->bp == *it) { + itr = bps.erase(itr); + } else { + itr++; + } + } + //clean the stats summary + auto itr_stats = bps_stats.find((*it).value); + if (itr_stats != bps_stats.end()) bps_stats.erase(itr_stats); + } +} + +ACTION rateproducer::wipe() { + + require_auth(_self); + _ratings bps(_self, _self.value); + auto itr = bps.begin(); + while (itr != bps.end()) { + itr = bps.erase(itr); + } + + _stats bps_stats(_self, _self.value); + auto itr_stats = bps_stats.begin(); + while (itr_stats != bps_stats.end()) { + itr_stats = bps_stats.erase(itr_stats); + } +} + +ACTION rateproducer::rminactive() { + + require_auth(_self); + std::set noupdated_bps; + _stats bps_stats(_self, _self.value); + auto itr_stats = bps_stats.begin(); + while ( itr_stats != bps_stats.end()) { + if (!is_blockproducer(itr_stats->bp)) { + noupdated_bps.insert(itr_stats->bp); + } + itr_stats++; + } + if(noupdated_bps.size()) erase_bp_info(&noupdated_bps); + print("bps deleted:",noupdated_bps.size()); +} + +ACTION rateproducer::rmrate(name user, name bp) { + require_auth(user); + + _ratings bps(_self, _self.value); + auto uniq_rating = (static_cast(user.value) << 64) | bp.value; + + auto uniq_rating_index = bps.get_index(); + auto existing_rating = uniq_rating_index.find(uniq_rating); + + if( existing_rating != uniq_rating_index.end() ) { + + //delete rate info + auto itr = uniq_rating_index.erase(existing_rating); + + //update bp stats + float bp_transparency = 0; + float bp_infrastructure = 0; + float bp_trustiness = 0; + float bp_community = 0; + float bp_development = 0; + uint32_t bp_ratings_cntr = 0; + float bp_average = 0; + + //re-calculate stats for the bp + calculate_bp_stats (bp, + &bp_transparency, + &bp_infrastructure, + &bp_trustiness, + &bp_community, + &bp_development, + &bp_ratings_cntr, + &bp_average); + + //save the re-calcualtes stats + update_bp_stats (&user, + &bp, + &bp_transparency, + &bp_infrastructure, + &bp_trustiness, + &bp_community, + &bp_development, + &bp_ratings_cntr, + &bp_average); + + } +} \ No newline at end of file diff --git a/contracts/scripts/compile.sh b/contracts/scripts/compile.sh new file mode 100755 index 00000000..5481cd4d --- /dev/null +++ b/contracts/scripts/compile.sh @@ -0,0 +1,3 @@ +echo 'Compiling rateproducer Smart Contract' + +eosio-cpp -abigen -I ../rateproducer/include -R ../rateproducer/ricardian -contract rateproducer -o rateproducer.wasm ../rateproducer/src/rateproducer.cpp \ No newline at end of file From 8fe13e0ed28f1ea2d7160b5d19a8e984efc40b7f Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Fri, 30 Jul 2021 19:09:52 -0600 Subject: [PATCH 11/54] Update vote component design (#623) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * fix(backend): use envarioment variables * fix(backend): update .env.example variables * fix(backend): rename envarioment variables * fix(backend): minor change * fix(backend): update docker-compose * fix(backend): update .env.example values * fix(backend): refactor variables names * fix(backend): add config.yaml file and remove .gitignore from it * fix(backend): update cryptolions to jungle.eosio * fix(.env.example): update unauthorized role to anonymous * fix(push-enviroment): remove duplicated variable * fix(home page): fix show button vote * fix(design): Fix broken titles on card component * fix(conflicts) * delete(package) * refactor(design): change design on volting tool * fix(voting-tool): apply new design on this component Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez Co-authored-by: Leister Francisco Alvarez Campos --- .../src/components/bp-chip-avatar/styles.js | 2 +- .../compare-tool/compare-graph-view.js | 179 ++++++++++++++---- webapp/src/components/compare-tool/index.js | 14 +- webapp/src/components/compare-tool/styles.js | 18 +- webapp/src/language/en.json | 2 + webapp/src/language/es.json | 2 + .../bottom-sheet-selected-bps.js | 25 ++- webapp/src/routes/block-producers/index.js | 7 +- webapp/src/routes/block-producers/styles.js | 7 +- 9 files changed, 197 insertions(+), 59 deletions(-) diff --git a/webapp/src/components/bp-chip-avatar/styles.js b/webapp/src/components/bp-chip-avatar/styles.js index 9a585829..a1434383 100644 --- a/webapp/src/components/bp-chip-avatar/styles.js +++ b/webapp/src/components/bp-chip-avatar/styles.js @@ -2,7 +2,7 @@ export default (props) => ({ root: { margin: 8, color: 'white', - width: 160, + width: 158, backgroundColor: (props) => props.color } }) diff --git a/webapp/src/components/compare-tool/compare-graph-view.js b/webapp/src/components/compare-tool/compare-graph-view.js index 56dc66f3..6315bb52 100644 --- a/webapp/src/components/compare-tool/compare-graph-view.js +++ b/webapp/src/components/compare-tool/compare-graph-view.js @@ -1,17 +1,21 @@ -import React, { useState } from 'react' +import React from 'react' import PropTypes from 'prop-types' import { makeStyles } from '@material-ui/core/styles' import Grid from '@material-ui/core/Grid' import CardHeader from '@material-ui/core/CardHeader' import Typography from '@material-ui/core/Typography' import Avatar from '@material-ui/core/Avatar' +import FormControlLabel from '@material-ui/core/FormControlLabel' import LockOpenIcon from '@material-ui/icons/LockOpenOutlined' import LockIcon from '@material-ui/icons/LockOutlined' +import Button from '@material-ui/core/Button' import Tooltip from '@material-ui/core/Tooltip' import Box from '@material-ui/core/Box' import withWidth from '@material-ui/core/withWidth' import Help from '@material-ui/icons/HelpOutlineRounded' +import { useMediaQuery } from '@material-ui/core' import { useTranslation } from 'react-i18next' +import Switch from '@material-ui/core/Switch' import _get from 'lodash.get' import Radar from 'components/radar' @@ -133,55 +137,138 @@ const CompareGraphView = ({ isProxy, userInfo, width, + handleOnClose, + onHandleVote, + setIsCollapsedView, + isCollapsedView, ...props }) => { const { t } = useTranslation('translations') const classes = useStyles() - const [open, setOpen] = useState(false) - const userHasVote = - Boolean(userInfo.proxy.length) || Boolean(userInfo.producers.length > 21) - - const handleTooltip = (e) => { - setOpen(!open) - e.preventDefault() - } + const isDesktop = useMediaQuery('(min-width:900px)', { + defaultMatches: false + }) + const mobileMedium = useMediaQuery('(min-height:711px)') return ( - - - ({ - ...data, - backgroundColor: data.backgroundColor.replace('.9', '.2') - })) - }} - /> - - + + - - - {t('voteToolTitle')} + + + {`${t('voteToolTitle')} (${selected.length} ${t('selected')})`} + + + {t('voteToolDescription')} - - + + + ({ + ...data, + backgroundColor: data.backgroundColor.replace('.9', '.2') + })) + }} + /> + + + + {isProxy && {selected[0].name}} + {!isProxy && ( + + setIsCollapsedView(event.target.checked) + } + value='isCollapsedView' + /> + } + label={t('compareToolCollapsedSwitch')} + /> + )} + + + {!isDesktop && ( + + + + )} + {!isProxy && ( + + + + + + + + + + + + + )} + + {isDesktop && ( + + + + )} ) } @@ -192,13 +279,21 @@ CompareGraphView.propTypes = { selected: PropTypes.array.isRequired, className: PropTypes.string, isProxy: PropTypes.bool, - userInfo: PropTypes.object + userInfo: PropTypes.object, + handleOnClose: PropTypes.func, + onHandleVote: PropTypes.func, + setIsCollapsedView: PropTypes.func, + isCollapsedView: PropTypes.bool } CompareGraphView.defaultProps = { className: '', isProxy: false, - userInfo: { proxy: '', producers: [], isUser: false } + userInfo: { proxy: '', producers: [], isUser: false }, + onHandleVote: () => {}, + handleOnClose: () => {}, + setIsCollapsedView: () => {}, + isCollapsedView: true } CompareBodyList.propTypes = { @@ -215,7 +310,7 @@ TooltipWrapper.propTypes = { onHandleTooltip: PropTypes.func, t: PropTypes.any, userHasVote: PropTypes.bool, - isUser: PropTypes.bool + isUser: PropTypes.bool.apply } export default withWidth()(CompareGraphView) diff --git a/webapp/src/components/compare-tool/index.js b/webapp/src/components/compare-tool/index.js index da10aac5..295e0eb2 100644 --- a/webapp/src/components/compare-tool/index.js +++ b/webapp/src/components/compare-tool/index.js @@ -27,7 +27,7 @@ const CompareTool = ({ onHandleVote, userInfo, message, - onHandleClose + handleOnClose }) => { const { t } = useTranslation('translations') const classes = useStyles() @@ -67,12 +67,16 @@ const CompareTool = ({ selected={selectedData} isProxy={isProxy} userInfo={{ proxy, producers, isUser: Boolean(userInfo) }} + handleOnClose={handleOnClose} + onHandleVote={onHandleVote} + isCollapsedView={isCollapsedView} + setIsCollapsedView={setIsCollapsedView} /> ) : ( )}
- {!isProxy && ( + {!isCollapsedView && ( <> diff --git a/webapp/src/routes/block-producers/styles.js b/webapp/src/routes/block-producers/styles.js index 3a1a4a15..73e43319 100644 --- a/webapp/src/routes/block-producers/styles.js +++ b/webapp/src/routes/block-producers/styles.js @@ -23,10 +23,11 @@ export default (theme) => ({ margin: 'auto' }, compareTool: { - minHeight: 340, + paddingTop: '0 !important', transform: 'scaleY(1)', transformOrigin: 'top', opacity: 1, + height: '100%', transition: [ 'opacity 0.25s ease', 'height 0.25s ease', @@ -223,5 +224,9 @@ export default (theme) => ({ '&:hover': { textDecoration: 'underline' } + }, + paperAnchor: { + right: '0', + overflowY: 'initial' } }) From 8d01469ef7a07447507ce18a94e85b2769f5fd57 Mon Sep 17 00:00:00 2001 From: Leister Francisco Alvarez Campos Date: Fri, 30 Jul 2021 19:12:48 -0600 Subject: [PATCH 12/54] fix(enviroment): solve dev env variables (#628) * fix(enviroment): solve dev env variables * fix(sync-proxies): take env values --- .../workflows/push-master-environment.yaml | 15 ++++++----- .../workflows/push-staging-environment.yaml | 17 +++++++----- docker-compose.yml | 2 ++ hapi/src/libs/sync-bps.js | 21 ++++++++++----- hapi/src/libs/sync-proxies.js | 26 +++++++++++------- hapi/src/libs/sync-ratings.js | 26 +++++++++++------- hapi/src/libs/sync-stats.js | 27 +++++++++++-------- 7 files changed, 85 insertions(+), 49 deletions(-) diff --git a/.github/workflows/push-master-environment.yaml b/.github/workflows/push-master-environment.yaml index a4380b1e..6f157370 100644 --- a/.github/workflows/push-master-environment.yaml +++ b/.github/workflows/push-master-environment.yaml @@ -82,14 +82,17 @@ jobs: POSTGRES_USER: ${{ secrets.POSTGRES_USER }} POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }} # hapi - POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }} - POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }} - POSTGRES_SCHEMA: ${{ secrets.POSTGRES_SCHEMA }} - HAPI_EOS_API_ENDPOINT: https://api.eosio.cr HAPI_SERVER_ADDRESS: 0.0.0.0 HAPI_SERVER_PORT: 9090 - HAPI_PROXY_CONTRACT: ${{ secrets.HAPI_PROXY_CONTRACT }} - HAPI_RATING_CONTRACT: ${{ secrets.HAPI_RATING_CONTRACT }} + HAPI_POSTGRES_USER: ${{ secrets.HAPI_POSTGRES_USER }} + HAPI_POSTGRES_PASSWORD: ${{ secrets.HAPI_POSTGRES_PASSWORD }} + HAPI_PROXY_CONTRACT: proxyaccount + HAPI_RATING_CONTRACT: rateproducer + HAPI_POSTGRES_DB: localdb + HAPI_POSTGRES_HOST: postgres + HAPI_POSTGRES_PORT: 5432 + HAPI_POSTGRES_SCHEMA: public + HAPI_EOS_API_ENDPOINT: https://jungle3.cryptolions.io # hasura HASURA_GRAPHQL_DATABASE_URL: ${{ secrets.HASURA_GRAPHQL_DATABASE_URL }} HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations diff --git a/.github/workflows/push-staging-environment.yaml b/.github/workflows/push-staging-environment.yaml index 13e140f9..43c88885 100644 --- a/.github/workflows/push-staging-environment.yaml +++ b/.github/workflows/push-staging-environment.yaml @@ -82,14 +82,17 @@ jobs: POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }} POSTGRES_USER: ${{ secrets.POSTGRES_USER }} # hapi - POSTGRES_HOST: ${{ secrets.POSTGRES_HOST }} - POSTGRES_PORT: ${{ secrets.POSTGRES_PORT }} - POSTGRES_SCHEMA: ${{ secrets.POSTGRES_SCHEMA }} - HAPI_EOS_API_ENDPOINT: https://jungle3.cryptolions.io HAPI_SERVER_ADDRESS: 0.0.0.0 HAPI_SERVER_PORT: 9090 - HAPI_PROXY_CONTRACT: ${{ secrets.HAPI_PROXY_CONTRACT }} - HAPI_RATING_CONTRACT: ${{ secrets.HAPI_RATING_CONTRACT }} + HAPI_POSTGRES_USER: ${{ secrets.HAPI_POSTGRES_USER }} + HAPI_POSTGRES_PASSWORD: ${{ secrets.HAPI_POSTGRES_PASSWORD }} + HAPI_PROXY_CONTRACT: proxyaccount + HAPI_RATING_CONTRACT: rateproducer + HAPI_POSTGRES_DB: localdb + HAPI_POSTGRES_HOST: postgres + HAPI_POSTGRES_PORT: 5432 + HAPI_POSTGRES_SCHEMA: public + HAPI_EOS_API_ENDPOINT: https://jungle3.cryptolions.io # hasura HASURA_GRAPHQL_DATABASE_URL: ${{ secrets.HASURA_GRAPHQL_DATABASE_URL }} HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations @@ -106,4 +109,4 @@ jobs: NAMESPACE: jungle-eosrate K8S_BUILD_DIR: build_k8s with: - args: version && make deploy-kubernetes + args: version && make deploy-kubernetes \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 2fcfdc40..7f29ed53 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -44,6 +44,8 @@ services: HAPI_POSTGRES_HOST: "${HAPI_POSTGRES_HOST}" HAPI_POSTGRES_SCHEMA: "${HAPI_POSTGRES_SCHEMA}" HAPI_EOS_API_ENDPOINT: "${HAPI_EOS_API_ENDPOINT}" + HAPI_PROXY_CONTRACT: "${HAPI_PROXY_CONTRACT}" + HAPI_RATING_CONTRACT: "${HAPI_RATING_CONTRACT}" depends_on: - postgres diff --git a/hapi/src/libs/sync-bps.js b/hapi/src/libs/sync-bps.js index 94e4d61c..315d1915 100644 --- a/hapi/src/libs/sync-bps.js +++ b/hapi/src/libs/sync-bps.js @@ -4,7 +4,7 @@ const massive = require('massive') const request = require('request-promise') const { massiveConfig } = require('../config') -const HAPI_EOS_API_ENDPOINT = process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr' +const HAPI_EOS_API_ENDPOINT = process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle3.cryptolions.io' const getBlockProducersData = async () => { @@ -13,10 +13,19 @@ const getBlockProducersData = async () => { verbose: false }) - const { rows: producers } = await eos.getProducers({ - json: true, - limit: 1000 - }) + let producers + + try { + const { rows: tempProducers } = await eos.getProducers({ + json: true, + limit: 1000 + }) + + producers = tempProducers + } catch (err) { + console.log(`Database connection error ${err}`) + return [] + } const allProducers = producers.reduce((result, producer) => { if (!producer.is_active || !parseInt(producer.total_votes) || !producer.url) return result @@ -51,7 +60,7 @@ const getBlockProducersData = async () => { producer['bpJson'] = bp producersBPJSON.push(producer) } - } catch (error) { + } catch (err) { console.log(`Failed to add bpJson info for ${producer.owner}`) } } diff --git a/hapi/src/libs/sync-proxies.js b/hapi/src/libs/sync-proxies.js index 29e71fbb..7e92ddbd 100644 --- a/hapi/src/libs/sync-proxies.js +++ b/hapi/src/libs/sync-proxies.js @@ -10,6 +10,7 @@ const HAPI_PROXY_CONTRACT = process.env.HAPI_PROXY_CONTRACT || 'proxyaccount' const getProxiesData = async () => { + console.log('==== Updating proxies ====') const db = await massive(massiveConfig) const eos = new JsonRpc(HAPI_EOS_API_ENDPOINT, { fetch }) const eosApi = EosApi({ @@ -17,15 +18,22 @@ const getProxiesData = async () => { verbose: false }) - const { rows: proxies } = await eos.get_table_rows({ - json: true, - code: HAPI_PROXY_CONTRACT, - scope: HAPI_PROXY_CONTRACT, - table: 'proxies', - limit: 1000, - reverse: false, - show_payer: false - }) + let proxies + + try { + ({rows: proxies} = await eos.get_table_rows({ + json: true, + code: HAPI_PROXY_CONTRACT, + scope: HAPI_PROXY_CONTRACT, + table: 'proxies', + limit: 1000, + reverse: false, + show_payer: false + })) + } catch (err) { + console.log(`Database connection error ${err}`) + return [] + } proxies.forEach(async (proxy) => { const account = await eosApi.getAccount({ account_name: proxy.owner }) diff --git a/hapi/src/libs/sync-ratings.js b/hapi/src/libs/sync-ratings.js index 51f988a4..bc0eda9f 100644 --- a/hapi/src/libs/sync-ratings.js +++ b/hapi/src/libs/sync-ratings.js @@ -10,16 +10,22 @@ const HAPI_RATING_CONTRACT = process.env.HAPI_RATING_CONTRACT || 'rateproducer' const getUserRatings = async () => { const eos = new JsonRpc(HAPI_EOS_API_ENDPOINT, { fetch }) - let ratings = await eos.get_table_rows({ - json: true, - code: HAPI_RATING_CONTRACT, - scope: HAPI_RATING_CONTRACT, - table: 'ratings', - limit: 1000, - reverse: false, - show_payer: false - }) - return ratings + try { + const ratings = await eos.get_table_rows({ + json: true, + code: HAPI_RATING_CONTRACT, + scope: HAPI_RATING_CONTRACT, + table: 'ratings', + limit: 1000, + reverse: false, + show_payer: false + }) + + return ratings + } catch (err) { + console.log(`Database connection error ${err}`) + return [] + } } const updateUserRatings = async () => { diff --git a/hapi/src/libs/sync-stats.js b/hapi/src/libs/sync-stats.js index 621cab56..7c4b8bc6 100644 --- a/hapi/src/libs/sync-stats.js +++ b/hapi/src/libs/sync-stats.js @@ -10,17 +10,22 @@ const HAPI_RATING_CONTRACT = process.env.HAPI_RATING_CONTRACT || 'rateproducer' const getRatingsStats = async () => { const eos = new JsonRpc(HAPI_EOS_API_ENDPOINT, { fetch }) - const ratings = await eos.get_table_rows({ - json: true, - code: HAPI_RATING_CONTRACT, - scope: HAPI_RATING_CONTRACT, - table: 'stats', - limit: 1000, - reverse: false, - show_payer: false - }) - - return ratings + try { + const ratings = await eos.get_table_rows({ + json: true, + code: HAPI_RATING_CONTRACT, + scope: HAPI_RATING_CONTRACT, + table: 'stats', + limit: 1000, + reverse: false, + show_payer: false + }) + + return ratings + } catch (err) { + console.log(`Database connection error ${err}`) + return [] + } } const updateRatingsStats = async () => { From 274f9e4e107de510026e766f94378e81486e4642 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Fri, 30 Jul 2021 20:53:39 -0600 Subject: [PATCH 13/54] fix(devops): adjust env var values (#630) --- .github/workflows/push-master-environment.yaml | 10 +++------- .github/workflows/push-staging-environment.yaml | 3 +-- kubernetes/configmaps.yaml | 15 +++++++-------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/.github/workflows/push-master-environment.yaml b/.github/workflows/push-master-environment.yaml index 6f157370..8669a98b 100644 --- a/.github/workflows/push-master-environment.yaml +++ b/.github/workflows/push-master-environment.yaml @@ -7,7 +7,6 @@ on: jobs: create-master-image: - name: runs-on: ubuntu-latest environment: master steps: @@ -77,18 +76,17 @@ jobs: REACT_APP_BLOCK_EXPLORER: https://bloks.io REACT_APP_NETWORK_MONITOR_URL: https://jungle.eosio.online/ # postgres - DATABASE_DIRECTORY: database POSTGRES_DB: ${{ secrets.POSTGRES_DB }} POSTGRES_USER: ${{ secrets.POSTGRES_USER }} POSTGRES_PASSWORD: ${{ secrets.POSTGRES_PASSWORD }} # hapi HAPI_SERVER_ADDRESS: 0.0.0.0 HAPI_SERVER_PORT: 9090 + HAPI_PROXY_CONTRACT: regproxyinfo + HAPI_RATING_CONTRACT: rateproducer HAPI_POSTGRES_USER: ${{ secrets.HAPI_POSTGRES_USER }} HAPI_POSTGRES_PASSWORD: ${{ secrets.HAPI_POSTGRES_PASSWORD }} - HAPI_PROXY_CONTRACT: proxyaccount - HAPI_RATING_CONTRACT: rateproducer - HAPI_POSTGRES_DB: localdb + HAPI_POSTGRES_DB: eosrate HAPI_POSTGRES_HOST: postgres HAPI_POSTGRES_PORT: 5432 HAPI_POSTGRES_SCHEMA: public @@ -99,8 +97,6 @@ jobs: HASURA_GRAPHQL_ADMIN_SECRET: ${{ secrets.HASURA_GRAPHQL_ADMIN_SECRET }} HASURA_GRAPHQL_UNAUTHORIZED_ROLE: ${{ secrets.HASURA_GRAPHQL_UNAUTHORIZED_ROLE }} HASURA_GRAPHQL_ACTION_BASE_URL: http://hapi:9090 - # pgweb - DATABASE_URL: ${{ secrets.DATABASE_URL }} - name: Setup and deploy kubernetes environment uses: steebchen/kubectl@v1.1.0 diff --git a/.github/workflows/push-staging-environment.yaml b/.github/workflows/push-staging-environment.yaml index 43c88885..39864db0 100644 --- a/.github/workflows/push-staging-environment.yaml +++ b/.github/workflows/push-staging-environment.yaml @@ -7,7 +7,6 @@ on: jobs: create-staging-image: - name: runs-on: ubuntu-latest environment: staging steps: @@ -88,7 +87,7 @@ jobs: HAPI_POSTGRES_PASSWORD: ${{ secrets.HAPI_POSTGRES_PASSWORD }} HAPI_PROXY_CONTRACT: proxyaccount HAPI_RATING_CONTRACT: rateproducer - HAPI_POSTGRES_DB: localdb + HAPI_POSTGRES_DB: eosrate HAPI_POSTGRES_HOST: postgres HAPI_POSTGRES_PORT: 5432 HAPI_POSTGRES_SCHEMA: public diff --git a/kubernetes/configmaps.yaml b/kubernetes/configmaps.yaml index 000ca503..c2cbf94a 100644 --- a/kubernetes/configmaps.yaml +++ b/kubernetes/configmaps.yaml @@ -4,7 +4,6 @@ metadata: name: postgres-config data: # postgres - DATABASE_DIRECTORY: "${DATABASE_DIRECTORY}" POSTGRES_DB: "${POSTGRES_DB}" POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" POSTGRES_USER: "${POSTGRES_USER}" @@ -15,17 +14,17 @@ metadata: name: hapi-config data: # hapi - HAPI_POSTGRES_HOST: "${POSTGRES_HOST}" - HAPI_POSTGRES_DB: "${POSTGRES_DB}" - HAPI_POSTGRES_PASSWORD: "${POSTGRES_PASSWORD}" - HAPI_POSTGRES_PORT: "${POSTGRES_PORT}" - HAPI_POSTGRES_SCHEMA: "${POSTGRES_SCHEMA}" - HAPI_POSTGRES_USER: "${POSTGRES_USER}" + HAPI_POSTGRES_HOST: "${HAPI_POSTGRES_HOST}" + HAPI_POSTGRES_DB: "${HAPI_POSTGRES_DB}" + HAPI_POSTGRES_PASSWORD: "${HAPI_POSTGRES_PASSWORD}" + HAPI_POSTGRES_PORT: "${HAPI_POSTGRES_PORT}" + HAPI_POSTGRES_SCHEMA: "${HAPI_POSTGRES_SCHEMA}" + HAPI_POSTGRES_USER: "${HAPI_POSTGRES_USER}" HAPI_EOS_API_ENDPOINT: "${HAPI_EOS_API_ENDPOINT}" HAPI_SERVER_ADDRESS: "${HAPI_SERVER_ADDRESS}" HAPI_SERVER_PORT: "${HAPI_SERVER_PORT}" HAPI_PROXY_CONTRACT: "${HAPI_PROXY_CONTRACT}" - HAPI_RATING_CONTRACT: "${HAPI_STATS_CONTRACT_CODE}" + HAPI_RATING_CONTRACT: "${HAPI_RATING_CONTRACT}" --- apiVersion: v1 kind: ConfigMap From a687d39a4ba0d2156563a802024b6d5a7d0f8fb4 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Fri, 30 Jul 2021 21:19:57 -0600 Subject: [PATCH 14/54] fix(devops): remove pgwebservice from productiony (#631) * fix(devops): remove pgwebservice from productiony * fix(devops): adjust env var values --- .../workflows/push-staging-environment.yaml | 2 -- hapi/src/config/server.config.js | 2 +- kubernetes/pgweb-deployment.yaml | 26 ------------------- kubernetes/pgweb-service.yaml | 13 ---------- 4 files changed, 1 insertion(+), 42 deletions(-) delete mode 100644 kubernetes/pgweb-deployment.yaml delete mode 100644 kubernetes/pgweb-service.yaml diff --git a/.github/workflows/push-staging-environment.yaml b/.github/workflows/push-staging-environment.yaml index 39864db0..a96dd544 100644 --- a/.github/workflows/push-staging-environment.yaml +++ b/.github/workflows/push-staging-environment.yaml @@ -98,8 +98,6 @@ jobs: HASURA_GRAPHQL_ADMIN_SECRET: ${{ secrets.HASURA_GRAPHQL_ADMIN_SECRET }} HASURA_GRAPHQL_UNAUTHORIZED_ROLE: ${{ secrets.HASURA_GRAPHQL_UNAUTHORIZED_ROLE }} HASURA_GRAPHQL_ACTION_BASE_URL: http://hapi:9090 - # pgweb - DATABASE_URL: ${{ secrets.DATABASE_URL }} - name: Setup and deploy kubernetes environment uses: steebchen/kubectl@v1.1.0 diff --git a/hapi/src/config/server.config.js b/hapi/src/config/server.config.js index 1a698b28..79a4fd5f 100644 --- a/hapi/src/config/server.config.js +++ b/hapi/src/config/server.config.js @@ -3,6 +3,6 @@ module.exports = { host: process.env.HAPI_POSTGRES_HOST || 'postgres', port: process.env.HAPI_POSTGRES_PORT || 5432, database: process.env.HAPI_POSTGRES_DB || 'eosrate', - user: process.env.HAPI_POSTGRES_USER || 'user', + user: process.env.HAPI_POSTGRES_USER || 'eoscr', password: process.env.HAPI_POSTGRES_PASSWORD || 'password' } \ No newline at end of file diff --git a/kubernetes/pgweb-deployment.yaml b/kubernetes/pgweb-deployment.yaml deleted file mode 100644 index 5d5d9099..00000000 --- a/kubernetes/pgweb-deployment.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: pgweb - name: pgweb -spec: - replicas: 1 - selector: - matchLabels: - app: pgweb - template: - metadata: - labels: - app: pgweb - spec: - containers: - - name: eosrate-pgweb - image: sosedoff/pgweb:latest - imagePullPolicy: "Always" - envFrom: - - configMapRef: - name: pgweb-config - ports: - - containerPort: 8081 - restartPolicy: Always diff --git a/kubernetes/pgweb-service.yaml b/kubernetes/pgweb-service.yaml deleted file mode 100644 index 18335d41..00000000 --- a/kubernetes/pgweb-service.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - labels: - app: pgweb - name: pgweb -spec: - ports: - - name: pgweb - port: 8082 - targetPort: 8082 - selector: - app: pgweb From 9d5084ded752079e45ccf2a068287a561005ec79 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Fri, 30 Jul 2021 21:41:32 -0600 Subject: [PATCH 15/54] Fix/hasura migrations (#633) * fix(devops): remove pgwebservice from productiony * fix(devops): adjust env var values * fix(devops): add hasura migrations build args --- hasura/makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hasura/makefile b/hasura/makefile index 3db4beff..46065366 100644 --- a/hasura/makefile +++ b/hasura/makefile @@ -19,7 +19,8 @@ build-docker: ##@devops Build the docker image build-docker: ./Dockerfile @docker pull $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) || true @docker build \ - --build-arg hasura_graphql_migrations_dir=/hasura-migrations \ + --build-arg hasura_graphql_migrations_dir=/migrations \ + --build-arg hasura_graphql_metadata_dir=/metadata \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ . @@ -31,7 +32,8 @@ pull-image: build-docker-cached: ##@devops Build the docker image using cached layers build-docker-cached: ./Dockerfile @docker build \ - --build-arg hasura_graphql_migrations_dir=/hasura-migrations \ + --build-arg hasura_graphql_migrations_dir=/migrations \ + --build-arg hasura_graphql_metadata_dir=/metadata \ --cache-from $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ From 1135a4add8e48921dd60cd913ff061981a012f81 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Fri, 30 Jul 2021 21:59:28 -0600 Subject: [PATCH 16/54] Fix/hasura migrations (#634) * fix(devops): remove pgwebservice from productiony * fix(devops): adjust env var values * fix(devops): add hasura migrations build args * fix(devops): add hasura migrations build args --- hasura/makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hasura/makefile b/hasura/makefile index 46065366..e5e748c8 100644 --- a/hasura/makefile +++ b/hasura/makefile @@ -19,8 +19,8 @@ build-docker: ##@devops Build the docker image build-docker: ./Dockerfile @docker pull $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) || true @docker build \ - --build-arg hasura_graphql_migrations_dir=/migrations \ - --build-arg hasura_graphql_metadata_dir=/metadata \ + --build-arg hasura_graphql_migrations_dir=/hasura-migrations \ + --build-arg hasura_graphql_metadata_dir=/hasura-metadata \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ . @@ -32,8 +32,8 @@ pull-image: build-docker-cached: ##@devops Build the docker image using cached layers build-docker-cached: ./Dockerfile @docker build \ - --build-arg hasura_graphql_migrations_dir=/migrations \ - --build-arg hasura_graphql_metadata_dir=/metadata \ + --build-arg hasura_graphql_migrations_dir=/hasura-migrations \ + --build-arg hasura_graphql_metadata_dir=/hasura-metadata \ --cache-from $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ From 5a1262801f695e1a678d9d832d367b1ba5267c45 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Fri, 30 Jul 2021 22:31:19 -0600 Subject: [PATCH 17/54] Fix/hasura migrations (#635) * fix(devops): remove pgwebservice from productiony * fix(devops): adjust env var values * fix(devops): add hasura migrations build args * fix(devops): add hasura migrations build args * fix(devops): change hasura migrations dir --- hapi/yarn.lock | 72 +++++----- hasura/Dockerfile | 6 - .../1548725474630_create_producers.down.yaml | 0 .../1548725474630_create_producers.up.sql | 0 ...30845804_create_producer_ratings.down.yaml | 0 ...48730845804_create_producer_ratings.up.sql | 0 ...8732282821_create_producers_list.down.yaml | 0 ...1548732282821_create_producers_list.up.sql | 0 .../1580686687967_add_ratings_table/down.yaml | 0 .../1580686687967_add_ratings_table/up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../1580754206808_add_extra_data/down.yaml | 0 .../1580754206808_add_extra_data/up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.yaml | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.yaml | 0 .../up.sql | 0 .../down.yaml | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 webapp/yarn.lock | 129 +++++++++--------- 37 files changed, 99 insertions(+), 108 deletions(-) rename hasura/migrations/{default => }/1548725474630_create_producers.down.yaml (100%) rename hasura/migrations/{default => }/1548725474630_create_producers.up.sql (100%) rename hasura/migrations/{default => }/1548730845804_create_producer_ratings.down.yaml (100%) rename hasura/migrations/{default => }/1548730845804_create_producer_ratings.up.sql (100%) rename hasura/migrations/{default => }/1548732282821_create_producers_list.down.yaml (100%) rename hasura/migrations/{default => }/1548732282821_create_producers_list.up.sql (100%) rename hasura/migrations/{default => }/1580686687967_add_ratings_table/down.yaml (100%) rename hasura/migrations/{default => }/1580686687967_add_ratings_table/up.sql (100%) rename hasura/migrations/{default => }/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql (100%) rename hasura/migrations/{default => }/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql (100%) rename hasura/migrations/{default => }/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql (100%) rename hasura/migrations/{default => }/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql (100%) rename hasura/migrations/{default => }/1580754206808_add_extra_data/down.yaml (100%) rename hasura/migrations/{default => }/1580754206808_add_extra_data/up.sql (100%) rename hasura/migrations/{default => }/1580754274249_rename_table_public_ratings/down.sql (100%) rename hasura/migrations/{default => }/1580754274249_rename_table_public_ratings/up.sql (100%) rename hasura/migrations/{default => }/1581704802407_join_producer_ratings_stats/down.yaml (100%) rename hasura/migrations/{default => }/1581704802407_join_producer_ratings_stats/up.sql (100%) rename hasura/migrations/{default => }/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql (100%) rename hasura/migrations/{default => }/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql (100%) rename hasura/migrations/{default => }/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql (100%) rename hasura/migrations/{default => }/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql (100%) rename hasura/migrations/{default => }/1582436829131_modify_primarykey_public_user_ratings/down.sql (100%) rename hasura/migrations/{default => }/1582436829131_modify_primarykey_public_user_ratings/up.sql (100%) rename hasura/migrations/{default => }/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql (100%) rename hasura/migrations/{default => }/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql (100%) rename hasura/migrations/{default => }/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql (100%) rename hasura/migrations/{default => }/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql (100%) rename hasura/migrations/{default => }/1583531471259_add_ratings_cntr_column/down.yaml (100%) rename hasura/migrations/{default => }/1583531471259_add_ratings_cntr_column/up.sql (100%) rename hasura/migrations/{default => }/1583953599516_add_general_info_column/down.yaml (100%) rename hasura/migrations/{default => }/1583953599516_add_general_info_column/up.sql (100%) rename hasura/migrations/{default => }/1584293813117_create_table_public_proxies/down.sql (100%) rename hasura/migrations/{default => }/1584293813117_create_table_public_proxies/up.sql (100%) diff --git a/hapi/yarn.lock b/hapi/yarn.lock index 77e61c07..a97a0bf6 100644 --- a/hapi/yarn.lock +++ b/hapi/yarn.lock @@ -707,9 +707,9 @@ brorand@^1.1.0: integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8= buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer-writer@2.0.0: version "2.0.0" @@ -821,9 +821,9 @@ chalk@^3.0.0: supports-color "^7.1.0" chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -1294,9 +1294,9 @@ error-stack-parser@^1.3.3: stackframe "^0.3.1" es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: - version "1.18.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0" - integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw== + version "1.18.4" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.4.tgz#c6b7a1acd6bb1c8b5afeb54a53c46ad02fab346d" + integrity sha512-xjDAPJRxKc1uoTkdW8MEk7Fq/2bzz3YoCADYniDV7+KITCUdu9c90fj1aKI7nEZFZxRrHlDo3wtma/C6QkhlXQ== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -1304,11 +1304,12 @@ es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: get-intrinsic "^1.1.1" has "^1.0.3" has-symbols "^1.0.2" + internal-slot "^1.0.3" is-callable "^1.2.3" is-negative-zero "^2.0.1" is-regex "^1.1.3" is-string "^1.0.6" - object-inspect "^1.10.3" + object-inspect "^1.11.0" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" @@ -1511,9 +1512,9 @@ eslint-visitor-keys@^2.0.0: integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== eslint@^7.30.0: - version "7.31.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz#f972b539424bf2604907a970860732c5d99d3aca" - integrity sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA== + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== dependencies: "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.4.3" @@ -1848,9 +1849,9 @@ flatted@^2.0.0: integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== flatted@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz#bbef080d95fca6709362c73044a1634f7c6e7d05" - integrity sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg== + version "3.2.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" + integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== forever-agent@~0.6.1: version "0.6.1" @@ -2891,22 +2892,17 @@ micromatch@^4.0.4: braces "^3.0.1" picomatch "^2.2.3" -mime-db@1.48.0: - version "1.48.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" - integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== - -mime-db@1.x.x: +mime-db@1.49.0, mime-db@1.x.x: version "1.49.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== mime-types@^2.1.12, mime-types@~2.1.19: - version "2.1.31" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" - integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== + version "2.1.32" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" + integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== dependencies: - mime-db "1.48.0" + mime-db "1.49.0" mimic-fn@^1.0.0: version "1.2.0" @@ -3120,7 +3116,7 @@ object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= -object-inspect@^1.10.3, object-inspect@^1.9.0: +object-inspect@^1.11.0, object-inspect@^1.9.0: version "1.11.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== @@ -3432,10 +3428,10 @@ pg-connection-string@^2.5.0: resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.5.0.tgz#538cadd0f7e603fc09a12590f3b8a452c2c0cf34" integrity sha512-r5o/V/ORTA6TmUnyWZR9nCj1klXCO2CEKNRlVuJptZe85QuhFayC7WeMic7ndayT5IRIR0S0xFxFi2ousartlQ== -pg-cursor@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/pg-cursor/-/pg-cursor-2.6.0.tgz#a85df1bd1389c75ffa443ee94073da0a1be360ba" - integrity sha512-BFLg40CTgBJ+LX9EwqjztUYaKxpxLffMmDTmlQNMCustX/JxMTYimxRkdhZvPYZGp++/2LjuqkKtO5DVVq0FNg== +pg-cursor@^2.7.1: + version "2.7.1" + resolved "https://registry.yarnpkg.com/pg-cursor/-/pg-cursor-2.7.1.tgz#0c545b70006589537232986fa06c03a799d8f22b" + integrity sha512-dtxtyvx4BcSammddki27KPBVA0sZ8AguLabgs7++gqaefX7dlQ5zaRlk1Gi5mvyO25aCmHFAZyNq9zYtPDwFTA== pg-int8@1.0.1: version "1.0.1" @@ -3448,9 +3444,9 @@ pg-minify@1.6.2: integrity sha512-1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg== pg-pool@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.3.0.tgz#12d5c7f65ea18a6e99ca9811bd18129071e562fc" - integrity sha512-0O5huCql8/D6PIRFAlmccjphLYWC+JIzvUhSzXSpGaf+tjTZc4nn+Lr7mLXBbFJfvwbP0ywDv73EiaBsxn7zdg== + version "3.4.1" + resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz#0e71ce2c67b442a5e862a9c182172c37eda71e9c" + integrity sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ== pg-promise@^10.10.2: version "10.10.2" @@ -3468,11 +3464,11 @@ pg-protocol@^1.5.0: integrity sha512-muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ== pg-query-stream@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/pg-query-stream/-/pg-query-stream-4.1.0.tgz#71ab18556ad2bd699e9263972a707f78e16d559b" - integrity sha512-QbupRwS1JHqRVmNLQax4dIENgi+HoT7ToEn+rCcWqsZ/fbjTVdV+RmeZJRSMIcDhza3CImb/yAsTN0g2UGy6vg== + version "4.2.1" + resolved "https://registry.yarnpkg.com/pg-query-stream/-/pg-query-stream-4.2.1.tgz#e69d8c9a3cc5aa43d0943bdee63dfb2af9763c36" + integrity sha512-8rOjGPgerzYmfRnX/EYhWiI7OVI17BGM3PxsI8o/Ot8IDyFMy8cf2xG5S9XpVPgkAjBs8c47vSclKuJqlN2c9g== dependencies: - pg-cursor "^2.6.0" + pg-cursor "^2.7.1" pg-types@^2.1.0: version "2.2.0" diff --git a/hasura/Dockerfile b/hasura/Dockerfile index d12cae7b..a9b6c11e 100644 --- a/hasura/Dockerfile +++ b/hasura/Dockerfile @@ -7,12 +7,6 @@ ENV HASURA_GRAPHQL_MIGRATIONS_DIR $hasura_graphql_migrations_dir ENV HASURA_GRAPHQL_METADATA_DIR $hasura_graphql_metadata_dir ENV PORT_HASURA 8080 -ARG HASURA_GRAPHQL_UNAUTHORIZED_ROLE -ENV HASURA_GRAPHQL_UNAUTHORIZED_ROLE ${HASURA_GRAPHQL_UNAUTHORIZED_ROLE} - -ARG HASURA_GRAPHQL_ADMIN_SECRET -ENV HASURA_GRAPHQL_ADMIN_SECRET ${HASURA_GRAPHQL_ADMIN_SECRET} - EXPOSE $PORT_HASURA COPY migrations $HASURA_GRAPHQL_MIGRATIONS_DIR diff --git a/hasura/migrations/default/1548725474630_create_producers.down.yaml b/hasura/migrations/1548725474630_create_producers.down.yaml similarity index 100% rename from hasura/migrations/default/1548725474630_create_producers.down.yaml rename to hasura/migrations/1548725474630_create_producers.down.yaml diff --git a/hasura/migrations/default/1548725474630_create_producers.up.sql b/hasura/migrations/1548725474630_create_producers.up.sql similarity index 100% rename from hasura/migrations/default/1548725474630_create_producers.up.sql rename to hasura/migrations/1548725474630_create_producers.up.sql diff --git a/hasura/migrations/default/1548730845804_create_producer_ratings.down.yaml b/hasura/migrations/1548730845804_create_producer_ratings.down.yaml similarity index 100% rename from hasura/migrations/default/1548730845804_create_producer_ratings.down.yaml rename to hasura/migrations/1548730845804_create_producer_ratings.down.yaml diff --git a/hasura/migrations/default/1548730845804_create_producer_ratings.up.sql b/hasura/migrations/1548730845804_create_producer_ratings.up.sql similarity index 100% rename from hasura/migrations/default/1548730845804_create_producer_ratings.up.sql rename to hasura/migrations/1548730845804_create_producer_ratings.up.sql diff --git a/hasura/migrations/default/1548732282821_create_producers_list.down.yaml b/hasura/migrations/1548732282821_create_producers_list.down.yaml similarity index 100% rename from hasura/migrations/default/1548732282821_create_producers_list.down.yaml rename to hasura/migrations/1548732282821_create_producers_list.down.yaml diff --git a/hasura/migrations/default/1548732282821_create_producers_list.up.sql b/hasura/migrations/1548732282821_create_producers_list.up.sql similarity index 100% rename from hasura/migrations/default/1548732282821_create_producers_list.up.sql rename to hasura/migrations/1548732282821_create_producers_list.up.sql diff --git a/hasura/migrations/default/1580686687967_add_ratings_table/down.yaml b/hasura/migrations/1580686687967_add_ratings_table/down.yaml similarity index 100% rename from hasura/migrations/default/1580686687967_add_ratings_table/down.yaml rename to hasura/migrations/1580686687967_add_ratings_table/down.yaml diff --git a/hasura/migrations/default/1580686687967_add_ratings_table/up.sql b/hasura/migrations/1580686687967_add_ratings_table/up.sql similarity index 100% rename from hasura/migrations/default/1580686687967_add_ratings_table/up.sql rename to hasura/migrations/1580686687967_add_ratings_table/up.sql diff --git a/hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql b/hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql similarity index 100% rename from hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql rename to hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql diff --git a/hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql b/hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql similarity index 100% rename from hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql rename to hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql diff --git a/hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql b/hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql similarity index 100% rename from hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql rename to hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql diff --git a/hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql b/hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql similarity index 100% rename from hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql rename to hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql diff --git a/hasura/migrations/default/1580754206808_add_extra_data/down.yaml b/hasura/migrations/1580754206808_add_extra_data/down.yaml similarity index 100% rename from hasura/migrations/default/1580754206808_add_extra_data/down.yaml rename to hasura/migrations/1580754206808_add_extra_data/down.yaml diff --git a/hasura/migrations/default/1580754206808_add_extra_data/up.sql b/hasura/migrations/1580754206808_add_extra_data/up.sql similarity index 100% rename from hasura/migrations/default/1580754206808_add_extra_data/up.sql rename to hasura/migrations/1580754206808_add_extra_data/up.sql diff --git a/hasura/migrations/default/1580754274249_rename_table_public_ratings/down.sql b/hasura/migrations/1580754274249_rename_table_public_ratings/down.sql similarity index 100% rename from hasura/migrations/default/1580754274249_rename_table_public_ratings/down.sql rename to hasura/migrations/1580754274249_rename_table_public_ratings/down.sql diff --git a/hasura/migrations/default/1580754274249_rename_table_public_ratings/up.sql b/hasura/migrations/1580754274249_rename_table_public_ratings/up.sql similarity index 100% rename from hasura/migrations/default/1580754274249_rename_table_public_ratings/up.sql rename to hasura/migrations/1580754274249_rename_table_public_ratings/up.sql diff --git a/hasura/migrations/default/1581704802407_join_producer_ratings_stats/down.yaml b/hasura/migrations/1581704802407_join_producer_ratings_stats/down.yaml similarity index 100% rename from hasura/migrations/default/1581704802407_join_producer_ratings_stats/down.yaml rename to hasura/migrations/1581704802407_join_producer_ratings_stats/down.yaml diff --git a/hasura/migrations/default/1581704802407_join_producer_ratings_stats/up.sql b/hasura/migrations/1581704802407_join_producer_ratings_stats/up.sql similarity index 100% rename from hasura/migrations/default/1581704802407_join_producer_ratings_stats/up.sql rename to hasura/migrations/1581704802407_join_producer_ratings_stats/up.sql diff --git a/hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql b/hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql similarity index 100% rename from hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql rename to hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql diff --git a/hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql b/hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql similarity index 100% rename from hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql rename to hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql diff --git a/hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql b/hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql similarity index 100% rename from hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql rename to hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql diff --git a/hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql b/hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql similarity index 100% rename from hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql rename to hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql diff --git a/hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/down.sql b/hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/down.sql similarity index 100% rename from hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/down.sql rename to hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/down.sql diff --git a/hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/up.sql b/hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/up.sql similarity index 100% rename from hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/up.sql rename to hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/up.sql diff --git a/hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql b/hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql similarity index 100% rename from hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql rename to hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql diff --git a/hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql b/hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql similarity index 100% rename from hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql rename to hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql diff --git a/hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql b/hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql similarity index 100% rename from hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql rename to hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql diff --git a/hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql b/hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql similarity index 100% rename from hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql rename to hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql diff --git a/hasura/migrations/default/1583531471259_add_ratings_cntr_column/down.yaml b/hasura/migrations/1583531471259_add_ratings_cntr_column/down.yaml similarity index 100% rename from hasura/migrations/default/1583531471259_add_ratings_cntr_column/down.yaml rename to hasura/migrations/1583531471259_add_ratings_cntr_column/down.yaml diff --git a/hasura/migrations/default/1583531471259_add_ratings_cntr_column/up.sql b/hasura/migrations/1583531471259_add_ratings_cntr_column/up.sql similarity index 100% rename from hasura/migrations/default/1583531471259_add_ratings_cntr_column/up.sql rename to hasura/migrations/1583531471259_add_ratings_cntr_column/up.sql diff --git a/hasura/migrations/default/1583953599516_add_general_info_column/down.yaml b/hasura/migrations/1583953599516_add_general_info_column/down.yaml similarity index 100% rename from hasura/migrations/default/1583953599516_add_general_info_column/down.yaml rename to hasura/migrations/1583953599516_add_general_info_column/down.yaml diff --git a/hasura/migrations/default/1583953599516_add_general_info_column/up.sql b/hasura/migrations/1583953599516_add_general_info_column/up.sql similarity index 100% rename from hasura/migrations/default/1583953599516_add_general_info_column/up.sql rename to hasura/migrations/1583953599516_add_general_info_column/up.sql diff --git a/hasura/migrations/default/1584293813117_create_table_public_proxies/down.sql b/hasura/migrations/1584293813117_create_table_public_proxies/down.sql similarity index 100% rename from hasura/migrations/default/1584293813117_create_table_public_proxies/down.sql rename to hasura/migrations/1584293813117_create_table_public_proxies/down.sql diff --git a/hasura/migrations/default/1584293813117_create_table_public_proxies/up.sql b/hasura/migrations/1584293813117_create_table_public_proxies/up.sql similarity index 100% rename from hasura/migrations/default/1584293813117_create_table_public_proxies/up.sql rename to hasura/migrations/1584293813117_create_table_public_proxies/up.sql diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 11d0962d..7f5502ad 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -1729,9 +1729,9 @@ integrity sha512-o+TYF8vBcyySRsb2kqBDv/KMeme8a2nwWoG+lAWzbDmWfb2/MrVWYCVYDYvjXdSoI/Cujqy1i0gIDrkdxa9chA== "@material-ui/core@^4.11.0", "@material-ui/core@^4.12.1": - version "4.12.2" - resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.2.tgz#59a8b19f16b8c218d912f37f5ae70473c3c82c73" - integrity sha512-Q1npB8V73IC+eV2X6as+g71MpEGQwqKHUI2iujY62npk35V8nMx/bUXAHjv5kKG1BZ8s8XUWoG6s/VkjYPjjQA== + version "4.12.3" + resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.3.tgz#80d665caf0f1f034e52355c5450c0e38b099d3ca" + integrity sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw== dependencies: "@babel/runtime" "^7.4.4" "@material-ui/styles" "^4.11.4" @@ -2190,9 +2190,9 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/node@*", "@types/node@>=6": - version "16.4.3" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.3.tgz#c01c1a215721f6dec71b47d88b4687463601ba48" - integrity sha512-GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg== + version "16.4.8" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.8.tgz#ef4974f47524448428542365db2fe7b638f928e5" + integrity sha512-VL7RZyCpfYEmbyd3/Eq5RNYhZt7yoL1JThZQ3KzimzhLya2Qa86U1ZZmioNWAAjiz99z1ED1xF9NUV2srvfVrA== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -2708,16 +2708,16 @@ alphanum-sort@^1.0.0: integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= anchor-link-browser-transport@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/anchor-link-browser-transport/-/anchor-link-browser-transport-3.2.3.tgz#a4770ae1fd42d362e513f04198ec298a87d8ed53" - integrity sha512-nLWcB2gCY95R3F54RiPltuOUssK9hry+Z8GXziRxj+HX9GNyb2f0lQ3YG3+U+yhJvQbXwIU9O5ssllZF2zpZPA== + version "3.2.4" + resolved "https://registry.yarnpkg.com/anchor-link-browser-transport/-/anchor-link-browser-transport-3.2.4.tgz#61ce650666c557db9d12d6ac54abd5ab934eb952" + integrity sha512-dtuZMWbBGYlcwo7gQWMCoMGgCCCEEYQ41RPlSUC5PWOLsgtS1rxp3ueEve1wCwNl4QCJcAN8SJGHShWcJ5ZfJQ== dependencies: tslib "^2.0.3" anchor-link@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/anchor-link/-/anchor-link-3.3.2.tgz#7165b7d28cfe26ce2f7db959e8971bb13c029c20" - integrity sha512-JDsI2Xwy4Y4D1AzfgSOioOBb5GfDPteQZOSu+cs2hT8gdRg4Asfhnxj8qDwpZX5RWdxP2NyHJEqBW5xDWH93kw== + version "3.3.3" + resolved "https://registry.yarnpkg.com/anchor-link/-/anchor-link-3.3.3.tgz#7eb667c07e74f438c41b5376496911e4a3d70592" + integrity sha512-ssUIWhsFIrw8/hokPXSIS5eddajVHcGZlSwxm/HUG1IMvkwh7TSn/m5IY/VsAfF+roN7MJ5zs0XyFl8JtJno9Q== dependencies: "@greymass/eosio" "^0.4.0" asmcrypto.js "^2.3.2" @@ -3113,9 +3113,9 @@ autoprefixer@^9.6.1: postcss-value-parser "^4.1.0" axe-core@^4.0.2: - version "4.3.1" - resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.1.tgz#0c6a076e4a1c3e0544ba6a9479158f9be7a7928e" - integrity sha512-3WVgVPs/7OnKU3s+lqMtkv3wQlg3WxK1YifmpJSDO0E1aPBrZWlrrTO6cxRqCXLuX2aYgCljqXIQd0VnRidV0g== + version "4.3.2" + resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.3.2.tgz#fcf8777b82c62cfc69c7e9f32c0d2226287680e7" + integrity sha512-5LMaDRWm8ZFPAEdzTYmgjjEdj1YnQcpfrVajO/sn/LhbpGp0Y0H64c2hLZI1gRMxfA+w1S71Uc/nHaOXgcCvGg== axobject-query@^2.2.0: version "2.2.0" @@ -3218,9 +3218,9 @@ babel-plugin-polyfill-corejs2@^0.2.2: semver "^6.1.1" babel-plugin-polyfill-corejs3@^0.2.2: - version "0.2.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz#72add68cf08a8bf139ba6e6dfc0b1d504098e57b" - integrity sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g== + version "0.2.4" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz#68cb81316b0e8d9d721a92e0009ec6ecd4cd2ca9" + integrity sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ== dependencies: "@babel/helper-define-polyfill-provider" "^0.2.2" core-js-compat "^3.14.0" @@ -3632,9 +3632,9 @@ bser@2.1.1: node-int64 "^0.4.0" buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer-indexof@^1.0.0: version "1.1.1" @@ -3828,9 +3828,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001219: - version "1.0.30001247" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001247.tgz#105be7a8fb30cdd303275e769a9dfb87d4b3577a" - integrity sha512-4rS7co+7+AoOSPRPOPUt5/GdaqZc0EsUpWk66ofE3HJTAajUK2Ss2VwoNzVN69ghg8lYYlh0an0Iy4LIHHo9UQ== + version "1.0.30001248" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz#26ab45e340f155ea5da2920dadb76a533cb8ebce" + integrity sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw== capture-exit@^2.0.0: version "2.0.0" @@ -3871,9 +3871,9 @@ chalk@^3.0.0: supports-color "^7.1.0" chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -4355,17 +4355,17 @@ copy-descriptor@^0.1.0: integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= core-js-compat@^3.14.0, core-js-compat@^3.15.0, core-js-compat@^3.6.2: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz#47272fbb479880de14b4e6081f71f3492f5bd3cb" - integrity sha512-Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ== + version "3.16.0" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.0.tgz#fced4a0a534e7e02f7e084bff66c701f8281805f" + integrity sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q== dependencies: browserslist "^4.16.6" semver "7.0.0" core-js-pure@^3.15.0: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.15.2.tgz#c8e0874822705f3385d3197af9348f7c9ae2e3ce" - integrity sha512-D42L7RYh1J2grW8ttxoY1+17Y4wXZeKe7uyplAI3FkNQyI5OgBIAjUfFiTPfL1rs0qLpxaabITNbjKl1Sp82tA== + version "3.16.0" + resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.0.tgz#218e07add3f1844e53fab195c47871fc5ba18de8" + integrity sha512-wzlhZNepF/QA9yvx3ePDgNGudU5KDB8lu/TRPKelYA/QtSnkS/cLl2W+TIdEX1FAFcBr0YpY7tPDlcmXJ7AyiQ== core-js@^2.4.0: version "2.6.12" @@ -4373,9 +4373,9 @@ core-js@^2.4.0: integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ== core-js@^3.6.5: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" - integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q== + version "3.16.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.0.tgz#1d46fb33720bc1fa7f90d20431f36a5540858986" + integrity sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g== core-util-is@~1.0.0: version "1.0.2" @@ -5220,9 +5220,9 @@ ejs@^2.6.1: integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== electron-to-chromium@^1.3.564, electron-to-chromium@^1.3.723: - version "1.3.788" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.788.tgz#7a304c8ebb11d30916a1a1c1b4a9bad3983ef232" - integrity sha512-dbMIpX4E4/Gk4gzOh1GYS7ls1vGsByWKpIqLviJi1mSmSt5BvrWLLtSqpFE5BaC7Ef4NnI0GMaiddNX2Brw6zA== + version "1.3.792" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.792.tgz#791b0d8fcf7411885d086193fb49aaef0c1594ca" + integrity sha512-RM2O2xrNarM7Cs+XF/OE2qX/aBROyOZqqgP+8FXMXSuWuUqCfUUzg7NytQrzZU3aSqk1Qq6zqnVkJsbfMkIatg== elliptic@6.5.0: version "6.5.0" @@ -5472,9 +5472,9 @@ error-stack-parser@^2.0.6: stackframe "^1.1.1" es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: - version "1.18.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0" - integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw== + version "1.18.4" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.4.tgz#c6b7a1acd6bb1c8b5afeb54a53c46ad02fab346d" + integrity sha512-xjDAPJRxKc1uoTkdW8MEk7Fq/2bzz3YoCADYniDV7+KITCUdu9c90fj1aKI7nEZFZxRrHlDo3wtma/C6QkhlXQ== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -5482,11 +5482,12 @@ es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es- get-intrinsic "^1.1.1" has "^1.0.3" has-symbols "^1.0.2" + internal-slot "^1.0.3" is-callable "^1.2.3" is-negative-zero "^2.0.1" is-regex "^1.1.3" is-string "^1.0.6" - object-inspect "^1.10.3" + object-inspect "^1.11.0" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" @@ -5827,9 +5828,9 @@ eslint-webpack-plugin@^2.5.2: schema-utils "^3.0.0" eslint@^7.11.0: - version "7.31.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz#f972b539424bf2604907a970860732c5d99d3aca" - integrity sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA== + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== dependencies: "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.4.3" @@ -6404,9 +6405,9 @@ flatted@^2.0.0: integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== flatted@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz#bbef080d95fca6709362c73044a1634f7c6e7d05" - integrity sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg== + version "3.2.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" + integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== flatten@^1.0.2: version "1.0.3" @@ -8945,12 +8946,7 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.48.0: - version "1.48.0" - resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d" - integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ== - -"mime-db@>= 1.43.0 < 2": +mime-db@1.49.0, "mime-db@>= 1.43.0 < 2": version "1.49.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.49.0.tgz#f3dfde60c99e9cf3bc9701d687778f537001cbed" integrity sha512-CIc8j9URtOVApSFCQIF+VBkX1RwXp/oMMOrqdyXSBXq5RWNEsRfyj1kiRnQgmNXmHxPoFIxOroKA3zcU9P+nAA== @@ -8968,11 +8964,11 @@ mime-types@2.1.18: mime-db "~1.33.0" mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.24: - version "2.1.31" - resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b" - integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg== + version "2.1.32" + resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.32.tgz#1d00e89e7de7fe02008db61001d9e02852670fd5" + integrity sha512-hJGaVS4G4c9TSMYh2n6SQAGrC4RnfU+daP8G7cSCmaqNjiOoUY0VHCMS42pxnQmVF1GWwFhbHWn3RIxCqTmZ9A== dependencies: - mime-db "1.48.0" + mime-db "1.49.0" mime@1.6.0: version "1.6.0" @@ -9418,7 +9414,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.10.3, object-inspect@^1.9.0: +object-inspect@^1.11.0, object-inspect@^1.9.0: version "1.11.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== @@ -9675,11 +9671,16 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== -pako@2.0.3, pako@^2.0.3: +pako@2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.3.tgz#cdf475e31b678565251406de9e759196a0ea7a43" integrity sha512-WjR1hOeg+kki3ZIOjaf4b5WVcay1jaliKSYiEaB1XzwhMQZJxRdQRv0V31EKBYlxb4T7SK3hjfc/jxyU64BoSw== +pako@^2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/pako/-/pako-2.0.4.tgz#6cebc4bbb0b6c73b0d5b8d7e8476e2b2fbea576d" + integrity sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg== + pako@~1.0.5: version "1.0.11" resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf" @@ -13273,9 +13274,9 @@ ua-parser-js@^0.7.18: integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== ual-anchor@^1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/ual-anchor/-/ual-anchor-1.0.8.tgz#4be584fd088490422d1be4881540b864c88f687b" - integrity sha512-N2BnzDbQlLSP32+IhUYGXASR956wmgIRhmCwnaKyzM5xo4S1jmxikYKI+6XG+XlkDvGKTwSMkykA9PorQp4GlQ== + version "1.0.9" + resolved "https://registry.yarnpkg.com/ual-anchor/-/ual-anchor-1.0.9.tgz#c777e9f3d69cdd6affa46de914732847027e5477" + integrity sha512-aaQ//gJ8tQnsmaEe5iiFbJovKuiTFJ8FPNUrlvHLjaMqJnjFbprDT4AhLfpHHe+9fwSp/ol8wP4spPACpuofPg== dependencies: "@greymass/eosio" "^0.4.3" anchor-link "^3.3.2" From 70e79f211044d4f684ab1af8a810238076857b14 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Fri, 30 Jul 2021 23:14:58 -0600 Subject: [PATCH 18/54] Fix/hasura migrations (#636) * fix(devops): remove pgwebservice from productiony * fix(devops): adjust env var values * fix(devops): add hasura migrations build args * fix(devops): add hasura migrations build args * fix(devops): change hasura migrations dir * fix(devops): change hasura migrations dir * fix(devops): change hasura migrations dir * fix(devops): change db name --- .env.example | 6 +++--- .../default}/1548725474630_create_producers.down.yaml | 0 .../default}/1548725474630_create_producers.up.sql | 0 .../1548730845804_create_producer_ratings.down.yaml | 0 .../default}/1548730845804_create_producer_ratings.up.sql | 0 .../default}/1548732282821_create_producers_list.down.yaml | 0 .../default}/1548732282821_create_producers_list.up.sql | 0 .../default}/1580686687967_add_ratings_table/down.yaml | 0 .../default}/1580686687967_add_ratings_table/up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../default}/1580754206808_add_extra_data/down.yaml | 0 .../default}/1580754206808_add_extra_data/up.sql | 0 .../1580754274249_rename_table_public_ratings/down.sql | 0 .../1580754274249_rename_table_public_ratings/up.sql | 0 .../1581704802407_join_producer_ratings_stats/down.yaml | 0 .../1581704802407_join_producer_ratings_stats/up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../1583531471259_add_ratings_cntr_column/down.yaml | 0 .../default}/1583531471259_add_ratings_cntr_column/up.sql | 0 .../1583953599516_add_general_info_column/down.yaml | 0 .../default}/1583953599516_add_general_info_column/up.sql | 0 .../1584293813117_create_table_public_proxies/down.sql | 0 .../1584293813117_create_table_public_proxies/up.sql | 0 35 files changed, 3 insertions(+), 3 deletions(-) rename hasura/migrations/{ => databases/default}/1548725474630_create_producers.down.yaml (100%) rename hasura/migrations/{ => databases/default}/1548725474630_create_producers.up.sql (100%) rename hasura/migrations/{ => databases/default}/1548730845804_create_producer_ratings.down.yaml (100%) rename hasura/migrations/{ => databases/default}/1548730845804_create_producer_ratings.up.sql (100%) rename hasura/migrations/{ => databases/default}/1548732282821_create_producers_list.down.yaml (100%) rename hasura/migrations/{ => databases/default}/1548732282821_create_producers_list.up.sql (100%) rename hasura/migrations/{ => databases/default}/1580686687967_add_ratings_table/down.yaml (100%) rename hasura/migrations/{ => databases/default}/1580686687967_add_ratings_table/up.sql (100%) rename hasura/migrations/{ => databases/default}/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql (100%) rename hasura/migrations/{ => databases/default}/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql (100%) rename hasura/migrations/{ => databases/default}/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql (100%) rename hasura/migrations/{ => databases/default}/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql (100%) rename hasura/migrations/{ => databases/default}/1580754206808_add_extra_data/down.yaml (100%) rename hasura/migrations/{ => databases/default}/1580754206808_add_extra_data/up.sql (100%) rename hasura/migrations/{ => databases/default}/1580754274249_rename_table_public_ratings/down.sql (100%) rename hasura/migrations/{ => databases/default}/1580754274249_rename_table_public_ratings/up.sql (100%) rename hasura/migrations/{ => databases/default}/1581704802407_join_producer_ratings_stats/down.yaml (100%) rename hasura/migrations/{ => databases/default}/1581704802407_join_producer_ratings_stats/up.sql (100%) rename hasura/migrations/{ => databases/default}/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql (100%) rename hasura/migrations/{ => databases/default}/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql (100%) rename hasura/migrations/{ => databases/default}/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql (100%) rename hasura/migrations/{ => databases/default}/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql (100%) rename hasura/migrations/{ => databases/default}/1582436829131_modify_primarykey_public_user_ratings/down.sql (100%) rename hasura/migrations/{ => databases/default}/1582436829131_modify_primarykey_public_user_ratings/up.sql (100%) rename hasura/migrations/{ => databases/default}/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql (100%) rename hasura/migrations/{ => databases/default}/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql (100%) rename hasura/migrations/{ => databases/default}/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql (100%) rename hasura/migrations/{ => databases/default}/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql (100%) rename hasura/migrations/{ => databases/default}/1583531471259_add_ratings_cntr_column/down.yaml (100%) rename hasura/migrations/{ => databases/default}/1583531471259_add_ratings_cntr_column/up.sql (100%) rename hasura/migrations/{ => databases/default}/1583953599516_add_general_info_column/down.yaml (100%) rename hasura/migrations/{ => databases/default}/1583953599516_add_general_info_column/up.sql (100%) rename hasura/migrations/{ => databases/default}/1584293813117_create_table_public_proxies/down.sql (100%) rename hasura/migrations/{ => databases/default}/1584293813117_create_table_public_proxies/up.sql (100%) diff --git a/.env.example b/.env.example index 89131e7d..d36f9a7c 100644 --- a/.env.example +++ b/.env.example @@ -7,7 +7,7 @@ POSTGRES_HOST=localhost POSTGRES_PORT=5432 POSTGRES_USER=user POSTGRES_PASSWORD=password -POSTGRES_DB=localdb +POSTGRES_DB=eosrate POSTGRES_SCHEMA=public POSTGRES_DATA=./db_data @@ -16,7 +16,7 @@ HAPI_POSTGRES_HOST=eosrate_postgres HAPI_POSTGRES_PORT=5432 HAPI_POSTGRES_USER=user HAPI_POSTGRES_PASSWORD=password -HAPI_POSTGRES_DB=localdb +HAPI_POSTGRES_DB=eosrate HAPI_POSTGRES_SCHEMA=public HAPI_SERVER_PORT=9090 HAPI_SERVER_ADDRESS=0.0.0.0 @@ -25,7 +25,7 @@ HAPI_PROXY_CONTRACT=proxyaccount HAPI_RATING_CONTRACT=rateproducer # HASURA -HASURA_GRAPHQL_DATABASE_URL=postgres://user:password@eosrate_postgres:5432/localdb +HASURA_GRAPHQL_DATABASE_URL=postgres://user:password@eosrate_postgres:5432/eosrate HASURA_GRAPHQL_ADMIN_SECRET=hasurasecret HASURA_GRAPHQL_UNAUTHORIZED_ROLE=anonymous HASURA_GRAPHQL_ACTION_BASE_URL=http://hapi:9090 diff --git a/hasura/migrations/1548725474630_create_producers.down.yaml b/hasura/migrations/databases/default/1548725474630_create_producers.down.yaml similarity index 100% rename from hasura/migrations/1548725474630_create_producers.down.yaml rename to hasura/migrations/databases/default/1548725474630_create_producers.down.yaml diff --git a/hasura/migrations/1548725474630_create_producers.up.sql b/hasura/migrations/databases/default/1548725474630_create_producers.up.sql similarity index 100% rename from hasura/migrations/1548725474630_create_producers.up.sql rename to hasura/migrations/databases/default/1548725474630_create_producers.up.sql diff --git a/hasura/migrations/1548730845804_create_producer_ratings.down.yaml b/hasura/migrations/databases/default/1548730845804_create_producer_ratings.down.yaml similarity index 100% rename from hasura/migrations/1548730845804_create_producer_ratings.down.yaml rename to hasura/migrations/databases/default/1548730845804_create_producer_ratings.down.yaml diff --git a/hasura/migrations/1548730845804_create_producer_ratings.up.sql b/hasura/migrations/databases/default/1548730845804_create_producer_ratings.up.sql similarity index 100% rename from hasura/migrations/1548730845804_create_producer_ratings.up.sql rename to hasura/migrations/databases/default/1548730845804_create_producer_ratings.up.sql diff --git a/hasura/migrations/1548732282821_create_producers_list.down.yaml b/hasura/migrations/databases/default/1548732282821_create_producers_list.down.yaml similarity index 100% rename from hasura/migrations/1548732282821_create_producers_list.down.yaml rename to hasura/migrations/databases/default/1548732282821_create_producers_list.down.yaml diff --git a/hasura/migrations/1548732282821_create_producers_list.up.sql b/hasura/migrations/databases/default/1548732282821_create_producers_list.up.sql similarity index 100% rename from hasura/migrations/1548732282821_create_producers_list.up.sql rename to hasura/migrations/databases/default/1548732282821_create_producers_list.up.sql diff --git a/hasura/migrations/1580686687967_add_ratings_table/down.yaml b/hasura/migrations/databases/default/1580686687967_add_ratings_table/down.yaml similarity index 100% rename from hasura/migrations/1580686687967_add_ratings_table/down.yaml rename to hasura/migrations/databases/default/1580686687967_add_ratings_table/down.yaml diff --git a/hasura/migrations/1580686687967_add_ratings_table/up.sql b/hasura/migrations/databases/default/1580686687967_add_ratings_table/up.sql similarity index 100% rename from hasura/migrations/1580686687967_add_ratings_table/up.sql rename to hasura/migrations/databases/default/1580686687967_add_ratings_table/up.sql diff --git a/hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql b/hasura/migrations/databases/default/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql similarity index 100% rename from hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql rename to hasura/migrations/databases/default/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql diff --git a/hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql b/hasura/migrations/databases/default/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql similarity index 100% rename from hasura/migrations/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql rename to hasura/migrations/databases/default/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql diff --git a/hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql b/hasura/migrations/databases/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql similarity index 100% rename from hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql rename to hasura/migrations/databases/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql diff --git a/hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql b/hasura/migrations/databases/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql similarity index 100% rename from hasura/migrations/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql rename to hasura/migrations/databases/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql diff --git a/hasura/migrations/1580754206808_add_extra_data/down.yaml b/hasura/migrations/databases/default/1580754206808_add_extra_data/down.yaml similarity index 100% rename from hasura/migrations/1580754206808_add_extra_data/down.yaml rename to hasura/migrations/databases/default/1580754206808_add_extra_data/down.yaml diff --git a/hasura/migrations/1580754206808_add_extra_data/up.sql b/hasura/migrations/databases/default/1580754206808_add_extra_data/up.sql similarity index 100% rename from hasura/migrations/1580754206808_add_extra_data/up.sql rename to hasura/migrations/databases/default/1580754206808_add_extra_data/up.sql diff --git a/hasura/migrations/1580754274249_rename_table_public_ratings/down.sql b/hasura/migrations/databases/default/1580754274249_rename_table_public_ratings/down.sql similarity index 100% rename from hasura/migrations/1580754274249_rename_table_public_ratings/down.sql rename to hasura/migrations/databases/default/1580754274249_rename_table_public_ratings/down.sql diff --git a/hasura/migrations/1580754274249_rename_table_public_ratings/up.sql b/hasura/migrations/databases/default/1580754274249_rename_table_public_ratings/up.sql similarity index 100% rename from hasura/migrations/1580754274249_rename_table_public_ratings/up.sql rename to hasura/migrations/databases/default/1580754274249_rename_table_public_ratings/up.sql diff --git a/hasura/migrations/1581704802407_join_producer_ratings_stats/down.yaml b/hasura/migrations/databases/default/1581704802407_join_producer_ratings_stats/down.yaml similarity index 100% rename from hasura/migrations/1581704802407_join_producer_ratings_stats/down.yaml rename to hasura/migrations/databases/default/1581704802407_join_producer_ratings_stats/down.yaml diff --git a/hasura/migrations/1581704802407_join_producer_ratings_stats/up.sql b/hasura/migrations/databases/default/1581704802407_join_producer_ratings_stats/up.sql similarity index 100% rename from hasura/migrations/1581704802407_join_producer_ratings_stats/up.sql rename to hasura/migrations/databases/default/1581704802407_join_producer_ratings_stats/up.sql diff --git a/hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql b/hasura/migrations/databases/default/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql similarity index 100% rename from hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql rename to hasura/migrations/databases/default/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql diff --git a/hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql b/hasura/migrations/databases/default/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql similarity index 100% rename from hasura/migrations/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql rename to hasura/migrations/databases/default/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql diff --git a/hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql b/hasura/migrations/databases/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql similarity index 100% rename from hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql rename to hasura/migrations/databases/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql diff --git a/hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql b/hasura/migrations/databases/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql similarity index 100% rename from hasura/migrations/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql rename to hasura/migrations/databases/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql diff --git a/hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/down.sql b/hasura/migrations/databases/default/1582436829131_modify_primarykey_public_user_ratings/down.sql similarity index 100% rename from hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/down.sql rename to hasura/migrations/databases/default/1582436829131_modify_primarykey_public_user_ratings/down.sql diff --git a/hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/up.sql b/hasura/migrations/databases/default/1582436829131_modify_primarykey_public_user_ratings/up.sql similarity index 100% rename from hasura/migrations/1582436829131_modify_primarykey_public_user_ratings/up.sql rename to hasura/migrations/databases/default/1582436829131_modify_primarykey_public_user_ratings/up.sql diff --git a/hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql b/hasura/migrations/databases/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql similarity index 100% rename from hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql rename to hasura/migrations/databases/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql diff --git a/hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql b/hasura/migrations/databases/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql similarity index 100% rename from hasura/migrations/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql rename to hasura/migrations/databases/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql diff --git a/hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql b/hasura/migrations/databases/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql similarity index 100% rename from hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql rename to hasura/migrations/databases/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql diff --git a/hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql b/hasura/migrations/databases/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql similarity index 100% rename from hasura/migrations/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql rename to hasura/migrations/databases/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql diff --git a/hasura/migrations/1583531471259_add_ratings_cntr_column/down.yaml b/hasura/migrations/databases/default/1583531471259_add_ratings_cntr_column/down.yaml similarity index 100% rename from hasura/migrations/1583531471259_add_ratings_cntr_column/down.yaml rename to hasura/migrations/databases/default/1583531471259_add_ratings_cntr_column/down.yaml diff --git a/hasura/migrations/1583531471259_add_ratings_cntr_column/up.sql b/hasura/migrations/databases/default/1583531471259_add_ratings_cntr_column/up.sql similarity index 100% rename from hasura/migrations/1583531471259_add_ratings_cntr_column/up.sql rename to hasura/migrations/databases/default/1583531471259_add_ratings_cntr_column/up.sql diff --git a/hasura/migrations/1583953599516_add_general_info_column/down.yaml b/hasura/migrations/databases/default/1583953599516_add_general_info_column/down.yaml similarity index 100% rename from hasura/migrations/1583953599516_add_general_info_column/down.yaml rename to hasura/migrations/databases/default/1583953599516_add_general_info_column/down.yaml diff --git a/hasura/migrations/1583953599516_add_general_info_column/up.sql b/hasura/migrations/databases/default/1583953599516_add_general_info_column/up.sql similarity index 100% rename from hasura/migrations/1583953599516_add_general_info_column/up.sql rename to hasura/migrations/databases/default/1583953599516_add_general_info_column/up.sql diff --git a/hasura/migrations/1584293813117_create_table_public_proxies/down.sql b/hasura/migrations/databases/default/1584293813117_create_table_public_proxies/down.sql similarity index 100% rename from hasura/migrations/1584293813117_create_table_public_proxies/down.sql rename to hasura/migrations/databases/default/1584293813117_create_table_public_proxies/down.sql diff --git a/hasura/migrations/1584293813117_create_table_public_proxies/up.sql b/hasura/migrations/databases/default/1584293813117_create_table_public_proxies/up.sql similarity index 100% rename from hasura/migrations/1584293813117_create_table_public_proxies/up.sql rename to hasura/migrations/databases/default/1584293813117_create_table_public_proxies/up.sql From b8d63a20b9dd3fd33ff540ab820b26939e2d2365 Mon Sep 17 00:00:00 2001 From: Leister Francisco Alvarez Campos Date: Sun, 1 Aug 2021 11:25:18 -0600 Subject: [PATCH 19/54] fix(hasura): remove migrations/database folder to migrations/defult (#637) --- .../default/1548725474630_create_producers.down.yaml | 0 .../{databases => }/default/1548725474630_create_producers.up.sql | 0 .../default/1548730845804_create_producer_ratings.down.yaml | 0 .../default/1548730845804_create_producer_ratings.up.sql | 0 .../default/1548732282821_create_producers_list.down.yaml | 0 .../default/1548732282821_create_producers_list.up.sql | 0 .../default/1580686687967_add_ratings_table/down.yaml | 0 .../default/1580686687967_add_ratings_table/up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../default/1580754206808_add_extra_data/down.yaml | 0 .../{databases => }/default/1580754206808_add_extra_data/up.sql | 0 .../default/1580754274249_rename_table_public_ratings/down.sql | 0 .../default/1580754274249_rename_table_public_ratings/up.sql | 0 .../default/1581704802407_join_producer_ratings_stats/down.yaml | 0 .../default/1581704802407_join_producer_ratings_stats/up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../1582436829131_modify_primarykey_public_user_ratings/down.sql | 0 .../1582436829131_modify_primarykey_public_user_ratings/up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../down.sql | 0 .../up.sql | 0 .../default/1583531471259_add_ratings_cntr_column/down.yaml | 0 .../default/1583531471259_add_ratings_cntr_column/up.sql | 0 .../default/1583953599516_add_general_info_column/down.yaml | 0 .../default/1583953599516_add_general_info_column/up.sql | 0 .../default/1584293813117_create_table_public_proxies/down.sql | 0 .../default/1584293813117_create_table_public_proxies/up.sql | 0 34 files changed, 0 insertions(+), 0 deletions(-) rename hasura/migrations/{databases => }/default/1548725474630_create_producers.down.yaml (100%) rename hasura/migrations/{databases => }/default/1548725474630_create_producers.up.sql (100%) rename hasura/migrations/{databases => }/default/1548730845804_create_producer_ratings.down.yaml (100%) rename hasura/migrations/{databases => }/default/1548730845804_create_producer_ratings.up.sql (100%) rename hasura/migrations/{databases => }/default/1548732282821_create_producers_list.down.yaml (100%) rename hasura/migrations/{databases => }/default/1548732282821_create_producers_list.up.sql (100%) rename hasura/migrations/{databases => }/default/1580686687967_add_ratings_table/down.yaml (100%) rename hasura/migrations/{databases => }/default/1580686687967_add_ratings_table/up.sql (100%) rename hasura/migrations/{databases => }/default/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql (100%) rename hasura/migrations/{databases => }/default/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql (100%) rename hasura/migrations/{databases => }/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql (100%) rename hasura/migrations/{databases => }/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql (100%) rename hasura/migrations/{databases => }/default/1580754206808_add_extra_data/down.yaml (100%) rename hasura/migrations/{databases => }/default/1580754206808_add_extra_data/up.sql (100%) rename hasura/migrations/{databases => }/default/1580754274249_rename_table_public_ratings/down.sql (100%) rename hasura/migrations/{databases => }/default/1580754274249_rename_table_public_ratings/up.sql (100%) rename hasura/migrations/{databases => }/default/1581704802407_join_producer_ratings_stats/down.yaml (100%) rename hasura/migrations/{databases => }/default/1581704802407_join_producer_ratings_stats/up.sql (100%) rename hasura/migrations/{databases => }/default/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql (100%) rename hasura/migrations/{databases => }/default/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql (100%) rename hasura/migrations/{databases => }/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql (100%) rename hasura/migrations/{databases => }/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql (100%) rename hasura/migrations/{databases => }/default/1582436829131_modify_primarykey_public_user_ratings/down.sql (100%) rename hasura/migrations/{databases => }/default/1582436829131_modify_primarykey_public_user_ratings/up.sql (100%) rename hasura/migrations/{databases => }/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql (100%) rename hasura/migrations/{databases => }/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql (100%) rename hasura/migrations/{databases => }/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql (100%) rename hasura/migrations/{databases => }/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql (100%) rename hasura/migrations/{databases => }/default/1583531471259_add_ratings_cntr_column/down.yaml (100%) rename hasura/migrations/{databases => }/default/1583531471259_add_ratings_cntr_column/up.sql (100%) rename hasura/migrations/{databases => }/default/1583953599516_add_general_info_column/down.yaml (100%) rename hasura/migrations/{databases => }/default/1583953599516_add_general_info_column/up.sql (100%) rename hasura/migrations/{databases => }/default/1584293813117_create_table_public_proxies/down.sql (100%) rename hasura/migrations/{databases => }/default/1584293813117_create_table_public_proxies/up.sql (100%) diff --git a/hasura/migrations/databases/default/1548725474630_create_producers.down.yaml b/hasura/migrations/default/1548725474630_create_producers.down.yaml similarity index 100% rename from hasura/migrations/databases/default/1548725474630_create_producers.down.yaml rename to hasura/migrations/default/1548725474630_create_producers.down.yaml diff --git a/hasura/migrations/databases/default/1548725474630_create_producers.up.sql b/hasura/migrations/default/1548725474630_create_producers.up.sql similarity index 100% rename from hasura/migrations/databases/default/1548725474630_create_producers.up.sql rename to hasura/migrations/default/1548725474630_create_producers.up.sql diff --git a/hasura/migrations/databases/default/1548730845804_create_producer_ratings.down.yaml b/hasura/migrations/default/1548730845804_create_producer_ratings.down.yaml similarity index 100% rename from hasura/migrations/databases/default/1548730845804_create_producer_ratings.down.yaml rename to hasura/migrations/default/1548730845804_create_producer_ratings.down.yaml diff --git a/hasura/migrations/databases/default/1548730845804_create_producer_ratings.up.sql b/hasura/migrations/default/1548730845804_create_producer_ratings.up.sql similarity index 100% rename from hasura/migrations/databases/default/1548730845804_create_producer_ratings.up.sql rename to hasura/migrations/default/1548730845804_create_producer_ratings.up.sql diff --git a/hasura/migrations/databases/default/1548732282821_create_producers_list.down.yaml b/hasura/migrations/default/1548732282821_create_producers_list.down.yaml similarity index 100% rename from hasura/migrations/databases/default/1548732282821_create_producers_list.down.yaml rename to hasura/migrations/default/1548732282821_create_producers_list.down.yaml diff --git a/hasura/migrations/databases/default/1548732282821_create_producers_list.up.sql b/hasura/migrations/default/1548732282821_create_producers_list.up.sql similarity index 100% rename from hasura/migrations/databases/default/1548732282821_create_producers_list.up.sql rename to hasura/migrations/default/1548732282821_create_producers_list.up.sql diff --git a/hasura/migrations/databases/default/1580686687967_add_ratings_table/down.yaml b/hasura/migrations/default/1580686687967_add_ratings_table/down.yaml similarity index 100% rename from hasura/migrations/databases/default/1580686687967_add_ratings_table/down.yaml rename to hasura/migrations/default/1580686687967_add_ratings_table/down.yaml diff --git a/hasura/migrations/databases/default/1580686687967_add_ratings_table/up.sql b/hasura/migrations/default/1580686687967_add_ratings_table/up.sql similarity index 100% rename from hasura/migrations/databases/default/1580686687967_add_ratings_table/up.sql rename to hasura/migrations/default/1580686687967_add_ratings_table/up.sql diff --git a/hasura/migrations/databases/default/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql b/hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql similarity index 100% rename from hasura/migrations/databases/default/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql rename to hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/down.sql diff --git a/hasura/migrations/databases/default/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql b/hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql similarity index 100% rename from hasura/migrations/databases/default/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql rename to hasura/migrations/default/1580688144818_alter_table_public_ratings_alter_column_created_at/up.sql diff --git a/hasura/migrations/databases/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql b/hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql similarity index 100% rename from hasura/migrations/databases/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql rename to hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/down.sql diff --git a/hasura/migrations/databases/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql b/hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql similarity index 100% rename from hasura/migrations/databases/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql rename to hasura/migrations/default/1580688151803_alter_table_public_ratings_alter_column_updated_at/up.sql diff --git a/hasura/migrations/databases/default/1580754206808_add_extra_data/down.yaml b/hasura/migrations/default/1580754206808_add_extra_data/down.yaml similarity index 100% rename from hasura/migrations/databases/default/1580754206808_add_extra_data/down.yaml rename to hasura/migrations/default/1580754206808_add_extra_data/down.yaml diff --git a/hasura/migrations/databases/default/1580754206808_add_extra_data/up.sql b/hasura/migrations/default/1580754206808_add_extra_data/up.sql similarity index 100% rename from hasura/migrations/databases/default/1580754206808_add_extra_data/up.sql rename to hasura/migrations/default/1580754206808_add_extra_data/up.sql diff --git a/hasura/migrations/databases/default/1580754274249_rename_table_public_ratings/down.sql b/hasura/migrations/default/1580754274249_rename_table_public_ratings/down.sql similarity index 100% rename from hasura/migrations/databases/default/1580754274249_rename_table_public_ratings/down.sql rename to hasura/migrations/default/1580754274249_rename_table_public_ratings/down.sql diff --git a/hasura/migrations/databases/default/1580754274249_rename_table_public_ratings/up.sql b/hasura/migrations/default/1580754274249_rename_table_public_ratings/up.sql similarity index 100% rename from hasura/migrations/databases/default/1580754274249_rename_table_public_ratings/up.sql rename to hasura/migrations/default/1580754274249_rename_table_public_ratings/up.sql diff --git a/hasura/migrations/databases/default/1581704802407_join_producer_ratings_stats/down.yaml b/hasura/migrations/default/1581704802407_join_producer_ratings_stats/down.yaml similarity index 100% rename from hasura/migrations/databases/default/1581704802407_join_producer_ratings_stats/down.yaml rename to hasura/migrations/default/1581704802407_join_producer_ratings_stats/down.yaml diff --git a/hasura/migrations/databases/default/1581704802407_join_producer_ratings_stats/up.sql b/hasura/migrations/default/1581704802407_join_producer_ratings_stats/up.sql similarity index 100% rename from hasura/migrations/databases/default/1581704802407_join_producer_ratings_stats/up.sql rename to hasura/migrations/default/1581704802407_join_producer_ratings_stats/up.sql diff --git a/hasura/migrations/databases/default/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql b/hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql similarity index 100% rename from hasura/migrations/databases/default/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql rename to hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/down.sql diff --git a/hasura/migrations/databases/default/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql b/hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql similarity index 100% rename from hasura/migrations/databases/default/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql rename to hasura/migrations/default/1582436287385_alter_table_public_user_ratings_alter_column_account/up.sql diff --git a/hasura/migrations/databases/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql b/hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql similarity index 100% rename from hasura/migrations/databases/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql rename to hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/down.sql diff --git a/hasura/migrations/databases/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql b/hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql similarity index 100% rename from hasura/migrations/databases/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql rename to hasura/migrations/default/1582436803376_alter_table_public_user_ratings_add_column_uniq_rating/up.sql diff --git a/hasura/migrations/databases/default/1582436829131_modify_primarykey_public_user_ratings/down.sql b/hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/down.sql similarity index 100% rename from hasura/migrations/databases/default/1582436829131_modify_primarykey_public_user_ratings/down.sql rename to hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/down.sql diff --git a/hasura/migrations/databases/default/1582436829131_modify_primarykey_public_user_ratings/up.sql b/hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/up.sql similarity index 100% rename from hasura/migrations/databases/default/1582436829131_modify_primarykey_public_user_ratings/up.sql rename to hasura/migrations/default/1582436829131_modify_primarykey_public_user_ratings/up.sql diff --git a/hasura/migrations/databases/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql b/hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql similarity index 100% rename from hasura/migrations/databases/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql rename to hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/down.sql diff --git a/hasura/migrations/databases/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql b/hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql similarity index 100% rename from hasura/migrations/databases/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql rename to hasura/migrations/default/1582436863355_alter_table_public_user_ratings_alter_column_ratings/up.sql diff --git a/hasura/migrations/databases/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql b/hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql similarity index 100% rename from hasura/migrations/databases/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql rename to hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/down.sql diff --git a/hasura/migrations/databases/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql b/hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql similarity index 100% rename from hasura/migrations/databases/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql rename to hasura/migrations/default/1582437040531_alter_table_public_user_ratings_alter_column_ratings/up.sql diff --git a/hasura/migrations/databases/default/1583531471259_add_ratings_cntr_column/down.yaml b/hasura/migrations/default/1583531471259_add_ratings_cntr_column/down.yaml similarity index 100% rename from hasura/migrations/databases/default/1583531471259_add_ratings_cntr_column/down.yaml rename to hasura/migrations/default/1583531471259_add_ratings_cntr_column/down.yaml diff --git a/hasura/migrations/databases/default/1583531471259_add_ratings_cntr_column/up.sql b/hasura/migrations/default/1583531471259_add_ratings_cntr_column/up.sql similarity index 100% rename from hasura/migrations/databases/default/1583531471259_add_ratings_cntr_column/up.sql rename to hasura/migrations/default/1583531471259_add_ratings_cntr_column/up.sql diff --git a/hasura/migrations/databases/default/1583953599516_add_general_info_column/down.yaml b/hasura/migrations/default/1583953599516_add_general_info_column/down.yaml similarity index 100% rename from hasura/migrations/databases/default/1583953599516_add_general_info_column/down.yaml rename to hasura/migrations/default/1583953599516_add_general_info_column/down.yaml diff --git a/hasura/migrations/databases/default/1583953599516_add_general_info_column/up.sql b/hasura/migrations/default/1583953599516_add_general_info_column/up.sql similarity index 100% rename from hasura/migrations/databases/default/1583953599516_add_general_info_column/up.sql rename to hasura/migrations/default/1583953599516_add_general_info_column/up.sql diff --git a/hasura/migrations/databases/default/1584293813117_create_table_public_proxies/down.sql b/hasura/migrations/default/1584293813117_create_table_public_proxies/down.sql similarity index 100% rename from hasura/migrations/databases/default/1584293813117_create_table_public_proxies/down.sql rename to hasura/migrations/default/1584293813117_create_table_public_proxies/down.sql diff --git a/hasura/migrations/databases/default/1584293813117_create_table_public_proxies/up.sql b/hasura/migrations/default/1584293813117_create_table_public_proxies/up.sql similarity index 100% rename from hasura/migrations/databases/default/1584293813117_create_table_public_proxies/up.sql rename to hasura/migrations/default/1584293813117_create_table_public_proxies/up.sql From ec13024402aced1c40acb6988a7e5534e367878b Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Sun, 1 Aug 2021 13:51:12 -0600 Subject: [PATCH 20/54] Fix/export hasura metadata (#642) * fix(hasura): generate metadata export * fix(hasura): consfigure local dev environment * fix(hasura): fix trailing spaces --- docker-compose.yml | 9 +- hapi/yarn.lock | 68 ++++----- hasura/metadata/actions.graphql | 3 - hasura/metadata/databases/databases.yaml | 1 - .../default/tables/public_producers.yaml | 6 +- .../default/tables/public_producers_list.yaml | 6 +- .../default/tables/public_proxies.yaml | 6 +- .../default/tables/public_ratings_stats.yaml | 6 +- .../default/tables/public_user_ratings.yaml | 6 +- webapp/yarn.lock | 130 +++++++++--------- 10 files changed, 119 insertions(+), 122 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 7f29ed53..ae9e16f0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -90,13 +90,14 @@ services: HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations HASURA_GRAPHQL_METADATA_DIR: /hasura-metadata HASURA_GRAPHQL_ACTION_BASE_URL: "${HASURA_GRAPHQL_ACTION_BASE_URL}" - HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}" - HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "${HASURA_GRAPHQL_UNAUTHORIZED_ROLE}" HASURA_GRAPHQL_ENABLE_CONSOLE: "true" - ## enable debugging mode. It is recommended to disable this in production + # Local Development Configurations It is recommended to disable this in production HASURA_GRAPHQL_DEV_MODE: "true" HASURA_GRAPHQL_ENABLED_LOG_TYPES: startup, http-log, webhook-log, websocket-log, query-log - + HASURA_GRAPHQL_ENABLE_LOGGING: "true" + # disabled security for local development + # HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}" + # HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "${HASURA_GRAPHQL_UNAUTHORIZED_ROLE}" volumes: - ./hasura/migrations:/hasura-migrations - ./hasura/metadata:/hasura-metadata diff --git a/hapi/yarn.lock b/hapi/yarn.lock index a97a0bf6..71bc395c 100644 --- a/hapi/yarn.lock +++ b/hapi/yarn.lock @@ -16,12 +16,12 @@ dependencies: "@babel/highlight" "^7.14.5" -"@babel/generator@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070" - integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg== +"@babel/generator@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.9.tgz#23b19c597d38b4f7dc2e3fe42a69c88d9ecfaa16" + integrity sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA== dependencies: - "@babel/types" "^7.14.8" + "@babel/types" "^7.14.9" jsesc "^2.5.1" source-map "^0.5.0" @@ -55,10 +55,10 @@ dependencies: "@babel/types" "^7.14.5" -"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c" - integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow== +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== "@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": version "7.14.5" @@ -69,10 +69,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.3.1": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4" - integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA== +"@babel/parser@^7.14.5", "@babel/parser@^7.14.9", "@babel/parser@^7.3.1": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.9.tgz#596c1ad67608070058ebf8df50c1eaf65db895a4" + integrity sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ== "@babel/template@^7.14.5": version "7.14.5" @@ -84,26 +84,26 @@ "@babel/types" "^7.14.5" "@babel/traverse@^7.2.3": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce" - integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg== + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.9.tgz#016126b331210bf06fff29d52971eef8383e556f" + integrity sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g== dependencies: "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.8" + "@babel/generator" "^7.14.9" "@babel/helper-function-name" "^7.14.5" "@babel/helper-hoist-variables" "^7.14.5" "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.8" - "@babel/types" "^7.14.8" + "@babel/parser" "^7.14.9" + "@babel/types" "^7.14.9" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.14.5", "@babel/types@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728" - integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q== +"@babel/types@^7.14.5", "@babel/types@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.9.tgz#f2b19c3f2f77c5708d67fe8f6046e9cea2b5036d" + integrity sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow== dependencies: - "@babel/helper-validator-identifier" "^7.14.8" + "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" "@eslint/eslintrc@^0.2.1": @@ -3443,18 +3443,18 @@ pg-minify@1.6.2: resolved "https://registry.yarnpkg.com/pg-minify/-/pg-minify-1.6.2.tgz#055acfe862cfca3ca0a529020846b0f308d68e70" integrity sha512-1KdmFGGTP6jplJoI8MfvRlfvMiyBivMRP7/ffh4a11RUFJ7kC2J0ZHlipoKiH/1hz+DVgceon9U2qbaHpPeyPg== -pg-pool@^3.3.0: +pg-pool@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.4.1.tgz#0e71ce2c67b442a5e862a9c182172c37eda71e9c" integrity sha512-TVHxR/gf3MeJRvchgNHxsYsTCHQ+4wm3VIHSS19z8NC0+gioEhq1okDY1sm/TYbfoP6JLFx01s0ShvZ3puP/iQ== pg-promise@^10.10.2: - version "10.10.2" - resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-10.10.2.tgz#6895c4d38aaeede5c1a4388e5594f1604257bfd4" - integrity sha512-ezc5Jn2DdtYpNoDjo7v9TVQFXBEGR+tnseot8IsZ3/B4XD/CnIjyUPMfizDdbXWNO66hN8p2m8nNrcrJ8uhM/g== + version "10.11.0" + resolved "https://registry.yarnpkg.com/pg-promise/-/pg-promise-10.11.0.tgz#ae6708983650eee438d976e71d1d36476fefb559" + integrity sha512-UntgHZNv+gpGJKhh+tzGSGHLkniKWV+ZQ8/SNdtvElsg9Aa7ZJ4Fgyl6pl2x0ZtJ7uFNy+OIq3Z+Ei6iplqTDQ== dependencies: assert-options "0.7.0" - pg "8.6.0" + pg "8.7.1" pg-minify "1.6.2" spex "3.2.0" @@ -3481,15 +3481,15 @@ pg-types@^2.1.0: postgres-date "~1.0.4" postgres-interval "^1.1.0" -pg@8.6.0: - version "8.6.0" - resolved "https://registry.yarnpkg.com/pg/-/pg-8.6.0.tgz#e222296b0b079b280cce106ea991703335487db2" - integrity sha512-qNS9u61lqljTDFvmk/N66EeGq3n6Ujzj0FFyNMGQr6XuEv4tgNTXvJQTfJdcvGit5p5/DWPu+wj920hAJFI+QQ== +pg@8.7.1: + version "8.7.1" + resolved "https://registry.yarnpkg.com/pg/-/pg-8.7.1.tgz#9ea9d1ec225980c36f94e181d009ab9f4ce4c471" + integrity sha512-7bdYcv7V6U3KAtWjpQJJBww0UEsWuh4yQ/EjNf2HeO/NnvKjpvhEIe/A/TleP6wtmSKnUnghs5A9jUoK6iDdkA== dependencies: buffer-writer "2.0.0" packet-reader "1.0.0" pg-connection-string "^2.5.0" - pg-pool "^3.3.0" + pg-pool "^3.4.1" pg-protocol "^1.5.0" pg-types "^2.1.0" pgpass "1.x" diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql index 8c4d53f6..eca1ea24 100644 --- a/hasura/metadata/actions.graphql +++ b/hasura/metadata/actions.graphql @@ -4,9 +4,6 @@ type Mutation { ): RatingOutput } - - - input RatingInput { user : String! producer : String! diff --git a/hasura/metadata/databases/databases.yaml b/hasura/metadata/databases/databases.yaml index e0f5d8a9..65a11b20 100644 --- a/hasura/metadata/databases/databases.yaml +++ b/hasura/metadata/databases/databases.yaml @@ -12,4 +12,3 @@ retries: 1 use_prepared_statements: true tables: "!include default/tables/tables.yaml" - functions: "!include default/functions/functions.yaml" diff --git a/hasura/metadata/databases/default/tables/public_producers.yaml b/hasura/metadata/databases/default/tables/public_producers.yaml index eae54aac..3e856471 100644 --- a/hasura/metadata/databases/default/tables/public_producers.yaml +++ b/hasura/metadata/databases/default/tables/public_producers.yaml @@ -1,3 +1,6 @@ +table: + name: producers + schema: public select_permissions: - permission: columns: @@ -7,6 +10,3 @@ select_permissions: - system filter: {} role: anonymous -table: - name: producers - schema: public diff --git a/hasura/metadata/databases/default/tables/public_producers_list.yaml b/hasura/metadata/databases/default/tables/public_producers_list.yaml index 9b092074..8162fc57 100644 --- a/hasura/metadata/databases/default/tables/public_producers_list.yaml +++ b/hasura/metadata/databases/default/tables/public_producers_list.yaml @@ -1,3 +1,6 @@ +table: + name: producers_list + schema: public select_permissions: - permission: columns: @@ -16,6 +19,3 @@ select_permissions: - trustiness filter: {} role: anonymous -table: - name: producers_list - schema: public diff --git a/hasura/metadata/databases/default/tables/public_proxies.yaml b/hasura/metadata/databases/default/tables/public_proxies.yaml index cfa32048..24b9f599 100644 --- a/hasura/metadata/databases/default/tables/public_proxies.yaml +++ b/hasura/metadata/databases/default/tables/public_proxies.yaml @@ -1,3 +1,6 @@ +table: + name: proxies + schema: public select_permissions: - permission: columns: @@ -15,6 +18,3 @@ select_permissions: - wechat filter: {} role: anonymous -table: - name: proxies - schema: public diff --git a/hasura/metadata/databases/default/tables/public_ratings_stats.yaml b/hasura/metadata/databases/default/tables/public_ratings_stats.yaml index 9e898a7b..0f2c2403 100644 --- a/hasura/metadata/databases/default/tables/public_ratings_stats.yaml +++ b/hasura/metadata/databases/default/tables/public_ratings_stats.yaml @@ -1,3 +1,6 @@ +table: + name: ratings_stats + schema: public select_permissions: - permission: columns: @@ -13,6 +16,3 @@ select_permissions: - updated_at filter: {} role: anonymous -table: - name: ratings_stats - schema: public diff --git a/hasura/metadata/databases/default/tables/public_user_ratings.yaml b/hasura/metadata/databases/default/tables/public_user_ratings.yaml index 7ab3fc1a..9977269d 100644 --- a/hasura/metadata/databases/default/tables/public_user_ratings.yaml +++ b/hasura/metadata/databases/default/tables/public_user_ratings.yaml @@ -1,3 +1,6 @@ +table: + name: user_ratings + schema: public select_permissions: - permission: columns: @@ -8,6 +11,3 @@ select_permissions: - user filter: {} role: anonymous -table: - name: user_ratings - schema: public diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 7f5502ad..6914434a 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -72,10 +72,10 @@ dependencies: "@babel/highlight" "^7.14.5" -"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" - integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== +"@babel/compat-data@^7.12.1", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.9.tgz#ac7996ceaafcf8f410119c8af0d1db4cf914a210" + integrity sha512-p3QjZmMGHDGdpcwEYYWu7i7oJShJvtgMjJeb0W95PPhSm++3lm8YXYOh45Y6iCN9PkZLTZ7CIX5nFrp7pw7TXw== "@babel/core@7.12.3": version "7.12.3" @@ -140,12 +140,12 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.12.1", "@babel/generator@^7.14.8", "@babel/generator@^7.6.0": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070" - integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg== +"@babel/generator@^7.12.1", "@babel/generator@^7.14.8", "@babel/generator@^7.14.9", "@babel/generator@^7.6.0": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.9.tgz#23b19c597d38b4f7dc2e3fe42a69c88d9ecfaa16" + integrity sha512-4yoHbhDYzFa0GLfCzLp5GxH7vPPMAHdZjyE7M/OajM9037zhx0rf+iNsJwp4PT0MSFpwjG7BsHEbPkBQpZ6cYA== dependencies: - "@babel/types" "^7.14.8" + "@babel/types" "^7.14.9" jsesc "^2.5.1" source-map "^0.5.0" @@ -318,10 +318,10 @@ dependencies: "@babel/types" "^7.14.5" -"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c" - integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow== +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8", "@babel/helper-validator-identifier@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== "@babel/helper-validator-option@^7.12.1", "@babel/helper-validator-option@^7.14.5": version "7.14.5" @@ -356,10 +356,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.6.0", "@babel/parser@^7.7.0": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4" - integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.14.9", "@babel/parser@^7.6.0", "@babel/parser@^7.7.0": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.9.tgz#596c1ad67608070058ebf8df50c1eaf65db895a4" + integrity sha512-RdUTOseXJ8POjjOeEBEvNMIZU/nm4yu2rufRkcibzkkg7DmQvXU8v3M4Xk9G7uuI86CDGkKcuDWgioqZm+mScQ== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": version "7.14.5" @@ -370,10 +370,10 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" "@babel/plugin-proposal-optional-chaining" "^7.14.5" -"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.14.7", "@babel/plugin-proposal-async-generator-functions@^7.2.0": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace" - integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q== +"@babel/plugin-proposal-async-generator-functions@^7.12.1", "@babel/plugin-proposal-async-generator-functions@^7.14.9", "@babel/plugin-proposal-async-generator-functions@^7.2.0": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a" + integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-remap-async-to-generator" "^7.14.5" @@ -710,10 +710,10 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.14.5", "@babel/plugin-transform-classes@^7.2.0": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf" - integrity sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA== +"@babel/plugin-transform-classes@^7.12.1", "@babel/plugin-transform-classes@^7.14.9", "@babel/plugin-transform-classes@^7.2.0": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f" + integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A== dependencies: "@babel/helper-annotate-as-pure" "^7.14.5" "@babel/helper-function-name" "^7.14.5" @@ -835,10 +835,10 @@ "@babel/helper-module-transforms" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e" - integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg== +"@babel/plugin-transform-named-capturing-groups-regex@^7.12.1", "@babel/plugin-transform-named-capturing-groups-regex@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2" + integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.14.5" @@ -900,9 +900,9 @@ "@babel/plugin-transform-react-jsx" "^7.14.5" "@babel/plugin-transform-react-jsx-self@^7.0.0", "@babel/plugin-transform-react-jsx-self@^7.12.1": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.5.tgz#703b5d1edccd342179c2a99ee8c7065c2b4403cc" - integrity sha512-M/fmDX6n0cfHK/NLTcPmrfVAORKDhK8tyjDhyxlUjYyPYYO8FRWwuxBA3WBx8kWN/uBUuwGa3s/0+hQ9JIN3Tg== + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.14.9.tgz#33041e665453391eb6ee54a2ecf3ba1d46bd30f4" + integrity sha512-Fqqu0f8zv9W+RyOnx29BX/RlEsBRANbOf5xs5oxb2aHP4FKbLXxIaVPUiCti56LAR1IixMH4EyaixhUsKqoBHw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" @@ -914,15 +914,15 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-react-jsx@^7.0.0", "@babel/plugin-transform-react-jsx@^7.12.1", "@babel/plugin-transform-react-jsx@^7.14.5": - version "7.14.5" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.5.tgz#39749f0ee1efd8a1bd729152cf5f78f1d247a44a" - integrity sha512-7RylxNeDnxc1OleDm0F5Q/BSL+whYRbOAR+bwgCxIr0L32v7UFh/pz1DLMZideAUxKT6eMoS2zQH6fyODLEi8Q== + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.14.9.tgz#3314b2163033abac5200a869c4de242cd50a914c" + integrity sha512-30PeETvS+AeD1f58i1OVyoDlVYQhap/K20ZrMjLmmzmC2AYR/G43D4sdJAaDAqCD3MYpSWbmrz3kES158QSLjw== dependencies: "@babel/helper-annotate-as-pure" "^7.14.5" "@babel/helper-module-imports" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-jsx" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/types" "^7.14.9" "@babel/plugin-transform-react-pure-annotations@^7.12.1", "@babel/plugin-transform-react-pure-annotations@^7.14.5": version "7.14.5" @@ -1136,16 +1136,16 @@ semver "^5.3.0" "@babel/preset-env@^7.12.1", "@babel/preset-env@^7.8.4": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.8.tgz#254942f5ca80ccabcfbb2a9f524c74bca574005b" - integrity sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg== + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.9.tgz#4a3bbbd745f20e9121d5925170bef040a21b7819" + integrity sha512-BV5JvCwBDebkyh67bPKBYVCC6gGw0MCzU6HfKe5Pm3upFpPVqiC/hB33zkOe0tVdAzaMywah0LSXQeD9v/BYdQ== dependencies: - "@babel/compat-data" "^7.14.7" + "@babel/compat-data" "^7.14.9" "@babel/helper-compilation-targets" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-validator-option" "^7.14.5" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" - "@babel/plugin-proposal-async-generator-functions" "^7.14.7" + "@babel/plugin-proposal-async-generator-functions" "^7.14.9" "@babel/plugin-proposal-class-properties" "^7.14.5" "@babel/plugin-proposal-class-static-block" "^7.14.5" "@babel/plugin-proposal-dynamic-import" "^7.14.5" @@ -1178,7 +1178,7 @@ "@babel/plugin-transform-async-to-generator" "^7.14.5" "@babel/plugin-transform-block-scoped-functions" "^7.14.5" "@babel/plugin-transform-block-scoping" "^7.14.5" - "@babel/plugin-transform-classes" "^7.14.5" + "@babel/plugin-transform-classes" "^7.14.9" "@babel/plugin-transform-computed-properties" "^7.14.5" "@babel/plugin-transform-destructuring" "^7.14.7" "@babel/plugin-transform-dotall-regex" "^7.14.5" @@ -1192,7 +1192,7 @@ "@babel/plugin-transform-modules-commonjs" "^7.14.5" "@babel/plugin-transform-modules-systemjs" "^7.14.5" "@babel/plugin-transform-modules-umd" "^7.14.5" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9" "@babel/plugin-transform-new-target" "^7.14.5" "@babel/plugin-transform-object-super" "^7.14.5" "@babel/plugin-transform-parameters" "^7.14.5" @@ -1207,11 +1207,11 @@ "@babel/plugin-transform-unicode-escapes" "^7.14.5" "@babel/plugin-transform-unicode-regex" "^7.14.5" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.14.8" + "@babel/types" "^7.14.9" babel-plugin-polyfill-corejs2 "^0.2.2" babel-plugin-polyfill-corejs3 "^0.2.2" babel-plugin-polyfill-regenerator "^0.2.2" - core-js-compat "^3.15.0" + core-js-compat "^3.16.0" semver "^6.3.0" "@babel/preset-modules@^0.1.3", "@babel/preset-modules@^0.1.4": @@ -1270,11 +1270,11 @@ "@babel/plugin-transform-typescript" "^7.12.1" "@babel/runtime-corejs3@^7.10.2": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.8.tgz#68539e0129f13eb1ed9a9aa273d3542b93c88384" - integrity sha512-4dMD5QRBkumn45oweR0SxoNtt15oz3BUBAQ8cIx7HJqZTtE8zjpM0My8aHJHVnyf4XfRg6DNzaE1080WLBiC1w== + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.14.9.tgz#fb21b1cf11650dcb8fcf4de2e6b3b8cf411da3f3" + integrity sha512-64RiH2ON4/y8qYtoa8rUiyam/tUVyGqRyNYhe+vCRGmjnV4bUlZvY+mwd0RrmLoCpJpdq3RsrNqKb7SJdw/4kw== dependencies: - core-js-pure "^3.15.0" + core-js-pure "^3.16.0" regenerator-runtime "^0.13.4" "@babel/runtime@7.12.1": @@ -1308,26 +1308,26 @@ "@babel/types" "^7.14.5" "@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.12.1", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8", "@babel/traverse@^7.6.0", "@babel/traverse@^7.7.0": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce" - integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg== + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.9.tgz#016126b331210bf06fff29d52971eef8383e556f" + integrity sha512-bldh6dtB49L8q9bUyB7bC20UKgU+EFDwKJylwl234Kv+ySZeMD31Xeht6URyueQ6LrRRpF2tmkfcZooZR9/e8g== dependencies: "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.8" + "@babel/generator" "^7.14.9" "@babel/helper-function-name" "^7.14.5" "@babel/helper-hoist-variables" "^7.14.5" "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.8" - "@babel/types" "^7.14.8" + "@babel/parser" "^7.14.9" + "@babel/types" "^7.14.9" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.0", "@babel/types@^7.7.0": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728" - integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q== +"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.6", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.14.9", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.6.0", "@babel/types@^7.7.0": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.9.tgz#f2b19c3f2f77c5708d67fe8f6046e9cea2b5036d" + integrity sha512-u0bLTnv3DFHeaQLYzb7oRJ1JHr1sv/SYDM7JSqHFFLwXG1wTZRughxFI5NCP8qBEo1rVVsn7Yg2Lvw49nne/Ow== dependencies: - "@babel/helper-validator-identifier" "^7.14.8" + "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -2190,9 +2190,9 @@ integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== "@types/node@*", "@types/node@>=6": - version "16.4.8" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.8.tgz#ef4974f47524448428542365db2fe7b638f928e5" - integrity sha512-VL7RZyCpfYEmbyd3/Eq5RNYhZt7yoL1JThZQ3KzimzhLya2Qa86U1ZZmioNWAAjiz99z1ED1xF9NUV2srvfVrA== + version "16.4.10" + resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.10.tgz#e57e2a54fc6da58da94b3571b1cb456d39f88597" + integrity sha512-TmVHsm43br64js9BqHWqiDZA+xMtbUpI1MBIA0EyiBmoV9pcEYFOSdj5fr6enZNfh4fChh+AGOLIzGwJnkshyQ== "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -4354,7 +4354,7 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40= -core-js-compat@^3.14.0, core-js-compat@^3.15.0, core-js-compat@^3.6.2: +core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.2: version "3.16.0" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.0.tgz#fced4a0a534e7e02f7e084bff66c701f8281805f" integrity sha512-5D9sPHCdewoUK7pSUPfTF7ZhLh8k9/CoJXWUEo+F1dZT5Z1DVgcuRqUKhjeKW+YLb8f21rTFgWwQJiNw1hoZ5Q== @@ -4362,7 +4362,7 @@ core-js-compat@^3.14.0, core-js-compat@^3.15.0, core-js-compat@^3.6.2: browserslist "^4.16.6" semver "7.0.0" -core-js-pure@^3.15.0: +core-js-pure@^3.16.0: version "3.16.0" resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.16.0.tgz#218e07add3f1844e53fab195c47871fc5ba18de8" integrity sha512-wzlhZNepF/QA9yvx3ePDgNGudU5KDB8lu/TRPKelYA/QtSnkS/cLl2W+TIdEX1FAFcBr0YpY7tPDlcmXJ7AyiQ== From bf068b78d7a6837c4b97c4e59fc12adb1aba9c47 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Sun, 1 Aug 2021 16:08:58 -0600 Subject: [PATCH 21/54] fix(hasura): fix dir paths (#643) * fix(hasura): fix dir paths * fix(hapi): correct grammar in messages * fix(hasura): fix dir paths --- .github/workflows/push-master-environment.yaml | 1 - .github/workflows/push-staging-environment.yaml | 1 - docker-compose.yml | 2 ++ hapi/src/libs/add-bps-info.js | 4 ++-- hapi/src/libs/sync-bps.js | 2 +- hapi/src/libs/sync-proxies.js | 2 +- hapi/src/libs/sync-ratings.js | 2 +- hapi/src/libs/sync-stats.js | 2 +- hasura/Dockerfile | 3 +++ hasura/config.yaml | 1 - hasura/makefile | 10 ++++++---- webapp/yarn.lock | 10 +++++----- 12 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.github/workflows/push-master-environment.yaml b/.github/workflows/push-master-environment.yaml index 8669a98b..5b6ded13 100644 --- a/.github/workflows/push-master-environment.yaml +++ b/.github/workflows/push-master-environment.yaml @@ -93,7 +93,6 @@ jobs: HAPI_EOS_API_ENDPOINT: https://jungle3.cryptolions.io # hasura HASURA_GRAPHQL_DATABASE_URL: ${{ secrets.HASURA_GRAPHQL_DATABASE_URL }} - HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations HASURA_GRAPHQL_ADMIN_SECRET: ${{ secrets.HASURA_GRAPHQL_ADMIN_SECRET }} HASURA_GRAPHQL_UNAUTHORIZED_ROLE: ${{ secrets.HASURA_GRAPHQL_UNAUTHORIZED_ROLE }} HASURA_GRAPHQL_ACTION_BASE_URL: http://hapi:9090 diff --git a/.github/workflows/push-staging-environment.yaml b/.github/workflows/push-staging-environment.yaml index a96dd544..259d9385 100644 --- a/.github/workflows/push-staging-environment.yaml +++ b/.github/workflows/push-staging-environment.yaml @@ -94,7 +94,6 @@ jobs: HAPI_EOS_API_ENDPOINT: https://jungle3.cryptolions.io # hasura HASURA_GRAPHQL_DATABASE_URL: ${{ secrets.HASURA_GRAPHQL_DATABASE_URL }} - HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations HASURA_GRAPHQL_ADMIN_SECRET: ${{ secrets.HASURA_GRAPHQL_ADMIN_SECRET }} HASURA_GRAPHQL_UNAUTHORIZED_ROLE: ${{ secrets.HASURA_GRAPHQL_UNAUTHORIZED_ROLE }} HASURA_GRAPHQL_ACTION_BASE_URL: http://hapi:9090 diff --git a/docker-compose.yml b/docker-compose.yml index ae9e16f0..4615108f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -89,6 +89,7 @@ services: HASURA_GRAPHQL_DATABASE_URL: "${HASURA_GRAPHQL_DATABASE_URL}" HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations HASURA_GRAPHQL_METADATA_DIR: /hasura-metadata + HASURA_GRAPHQL_SEEDS_DIR: /hasura-seeds HASURA_GRAPHQL_ACTION_BASE_URL: "${HASURA_GRAPHQL_ACTION_BASE_URL}" HASURA_GRAPHQL_ENABLE_CONSOLE: "true" # Local Development Configurations It is recommended to disable this in production @@ -101,6 +102,7 @@ services: volumes: - ./hasura/migrations:/hasura-migrations - ./hasura/metadata:/hasura-metadata + - ./hasura/seeds:/hasura-seeds webapp: container_name: eosrate_webapp diff --git a/hapi/src/libs/add-bps-info.js b/hapi/src/libs/add-bps-info.js index 4ed72806..fa5680f4 100644 --- a/hapi/src/libs/add-bps-info.js +++ b/hapi/src/libs/add-bps-info.js @@ -376,7 +376,7 @@ const updateBps = async () => { jungleBPinfo.forEach(async (bpInfo) => { try { const dbResult = await db.producers.save(bpInfo) - console.log(`Save of ${bpInfo.owner} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + console.log(`Save of ${bpInfo.owner} was ${dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL'}`) } catch(err) { console.log(`Error: ${err}`) } }) @@ -384,7 +384,7 @@ const updateBps = async () => { mainnetBPinfo.forEach(async (bpInfo) => { try { const dbResult = await db.producers.save(bpInfo) - console.log(`Save of ${bpInfo.owner} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + console.log(`Save of ${bpInfo.owner} was ${dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL'}`) } catch(err) { console.log(`Error: ${err}`) } }) }; diff --git a/hapi/src/libs/sync-bps.js b/hapi/src/libs/sync-bps.js index 315d1915..eb1432eb 100644 --- a/hapi/src/libs/sync-bps.js +++ b/hapi/src/libs/sync-bps.js @@ -83,7 +83,7 @@ const updateBlockProducersData = async () => { try { const saveBPResult = await db.producers.save(bpData) const dbResult = saveBPResult ? saveBPResult : await db.producers.insert(bpData) - console.log(`Save or insert of ${owner} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + console.log(`Save or insert of ${owner} was ${dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL'}`) } catch (err) { console.log(`Error: ${err}`) } }) } diff --git a/hapi/src/libs/sync-proxies.js b/hapi/src/libs/sync-proxies.js index 7e92ddbd..152cc6c5 100644 --- a/hapi/src/libs/sync-proxies.js +++ b/hapi/src/libs/sync-proxies.js @@ -43,7 +43,7 @@ const getProxiesData = async () => { try { const resultProxySave = await db.proxies.save(proxy) const dbResult = resultProxySave ? resultProxySave : await db.proxies.insert(proxy) - console.log(`Save or insert of ${proxy.owner} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + console.log(`Save or insert of ${proxy.owner} was ${dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL'}`) } catch (err) { console.log(`Error: ${err}`) } } else console.log(`${proxy.owner} is not a proxy`) }) diff --git a/hapi/src/libs/sync-ratings.js b/hapi/src/libs/sync-ratings.js index bc0eda9f..a319afbf 100644 --- a/hapi/src/libs/sync-ratings.js +++ b/hapi/src/libs/sync-ratings.js @@ -50,7 +50,7 @@ const updateUserRatings = async () => { try { const resultRatingsSave = await db.user_ratings.save(ratingsCore) const dbResult = resultRatingsSave ? resultRatingsSave : await db.user_ratings.insert(ratingsCore) - console.log(`Save or insert of ${ratingsCore.uniq_rating} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + console.log(`Save or insert of ${ratingsCore.uniq_rating} was ${dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL'}`) } catch (err) { console.log(`Error: ${err}`) } }) }; diff --git a/hapi/src/libs/sync-stats.js b/hapi/src/libs/sync-stats.js index 7c4b8bc6..88c78d32 100644 --- a/hapi/src/libs/sync-stats.js +++ b/hapi/src/libs/sync-stats.js @@ -37,7 +37,7 @@ const updateRatingsStats = async () => { try { const resultRatingStatsSave = await db.ratings_stats.save(rating) const dbResult = resultRatingStatsSave ? resultRatingStatsSave : await db.ratings_stats.insert(rating) - console.log(`Save or insert of ${rating.bp} was ${dbResult ? 'SUCCESSFULLY' : 'UNSUCCESSFULLY'}`) + console.log(`Save or insert of ${rating.bp} was ${dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL'}`) } catch (err) { console.log(`Error: ${err}`) } }) } diff --git a/hasura/Dockerfile b/hasura/Dockerfile index a9b6c11e..9d4a9daf 100644 --- a/hasura/Dockerfile +++ b/hasura/Dockerfile @@ -2,15 +2,18 @@ FROM hasura/graphql-engine:v2.0.3.cli-migrations-v2 ARG hasura_graphql_migrations_dir ARG hasura_graphql_metadata_dir +ARG hasura_graphql_seeds_dir ENV HASURA_GRAPHQL_MIGRATIONS_DIR $hasura_graphql_migrations_dir ENV HASURA_GRAPHQL_METADATA_DIR $hasura_graphql_metadata_dir +ENV HASURA_GRAPHQL_SEEDS_DIR $hasura_graphql_seeds_dir ENV PORT_HASURA 8080 EXPOSE $PORT_HASURA COPY migrations $HASURA_GRAPHQL_MIGRATIONS_DIR COPY metadata $HASURA_GRAPHQL_METADATA_DIR +COPY seeds $HASURA_GRAPHQL_SEEDS_DIR CMD graphql-engine \ serve \ diff --git a/hasura/config.yaml b/hasura/config.yaml index 3d5c67ad..0ba1ae4f 100644 --- a/hasura/config.yaml +++ b/hasura/config.yaml @@ -5,7 +5,6 @@ api_paths: v2_query: v2/query v1_metadata: v1/metadata graphql: v1/graphql - config: v1alpha1/config pg_dump: v1alpha1/pg_dump version: v1/version metadata_directory: metadata diff --git a/hasura/makefile b/hasura/makefile index e5e748c8..a2300fa6 100644 --- a/hasura/makefile +++ b/hasura/makefile @@ -19,8 +19,9 @@ build-docker: ##@devops Build the docker image build-docker: ./Dockerfile @docker pull $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) || true @docker build \ - --build-arg hasura_graphql_migrations_dir=/hasura-migrations \ - --build-arg hasura_graphql_metadata_dir=/hasura-metadata \ + --build-arg hasura_graphql_migrations_dir=hasura-migrations \ + --build-arg hasura_graphql_metadata_dir=hasura-metadata \ + --build-arg hasura_graphql_metadata_dir=hasura-seeds \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ . @@ -32,8 +33,9 @@ pull-image: build-docker-cached: ##@devops Build the docker image using cached layers build-docker-cached: ./Dockerfile @docker build \ - --build-arg hasura_graphql_migrations_dir=/hasura-migrations \ - --build-arg hasura_graphql_metadata_dir=/hasura-metadata \ + --build-arg hasura_graphql_migrations_dir=hasura-migrations \ + --build-arg hasura_graphql_metadata_dir=hasura-metadata \ + --build-arg hasura_graphql_metadata_dir=hasura-seeds \ --cache-from $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 6914434a..c5870e07 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -8232,9 +8232,9 @@ js-yaml@^3.13.1: esprima "^4.0.0" jsdom@^16.4.0: - version "16.6.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac" - integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg== + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== dependencies: abab "^2.0.5" acorn "^8.2.4" @@ -8261,7 +8261,7 @@ jsdom@^16.4.0: whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" whatwg-url "^8.5.0" - ws "^7.4.5" + ws "^7.4.6" xml-name-validator "^3.0.0" jsesc@^2.5.1: @@ -14179,7 +14179,7 @@ write@1.0.3: dependencies: mkdirp "^0.5.1" -"ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.4.3, ws@^7.4.5: +"ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.4.3, ws@^7.4.6: version "7.5.3" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== From 6d60f082ed2042f7d2e606f380643b674bec3da5 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Sun, 1 Aug 2021 16:27:20 -0600 Subject: [PATCH 22/54] Fix/hasura directories (#644) * fix(hasura): fix dir paths * fix(hapi): correct grammar in messages * fix(hasura): fix dir paths * fix(hasura): build arguments --- hasura/makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hasura/makefile b/hasura/makefile index a2300fa6..08ee0b4c 100644 --- a/hasura/makefile +++ b/hasura/makefile @@ -21,7 +21,7 @@ build-docker: ./Dockerfile @docker build \ --build-arg hasura_graphql_migrations_dir=hasura-migrations \ --build-arg hasura_graphql_metadata_dir=hasura-metadata \ - --build-arg hasura_graphql_metadata_dir=hasura-seeds \ + --build-arg hasura_graphql_seeds_dir=hasura-seeds \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ . @@ -35,7 +35,7 @@ build-docker-cached: ./Dockerfile @docker build \ --build-arg hasura_graphql_migrations_dir=hasura-migrations \ --build-arg hasura_graphql_metadata_dir=hasura-metadata \ - --build-arg hasura_graphql_metadata_dir=hasura-seeds \ + --build-arg hasura_graphql_seeds_dir=hasura-seeds \ --cache-from $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ From f229afe070242845c7e3dbc4c30f4aaeab225410 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Sun, 1 Aug 2021 18:38:00 -0600 Subject: [PATCH 23/54] add hasura seeds directory (#645) * fix(hasura): fix dir paths * fix(hapi): correct grammar in messages * fix(hasura): fix dir paths * fix(hasura): build arguments * fix(hasura): add empty seeds dir --- hasura/seeds/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 hasura/seeds/.gitkeep diff --git a/hasura/seeds/.gitkeep b/hasura/seeds/.gitkeep new file mode 100644 index 00000000..e69de29b From 32b13217b96dd6b25da3bb44cde4b0baba81829b Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Sun, 1 Aug 2021 18:56:15 -0600 Subject: [PATCH 24/54] Fix/hasura directories (#646) * fix(hasura): fix dir paths * fix(hapi): correct grammar in messages * fix(hasura): fix dir paths * fix(hasura): build arguments * fix(hasura): add empty seeds dir * fix(hasura): remove migrations dir env var --- kubernetes/configmaps.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/kubernetes/configmaps.yaml b/kubernetes/configmaps.yaml index c2cbf94a..b520733e 100644 --- a/kubernetes/configmaps.yaml +++ b/kubernetes/configmaps.yaml @@ -33,7 +33,6 @@ metadata: data: # hasura HASURA_GRAPHQL_DATABASE_URL: "${HASURA_GRAPHQL_DATABASE_URL}" - HASURA_GRAPHQL_MIGRATIONS_DIR: "${HASURA_GRAPHQL_MIGRATIONS_DIR}" HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}" HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "${HASURA_GRAPHQL_UNAUTHORIZED_ROLE}" HASURA_GRAPHQL_ACTION_BASE_URL: "${HASURA_GRAPHQL_ACTION_BASE_URL}" From 1e16ea335d3101f87cf0e80e460723906f199e10 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Sun, 1 Aug 2021 19:23:40 -0600 Subject: [PATCH 25/54] Fix/hasura directories (#647) * fix(hasura): fix dir paths * fix(hapi): correct grammar in messages * fix(hasura): fix dir paths * fix(hasura): build arguments * fix(hasura): add empty seeds dir * fix(hasura): remove migrations dir env var * fix(hasura): fix directory paths config --- docker-compose.yml | 2 +- hasura/Dockerfile | 2 +- hasura/config.yaml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 4615108f..445bb435 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -79,7 +79,7 @@ services: hasura: container_name: eosrate_hasura - image: hasura/graphql-engine:v2.0.3.cli-migrations-v3 + image: hasura/graphql-engine:v2.0.4.cli-migrations-v3 ports: - "8080:8080" depends_on: diff --git a/hasura/Dockerfile b/hasura/Dockerfile index 9d4a9daf..265ebc6e 100644 --- a/hasura/Dockerfile +++ b/hasura/Dockerfile @@ -1,4 +1,4 @@ -FROM hasura/graphql-engine:v2.0.3.cli-migrations-v2 +FROM hasura/graphql-engine:v2.0.4.cli-migrations-v2 ARG hasura_graphql_migrations_dir ARG hasura_graphql_metadata_dir diff --git a/hasura/config.yaml b/hasura/config.yaml index 0ba1ae4f..f6060e13 100644 --- a/hasura/config.yaml +++ b/hasura/config.yaml @@ -7,9 +7,9 @@ api_paths: graphql: v1/graphql pg_dump: v1alpha1/pg_dump version: v1/version -metadata_directory: metadata -migrations_directory: migrations -seeds_directory: seeds +metadata_directory: hasura-metadata +migrations_directory: hasura-migrations +seeds_directory: hasura-seeds actions: kind: synchronous handler_webhook_baseurl: http://localhost:3000 From 64aad7f9427b6eeea74b7313e8e30e1c80560a09 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Sun, 1 Aug 2021 19:47:03 -0600 Subject: [PATCH 26/54] Fix/hasura directories (#648) * fix(hasura): fix dir paths * fix(hapi): correct grammar in messages * fix(hasura): fix dir paths * fix(hasura): build arguments * fix(hasura): add empty seeds dir * fix(hasura): remove migrations dir env var * fix(hasura): fix directory paths config * fix(hasura): rename directories * fix(hasura): fix directory paths config * fix(hasura): fix directory paths config --- docker-compose.yml | 14 +++++++------- hasura/config.yaml | 6 +++--- hasura/makefile | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 445bb435..38adaab3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -83,13 +83,13 @@ services: ports: - "8080:8080" depends_on: - - "postgres" + - postgres restart: always environment: HASURA_GRAPHQL_DATABASE_URL: "${HASURA_GRAPHQL_DATABASE_URL}" - HASURA_GRAPHQL_MIGRATIONS_DIR: /hasura-migrations - HASURA_GRAPHQL_METADATA_DIR: /hasura-metadata - HASURA_GRAPHQL_SEEDS_DIR: /hasura-seeds + HASURA_GRAPHQL_MIGRATIONS_DIR: /migrations + HASURA_GRAPHQL_METADATA_DIR: /metadata + HASURA_GRAPHQL_SEEDS_DIR: /seeds HASURA_GRAPHQL_ACTION_BASE_URL: "${HASURA_GRAPHQL_ACTION_BASE_URL}" HASURA_GRAPHQL_ENABLE_CONSOLE: "true" # Local Development Configurations It is recommended to disable this in production @@ -100,9 +100,9 @@ services: # HASURA_GRAPHQL_ADMIN_SECRET: "${HASURA_GRAPHQL_ADMIN_SECRET}" # HASURA_GRAPHQL_UNAUTHORIZED_ROLE: "${HASURA_GRAPHQL_UNAUTHORIZED_ROLE}" volumes: - - ./hasura/migrations:/hasura-migrations - - ./hasura/metadata:/hasura-metadata - - ./hasura/seeds:/hasura-seeds + - ./hasura/migrations:/migrations + - ./hasura/metadata:/metadata + - ./hasura/seeds:/seeds webapp: container_name: eosrate_webapp diff --git a/hasura/config.yaml b/hasura/config.yaml index f6060e13..0ba1ae4f 100644 --- a/hasura/config.yaml +++ b/hasura/config.yaml @@ -7,9 +7,9 @@ api_paths: graphql: v1/graphql pg_dump: v1alpha1/pg_dump version: v1/version -metadata_directory: hasura-metadata -migrations_directory: hasura-migrations -seeds_directory: hasura-seeds +metadata_directory: metadata +migrations_directory: migrations +seeds_directory: seeds actions: kind: synchronous handler_webhook_baseurl: http://localhost:3000 diff --git a/hasura/makefile b/hasura/makefile index 08ee0b4c..c19fff1b 100644 --- a/hasura/makefile +++ b/hasura/makefile @@ -19,9 +19,9 @@ build-docker: ##@devops Build the docker image build-docker: ./Dockerfile @docker pull $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) || true @docker build \ - --build-arg hasura_graphql_migrations_dir=hasura-migrations \ - --build-arg hasura_graphql_metadata_dir=hasura-metadata \ - --build-arg hasura_graphql_seeds_dir=hasura-seeds \ + --build-arg hasura_graphql_migrations_dir=migrations \ + --build-arg hasura_graphql_metadata_dir=metadata \ + --build-arg hasura_graphql_seeds_dir=seeds \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ . @@ -33,9 +33,9 @@ pull-image: build-docker-cached: ##@devops Build the docker image using cached layers build-docker-cached: ./Dockerfile @docker build \ - --build-arg hasura_graphql_migrations_dir=hasura-migrations \ - --build-arg hasura_graphql_metadata_dir=hasura-metadata \ - --build-arg hasura_graphql_seeds_dir=hasura-seeds \ + --build-arg hasura_graphql_migrations_dir=migrations \ + --build-arg hasura_graphql_metadata_dir=metadata \ + --build-arg hasura_graphql_seeds_dir=seeds \ --cache-from $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ From 5feb143504423def6e22bb4f724d62e32ada0c4c Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Sun, 1 Aug 2021 20:32:01 -0600 Subject: [PATCH 27/54] Fix/hasura directories (#649) * fix(hasura): fix dir paths * fix(hapi): correct grammar in messages * fix(hasura): fix dir paths * fix(hasura): build arguments * fix(hasura): add empty seeds dir * fix(hasura): remove migrations dir env var * fix(hasura): fix directory paths config * fix(hasura): rename directories * fix(hasura): fix directory paths config * fix(hasura): fix directory paths config * fix(hasura): update hasura config to v3 --- hasura/Dockerfile | 16 ++++------------ hasura/makefile | 6 ------ 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/hasura/Dockerfile b/hasura/Dockerfile index 265ebc6e..1583ee0d 100644 --- a/hasura/Dockerfile +++ b/hasura/Dockerfile @@ -1,20 +1,12 @@ -FROM hasura/graphql-engine:v2.0.4.cli-migrations-v2 +FROM hasura/graphql-engine:v2.0.4.cli-migrations-v3 -ARG hasura_graphql_migrations_dir -ARG hasura_graphql_metadata_dir -ARG hasura_graphql_seeds_dir - -ENV HASURA_GRAPHQL_MIGRATIONS_DIR $hasura_graphql_migrations_dir -ENV HASURA_GRAPHQL_METADATA_DIR $hasura_graphql_metadata_dir -ENV HASURA_GRAPHQL_SEEDS_DIR $hasura_graphql_seeds_dir +ENV HASURA_GRAPHQL_MIGRATIONS_DIR migrations +ENV HASURA_GRAPHQL_METADATA_DIR metadata +ENV HASURA_GRAPHQL_SEEDS_DIR seeds ENV PORT_HASURA 8080 EXPOSE $PORT_HASURA -COPY migrations $HASURA_GRAPHQL_MIGRATIONS_DIR -COPY metadata $HASURA_GRAPHQL_METADATA_DIR -COPY seeds $HASURA_GRAPHQL_SEEDS_DIR - CMD graphql-engine \ serve \ --database-url $HASURA_GRAPHQL_DATABASE_URL \ No newline at end of file diff --git a/hasura/makefile b/hasura/makefile index c19fff1b..80fcf706 100644 --- a/hasura/makefile +++ b/hasura/makefile @@ -19,9 +19,6 @@ build-docker: ##@devops Build the docker image build-docker: ./Dockerfile @docker pull $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) || true @docker build \ - --build-arg hasura_graphql_migrations_dir=migrations \ - --build-arg hasura_graphql_metadata_dir=metadata \ - --build-arg hasura_graphql_seeds_dir=seeds \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ . @@ -33,9 +30,6 @@ pull-image: build-docker-cached: ##@devops Build the docker image using cached layers build-docker-cached: ./Dockerfile @docker build \ - --build-arg hasura_graphql_migrations_dir=migrations \ - --build-arg hasura_graphql_metadata_dir=metadata \ - --build-arg hasura_graphql_seeds_dir=seeds \ --cache-from $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(VERSION) \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_HASURA):$(LATEST_TAG) \ From 4186b45395ad80b9dff8cc9d043d881d31c6877c Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Sun, 1 Aug 2021 21:07:52 -0600 Subject: [PATCH 28/54] Fix/hasura directories (#650) * fix(hasura): fix dir paths * fix(hapi): correct grammar in messages * fix(hasura): fix dir paths * fix(hasura): build arguments * fix(hasura): add empty seeds dir * fix(hasura): remove migrations dir env var * fix(hasura): fix directory paths config * fix(hasura): rename directories * fix(hasura): fix directory paths config * fix(hasura): fix directory paths config * fix(hasura): update hasura config to v3 * fix(devops): add hasura docker workdir * fix(devops): add hasura docker files --- hasura/Dockerfile | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/hasura/Dockerfile b/hasura/Dockerfile index 1583ee0d..0c8ae124 100644 --- a/hasura/Dockerfile +++ b/hasura/Dockerfile @@ -1,11 +1,15 @@ FROM hasura/graphql-engine:v2.0.4.cli-migrations-v3 -ENV HASURA_GRAPHQL_MIGRATIONS_DIR migrations -ENV HASURA_GRAPHQL_METADATA_DIR metadata -ENV HASURA_GRAPHQL_SEEDS_DIR seeds -ENV PORT_HASURA 8080 +ENV HASURA_GRAPHQL_MIGRATIONS_DIR /hasura-migrations +ENV HASURA_GRAPHQL_METADATA_DIR /hasura-metadata +ENV HASURA_GRAPHQL_SEEDS_DIR /hasura-seeds +ENV HASURA_PORT 8080 -EXPOSE $PORT_HASURA +COPY migrations $HASURA_GRAPHQL_MIGRATIONS_DIR +COPY metadata $HASURA_GRAPHQL_METADATA_DIR +COPY seeds $HASURA_GRAPHQL_SEEDS_DIR + +EXPOSE $HASURA_PORT CMD graphql-engine \ serve \ From 787b8d753a585a1614ecc102f37cf8f3face0ef7 Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Mon, 2 Aug 2021 10:09:13 -0600 Subject: [PATCH 29/54] chore(github):Update issue templates (#653) --- .github/ISSUE_TEMPLATE/bug_report.md | 38 +++++++++++++++++++++++ .github/ISSUE_TEMPLATE/feature_request.md | 20 ++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..dd84ea78 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,38 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. iOS] + - Browser [e.g. chrome, safari] + - Version [e.g. 22] + +**Smartphone (please complete the following information):** + - Device: [e.g. iPhone6] + - OS: [e.g. iOS8.1] + - Browser [e.g. stock browser, safari] + - Version [e.g. 22] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..bbcbbe7d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,20 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here. From bc38eeb08f401e40daab9567bb6ee97ef7b33ebe Mon Sep 17 00:00:00 2001 From: Leister Francisco Alvarez Campos Date: Tue, 3 Aug 2021 10:22:54 -0600 Subject: [PATCH 30/54] fix(login): remove unused login method (#654) --- webapp/src/routes/login-deprecated/index.js | 63 --------------------- 1 file changed, 63 deletions(-) delete mode 100644 webapp/src/routes/login-deprecated/index.js diff --git a/webapp/src/routes/login-deprecated/index.js b/webapp/src/routes/login-deprecated/index.js deleted file mode 100644 index 09956cf1..00000000 --- a/webapp/src/routes/login-deprecated/index.js +++ /dev/null @@ -1,63 +0,0 @@ -import React from 'react' -import * as yup from 'yup' -import { Redux } from 'redux-render' -import { Formik, Form } from 'formik' -import { useTranslation } from 'react-i18next' -import TextField from 'components/textField' -import Button from 'components/button' - -const validationSchema = (t) => - yup.object().shape({ - username: yup.string().required(t('loginValidationUsername')), - password: yup.string().required(t('loginValidationPassword')) - }) - -const Login = () => { - const { t } = useTranslation('translations') - return ( - null}> - {(_, dispatch) => ( - { - try { - await dispatch.session.login({ username, password }) - } catch (error) { - formActions.setSubmitting(false) - formActions.setErrors({ username: error.message }) - } - }} - > - {(form) => ( -
- - - - - - )} -
- )} - - ) -} - -export default Login From 7c26865c7614c52cd6de5ccc8f05cdf7ad21166d Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Tue, 3 Aug 2021 10:28:12 -0600 Subject: [PATCH 31/54] Create CODE_OF_CONDUCT.md (#652) * Create CODE_OF_CONDUCT.md * chore(docs): fix typo --- CODE_OF_CONDUCT.md | 128 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..a2ec0aa6 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,128 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +We as members, contributors, and leaders pledge to make participation in our +community a harassment-free experience for everyone, regardless of age, body +size, visible or invisible disability, ethnicity, sex characteristics, gender +identity and expression, level of experience, education, socio-economic status, +nationality, personal appearance, race, religion, or sexual identity +and orientation. + +We pledge to act and interact in ways that contribute to an open, welcoming, +diverse, inclusive, and healthy community. + +## Our Standards + +Examples of behavior that contributes to a positive environment for our +community include: + +* Demonstrating empathy and kindness toward other people +* Being respectful of differing opinions, viewpoints, and experiences +* Giving and gracefully accepting constructive feedback +* Accepting responsibility and apologizing to those affected by our mistakes, + and learning from the experience +* Focusing on what is best not just for us as individuals, but for the + overall community + +Examples of unacceptable behavior include: + +* The use of sexualized language or imagery, and sexual attention or + advances of any kind +* Trolling, insulting or derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or email + address, without their explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Enforcement Responsibilities + +Community leaders are responsible for clarifying and enforcing our standards of +acceptable behavior and will take appropriate and fair corrective action in +response to any behavior that they deem inappropriate, threatening, offensive, +or harmful. + +Community leaders have the right and responsibility to remove, edit, or reject +comments, commits, code, wiki edits, issues, and other contributions that are +not aligned to this Code of Conduct, and will communicate reasons for moderation +decisions when appropriate. + +## Scope + +This Code of Conduct applies within all community spaces, and also applies when +an individual is officially representing the community in public spaces. +Examples of representing our community include using an official e-mail address, +posting via an official social media account, or acting as an appointed +representative at an online or offline event. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported to the community leaders responsible for enforcement at +bp@eosio.cr. +All complaints will be reviewed and investigated promptly and fairly. + +All community leaders are obligated to respect the privacy and security of the +reporter of any incident. + +## Enforcement Guidelines + +Community leaders will follow these Community Impact Guidelines in determining +the consequences for any action they deem in violation of this Code of Conduct: + +### 1. Correction + +**Community Impact**: Use of inappropriate language or other behavior deemed +unprofessional or unwelcome in the community. + +**Consequence**: A private, written warning from community leaders, providing +clarity around the nature of the violation and an explanation of why the +behavior was inappropriate. A public apology may be requested. + +### 2. Warning + +**Community Impact**: A violation through a single incident or series +of actions. + +**Consequence**: A warning with consequences for continued behavior. No +interaction with the people involved, including unsolicited interaction with +those enforcing the Code of Conduct, for a specified period of time. This +includes avoiding interactions in community spaces as well as external channels +like social media. Violating these terms may lead to a temporary or +permanent ban. + +### 3. Temporary Ban + +**Community Impact**: A serious violation of community standards, including +sustained inappropriate behavior. + +**Consequence**: A temporary ban from any sort of interaction or public +communication with the community for a specified period of time. No public or +private interaction with the people involved, including unsolicited interaction +with those enforcing the Code of Conduct, is allowed during this period. +Violating these terms may lead to a permanent ban. + +### 4. Permanent Ban + +**Community Impact**: Demonstrating a pattern of violation of community +standards, including sustained inappropriate behavior, harassment of an +individual, or aggression toward or disparagement of classes of individuals. + +**Consequence**: A permanent ban from any sort of public interaction within +the community. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], +version 2.0, available at +https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. + +Community Impact Guidelines were inspired by [Mozilla's code of conduct +enforcement ladder](https://github.com/mozilla/diversity). + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see the FAQ at +https://www.contributor-covenant.org/faq. Translations are available at +https://www.contributor-covenant.org/translations. From 28e4fee46aca297ed0f66b34755b0da1f24d8362 Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Tue, 3 Aug 2021 12:06:56 -0600 Subject: [PATCH 32/54] Solved chart.js dimensions (#655) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * fix(backend): use envarioment variables * fix(backend): update .env.example variables * fix(backend): rename envarioment variables * fix(backend): minor change * fix(backend): update docker-compose * fix(backend): update .env.example values * fix(backend): refactor variables names * fix(backend): add config.yaml file and remove .gitignore from it * fix(backend): update cryptolions to jungle.eosio * fix(.env.example): update unauthorized role to anonymous * fix(push-enviroment): remove duplicated variable * fix(home page): fix show button vote * fix(design): Fix broken titles on card component * fix(conflicts) * delete(package) * refactor(design): change design on volting tool * fix(voting-tool): apply new design on this component * fix(radar-design): update use to react-chart2 library * fix(compare-graph-view): fix merge conflicts Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez Co-authored-by: Leister Francisco Alvarez Campos --- makefile | 16 ++++++------- webapp/src/components/card/index.js | 11 +++++++-- webapp/src/components/card/styles.js | 4 +--- .../compare-tool/compare-graph-view.js | 13 +++++++---- .../compare-tool/compare-slider-view.js | 15 +++++++++--- webapp/src/components/radar/index.js | 23 +++++++++++++++---- .../block-producers/block-producer-profile.js | 13 ++++++++++- .../block-producers/block-producer-rate.js | 9 ++++++++ webapp/src/routes/home/cover.js | 12 ++++++++-- webapp/src/routes/proxies/proxy-profile.js | 11 +++++++++ 10 files changed, 99 insertions(+), 28 deletions(-) diff --git a/makefile b/makefile index 79f16d45..988f1131 100644 --- a/makefile +++ b/makefile @@ -11,10 +11,10 @@ K8S_BUILD_DIR ?= ./build_k8s K8S_FILES := $(shell find ./kubernetes -name '*.yaml' | sed 's:./kubernetes/::g') stop: - @docker compose stop + @docker-compose stop clean: - @docker compose stop + @docker-compose stop @rm -rf db_data @rm -rf webapp/node_modules @rm -rf webapp/yarn.lock @@ -38,24 +38,24 @@ run: run-postgres: mkdir -p $(POSTGRES_DATA) - @docker compose up -d --build postgres + @docker-compose up -d --build postgres run-hapi: - @docker compose up -d --build hapi + @docker-compose up -d --build hapi @echo "done hapi" run-hasura: $(eval -include .env) @until \ - docker compose exec -T postgres pg_isready; \ + docker-compose exec -T postgres pg_isready; \ do echo "$(BLUE)hasura |$(RESET) waiting for postgres service"; \ sleep 5; done; @until \ curl -s -o /dev/null -w 'hapi status %{http_code}\n' http://localhost:9090/healthz; \ do echo "$(BLUE)hasura |$(RESET) waiting for hapi service"; \ sleep 5; done; - @docker compose stop hasura - @docker compose up -d --build hasura + @docker-compose stop hasura + @docker-compose up -d --build hasura @echo "done hasura" run-hasura-cli: @@ -77,7 +77,7 @@ run-webapp: @echo "done webapp" run-logs: - @docker compose logs -f hapi webapp + @docker-compose logs -f hapi webapp migrate: scripts/migrate.sh ./scripts/migrate.sh diff --git a/webapp/src/components/card/index.js b/webapp/src/components/card/index.js index 1ecacf11..9a6b788f 100644 --- a/webapp/src/components/card/index.js +++ b/webapp/src/components/card/index.js @@ -1,4 +1,4 @@ -import React, { useState, forwardRef } from 'react' +import React, { useState, forwardRef, useEffect } from 'react' import PropTypes from 'prop-types' import { makeStyles } from '@material-ui/styles' import { useTheme } from '@material-ui/core/styles' @@ -59,12 +59,18 @@ const CardData = ({ const classes = useStyles() const theme = useTheme() const isMobile = useMediaQuery(theme.breakpoints.only('xs')) + const isDesktop = useMediaQuery('(min-width:770px)') + const [sizes, setSizes] = useState() const handleTooltip = (e) => { setOpen(!open) e.preventDefault() } + useEffect(() => { + setSizes(isDesktop ? 400 : 240) + }, [isDesktop]) + return ( ({ justifyContent: 'space-between' }, radar: { - background: theme.palette.surface.light, - paddingBottom: theme.spacing(2) + background: theme.palette.surface.light }, avatar: { backgroundColor: theme.palette.surface.main @@ -55,7 +54,6 @@ export default (theme) => ({ justifyContent: 'flex-end', alignItems: 'center', width: '100%', - height: 25, padding: theme.spacing(0, 1) }, boxTitle: { diff --git a/webapp/src/components/compare-tool/compare-graph-view.js b/webapp/src/components/compare-tool/compare-graph-view.js index 6315bb52..36a9ffe6 100644 --- a/webapp/src/components/compare-tool/compare-graph-view.js +++ b/webapp/src/components/compare-tool/compare-graph-view.js @@ -1,4 +1,4 @@ -import React from 'react' +import React, { useState, useEffect } from 'react' import PropTypes from 'prop-types' import { makeStyles } from '@material-ui/core/styles' import Grid from '@material-ui/core/Grid' @@ -145,10 +145,13 @@ const CompareGraphView = ({ }) => { const { t } = useTranslation('translations') const classes = useStyles() - const isDesktop = useMediaQuery('(min-width:900px)', { - defaultMatches: false - }) + const isDesktop = useMediaQuery('(min-width:767px)') const mobileMedium = useMediaQuery('(min-height:711px)') + const [sizes, setSizes] = useState() + + useEffect(() => { + setSizes(isDesktop ? 400 : 240) + }, [isDesktop]) return ( @@ -171,6 +174,8 @@ const CompareGraphView = ({ style={{ padding: mobileMedium ? '15px 0 15px 0' : '0' }} > ({ ...data, diff --git a/webapp/src/components/compare-tool/compare-slider-view.js b/webapp/src/components/compare-tool/compare-slider-view.js index ecdbd310..c4d2b5ad 100644 --- a/webapp/src/components/compare-tool/compare-slider-view.js +++ b/webapp/src/components/compare-tool/compare-slider-view.js @@ -1,9 +1,10 @@ -import React from 'react' -import PropTypes from 'prop-types' +import React, { useState, useEffect } from 'react' import { makeStyles } from '@material-ui/core/styles' import Typography from '@material-ui/core/Typography' -import _get from 'lodash.get' +import { useMediaQuery } from '@material-ui/core' import { useTranslation } from 'react-i18next' +import PropTypes from 'prop-types' +import _get from 'lodash.get' import Radar from 'components/radar' @@ -20,6 +21,12 @@ const CompareSliderView = ({ }) => { const { t } = useTranslation('translations') const classes = useStyles() + const isDesktop = useMediaQuery('(min-width:767px)') + const [sizes, setSizes] = useState() + + useEffect(() => { + setSizes(isDesktop ? 400 : 240) + }, [isDesktop]) return (
@@ -37,6 +44,8 @@ const CompareSliderView = ({ return (
{ +const RadarData = ({ bpData, height, showLabel, width, ...props }) => { const { t } = useTranslation('translations') const labels = getRadarLabelName(t) + const [sizes, setSizes] = useState({ width: 240, height: 240 }) const bpValidData = bpData.datasets && bpData.datasets.length ? { ...bpData, labels } : { labels, datasets: [{ data: [0, 0, 0, 0, 0] }] } + useEffect(() => { + if (!width && !height) return + + setSizes({ width, height }) + }, [width, height]) + return ( { circular: true, lineWidth: 4 }, + suggestedMin: 1, + suggestedMax: 10, angleLines: { color: '#e5e5e5', lineWidth: 4 }, - pointLabels: { fontColor: '#443F5B', fontSize: 14 } + pointLabels: { fontColor: '#443F5B', fontSize: 20 } } }, layout: { @@ -82,7 +94,8 @@ const RadarData = ({ bpData, height, showLabel, ...props }) => { RadarData.propTypes = { bpData: PropTypes.object, - height: PropTypes.number, + height: PropTypes.any, + width: PropTypes.any, showLabel: PropTypes.bool } diff --git a/webapp/src/routes/block-producers/block-producer-profile.js b/webapp/src/routes/block-producers/block-producer-profile.js index 44ba1b99..e6f72bc2 100644 --- a/webapp/src/routes/block-producers/block-producer-profile.js +++ b/webapp/src/routes/block-producers/block-producer-profile.js @@ -1,4 +1,4 @@ -import React, { useEffect, forwardRef } from 'react' +import React, { useState, useEffect, forwardRef } from 'react' import PropTypes from 'prop-types' import { useDispatch, useSelector } from 'react-redux' import classNames from 'classnames' @@ -12,6 +12,7 @@ import Paper from '@material-ui/core/Paper' import { makeStyles } from '@material-ui/core/styles' import KeyboardArrowLeft from '@material-ui/icons/KeyboardArrowLeft' import AccountCircle from '@material-ui/icons/AccountCircle' +import { useMediaQuery } from '@material-ui/core' import Divider from '@material-ui/core/Divider' import _get from 'lodash.get' @@ -61,6 +62,8 @@ const BlockProducerProfile = ({ account, ...props }) => { const { t } = useTranslation('profile') const classes = useStyles() const dispatch = useDispatch() + const isDesktop = useMediaQuery('(min-width:767px)') + const [sizes, setSizes] = useState() const { list: blockProducers, producer } = useSelector( (state) => state.blockProducers ) @@ -77,6 +80,10 @@ const BlockProducerProfile = ({ account, ...props }) => { ) const webInfo = _get(producer, 'general_info', null) + useEffect(() => { + setSizes(isDesktop ? 400 : 240) + }, [isDesktop]) + useEffect(() => { const getData = async () => { !blockProducers.length && (await dispatch.blockProducers.getBPs()) @@ -153,6 +160,8 @@ const BlockProducerProfile = ({ account, ...props }) => { )} > { )} > { const accountName = _get(ual, 'activeUser.accountName', null) const bpData = _get(producer, 'data', {}) const [lastTransactionId, setLastTransactionId] = useState(undefined) + const isDesktop = useMediaQuery('(min-width:767px)') + const [sizes, setSizes] = useState() const handleStateChange = (parameter) => (event, value) => { setRatingState({ ...ratingState, [parameter]: value }) @@ -69,6 +72,10 @@ const BlockProducerRate = ({ account, ual }) => { const bPLogo = _get(producer, 'bpjson.org.branding.logo_256', null) + useEffect(() => { + setSizes(isDesktop ? 400 : 240) + }, [isDesktop]) + useEffect(() => { const getData = async () => { if (account) { @@ -372,6 +379,8 @@ const BlockProducerRate = ({ account, ual }) => { > { const { t } = useTranslation('home') const classes = useStyles() + const isDesktop = useMediaQuery('(min-width:767px)') + const [sizes, setSizes] = useState() + + useEffect(() => { + setSizes(isDesktop ? 400 : 240) + }, [isDesktop]) return ( @@ -61,7 +68,8 @@ const HomeCover = ({ blockProducer }) => {
{ const dispatch = useDispatch() const { proxy } = useSelector((state) => state.proxies) const [showMessage, setShowMessage] = useState(false) + const isDesktop = useMediaQuery('(min-width:767px)') + const [sizes, setSizes] = useState() const [ratingState, setRatingState] = useState({ processing: false, txError: null, @@ -122,6 +125,10 @@ const ProxyProfile = ({ account, ual, ...props }) => { getData() }, [account, accountName, setShowMessage]) + useEffect(() => { + setSizes(isDesktop ? 400 : 240) + }, [isDesktop]) + return ( @@ -187,6 +194,8 @@ const ProxyProfile = ({ account, ual, ...props }) => { )} > { )} > Date: Wed, 4 Aug 2021 14:43:41 -0600 Subject: [PATCH 33/54] Fix/warnings (#651) * fix(fade): rename fade by alpha * fix(createMuiTheme): solve deprecated use * fix(justify): solve deprecated * fix(warnings): fix warnings on front-end * feat(delete): delete console.log Co-authored-by: AngeloCG97 --- webapp/src/components/app-bar/index.js | 4 ++-- webapp/src/components/app-bar/styles.js | 6 +++--- .../src/components/compare-tool/compare-graph-view.js | 4 ++-- webapp/src/components/input-autocomplete/index.js | 5 ++++- webapp/src/config/theme.js | 4 ++-- .../routes/block-producers/block-producer-profile.js | 2 +- .../src/routes/block-producers/block-producer-rate.js | 10 +++++----- webapp/src/routes/block-producers/index.js | 4 ++-- webapp/src/routes/home/cover.js | 2 +- webapp/src/routes/home/index.js | 6 +++--- webapp/src/routes/proxies/index.js | 7 ++++++- webapp/src/routes/proxies/proxy-profile.js | 2 +- 12 files changed, 32 insertions(+), 24 deletions(-) diff --git a/webapp/src/components/app-bar/index.js b/webapp/src/components/app-bar/index.js index 41aa0f33..78b57d2c 100644 --- a/webapp/src/components/app-bar/index.js +++ b/webapp/src/components/app-bar/index.js @@ -12,7 +12,7 @@ import MenuIcon from '@material-ui/icons/Menu' import SearchIcon from '@material-ui/icons/Search' import Toolbar from '@material-ui/core/Toolbar' import Typography from '@material-ui/core/Typography' -import { fade } from '@material-ui/core/styles/colorManipulator' +import { alpha } from '@material-ui/core/styles' import { makeStyles } from '@material-ui/styles' import { Link } from '@reach/router' @@ -22,7 +22,7 @@ import LanguageSelect from 'components/language-select' import styles from './styles' -const useStyles = makeStyles((theme) => styles(theme, fade)) +const useStyles = makeStyles((theme) => styles(theme, alpha)) const MainTopBar = ({ isSearchOpen, diff --git a/webapp/src/components/app-bar/styles.js b/webapp/src/components/app-bar/styles.js index f9c47643..33c72b31 100644 --- a/webapp/src/components/app-bar/styles.js +++ b/webapp/src/components/app-bar/styles.js @@ -1,4 +1,4 @@ -export default (theme, fade) => ({ +export default (theme, alpha) => ({ root: { flexGrow: 1 }, @@ -32,9 +32,9 @@ export default (theme, fade) => ({ position: 'relative', flexGrow: 1, borderRadius: theme.shape.borderRadius, - backgroundColor: fade(theme.palette.common.white, 0.15), + backgroundColor: alpha(theme.palette.common.white, 0.15), '&:hover': { - backgroundColor: fade(theme.palette.common.white, 0.25) + backgroundColor: alpha(theme.palette.common.white, 0.25) }, marginRight: theme.spacing(2), marginLeft: 0, diff --git a/webapp/src/components/compare-tool/compare-graph-view.js b/webapp/src/components/compare-tool/compare-graph-view.js index 36a9ffe6..d14d4e0f 100644 --- a/webapp/src/components/compare-tool/compare-graph-view.js +++ b/webapp/src/components/compare-tool/compare-graph-view.js @@ -154,7 +154,7 @@ const CompareGraphView = ({ }, [isDesktop]) return ( - + @@ -167,7 +167,7 @@ const CompareGraphView = ({ - + { }, [list, proxies]) const renderInputComponent = (inputProps) => { - const { inputRef = () => {}, ref, ...other } = inputProps + const { inputRef = () => {}, ref, classes, ...other } = inputProps const { hideSearchIcon, isFocused } = props return ( @@ -76,6 +76,9 @@ const InputAutocomplete = ({ ...props }) => { input: classes.input } }} + classes={{ + root: classes.root + }} {...other} /> ) diff --git a/webapp/src/config/theme.js b/webapp/src/config/theme.js index 6f97322e..b7a085a3 100644 --- a/webapp/src/config/theme.js +++ b/webapp/src/config/theme.js @@ -1,6 +1,6 @@ -import { createMuiTheme } from '@material-ui/core/styles' +import { createTheme } from '@material-ui/core/styles' -const theme = createMuiTheme({ +const theme = createTheme({ typography: { useNextVariants: true }, diff --git a/webapp/src/routes/block-producers/block-producer-profile.js b/webapp/src/routes/block-producers/block-producer-profile.js index e6f72bc2..4b124873 100644 --- a/webapp/src/routes/block-producers/block-producer-profile.js +++ b/webapp/src/routes/block-producers/block-producer-profile.js @@ -98,7 +98,7 @@ const BlockProducerProfile = ({ account, ...props }) => { }, []) return ( - + diff --git a/webapp/src/routes/block-producers/block-producer-rate.js b/webapp/src/routes/block-producers/block-producer-rate.js index a5b22944..b3add216 100644 --- a/webapp/src/routes/block-producers/block-producer-rate.js +++ b/webapp/src/routes/block-producers/block-producer-rate.js @@ -221,7 +221,7 @@ const BlockProducerRate = ({ account, ual }) => { } return ( - + { {showMessage && ( @@ -401,7 +401,7 @@ const BlockProducerRate = ({ account, ual }) => { {showMessage && ( @@ -473,13 +473,13 @@ const BlockProducerRate = ({ account, ual }) => { Success! { {(shownList || []).map((blockProducer) => ( @@ -214,7 +214,7 @@ const AllBps = ({ ual }) => { ))} {selectedBPs && selectedBPs.length > 0 && ( - +
- +
{ {blockProducer && ( { {blockProducer && ( { { handleToggleSelected() }} /> - + {(shownList || []).map((proxy) => ( { }, [isDesktop]) return ( - + From 4f5a2886e369d9edfa2cf9b636989c5300d50d37 Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Fri, 6 Aug 2021 14:09:23 -0600 Subject: [PATCH 34/54] Update design to BP details page (#658) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * fix(backend): use envarioment variables * fix(backend): update .env.example variables * fix(backend): rename envarioment variables * fix(backend): minor change * fix(backend): update docker-compose * fix(backend): update .env.example values * fix(backend): refactor variables names * fix(backend): add config.yaml file and remove .gitignore from it * fix(backend): update cryptolions to jungle.eosio * fix(.env.example): update unauthorized role to anonymous * fix(push-enviroment): remove duplicated variable * fix(home page): fix show button vote * fix(design): Fix broken titles on card component * fix(conflicts) * delete(package) * refactor(design): change design on volting tool * fix(voting-tool): apply new design on this component * fix(radar-design): update use to react-chart2 library * fix(compare-graph-view): fix merge conflicts * fix(compare-graph-view): fix broken pagen when load page * refactor(block-producer-profile): update design * refactor(front-end): update bp profile design * fix(block-producer-profile.js): fix merge conflicts Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez Co-authored-by: Leister Francisco Alvarez Campos --- .../compare-tool/compare-graph-view.js | 4 +- webapp/src/language/en.json | 3 + webapp/src/language/es.json | 3 + .../block-producers/block-producer-profile.js | 176 +++---- .../general-information-profile.js | 480 ++++++++++-------- webapp/src/routes/block-producers/styles.js | 17 +- 6 files changed, 370 insertions(+), 313 deletions(-) diff --git a/webapp/src/components/compare-tool/compare-graph-view.js b/webapp/src/components/compare-tool/compare-graph-view.js index d14d4e0f..ca58fb25 100644 --- a/webapp/src/components/compare-tool/compare-graph-view.js +++ b/webapp/src/components/compare-tool/compare-graph-view.js @@ -194,7 +194,9 @@ const CompareGraphView = ({ }} > - {isProxy && {selected[0].name}} + {isProxy && selected.length > 0 && ( + {selected[0].name} + )} {!isProxy && ( { const classes = useStyles() const dispatch = useDispatch() const isDesktop = useMediaQuery('(min-width:767px)') + const isMobile = useMediaQuery('(max-width:768px)') const [sizes, setSizes] = useState() const { list: blockProducers, producer } = useSelector( (state) => state.blockProducers @@ -98,9 +96,9 @@ const BlockProducerProfile = ({ account, ...props }) => { }, []) return ( - + - + - - - - - - - - - {bPLogo ? ( - - - - ) : ( - - )} - - - - - - -
- - - - - - + + + {bPLogo ? ( + + + + ) : ( + + )} + + + + {!isMobile && ( + + + + + )} + + + + + +
+ ))} + className={classes.btnBP} + > + {t('buttonRate')} + + + + {isMobile && ( + + + + )} + + + + {isMobile && ( + + - + )} ) diff --git a/webapp/src/routes/block-producers/general-information-profile.js b/webapp/src/routes/block-producers/general-information-profile.js index 9fff07e9..1f258051 100644 --- a/webapp/src/routes/block-producers/general-information-profile.js +++ b/webapp/src/routes/block-producers/general-information-profile.js @@ -1,14 +1,12 @@ -import React, { forwardRef } from 'react' +import React from 'react' import PropTypes from 'prop-types' import classNames from 'classnames' import { useTranslation } from 'react-i18next' import countries from 'i18n-iso-countries' -import { Link } from '@reach/router' -import Button from '@material-ui/core/Button' import Grid from '@material-ui/core/Grid' import _get from 'lodash.get' import Typography from '@material-ui/core/Typography' - +import Box from '@material-ui/core/Box' import formatNumber from 'utils/formatNumber' import getAverageValue from 'utils/getAverageValue' @@ -32,7 +30,7 @@ const _getCountryName = (country = null, locationNumber, defaultMessage) => { return defaultMessage } -const SocialNetworks = ({ classes, overrideClass, producer }) => { +const SocialNetworks = ({ classes, producer }) => { const { t } = useTranslation('profile') const github = _get(producer, 'org.social.github') const twitter = _get(producer, 'org.social.twitter') @@ -41,114 +39,112 @@ const SocialNetworks = ({ classes, overrideClass, producer }) => { const instagram = _get(producer, 'org.social.instagram') return ( - - + + {t('social')} - {github && ( - - - GitHub: - - - + {github && ( + + + GitHub: + + - {github} - - - - )} - {twitter && ( - - - Twitter: - - - + {github} + + + + )} + {twitter && ( + + + Twitter: + + - {twitter} - - - - )} - {linkedin && ( - - - LinkedIn: - - - + {twitter} + + + + )} + {linkedin && ( + + + LinkedIn: + + - {linkedin} - - - - )} - {telegram && ( - - - Telegram: - - - + {linkedin} + + + + )} + {telegram && ( + + + Telegram: + + - {telegram} - - - - )} - {instagram && ( - - - Instagram: - - - + {telegram} + + + + )} + {instagram && ( + + + Instagram: + + - {instagram} - - - - )} + + {instagram} + + + + )} + ) } @@ -157,14 +153,16 @@ const WebsiteLegend = ({ classes, webInfo }) => { const { t } = useTranslation('profile') const content = webInfo ? ( - <> - + + {t('websiteInfo')}: - - {webInfo.websiteText} - - + + + {webInfo.websiteText} + + + ) : null return ( @@ -188,113 +186,166 @@ const GeneralInformation = ({ classes, producer = {} }) => { return ( <> - + {t('generalInformation')} - - - {t('account')}: - - - {_get(producer, 'system.owner', '- -')} - - - - - {t('location')}: - - - {countryName} - - - - - {t('website')}: - - - {webpageURL ? ( - - {webpageURL} - - ) : ( - '- -' - )} - - + + + + {t('account')}: + + + {_get(producer, 'system.owner', '- -')} + + + + + {t('location')}: + + + {countryName} + + + + + {t('website')}: + + + {webpageURL ? ( + + {webpageURL} + + ) : ( + '- -' + )} + + + + + {t('votes')}: + + + {formatNumber(parseFloat(totalVotes), 0)} + + + - - - - {t('rankings')} - - - - {t('votes')}: - - - {formatNumber(parseFloat(totalVotes), 0)} - - - - - {t('rates')}: - - - {_get(producer, 'ratings_cntr', null) || 0} - + + + + + {t('eosRates')} + + + + + + {t('rates')}: + + + {_get(producer, 'ratings_cntr', null) || 0} + + + + + + + {t('average')}: + + + {getAverageValue(_get(producer, 'average', 0))} + + + - - - {t('average')}: - - - {getAverageValue(_get(producer, 'average', 0))} - + + + + {t('edenRates')} + + + + + + {t('rates')}: + + + {_get(producer, 'ratings_cntr', null) || 0} + + + + + + + {t('average')}: + + + {getAverageValue(_get(producer, 'average', 0))} + + + - - - - + + + + {t('tatolRates')} + + + + + + {t('rates')}: + + + {_get(producer, 'ratings_cntr', null) || 0} + + + + + + + {t('average')}: + + + {getAverageValue(_get(producer, 'average', 0))} + + + @@ -303,7 +354,6 @@ const GeneralInformation = ({ classes, producer = {} }) => { SocialNetworks.propTypes = { classes: PropTypes.object, - overrideClass: PropTypes.any, producer: PropTypes.oneOfType([PropTypes.object, PropTypes.bool]) } diff --git a/webapp/src/routes/block-producers/styles.js b/webapp/src/routes/block-producers/styles.js index 73e43319..3c02aa39 100644 --- a/webapp/src/routes/block-producers/styles.js +++ b/webapp/src/routes/block-producers/styles.js @@ -118,7 +118,7 @@ export default (theme) => ({ fontWeight: 500 }, category: { - marginTop: theme.spacing(1) + marginTop: theme.spacing(5) }, breadcrumbText: { color: '#fff', @@ -228,5 +228,20 @@ export default (theme) => ({ paperAnchor: { right: '0', overflowY: 'initial' + }, + reliefGrid: { + margin: '0 30px 30px 30px', + padding: '20px', + border: '1px solid #f8f8f', + borderRadius: '6px', + boxShadow: + 'inset 2px 2px 2px #fff, inset -1px -3px 2px rgba(0,0,0,.1), 1px 1px 3px rgba(0,0,0,.1)', + backgroundColor: '#fff' + }, + marginLeftBox: { + marginLeft: '11px', + [theme.breakpoints.down('md')]: { + marginLeft: '11px' + } } }) From e509e8d832282dc820dcc59e910e3951d5537cea Mon Sep 17 00:00:00 2001 From: Xavier <5632966+xavier506@users.noreply.github.com> Date: Sun, 8 Aug 2021 13:12:32 -0600 Subject: [PATCH 35/54] fix(devops): Docker image names not specific enough for public repsitory (#666) --- utils/meta.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/meta.mk b/utils/meta.mk index c03204ca..76de15f5 100644 --- a/utils/meta.mk +++ b/utils/meta.mk @@ -3,9 +3,9 @@ VERSION ?= $(shell git rev-parse --short HEAD) CURRENT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) -IMAGE_NAME_WEBAPP=webapp -IMAGE_NAME_HAPI=hapi -IMAGE_NAME_HASURA=hasura +IMAGE_NAME_WEBAPP=eosrate-webapp +IMAGE_NAME_HAPI=eosrate-hapi +IMAGE_NAME_HASURA=eosrate-hasura DOCKER_REGISTRY=eoscostarica506 SUBDIRS = webapp hapi hasura From 5ec30d6d2efe5baa70902903221d44193b326999 Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Tue, 10 Aug 2021 12:05:27 -0600 Subject: [PATCH 36/54] Update design to proxies details page (#663) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * fix(backend): use envarioment variables * fix(backend): update .env.example variables * fix(backend): rename envarioment variables * fix(backend): minor change * fix(backend): update docker-compose * fix(backend): update .env.example values * fix(backend): refactor variables names * fix(backend): add config.yaml file and remove .gitignore from it * fix(backend): update cryptolions to jungle.eosio * fix(.env.example): update unauthorized role to anonymous * fix(push-enviroment): remove duplicated variable * fix(home page): fix show button vote * fix(design): Fix broken titles on card component * fix(conflicts) * delete(package) * refactor(design): change design on volting tool * fix(voting-tool): apply new design on this component * fix(radar-design): update use to react-chart2 library * fix(compare-graph-view): fix merge conflicts * fix(compare-graph-view): fix broken pagen when load page * refactor(block-producer-profile): update design * refactor(front-end): update bp profile design * fix(block-producer-profile.js): fix merge conflicts * refactor(front-end): update proxies profile design * refactor(front-end): update proxies profile design * fix(proxy-profile): align design on all dimensions Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez Co-authored-by: Leister Francisco Alvarez Campos --- webapp/src/routes/block-producers/styles.js | 2 +- .../proxies/general-information-profile.js | 28 +- webapp/src/routes/proxies/proxy-profile.js | 296 ++++++++---------- webapp/src/routes/proxies/styles.js | 9 + 4 files changed, 152 insertions(+), 183 deletions(-) diff --git a/webapp/src/routes/block-producers/styles.js b/webapp/src/routes/block-producers/styles.js index 3c02aa39..a8c575a3 100644 --- a/webapp/src/routes/block-producers/styles.js +++ b/webapp/src/routes/block-producers/styles.js @@ -235,7 +235,7 @@ export default (theme) => ({ border: '1px solid #f8f8f', borderRadius: '6px', boxShadow: - 'inset 2px 2px 2px #fff, inset -1px -3px 2px rgba(0,0,0,.1), 1px 1px 3px rgba(0,0,0,.1)', + 'inset 2px 2px 2px #fff, inset -1px 0 2px rgba(0,0,0,.1), 1px 1px 3px rgba(0,0,0,.1)', backgroundColor: '#fff' }, marginLeftBox: { diff --git a/webapp/src/routes/proxies/general-information-profile.js b/webapp/src/routes/proxies/general-information-profile.js index 3adb75b9..c83ddc9d 100644 --- a/webapp/src/routes/proxies/general-information-profile.js +++ b/webapp/src/routes/proxies/general-information-profile.js @@ -2,14 +2,13 @@ import React from 'react' import PropTypes from 'prop-types' import classNames from 'classnames' import { useTranslation } from 'react-i18next' -import Button from '@material-ui/core/Button' import Grid from '@material-ui/core/Grid' import _get from 'lodash.get' import Typography from '@material-ui/core/Typography' import formatNumber from 'utils/formatNumber' -const SocialNetworks = ({ classes, overrideClass, proxy }) => { +const SocialNetworks = ({ classes, proxy }) => { const { t } = useTranslation('profile') const steemit = _get(proxy, 'steemit') const twitter = _get(proxy, 'twitter') @@ -18,11 +17,7 @@ const SocialNetworks = ({ classes, overrideClass, proxy }) => { if (!steemit && !twitter && !telegram) return null return ( - + {t('social')} @@ -90,7 +85,7 @@ const SocialNetworks = ({ classes, overrideClass, proxy }) => { ) } -const GeneralInformation = ({ classes, proxy = {}, onClick, disabled }) => { +const GeneralInformation = ({ classes, proxy = {} }) => { const { t } = useTranslation('profile') const webpageURL = _get(proxy, 'website') const totalVotes = _get(proxy, 'totalVoteEOS') || 0 @@ -164,7 +159,6 @@ const GeneralInformation = ({ classes, proxy = {}, onClick, disabled }) => { )} - {t('rankings')} @@ -192,32 +186,18 @@ const GeneralInformation = ({ classes, proxy = {}, onClick, disabled }) => { - - - - - ) } SocialNetworks.propTypes = { classes: PropTypes.object, - overrideClass: PropTypes.any, proxy: PropTypes.oneOfType([PropTypes.object, PropTypes.bool]) } GeneralInformation.propTypes = { classes: PropTypes.object, - proxy: PropTypes.oneOfType([PropTypes.object, PropTypes.bool]), - onClick: PropTypes.func, - disabled: PropTypes.bool + proxy: PropTypes.oneOfType([PropTypes.object, PropTypes.bool]) } export { SocialNetworks, GeneralInformation } diff --git a/webapp/src/routes/proxies/proxy-profile.js b/webapp/src/routes/proxies/proxy-profile.js index fe654805..f1e02457 100644 --- a/webapp/src/routes/proxies/proxy-profile.js +++ b/webapp/src/routes/proxies/proxy-profile.js @@ -11,13 +11,11 @@ import CircularProgress from '@material-ui/core/CircularProgress' import Avatar from '@material-ui/core/Avatar' import Button from '@material-ui/core/Button' import Grid from '@material-ui/core/Grid' -import { useMediaQuery } from '@material-ui/core' +import { Box, useMediaQuery } from '@material-ui/core' import Typography from '@material-ui/core/Typography' -import Paper from '@material-ui/core/Paper' import { makeStyles } from '@material-ui/core/styles' import KeyboardArrowLeft from '@material-ui/icons/KeyboardArrowLeft' import AccountCircle from '@material-ui/icons/AccountCircle' -import Divider from '@material-ui/core/Divider' import _get from 'lodash.get' import TitlePage from 'components/title-page' @@ -39,6 +37,7 @@ const ProxyProfile = ({ account, ual, ...props }) => { const { proxy } = useSelector((state) => state.proxies) const [showMessage, setShowMessage] = useState(false) const isDesktop = useMediaQuery('(min-width:767px)') + const isMobile = useMediaQuery('(max-width:768px)') const [sizes, setSizes] = useState() const [ratingState, setRatingState] = useState({ processing: false, @@ -145,165 +144,146 @@ const ProxyProfile = ({ account, ual, ...props }) => { - - - - - - - - - {logo ? ( - - - - ) : ( - - )} - - {ProxyTitle} - - - {slogan && ( - -
- {slogan} -
- - )} - - - + + + + {logo ? ( + + + + ) : ( + + )} + + {ProxyTitle} + + + {slogan && ( + +
{slogan}
+ + )} + + {isMobile && ( + + + -
- - + + + + )} + + + + {showMessage && ( + + + + } + color='secondary' + label={t('voteWithoutLogin')} + variant='outlined' + /> + )} + {ratingState.txError && ( + + + + } + color='secondary' + label={ratingState.txError} + variant='outlined' + /> + )} + {ratingState.txSuccess && ( + + + + } + color='secondary' + label='Success!' + variant='outlined' + /> + )} + {ratingState.processing && ( +
+ + - - - -
- {showMessage && ( - - - - } - color='secondary' - label={t('voteWithoutLogin')} - variant='outlined' - /> - )} - {ratingState.txError && ( - - - - } - color='secondary' - label={ratingState.txError} - variant='outlined' - /> - )} - {ratingState.txSuccess && ( - - - - } - color='secondary' - label='Success!' - variant='outlined' - /> - )} - {ratingState.processing && ( -
- - - {t('voting')} ... - -
- )} -
- - - - - - - - - - - - -
+ {t('voting')} ... + +
+ )} + + + + {!isMobile && ( + + + + + + + - + )} + + {proxy && Boolean(producers.length) && ( + console.log('remove')} + className={classes.compareTool} + list={[proxy]} + selected={[account]} + isProxy + useOnlySliderView + optionalLabel={`${ProxyTitle} ${t('labelTool')}:`} + /> + )} + - {proxy && Boolean(producers.length) && ( - console.log('remove')} - className={classes.compareTool} - list={[proxy]} - selected={[account]} - isProxy - useOnlySliderView - optionalLabel={`${ProxyTitle} ${t('labelTool')}:`} - /> - )} ) } diff --git a/webapp/src/routes/proxies/styles.js b/webapp/src/routes/proxies/styles.js index b5b3da53..c9c10659 100644 --- a/webapp/src/routes/proxies/styles.js +++ b/webapp/src/routes/proxies/styles.js @@ -160,5 +160,14 @@ export default (theme) => ({ fontStyle: 'italic', '&:before': { content: 'open-quote' }, '&:after': { content: 'close-quote' } + }, + reliefGrid: { + margin: '0 30px 30px 30px', + padding: '20px', + border: '1px solid #f8f8f', + borderRadius: '6px', + boxShadow: + 'inset 2px 2px 2px #fff, inset -1px 0 2px rgba(0,0,0,.1), 1px 1px 3px rgba(0,0,0,.1)', + backgroundColor: '#fff' } }) From 59b75f00f877840f9c8d910415125f3bfed09be6 Mon Sep 17 00:00:00 2001 From: Leister Francisco Alvarez Campos Date: Wed, 11 Aug 2021 11:00:46 -0700 Subject: [PATCH 37/54] refactor(smart-contract): update contract to eden clsdk interpretation (#668) * refactor(smart-contract): update contract to eden clsdk interpretation * refactor(ricardian-conntract): reformat ricardian contract to clsdk interpretation --- contracts/rateproducer/CMakeLists.txt | 27 + .../rateproducer/include/rateproducer.hpp | 403 +++++---- ....clauses.md => rateproducer-ricardian.cpp} | 65 +- .../ricardian/rateproducer.contracts.md | 34 - contracts/rateproducer/src/rateproducer.cpp | 786 +++++++++--------- 5 files changed, 695 insertions(+), 620 deletions(-) create mode 100644 contracts/rateproducer/CMakeLists.txt rename contracts/rateproducer/ricardian/{rateproducer.clauses.md => rateproducer-ricardian.cpp} (71%) delete mode 100644 contracts/rateproducer/ricardian/rateproducer.contracts.md diff --git a/contracts/rateproducer/CMakeLists.txt b/contracts/rateproducer/CMakeLists.txt new file mode 100644 index 00000000..596c5afc --- /dev/null +++ b/contracts/rateproducer/CMakeLists.txt @@ -0,0 +1,27 @@ +cmake_minimum_required(VERSION 3.16) +project(demo) + + +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_CXX_STANDARD_REQUIRED ON) + + +find_package(clsdk REQUIRED) + + +add_executable(rateproducer src/rateproducer.cpp) +target_link_libraries(rateproducer eosio-contract-simple-malloc) + + +add_executable(rateproducer-abigen src/rateproducer.cpp) +target_link_libraries(rateproducer-abigen eosio-contract-abigen) +add_custom_command(TARGET rateproducer-abigen POST_BUILD + COMMAND cltester rateproducer-abigen.wasm >rateproducer.abi +) + + +execute_process(COMMAND ln -sf ${clsdk_DIR} ${CMAKE_CURRENT_BINARY_DIR}/clsdk) +execute_process(COMMAND ln -sf ${WASI_SDK_PREFIX} ${CMAKE_CURRENT_BINARY_DIR}/wasi-sdk) + + +set(CMAKE_EXPORT_COMPILE_COMMANDS on) \ No newline at end of file diff --git a/contracts/rateproducer/include/rateproducer.hpp b/contracts/rateproducer/include/rateproducer.hpp index 5d3037f6..1f86ab43 100644 --- a/contracts/rateproducer/include/rateproducer.hpp +++ b/contracts/rateproducer/include/rateproducer.hpp @@ -1,3 +1,5 @@ +#pragma once + /* * @file * @author (C) 2020 by eoscostarica [ https://eoscostarica.io ] @@ -11,6 +13,7 @@ * GitHub: https://github.com/eoscostarica/eos-rate * */ + #include #include #include @@ -27,7 +30,7 @@ using namespace std; using namespace eosio; -using eosio::public_key; +using eosio::public_key; /* * this namespace is used to map producer_info and voter_info tables @@ -35,7 +38,7 @@ using eosio::public_key; * get_voters, get_proxy, is_active_proxy relay on these tables. * this approaches came from this thread : * https://eosio.stackexchange.com/questions/4676/check-within-smart-contract-if-an-account-is-a-proxy -*/ +*/ namespace eosio { constexpr name system_account{"eosio"_n}; @@ -151,14 +154,89 @@ namespace eosio { auto it = _voters.find(name.value); return it != _voters.end() && it->is_proxy; } - } // namespace eosio +namespace eoscostarica { + extern const char* rate_ricardian; + extern const char* erase_ricardian; + extern const char* wipe_ricardian; + extern const char* rminactive_ricardian; + extern const char* rmrate_ricardian; + + extern const char* datastorage_clause; + extern const char* datausage_clause; + extern const char* dataownership_clause; + extern const char* datadistribution_clause; + extern const char* datafuture_clause; + + /* + * Stores the rate average stats for a block producer + */ + struct stats { + name bp; + uint32_t ratings_cntr; + float average; + float transparency; + float infrastructure; + float trustiness; + float development; + float community; + uint64_t primary_key() const { return bp.value; } + }; + EOSIO_REFLECT( + stats, + bp, + ratings_cntr, + average, + transparency, + infrastructure, + trustiness, + development, + community + ) + typedef eosio::multi_index<"stats"_n, stats > _stats; -CONTRACT rateproducer : public contract { - public: - using contract::contract; - + /* + * Stores the rate vote for a block producer + */ + struct ratings { + uint64_t id; + uint128_t uniq_rating; + name user; + name bp; + float transparency; + float infrastructure; + float trustiness; + float development; + float community; + uint64_t primary_key() const { return id; } + uint128_t by_uniq_rating() const { return uniq_rating; } + uint64_t by_user() const { return user.value; } + uint64_t by_bp() const { return bp.value; } + }; + EOSIO_REFLECT( + ratings, + id, + uniq_rating, + user, + bp, + transparency, + infrastructure, + trustiness, + development, + community + ) + typedef eosio::multi_index<"ratings"_n, ratings, + indexed_by<"uniqrating"_n, const_mem_fun>, + indexed_by<"user"_n, const_mem_fun>, + indexed_by<"bp"_n, const_mem_fun> + > _ratings; + + struct rateproducer : public eosio::contract { + // Use the base class constructors + using eosio::contract::contract; + + /** * * Saves the info related with a sponsor within a community @@ -177,8 +255,8 @@ CONTRACT rateproducer : public contract { * @memo the account especific in user parameter is the ram payor * @memo user account must voted for at least 21 blockproducer * or vote for a proxy with at least 21 votes - */ - ACTION rate( + */ + void rate( name user, name bp, int8_t transparency, @@ -186,182 +264,145 @@ CONTRACT rateproducer : public contract { int8_t trustiness, int8_t community, int8_t development); + + /** + * + * Stores the rate stats within stats table + * for a specific block producer + * + * @param user - Voter account name, + * @param bp_name - Block Producer account name + * @param transparency - Rate for transparency category + * @param infrastructure - Rate for infrastructure category + * @param trustiness - Rate for trustiness category + * @param community - Rate for community category + * @param development - Rate for development category + * + * @memo this function is called for the first-time rate made + * by the tuple {user,bp} + * + */ + void save_bp_stats ( + name user, + name bp_name, + float transparency, + float infrastructure, + float trustiness, + float community, + float development); + + /** + * + * Calculates the value for all categories + * for a specified block producer, this fucntion + * iterates on ratings table + * + * @param bp_name - Block Producer account name + * @param transparency - Calculated value for transparency category + * @param infrastructure - Calculated value for infrastructure category + * @param trustiness - Calculated value for trustiness category + * @param community - Calculated value for community category + * @param development - Calculated value for development category + * @param ratings_cntr - Calculated value for rates counter + * @param average - Calculated average for categories + * + * @memo zero values are ignored, see the unit test script test_averaje.js + * in order to learn more details about the average calculation + * + * @memo variables transparency, infrastructure, trustiness, community + * development, ratings_cntr, average are passed by reference + * + * @return calculated values for: transparency, infrastructure, trustiness, community + * development, ratings_cntr + */ + void calculate_bp_stats ( + name bp_name, + float * transparency, + float * infrastructure, + float * trustiness, + float * community, + float * development, + uint32_t * ratings_cntr, + float * average); + + /** + * + * Updates the stats table, with the new + * categories values for a specific block producer + * + * @param user - Voter account name, + * @param bp_name - Block Producer account name + * @param transparency - Rate for transparency category + * @param infrastructure - Rate for infrastructure category + * @param trustiness - Rate for trustiness category + * @param community - Rate for community category + * @param development - Rate for development category + * + */ + void update_bp_stats ( + name * user, + name * bp_name, + float * transparency, + float * infrastructure, + float * trustiness, + float * community, + float * development, + uint32_t * ratings_cntr, + float * average); + + /** + * + * Erase all data related for a specific block producer + * + * @param bp_name - Block Producer account name + * + */ + void erase(name bp_name); - /** - * - * Stores the rate stats within stats table - * for a specific block producer - * - * @param user - Voter account name, - * @param bp_name - Block Producer account name - * @param transparency - Rate for transparency category - * @param infrastructure - Rate for infrastructure category - * @param trustiness - Rate for trustiness category - * @param community - Rate for community category - * @param development - Rate for development category - * - * @memo this function is called for the first-time rate made - * by the tuple {user,bp} - * - */ - void save_bp_stats ( - name user, - name bp_name, - float transparency, - float infrastructure, - float trustiness, - float community, - float development); - - /** - * - * Calculates the value for all categories - * for a specified block producer, this fucntion - * iterates on ratings table - * - * @param bp_name - Block Producer account name - * @param transparency - Calculated value for transparency category - * @param infrastructure - Calculated value for infrastructure category - * @param trustiness - Calculated value for trustiness category - * @param community - Calculated value for community category - * @param development - Calculated value for development category - * @param ratings_cntr - Calculated value for rates counter - * @param average - Calculated average for categories - * - * @memo zero values are ignored, see the unit test script test_averaje.js - * in order to learn more details about the average calculation - * - * @memo variables transparency, infrastructure, trustiness, community - * development, ratings_cntr, average are passed by reference - * - * @return calculated values for: transparency, infrastructure, trustiness, community - * development, ratings_cntr - */ - void calculate_bp_stats ( - name bp_name, - float * transparency, - float * infrastructure, - float * trustiness, - float * community, - float * development, - uint32_t * ratings_cntr, - float * average); - - /** - * - * Updates the stats table, with the new - * categories values for a specific block producer - * - * @param user - Voter account name, - * @param bp_name - Block Producer account name - * @param transparency - Rate for transparency category - * @param infrastructure - Rate for infrastructure category - * @param trustiness - Rate for trustiness category - * @param community - Rate for community category - * @param development - Rate for development category - * - */ - void update_bp_stats ( - name * user, - name * bp_name, - float * transparency, - float * infrastructure, - float * trustiness, - float * community, - float * development, - uint32_t * ratings_cntr, - float * average); - - /** - * - * Erase all data related for a specific block producer - * - * @param bp_name - Block Producer account name - * - */ - ACTION erase(name bp_name); - - - /** - * - * Erase all data related for a set of block producer - * - * @param bps_to_clean - List of Block Producer accounts - * - */ - void erase_bp_info(std::set * bps_to_clean); - - - /** - * - * Clean all data store within the tables - * - */ - ACTION wipe(); - - /** - * - * Erase all data for inactive block producers - * - */ - ACTION rminactive(); - - /** - * - * Erase a rate made for a specific account - * to a specific block producer - * - * @param user - Voter account name, - * @param bp - Block Producer account name - * - */ - - ACTION rmrate(name user, name bp); + /** + * + * Erase all data related for a set of block producer + * + * @param bps_to_clean - List of Block Producer accounts + * + */ + void erase_bp_info(std::set * bps_to_clean); - private: - /* - * Stores the rate average stats for a block producer - */ - TABLE stats { - name bp; - uint32_t ratings_cntr; - float average; - float transparency; - float infrastructure; - float trustiness; - float development; - float community; - uint64_t primary_key() const { return bp.value; } - }; - typedef eosio::multi_index<"stats"_n, stats > _stats; + /** + * + * Clean all data store within the tables + * + */ + void wipe(); + + /** + * + * Erase all data for inactive block producers + * + */ + void rminactive(); - /* - * Stores the rate vote for a block producer - */ - TABLE ratings { - uint64_t id; - uint128_t uniq_rating; - name user; - name bp; - float transparency; - float infrastructure; - float trustiness; - float development; - float community; - uint64_t primary_key() const { return id; } - uint128_t by_uniq_rating() const { return uniq_rating; } - uint64_t by_user() const { return user.value; } - uint64_t by_bp() const { return bp.value; } + /** + * + * Erase a rate made for a specific account + * to a specific block producer + * + * @param user - Voter account name, + * @param bp - Block Producer account name + * + */ + + void rmrate(name user, name bp); }; - typedef eosio::multi_index<"ratings"_n, ratings, - indexed_by<"uniqrating"_n, const_mem_fun>, - indexed_by<"user"_n, const_mem_fun>, - indexed_by<"bp"_n, const_mem_fun> - > _ratings; - -}; - -EOSIO_DISPATCH(rateproducer,(rate)(erase)(wipe)(rminactive)(rmrate)); \ No newline at end of file + EOSIO_ACTIONS(rateproducer, + "rateproducer"_n, + action(rate, user, bp, transparency, infrastructure, trustiness, community, development), + action(erase, bp_name), + action(wipe), + action(rminactive), + action(rmrate, user, bp)) + +} // namespace eoscostarica \ No newline at end of file diff --git a/contracts/rateproducer/ricardian/rateproducer.clauses.md b/contracts/rateproducer/ricardian/rateproducer-ricardian.cpp similarity index 71% rename from contracts/rateproducer/ricardian/rateproducer.clauses.md rename to contracts/rateproducer/ricardian/rateproducer-ricardian.cpp index 25820344..9aaa4b26 100644 --- a/contracts/rateproducer/ricardian/rateproducer.clauses.md +++ b/contracts/rateproducer/ricardian/rateproducer-ricardian.cpp @@ -1,37 +1,70 @@ -

Data Storage

---- +#include "../include/rateproducer.hpp" + + +// CONTRACTS +const char* eoscostarica::rate_ricardian = R"( +spec-version: 0.1.0 +title: Rate a block producer +summary: The intent of the `{{ rate }}` action is to allow the `issuer` account to rate a blockproducer into five categories: Community, Development, Infraestructure, Transparency, Trustiness. +)"; + +const char* eoscostarica::erase_ricardian = R"( +spec-version: 0.1.0 +title: Erase Block Producer Stats +summary: The intent of the `{{ erase }}` action is to provide a ways to clear all data related with a specific block producer. +)"; + +const char* eoscostarica::wipe_ricardian = R"( +spec-version: 0.1.0 +title: Wipe all contract's tables +summary: The intent of the `{{ wipe }}` action is to provide a way to release the stored data within the contract. +)"; + +const char* eoscostarica::rminactive_ricardian = R"( +spec-version: 0.1.0 +title: Erase innactive Block Producer +summary: The intent of the `{{ rminactive }}` action is to provide a method to purge stats related with inactive block producers. +)"; + +const char* eoscostarica::rmrate_ricardian = R"( +spec-version: 0.1.0 +title: Remove a especific rate +summary: The intent of the `{{ rmrate }}` action is remove a rate made from an especific account. +)"; + + +// CLAUSES +const char* eoscostarica::datastorage_clause = R"( spec-version: 0.1.0 title: General Data Storage summary: The rateproducer application values the security of personal data. We may process only minimal user data as much as it is necessary to maintain the rateproducer application running. We only receive and store any information you knowingly provide to us when you create an account, or fill using the app. +)"; -

Data Usage

---- +const char* eoscostarica::datausage_clause = R"( spec-version: 0.1.0 title: General Data Use summary: This smart contract will process user data to keep the rateproducer application running. Any of the information we collect from you may be used for these purposes: - Create and manage user accounts. - Run and operate the rateproducer application. - -

Data Ownership

---- +)"; + +const char* eoscostarica::dataownership_clause = R"( spec-version: 0.1.0 title: Data Ownership summary: The user of this smart contract verifies that the smart contract owns the data and that it can use the data in accordance with the terms defined in the Ricardian contract. You can delete certain personal information you shared with the rateproducer application. When you delete personal information, we may maintain a copy of the unrevised personal information in our records for the duration necessary to comply with our obligations to our affiliates and partners, and for the purposes described below. If you would like to delete your personal information or permanently delete your account, you can do so on your account's profile page in the rateproducer application. -We will retain and use your personal information for the period necessary to comply with our legal obligations, resolve disputes, and enforce our agreements unless a more extended retention period is required or permitted by law. We may use any aggregated data derived from or incorporating your personal information after you update or delete it, but not in a manner that would identify you personally. Once the retention period expires, personal information shall be deleted. -Data Distribution +We will retain and use your personal information for the period necessary to comply with our legal obligations, resolve disputes, and enforce our agreements unless a more extended retention period is required or permitted by law. We may use any aggregated data derived from or incorporating your personal information after you update or delete it, but not in a manner that would identify you personally. Once the retention period expires, personal information shall be deleted. +)"; - -

Data Distribution

---- +const char* eoscostarica::datadistribution_clause = R"( spec-version: 0.1.0 title: Data Distribution summary: The smart contract promises not actively to share or distribute the address data. The smart contract user understands that data stored in a multi-index table is not private and can be accessed by any user of the blockchain. Depending on your location, data transfers may involve transferring and storing your information in a country other than your own. Moreover, to keep rateproducer running, we must share necessary personal data such as your name with the authorized blood donation centers and sponsors. We do not store any information regarding your blood type, health conditions, or any other confidential information between you and the donation centers. +)"; -

Data Future

---- +const char* eoscostarica::datafuture_clause = R"( spec-version: 0.1.0 title: Data Future -summary: The smart contract promises to only use the data following the terms defined in the Ricardian contract, now and at all future dates. You may exercise certain rights regarding your information processed by us. In particular, you have the right to do the following: (i) you have the right to withdraw consent where you have previously given your consent to the processing of your information; (ii) you have the right to object to the processing of your information if the processing is carried out on a legal basis other than consent; (iii) you have the right to learn if information is being processed by us, obtain disclosure regarding certain aspects of the processing and obtain a copy of the information undergoing processing; (iv) you have the right to verify the accuracy of your information and ask for it to be updated or corrected; (v) you have the right, under certain circumstances, to restrict the processing of your information, in which case, we will not process your information for any purpose other than storing it; (vi) you have the right, under certain circumstances, to obtain the erasure of your Personal Information from us; (vii) you have the right to receive your information in a structured, commonly used and machine readable format and, if technically feasible, to have it transmitted to another controller without any hindrance. This provision is applicable provided that your information is processed by automated means and that the processing is based on your consent, on a contract you are part of or on pre-contractual obligations thereof - +summary: The smart contract promises to only use the data following the terms defined in the Ricardian contract, now and at all future dates. You may exercise certain rights regarding your information processed by us. In particular, you have the right to do the following: (i) you have the right to withdraw consent where you have previously given your consent to the processing of your information; (ii) you have the right to object to the processing of your information if the processing is carried out on a legal basis other than consent; (iii) you have the right to learn if information is being processed by us, obtain disclosure regarding certain aspects of the processing and obtain a copy of the information undergoing processing; (iv) you have the right to verify the accuracy of your information and ask for it to be updated or corrected; (v) you have the right, under certain circumstances, to restrict the processing of your information, in which case, we will not process your information for any purpose other than storing it; (vi) you have the right, under certain circumstances, to obtain the erasure of your Personal Information from us; (vii) you have the right to receive your information in a structured, commonly used and machine readable format and, if technically feasible, to have it transmitted to another controller without any hindrance. This provision is applicable provided that your information is processed by automated means and that the processing is based on your consent, on a contract you are part of or on pre-contractual obligations thereof. +)"; \ No newline at end of file diff --git a/contracts/rateproducer/ricardian/rateproducer.contracts.md b/contracts/rateproducer/ricardian/rateproducer.contracts.md deleted file mode 100644 index b69e4304..00000000 --- a/contracts/rateproducer/ricardian/rateproducer.contracts.md +++ /dev/null @@ -1,34 +0,0 @@ -

rate

---- -spec-version: 0.1.0 -title: Rate a block producer -summary: The intent of the `{{ rate }}` action is to allow the `issuer` account to rate a blockproducer into five categories: Community, Development, Infraestructure, Transparency, Trustiness . - - -

erase

---- -spec-version: 0.1.0 -title: Erase Block Producer Stats -summary: The intent of the `{{ erase }}` action is to provide a ways to clear all data related with a specific block producer. - - -

wipe

---- -spec-version: 0.1.0 -title: Wipe all contract's tables -summary: The intent of the `{{ wipe }}` action is to provide a way to release the stored data within the contract. - - -

rminactive

---- -spec-version: 0.1.0 -title: Erase innactive Block Producer -summary: The intent of the `{{ rminactive }}` action is to provide a method to purge stats related with inactive block producers. - - -

rmrate

---- -spec-version: 0.1.0 -title: Remove a especific rate -summary: The intent of the `{{ rmrate }}` action is remove a rate made from an especific account. - diff --git a/contracts/rateproducer/src/rateproducer.cpp b/contracts/rateproducer/src/rateproducer.cpp index 7d3892b3..4dd3f473 100644 --- a/contracts/rateproducer/src/rateproducer.cpp +++ b/contracts/rateproducer/src/rateproducer.cpp @@ -1,84 +1,93 @@ -#include - - -ACTION rateproducer::rate( - name user, - name bp, - int8_t transparency, - int8_t infrastructure, - int8_t trustiness, - int8_t community, - int8_t development) { - check( (transparency+infrastructure+trustiness+community+development), "Error vote must have value for at least one category"); - check( (MINVAL<= transparency && transparency<=MAXVAL ), "Error transparency value out of range"); - check( (MINVAL<= infrastructure && infrastructure<=MAXVAL ), "Error infrastructure value out of range" ); - check( (MINVAL<= trustiness && trustiness<=MAXVAL ), "Error trustiness value out of range" ); - check( (MINVAL<= development && development <=MAXVAL ), "Error development value out of range" ); - check( (MINVAL<= community && community<=MAXVAL ), "Error community value out of range" ); - - //checks if the bp is active - check( is_blockproducer(bp), "votes are allowed only for registered block producers" ); - - eosio::name proxy_name = get_proxy(user); - if(proxy_name.length()) { - //active proxy?? - check(is_active_proxy(proxy_name), "votes are allowed only for active proxies" ); - //account votes through a proxy - check(!(MIN_VOTERS > get_voters(proxy_name)), "delegated proxy does not have enough voters" ); - } else { - // acount must vote for at least 21 bp - check(!(MIN_VOTERS > get_voters(user)), "account does not have enough voters" ); - } +#include "../include/rateproducer.hpp" + +namespace eoscostarica { + void rateproducer::rate( + name user, + name bp, + int8_t transparency, + int8_t infrastructure, + int8_t trustiness, + int8_t community, + int8_t development) { + check( (transparency+infrastructure+trustiness+community+development), "Error vote must have value for at least one category"); + check( (MINVAL<= transparency && transparency<=MAXVAL ), "Error transparency value out of range"); + check( (MINVAL<= infrastructure && infrastructure<=MAXVAL ), "Error infrastructure value out of range" ); + check( (MINVAL<= trustiness && trustiness<=MAXVAL ), "Error trustiness value out of range" ); + check( (MINVAL<= development && development <=MAXVAL ), "Error development value out of range" ); + check( (MINVAL<= community && community<=MAXVAL ), "Error community value out of range" ); + + //checks if the bp is active + check( is_blockproducer(bp), "votes are allowed only for registered block producers" ); + + eosio::name proxy_name = get_proxy(user); + if(proxy_name.length()) { + //active proxy?? + check(is_active_proxy(proxy_name), "votes are allowed only for active proxies" ); + //account votes through a proxy + check(!(MIN_VOTERS > get_voters(proxy_name)), "delegated proxy does not have enough voters" ); + } else { + // acount must vote for at least 21 bp + check(!(MIN_VOTERS > get_voters(user)), "account does not have enough voters" ); + } + + // upsert bp rating + _ratings bps(_self, _self.value); + auto uniq_rating = (static_cast(user.value) << 64) | bp.value; + + auto uniq_rating_index = bps.get_index(); + auto existing_rating = uniq_rating_index.find(uniq_rating); + + if( existing_rating == uniq_rating_index.end() ) { + bps.emplace(user, [&]( auto& row ) { + row.id = bps.available_primary_key(); + row.uniq_rating = uniq_rating; + row.user = user; + row.bp = bp; + row.transparency = transparency; + row.infrastructure = infrastructure; + row.trustiness = trustiness; + row.community = community; + row.development = development ; + }); + //save stats + save_bp_stats(user, + bp, + transparency, + infrastructure, + trustiness, + community, + development); - // upsert bp rating - _ratings bps(_self, _self.value); - auto uniq_rating = (static_cast(user.value) << 64) | bp.value; - - auto uniq_rating_index = bps.get_index(); - auto existing_rating = uniq_rating_index.find(uniq_rating); - - if( existing_rating == uniq_rating_index.end() ) { - bps.emplace(user, [&]( auto& row ) { - row.id = bps.available_primary_key(); - row.uniq_rating = uniq_rating; - row.user = user; - row.bp = bp; - row.transparency = transparency; - row.infrastructure = infrastructure; - row.trustiness = trustiness; - row.community = community; - row.development = development ; - }); - //save stats - save_bp_stats(user, - bp, - transparency, - infrastructure, - trustiness, - community, - development); - - - } else { - //the voter update its vote - uniq_rating_index.modify(existing_rating, user, [&]( auto& row ) { - row.user = user; - row.bp = bp; - row.transparency = transparency; - row.infrastructure = infrastructure; - row.trustiness = trustiness; - row.community = community; - row.development = development ; - }); - //update bp stats - float bp_transparency = 0; - float bp_infrastructure = 0; - float bp_trustiness = 0; - float bp_community = 0; - float bp_development = 0; - uint32_t bp_ratings_cntr = 0; - float bp_average = 0; - calculate_bp_stats (bp, + + } else { + //the voter update its vote + uniq_rating_index.modify(existing_rating, user, [&]( auto& row ) { + row.user = user; + row.bp = bp; + row.transparency = transparency; + row.infrastructure = infrastructure; + row.trustiness = trustiness; + row.community = community; + row.development = development ; + }); + //update bp stats + float bp_transparency = 0; + float bp_infrastructure = 0; + float bp_trustiness = 0; + float bp_community = 0; + float bp_development = 0; + uint32_t bp_ratings_cntr = 0; + float bp_average = 0; + calculate_bp_stats (bp, + &bp_transparency, + &bp_infrastructure, + &bp_trustiness, + &bp_community, + &bp_development, + &bp_ratings_cntr, + &bp_average); + update_bp_stats (&user, + &bp, &bp_transparency, &bp_infrastructure, &bp_trustiness, @@ -86,349 +95,351 @@ ACTION rateproducer::rate( &bp_development, &bp_ratings_cntr, &bp_average); - update_bp_stats (&user, - &bp, - &bp_transparency, - &bp_infrastructure, - &bp_trustiness, - &bp_community, - &bp_development, - &bp_ratings_cntr, - &bp_average); - } -} - -void rateproducer::save_bp_stats ( - name user, - name bp_name, - float transparency, - float infrastructure, - float trustiness, - float community, - float development) { - _stats bps_stats(_self, _self.value); - auto itr = bps_stats.find(bp_name.value); - float counter =0; - float sum = 0; - if(itr == bps_stats.end()) { - //new entry - bps_stats.emplace(user, [&]( auto& row ) { - if (transparency) { - row.transparency = transparency; - counter++; - sum += transparency; - } + } + } + + void rateproducer::save_bp_stats ( + name user, + name bp_name, + float transparency, + float infrastructure, + float trustiness, + float community, + float development) { + _stats bps_stats(_self, _self.value); + auto itr = bps_stats.find(bp_name.value); + float counter =0; + float sum = 0; + if(itr == bps_stats.end()) { + //new entry + bps_stats.emplace(user, [&]( auto& row ) { + if (transparency) { + row.transparency = transparency; + counter++; + sum += transparency; + } - if (infrastructure) { - row.infrastructure = infrastructure; - counter++; - sum += infrastructure; - } + if (infrastructure) { + row.infrastructure = infrastructure; + counter++; + sum += infrastructure; + } - if (trustiness) { - row.trustiness = trustiness; - counter++; - sum += trustiness; - } + if (trustiness) { + row.trustiness = trustiness; + counter++; + sum += trustiness; + } - if (development) { - row.development = development; - counter++; - sum += development; - } + if (development) { + row.development = development; + counter++; + sum += development; + } - if (community) { - row.community = community; - counter++; - sum += community; - } + if (community) { + row.community = community; + counter++; + sum += community; + } - if(counter) { - row.bp = bp_name; - row.ratings_cntr = 1; - row.average =sum/counter; - - } - }); - } else { - //update the entry - bps_stats.modify(itr,user, [&]( auto& row ) { - if (transparency) { - sum += transparency; - if(row.transparency) { - transparency = (transparency + row.transparency)/2; + if(counter) { + row.bp = bp_name; + row.ratings_cntr = 1; + row.average =sum/counter; + + } + }); + } else { + //update the entry + bps_stats.modify(itr,user, [&]( auto& row ) { + if (transparency) { + sum += transparency; + if(row.transparency) { + transparency = (transparency + row.transparency)/2; + } + row.transparency = transparency; + counter++; } - row.transparency = transparency; - counter++; - } - if (infrastructure) { - sum += infrastructure; - if(row.infrastructure) { - infrastructure = (infrastructure + row.infrastructure)/2; + if (infrastructure) { + sum += infrastructure; + if(row.infrastructure) { + infrastructure = (infrastructure + row.infrastructure)/2; + } + row.infrastructure = infrastructure; + counter++; } - row.infrastructure = infrastructure; - counter++; - } - if (trustiness) { - sum += trustiness; - if(row.trustiness) { - trustiness = (trustiness + row.trustiness) / 2; + if (trustiness) { + sum += trustiness; + if(row.trustiness) { + trustiness = (trustiness + row.trustiness) / 2; + } + row.trustiness = trustiness; + counter++; } - row.trustiness = trustiness; - counter++; - } - if (development) { - sum += development; - if(row.development) { - development = (development + row.development) / 2; + if (development) { + sum += development; + if(row.development) { + development = (development + row.development) / 2; + } + row.development = development; + counter++; } - row.development = development; - counter++; - } - if (community) { - sum += community; - if(row.community) { - community = (community + row.community) / 2; + if (community) { + sum += community; + if(row.community) { + community = (community + row.community) / 2; + } + row.community = community; + counter++; } - row.community = community; - counter++; - } - if(counter) { - row.ratings_cntr++; - row.average =( (sum/counter) + row.average ) / 2; - } - }); + if(counter) { + row.ratings_cntr++; + row.average =( (sum/counter) + row.average ) / 2; + } + }); + } } -} - -void rateproducer::calculate_bp_stats ( - name bp_name, - float * transparency, - float * infrastructure, - float * trustiness, - float * community, - float * development, - uint32_t * ratings_cntr, - float * average) { - - float category_counter = 0; - - float transparency_total = 0; - float infrastructure_total = 0; - float trustiness_total = 0; - float community_total = 0; - float development_total = 0; - - float transparency_cntr = 0; - float infrastructure_cntr = 0; - float trustiness_cntr = 0; - float community_cntr = 0; - float development_cntr = 0; - uint32_t voters_cntr = 0; - - _ratings bps(_self, _self.value); - auto bps_index = bps.get_index(); - auto bps_it = bps_index.find(bp_name.value); - - while(bps_it != bps_index.end()) { - if(bp_name == bps_it->bp) { - if(bps_it->transparency) { - transparency_total+=bps_it->transparency; - transparency_cntr++; - } - if(bps_it->infrastructure) { - infrastructure_total+=bps_it->infrastructure; - infrastructure_cntr++; - } + void rateproducer::calculate_bp_stats ( + name bp_name, + float * transparency, + float * infrastructure, + float * trustiness, + float * community, + float * development, + uint32_t * ratings_cntr, + float * average) { + + float category_counter = 0; + + float transparency_total = 0; + float infrastructure_total = 0; + float trustiness_total = 0; + float community_total = 0; + float development_total = 0; + + float transparency_cntr = 0; + float infrastructure_cntr = 0; + float trustiness_cntr = 0; + float community_cntr = 0; + float development_cntr = 0; + uint32_t voters_cntr = 0; + + _ratings bps(_self, _self.value); + auto bps_index = bps.get_index(); + auto bps_it = bps_index.find(bp_name.value); + + while(bps_it != bps_index.end()) { + if(bp_name == bps_it->bp) { + if(bps_it->transparency) { + transparency_total+=bps_it->transparency; + transparency_cntr++; + } - if(bps_it->trustiness) { - trustiness_total+=bps_it->trustiness; - trustiness_cntr++; - } + if(bps_it->infrastructure) { + infrastructure_total+=bps_it->infrastructure; + infrastructure_cntr++; + } - if(bps_it->community) { - community_total+=bps_it->community; - community_cntr++; - } + if(bps_it->trustiness) { + trustiness_total+=bps_it->trustiness; + trustiness_cntr++; + } - if(bps_it->development) { - development_total+=bps_it->development; - development_cntr++; + if(bps_it->community) { + community_total+=bps_it->community; + community_cntr++; + } + + if(bps_it->development) { + development_total+=bps_it->development; + development_cntr++; + } + voters_cntr++; } - voters_cntr++; + bps_it ++; } - bps_it ++; - } - - if(transparency_cntr) { - *transparency = transparency_total/transparency_cntr; - category_counter++; - } - - if(infrastructure_cntr) { - *infrastructure =infrastructure_total/infrastructure_cntr; - category_counter++; - } - if(trustiness_cntr) { - *trustiness = trustiness_total/trustiness_cntr; - category_counter++; - } + if(transparency_cntr) { + *transparency = transparency_total/transparency_cntr; + category_counter++; + } - if(community_cntr) { - *community = community_total/community_cntr; - category_counter++; + if(infrastructure_cntr) { + *infrastructure =infrastructure_total/infrastructure_cntr; + category_counter++; + } + + if(trustiness_cntr) { + *trustiness = trustiness_total/trustiness_cntr; + category_counter++; + } + + if(community_cntr) { + *community = community_total/community_cntr; + category_counter++; + } + + if(development_cntr) { + *development = development_total/development_cntr; + category_counter++; + } + *average = (*transparency + *infrastructure + *trustiness + *community +*development)/category_counter; + *ratings_cntr = voters_cntr; } + + void rateproducer::update_bp_stats ( + name * user, + name * bp_name, + float * transparency, + float * infrastructure, + float * trustiness, + float * community, + float * development, + uint32_t * ratings_cntr, + float * average) { - if(development_cntr) { - *development = development_total/development_cntr; - category_counter++; - } - *average = (*transparency + *infrastructure + *trustiness + *community +*development)/category_counter; - *ratings_cntr = voters_cntr; -} - -void rateproducer::update_bp_stats ( - name * user, - name * bp_name, - float * transparency, - float * infrastructure, - float * trustiness, - float * community, - float * development, - uint32_t * ratings_cntr, - float * average) { - - _stats bps_stats(_self, _self.value); - auto itr = bps_stats.find(bp_name->value); - if(itr != bps_stats.end()) { - //if rate categories are more than zero - // we store, otherwise remove the entry - if( *transparency + - *infrastructure + - *trustiness + - *community + - *development) { - - bps_stats.modify(itr,*user, [&]( auto& row ) { - row.transparency = *transparency; - row.infrastructure = *infrastructure; - row.trustiness = *trustiness; - row.development = *development; - row.community = *community; - row.ratings_cntr= *ratings_cntr; - row.average = *average; - }); - } else { - bps_stats.erase(itr); - } + _stats bps_stats(_self, _self.value); + auto itr = bps_stats.find(bp_name->value); + if(itr != bps_stats.end()) { + //if rate categories are more than zero + // we store, otherwise remove the entry + if( *transparency + + *infrastructure + + *trustiness + + *community + + *development) { + + bps_stats.modify(itr,*user, [&]( auto& row ) { + row.transparency = *transparency; + row.infrastructure = *infrastructure; + row.trustiness = *trustiness; + row.development = *development; + row.community = *community; + row.ratings_cntr= *ratings_cntr; + row.average = *average; + }); + } else { + bps_stats.erase(itr); + } + } } -} -ACTION rateproducer::erase(name bp_name) { - - require_auth(_self); + void rateproducer::erase(name bp_name) { + + require_auth(_self); - _ratings bps(_self, _self.value); - auto itr = bps.begin(); - while (itr != bps.end()) { - if(itr->bp == bp_name) { - itr = bps.erase(itr); - } else { - itr++; - } - } - - //clean the stats summary - _stats bps_stats(_self, _self.value); - auto itr_stats = bps_stats.find(bp_name.value); - if (itr_stats != bps_stats.end()) bps_stats.erase(itr_stats); -} - -void rateproducer::erase_bp_info(std::set * bps_to_clean){ - _ratings bps(_self, _self.value); - _stats bps_stats(_self, _self.value); - - std::set::iterator it; - for (it = bps_to_clean->begin(); it != bps_to_clean->end(); ++it) { - //clean all ratings related to an bp + _ratings bps(_self, _self.value); auto itr = bps.begin(); while (itr != bps.end()) { - if(itr->bp == *it) { + if(itr->bp == bp_name) { itr = bps.erase(itr); } else { itr++; } } + //clean the stats summary - auto itr_stats = bps_stats.find((*it).value); + _stats bps_stats(_self, _self.value); + auto itr_stats = bps_stats.find(bp_name.value); if (itr_stats != bps_stats.end()) bps_stats.erase(itr_stats); } -} - -ACTION rateproducer::wipe() { - - require_auth(_self); - _ratings bps(_self, _self.value); - auto itr = bps.begin(); - while (itr != bps.end()) { - itr = bps.erase(itr); - } - _stats bps_stats(_self, _self.value); - auto itr_stats = bps_stats.begin(); - while (itr_stats != bps_stats.end()) { - itr_stats = bps_stats.erase(itr_stats); - } -} - -ACTION rateproducer::rminactive() { - - require_auth(_self); - std::set noupdated_bps; - _stats bps_stats(_self, _self.value); - auto itr_stats = bps_stats.begin(); - while ( itr_stats != bps_stats.end()) { - if (!is_blockproducer(itr_stats->bp)) { - noupdated_bps.insert(itr_stats->bp); + void rateproducer::erase_bp_info(std::set * bps_to_clean){ + _ratings bps(_self, _self.value); + _stats bps_stats(_self, _self.value); + + std::set::iterator it; + for (it = bps_to_clean->begin(); it != bps_to_clean->end(); ++it) { + //clean all ratings related to an bp + auto itr = bps.begin(); + while (itr != bps.end()) { + if(itr->bp == *it) { + itr = bps.erase(itr); + } else { + itr++; + } + } + //clean the stats summary + auto itr_stats = bps_stats.find((*it).value); + if (itr_stats != bps_stats.end()) bps_stats.erase(itr_stats); } - itr_stats++; } - if(noupdated_bps.size()) erase_bp_info(&noupdated_bps); - print("bps deleted:",noupdated_bps.size()); -} -ACTION rateproducer::rmrate(name user, name bp) { - require_auth(user); - - _ratings bps(_self, _self.value); - auto uniq_rating = (static_cast(user.value) << 64) | bp.value; + void rateproducer::wipe() { + + require_auth(_self); + _ratings bps(_self, _self.value); + auto itr = bps.begin(); + while (itr != bps.end()) { + itr = bps.erase(itr); + } - auto uniq_rating_index = bps.get_index(); - auto existing_rating = uniq_rating_index.find(uniq_rating); + _stats bps_stats(_self, _self.value); + auto itr_stats = bps_stats.begin(); + while (itr_stats != bps_stats.end()) { + itr_stats = bps_stats.erase(itr_stats); + } + } - if( existing_rating != uniq_rating_index.end() ) { + void rateproducer::rminactive() { - //delete rate info - auto itr = uniq_rating_index.erase(existing_rating); + require_auth(_self); + std::set noupdated_bps; + _stats bps_stats(_self, _self.value); + auto itr_stats = bps_stats.begin(); + while ( itr_stats != bps_stats.end()) { + if (!is_blockproducer(itr_stats->bp)) { + noupdated_bps.insert(itr_stats->bp); + } + itr_stats++; + } + if(noupdated_bps.size()) erase_bp_info(&noupdated_bps); + print("bps deleted:",noupdated_bps.size()); + } + + void rateproducer::rmrate(name user, name bp) { + require_auth(user); - //update bp stats - float bp_transparency = 0; - float bp_infrastructure = 0; - float bp_trustiness = 0; - float bp_community = 0; - float bp_development = 0; - uint32_t bp_ratings_cntr = 0; - float bp_average = 0; - - //re-calculate stats for the bp - calculate_bp_stats (bp, + _ratings bps(_self, _self.value); + auto uniq_rating = (static_cast(user.value) << 64) | bp.value; + + auto uniq_rating_index = bps.get_index(); + auto existing_rating = uniq_rating_index.find(uniq_rating); + + if( existing_rating != uniq_rating_index.end() ) { + + //delete rate info + auto itr = uniq_rating_index.erase(existing_rating); + + //update bp stats + float bp_transparency = 0; + float bp_infrastructure = 0; + float bp_trustiness = 0; + float bp_community = 0; + float bp_development = 0; + uint32_t bp_ratings_cntr = 0; + float bp_average = 0; + + //re-calculate stats for the bp + calculate_bp_stats (bp, + &bp_transparency, + &bp_infrastructure, + &bp_trustiness, + &bp_community, + &bp_development, + &bp_ratings_cntr, + &bp_average); + + //save the re-calcualtes stats + update_bp_stats (&user, + &bp, &bp_transparency, &bp_infrastructure, &bp_trustiness, @@ -436,17 +447,14 @@ ACTION rateproducer::rmrate(name user, name bp) { &bp_development, &bp_ratings_cntr, &bp_average); - - //save the re-calcualtes stats - update_bp_stats (&user, - &bp, - &bp_transparency, - &bp_infrastructure, - &bp_trustiness, - &bp_community, - &bp_development, - &bp_ratings_cntr, - &bp_average); - + + } } -} \ No newline at end of file +} // namespace eoscostarica + + +EOSIO_ACTION_DISPATCHER(eoscostarica::actions) + +EOSIO_ABIGEN(actions(eoscostarica::actions), + table("ratings"_n, eoscostarica::ratings), + table("stats"_n, eoscostarica::stats)) \ No newline at end of file From 90b2428a529b6481e402a7516ed97b5ec1f0010a Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Thu, 12 Aug 2021 17:20:50 -0600 Subject: [PATCH 38/54] Fix bugs whit user data and rating action (#672) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * add(link sidebar): Add network Monitor in sidebar * fix(user-data): fix lost user data * fix(rating): fix rating acction * fix(voting-tool): align elements Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez --- webapp/src/components/app-bar/index.js | 4 ++-- webapp/src/components/compare-tool/compare-graph-view.js | 7 +++++-- webapp/src/models/User/user.js | 3 +-- webapp/src/routes/block-producers/block-producer-rate.js | 2 +- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/webapp/src/components/app-bar/index.js b/webapp/src/components/app-bar/index.js index 78b57d2c..ec363bfc 100644 --- a/webapp/src/components/app-bar/index.js +++ b/webapp/src/components/app-bar/index.js @@ -46,8 +46,8 @@ const MainTopBar = ({ } } - getData() - }, []) + if (ual) getData() + }, [ual]) return ( diff --git a/webapp/src/components/compare-tool/compare-graph-view.js b/webapp/src/components/compare-tool/compare-graph-view.js index ca58fb25..b2b9595d 100644 --- a/webapp/src/components/compare-tool/compare-graph-view.js +++ b/webapp/src/components/compare-tool/compare-graph-view.js @@ -219,7 +219,7 @@ const CompareGraphView = ({ xs={12} md={7} style={{ - height: mobileMedium ? '260px' : '135px' + height: mobileMedium ? '225px' : '105px' }} > - {showChip && ( - - - - } - color='secondary' - label={ - - {message.txSuccess ? 'Success!' : message.txError} - - } - variant='outlined' - /> - )} )}
+ + + {message.txError} + + + + + {t('success')} + +
) } @@ -152,6 +154,7 @@ CompareTool.propTypes = { onHandleVote: PropTypes.func, userInfo: PropTypes.object, message: PropTypes.object, + setMessage: PropTypes.func, handleOnClose: PropTypes.func } diff --git a/webapp/src/language/en.json b/webapp/src/language/en.json index 67a7770e..2680e300 100644 --- a/webapp/src/language/en.json +++ b/webapp/src/language/en.json @@ -58,7 +58,9 @@ "drawerLinkAbout": "About", "drawerLinkRicardianContract": "Ricardian Contract", "drawerLinkHelp": "Help", - + "lockedRating": "You must vote for at least 21 block producers or a proxy to unlock ratings", + "unlockedRating": "You have voted for 21 bps or a proxy and have unlocked ratings", + "success" : "Success!", "appBarSignIn": "Sign In", "connecting": "Connecting", @@ -170,6 +172,7 @@ "myRate": "My Rating", "rateWithoutLogin": "You need to login to rate this block producer", "noBlockProducer": "This BP Does Not Exist.", + "success" : "Success!", "title": "Rate EOS Block Producer Infrastructure and Community Reputation ", "infoMessage": "Support the network by voting for your favorite BPs or proxy, once you have voted for 21 BPs you can start rating." }, @@ -208,6 +211,7 @@ "totalVotes": "Total Votes", "voteWithoutLogin": "You need to login to vote for this proxy", "labelTool": "votes for", + "success" : "Success!", "title": "Block Producer Community Ratings for", "proxyProfile": "Reviews on EOS proxy account" }, diff --git a/webapp/src/language/es.json b/webapp/src/language/es.json index 0a719bed..6566b568 100644 --- a/webapp/src/language/es.json +++ b/webapp/src/language/es.json @@ -58,7 +58,9 @@ "drawerLinkAbout": "Acerca de EOS Rate", "drawerLinkRicardianContract": "Contratos Ricardianos", "drawerLinkHelp": "Ayuda", - + "lockedRating": "Debes votar por al menos 21 productores de bloques o un proxy para desbloquear calificaciones", + "unlockedRating": "Ha votado por 21 bps o un proxy y ha desbloqueado calificaciones", + "success" : "¡Éxito!", "appBarSignIn": "Iniciar Sesión", "connecting": "Conectando", @@ -170,6 +172,7 @@ "myRate": "Mi Evaluación", "rateWithoutLogin": "Necesitas iniciar sesión para evaluar un productor de bloques", "noBlockProducer": "No encontramos este PB", + "success" : "¡Éxito!", "title": "Calificación de Productores de bloques EOS", "infoMessage": "Apoye la red votando por sus BP o proxy favoritos, una vez que haya votado por 21 BP puede comenzar a calificar." }, @@ -208,6 +211,7 @@ "voteWithoutLogin": "Necesitas iniciar sesión para votar por un proxy", "totalVotes": "Total de votos", "labelTool": "vota por", + "success" : "Success!", "title": "Calificaciones de productor de bloques EOS", "proxyProfile": "Reseñas sobre EOS proxy" }, diff --git a/webapp/src/routes/block-producers/block-producer-rate.js b/webapp/src/routes/block-producers/block-producer-rate.js index 4221371d..b536d64d 100644 --- a/webapp/src/routes/block-producers/block-producer-rate.js +++ b/webapp/src/routes/block-producers/block-producer-rate.js @@ -9,7 +9,6 @@ import { Avatar, Button, IconButton, - Chip, Grid, Paper, CircularProgress, @@ -18,11 +17,11 @@ import { } from '@material-ui/core' import AccountCircle from '@material-ui/icons/AccountCircle' import Close from '@material-ui/icons/Close' -import Error from '@material-ui/icons/Error' import KeyboardArrowLeft from '@material-ui/icons/KeyboardArrowLeft' import _get from 'lodash.get' import classNames from 'classnames' -import { Alert } from '@material-ui/lab' +import Snackbar from '@material-ui/core/Snackbar' +import MuiAlert from '@material-ui/lab/Alert' import { makeStyles } from '@material-ui/core/styles' import TitlePage from 'components/title-page' @@ -76,6 +75,24 @@ const BlockProducerRate = ({ account, ual }) => { setSizes(isDesktop ? 400 : 240) }, [isDesktop]) + function Alert(props) { + return + } + + const handleClose = (event, reason) => { + if (reason === 'clickaway') { + return + } + + setShowMessage(false) + setRatingState({ + ...ratingState, + processing: false, + txError: null, + txSuccess: false + }) + } + useEffect(() => { const getData = async () => { if (account) { @@ -313,30 +330,24 @@ const BlockProducerRate = ({ account, ual }) => { justifyContent='flex-end' style={{ marginTop: 10 }} > - {showMessage && ( - - - - } - color='secondary' - label={t('rateWithoutLogin')} - variant='outlined' - /> - )} - {ratingState.txError && ( - - - - } - color='secondary' - label={ratingState.txError} - variant='outlined' - /> - )} + + + {t('rateWithoutLogin')} + + + + + {ratingState.txError} + + + setLastTransactionId(undefined)} + > + + @@ -509,7 +514,7 @@ const BlockProducerRate = ({ account, ual }) => { )} {showAlert && ( - + {t('infoMessage')} diff --git a/webapp/src/routes/block-producers/index.js b/webapp/src/routes/block-producers/index.js index ea036354..2cb0b11a 100644 --- a/webapp/src/routes/block-producers/index.js +++ b/webapp/src/routes/block-producers/index.js @@ -73,6 +73,15 @@ const AllBps = ({ ual }) => { setOpenDesktopVotingTool(false) } + const handleSetRatingState = () => { + setRatingState({ + ...ratingState, + txError: null, + txSuccess: false, + showChipMessage: false + }) + } + const sendVoteBps = async (BPs) => { if (!accountName) return @@ -142,6 +151,7 @@ const AllBps = ({ ual }) => { onHandleVote={() => sendVoteBps(selectedBPs || [])} userInfo={user} message={ratingState} + setMessage={handleSetRatingState} handleOnClose={handleOnClose} /> ) diff --git a/webapp/src/routes/block-producers/styles.js b/webapp/src/routes/block-producers/styles.js index a8c575a3..74ddb453 100644 --- a/webapp/src/routes/block-producers/styles.js +++ b/webapp/src/routes/block-producers/styles.js @@ -157,7 +157,7 @@ export default (theme) => ({ closeIconButton: { padding: 0, verticalAlign: 'middle', - color: 'red' + color: 'black' }, detailsIconButton: { padding: '0 10px' diff --git a/webapp/src/routes/proxies/proxy-profile.js b/webapp/src/routes/proxies/proxy-profile.js index f1e02457..723685d4 100644 --- a/webapp/src/routes/proxies/proxy-profile.js +++ b/webapp/src/routes/proxies/proxy-profile.js @@ -4,9 +4,6 @@ import { useDispatch, useSelector } from 'react-redux' import classNames from 'classnames' import { useTranslation } from 'react-i18next' import { Link } from '@reach/router' -import Error from '@material-ui/icons/Error' -import CheckCircle from '@material-ui/icons/CheckCircle' -import Chip from '@material-ui/core/Chip' import CircularProgress from '@material-ui/core/CircularProgress' import Avatar from '@material-ui/core/Avatar' import Button from '@material-ui/core/Button' @@ -14,6 +11,8 @@ import Grid from '@material-ui/core/Grid' import { Box, useMediaQuery } from '@material-ui/core' import Typography from '@material-ui/core/Typography' import { makeStyles } from '@material-ui/core/styles' +import Snackbar from '@material-ui/core/Snackbar' +import MuiAlert from '@material-ui/lab/Alert' import KeyboardArrowLeft from '@material-ui/icons/KeyboardArrowLeft' import AccountCircle from '@material-ui/icons/AccountCircle' import _get from 'lodash.get' @@ -113,6 +112,24 @@ const ProxyProfile = ({ account, ual, ...props }) => { } } + function Alert(props) { + return + } + + const handleClose = (event, reason) => { + if (reason === 'clickaway') { + return + } + + setShowMessage(false) + setRatingState({ + ...ratingState, + processing: false, + txError: null, + txSuccess: false + }) + } + useEffect(() => { const getData = async () => { await dispatch.proxies.getProxies() @@ -194,42 +211,33 @@ const ProxyProfile = ({ account, ual, ...props }) => { disabled={!proxy || ratingState.processing} /> - {showMessage && ( - - - - } - color='secondary' - label={t('voteWithoutLogin')} - variant='outlined' - /> - )} - {ratingState.txError && ( - - - - } - color='secondary' - label={ratingState.txError} - variant='outlined' - /> - )} - {ratingState.txSuccess && ( - - - - } - color='secondary' - label='Success!' - variant='outlined' - /> - )} + + + {t('voteWithoutLogin')} + + + + + {ratingState.txError} + + + + + {t('success')} + + {ratingState.processing && (
From 614314dc1db114aae5e8ae8ed380072db4ee097f Mon Sep 17 00:00:00 2001 From: Leister Francisco Alvarez Campos Date: Mon, 16 Aug 2021 13:04:18 -0700 Subject: [PATCH 43/54] Apply eden features (#679) * fix(env): change import style * fix(env): change import style * fix(env): remove proxy variable * refactor(console): remove * feat(database): create eden__atings_stats table * fix(sync-bp-stats): solve duplicated key * fix(config): change genesisdeden to genesis.eden * docs(README): include clsdk content * docs(README): add bash code syntax highlighting * fix(env): add HAPI_GENESIS_EDEN_SCOPE variable * fix(env): remove HAPI_GENESIS_EDEN_SCOPE variable * fix(general): change genesis.eden to eden scope and make standard import * fix(rateproducer): solve eden logic validation --- .env.example | 1 + .../workflows/push-master-environment.yaml | 7 +- .../workflows/push-staging-environment.yaml | 4 + contracts/rateproducer/README.md | 98 ++++++++++++++++--- .../rateproducer/include/rateproducer.hpp | 3 +- contracts/rateproducer/src/rateproducer.cpp | 10 +- docker-compose.yml | 1 + hapi/src/config/index.js | 4 +- hapi/src/libs/sync-bp-stats.js | 46 ++++++--- hasura/metadata/actions.graphql | 18 ++-- .../tables/public_eden_ratings_stats.yaml | 3 + .../databases/default/tables/tables.yaml | 1 + webapp/makefile | 1 + webapp/src/config/index.js | 22 ++--- .../models/BlockProducer/blockProducers.js | 5 +- webapp/src/routes/account/index.js | 4 +- .../block-producers/block-producer-rate.js | 6 +- webapp/src/routes/index.js | 4 +- webapp/src/routes/termsOfUse/index.js | 5 +- webapp/src/utils/ualAuthenticators.js | 17 ++-- 20 files changed, 183 insertions(+), 77 deletions(-) create mode 100644 hasura/metadata/databases/default/tables/public_eden_ratings_stats.yaml diff --git a/.env.example b/.env.example index d36f9a7c..a191a2d1 100644 --- a/.env.example +++ b/.env.example @@ -31,6 +31,7 @@ HASURA_GRAPHQL_UNAUTHORIZED_ROLE=anonymous HASURA_GRAPHQL_ACTION_BASE_URL=http://hapi:9090 # WEBAPP +REACT_APP_RATING_CONTRACT=rateproducer REACT_APP_GRAPHQL_HTTP_URL=http://localhost:8080/v1/graphql REACT_APP_API_URL=https://jungle.eosio.cr REACT_APP_GRAPHQL_WS_URL=ws://localhost:8080/v1/graphql diff --git a/.github/workflows/push-master-environment.yaml b/.github/workflows/push-master-environment.yaml index 5b6ded13..23322b23 100644 --- a/.github/workflows/push-master-environment.yaml +++ b/.github/workflows/push-master-environment.yaml @@ -42,6 +42,8 @@ jobs: BRANCH: production NAMESPACE: mainnet-eosrate # webapp + REACT_APP_RATING_CONTRACT: rateproducer + REACT_APP_PROXY_CONTRACT: regproxyinfo REACT_APP_GRAPHQL_HTTP_URL: https://graphql.eosrate.io/v1/graphql REACT_APP_GRAPHQL_WS_URL: wss://graphql.eosrate.io/v1/graphql REACT_APP_EOS_API_URL: https://api.eosio.cr @@ -66,6 +68,7 @@ jobs: INGRESS_HOST: eosrate.io INGRESS_GRAPHQL_HOST: graphql.eosrate.io # webapp + REACT_APP_RATING_CONTRACT: rateproducer REACT_APP_GRAPHQL_HTTP_URL: https://graphql.eosrate.io/v1/graphql REACT_APP_GRAPHQL_WS_URL: wss://graphql.eosrate.io/v1/graphql REACT_APP_EOS_API_URL: https://api.eosio.cr @@ -82,10 +85,10 @@ jobs: # hapi HAPI_SERVER_ADDRESS: 0.0.0.0 HAPI_SERVER_PORT: 9090 - HAPI_PROXY_CONTRACT: regproxyinfo - HAPI_RATING_CONTRACT: rateproducer HAPI_POSTGRES_USER: ${{ secrets.HAPI_POSTGRES_USER }} HAPI_POSTGRES_PASSWORD: ${{ secrets.HAPI_POSTGRES_PASSWORD }} + HAPI_PROXY_CONTRACT: regproxyinfo + HAPI_RATING_CONTRACT: rateproducer HAPI_POSTGRES_DB: eosrate HAPI_POSTGRES_HOST: postgres HAPI_POSTGRES_PORT: 5432 diff --git a/.github/workflows/push-staging-environment.yaml b/.github/workflows/push-staging-environment.yaml index 259d9385..1ca86b85 100644 --- a/.github/workflows/push-staging-environment.yaml +++ b/.github/workflows/push-staging-environment.yaml @@ -42,6 +42,8 @@ jobs: BRANCH: staging NAMESPACE: jungle-eosrate # webapp + REACT_APP_RATING_CONTRACT: rateproducer + REACT_APP_PROXY_CONTRACT: regproxyinfo REACT_APP_GRAPHQL_HTTP_URL: https://graphql-jungle.eosrate.io/v1/graphql REACT_APP_GRAPHQL_WS_URL: wss://graphql-jungle.eosrate.io/v1/graphql REACT_APP_EOS_API_URL: https://jungle.eosio.cr @@ -66,6 +68,8 @@ jobs: INGRESS_HOST: jungle.eosrate.io INGRESS_GRAPHQL_HOST: graphql-jungle.eosrate.io # webapp + REACT_APP_RATING_CONTRACT: rateproducer + REACT_APP_PROXY_CONTRACT: regproxyinfo REACT_APP_GRAPHQL_HTTP_URL: https://graphql-jungle.eosrate.io/v1/graphql REACT_APP_GRAPHQL_WS_URL: wss://graphql-jungle.eosrate.io/v1/graphql REACT_APP_EOS_API_URL: https://jungle.eosio.cr diff --git a/contracts/rateproducer/README.md b/contracts/rateproducer/README.md index e842687a..1e5ec2be 100644 --- a/contracts/rateproducer/README.md +++ b/contracts/rateproducer/README.md @@ -1,55 +1,125 @@ +## Compilation +This contract is built with eden `clsdk` compiler, to have the local environment configured to compile this contract is needed to [take a look at this link](https://github.com/eoscommunity/demo-clsdk) to learn more or follow these steps to continue forward. + +## Get Started +### Ubuntu 20.04 +Run the following commands to set local environment. +``` +sudo apt-get update +sudo apt-get install -yq \ + binaryen \ + build-essential \ + cmake \ + gdb \ + git \ + libboost-all-dev \ + libcurl4-openssl-dev \ + libgmp-dev \ + libssl-dev \ + libusb-1.0-0-dev \ + pkg-config \ + wget + + +mkdir ~/work + +cd ~/work +wget https://github.com/WebAssembly/wasi-sdk/releases/download/wasi-sdk-12/wasi-sdk-12.0-linux.tar.gz +tar xf wasi-sdk-12.0-linux.tar.gz + +cd ~/work +wget https://github.com/eoscommunity/Eden/releases/download/sdk-v0.1.0-alpha/clsdk-ubuntu-20-04.tar.gz +tar xf clsdk-ubuntu-20-04.tar.gz +``` + +Make sure to have the following variables to compile the `rateproducer` contract: +``` +export WASI_SDK_PREFIX=~/work/wasi-sdk-12.0 +export CLSDK_PREFIX=~/work/clsdk + +export PATH=$CLSDK_PREFIX/bin:$PATH +``` + +Once the previous step is completed, inside of `rateproducer` folder: +``` +mkdir build +cd build +cmake `clsdk-cmake-args` .. +make -j ``` -Compile contract: -eosio-cpp -R ricardian rateproducer.cpp -o rateproducer.wasm -abigen Add resources: -cleos -u http://jungle2.cryptolions.io:80 system buyram rateproducer rateproducer "100 EOS" +```bash +cleos -u https://jungle3.cryptolions.io system buyram rateproducer rateproducer "100 EOS" +``` Publish Contract: -cleos -u http://jungle2.cryptolions.io:80 set contract rateproducer ./ -p rateproducer@active +```bash +cleos -u https://jungle3.cryptolions.io set contract rateproducer ./ -p rateproducer@active +``` Push rating with all categories: example 1: +```bash cleos -u hhttp://jungle2.cryptolions.io:80 push action rateproducer rate '{ "user": "rateproducer", "bp":"alohaeostest","transparency":8,"infrastructure":8,"trustiness":7,"development":6,"community":9 }' -p rateproducer@active +``` example 2: -cleos -u http://jungle2.cryptolions.io:80 push action rateproducer rate '{ "user": "eoscrvoter11", "bp":"eoscrprodo51","transparency":8,"infrastructure":8,"trustiness":7,"development":6,"community":9 }' -p eoscrvoter11@active +```bash +cleos -u https://jungle3.cryptolions.io push action rateproducer rate '{ "user": "eoscrvoter11", "bp":"eoscrprodo51","transparency":8,"infrastructure":8,"trustiness":7,"development":6,"community":9 }' -p eoscrvoter11@active +``` Push rating with partial categories: +```bash cleos -u http://monitor.jungletestnet.io:8888 push action rateproducer rate '{ "user": "rateproducer", "bp":"alohaeostest","transparency":8,"infrastructure":0,"trustiness":0,"development":0,"community":0 }' -p rateproducer@active +``` Get stats table: -cleos -u http://jungle2.cryptolions.io:80 get table -l 50 rateproducer rateproducer stats +```bash +cleos -u https://jungle3.cryptolions.io get table -l 50 rateproducer rateproducer stats +``` Get bp table: -cleos -u http://jungle2.cryptolions.io:80 get table -l 50 rateproducer rateproducer ratings +```bash +cleos -u https://jungle3.cryptolions.io get table -l 50 rateproducer rateproducer ratings +``` -Clean data for a block producer : +Clean data for a block producer: +```bash cleos -u http://monitor.jungletestnet.io:8888 push action rateproducer erase '{"bp_name":"eoscrprodo55"}' -p rateproducer@active +``` Clean all tables: +```bash cleos -u http://monitor.jungletestnet.io:8888 push action rateproducer wipe '[]' -p rateproducer@active +``` Clean data from un-register/inactive bp +```bash cleos -u http://monitor.jungletestnet.io:8888 push action rateproducer rminactive '[]' -p rateproducer@active +``` Remove a rate example 1: +```bash cleos -u http://monitor.jungletestnet.io:8888 push action rateproducer rmrate '{"user": "rateproducer", "bp":"alohaeostest"}' -p rateproducer@active +``` example 2: +```bash cleos -u http://monitor.jungletestnet.io:8888 push action rateproducer rmrate '{"user": "eoscrvoter11", "bp":"eoscrprodo51"}' -p eoscrvoter11@active - ``` + + Run test -you need to assign the priv key for the variable ```rateproducer_priv_key``` within the file test.js +you need to assign the priv key for the variable ```rateproducer_priv_key``` within the file test.js + +Execute the following commands: - execute the following commands: - ``` +``` yarn add eosjs yarn install yarn test yarn test_average yarn test_unreg_bp -``` - +``` \ No newline at end of file diff --git a/contracts/rateproducer/include/rateproducer.hpp b/contracts/rateproducer/include/rateproducer.hpp index 3751fa60..9aa55aaa 100644 --- a/contracts/rateproducer/include/rateproducer.hpp +++ b/contracts/rateproducer/include/rateproducer.hpp @@ -43,6 +43,7 @@ using eosio::public_key; namespace eosio { constexpr name system_account{"eosio"_n}; constexpr name eden_account{"genesis.eden"_n}; + constexpr name eden_scope{"eden"_n}; /* * EOSIO producer_info table @@ -196,7 +197,7 @@ namespace eosio { bool is_eden(name account) { member_table_type member_tb(eden_account, 0); auto it = member_tb.find(account.value); - if(it==member_tb.end() && !it->status()) return false; + if(it==member_tb.end() || !it->status()) return false; else return true; } } // namespace eosio diff --git a/contracts/rateproducer/src/rateproducer.cpp b/contracts/rateproducer/src/rateproducer.cpp index b5758849..d36bcbdb 100644 --- a/contracts/rateproducer/src/rateproducer.cpp +++ b/contracts/rateproducer/src/rateproducer.cpp @@ -12,7 +12,7 @@ namespace eoscostarica { int8_t development) { rate_aux(_self, user, bp, transparency, infrastructure, trustiness, community, development); - if(is_eden(user)) rate_aux(eden_account, user, bp, transparency, infrastructure, trustiness, community, development); + if(is_eden(user)) rate_aux(eden_scope, user, bp, transparency, infrastructure, trustiness, community, development); } void rateproducer::rate_aux( @@ -354,7 +354,7 @@ namespace eoscostarica { void rateproducer::erase(name bp_name) { erase_aux(_self, bp_name); - erase_aux(eden_account, bp_name); + erase_aux(eden_scope, bp_name); } void rateproducer::erase_aux(name scope, name bp_name) { @@ -379,7 +379,7 @@ namespace eoscostarica { void rateproducer::wipe() { wipe_aux(_self); - wipe_aux(eden_account); + wipe_aux(eden_scope); } void rateproducer::wipe_aux(name scope) { @@ -420,7 +420,7 @@ namespace eoscostarica { void rateproducer::rminactive() { rminactive_aux(_self); - rminactive_aux(eden_account); + rminactive_aux(eden_scope); } void rateproducer::rminactive_aux(name scope) { @@ -440,7 +440,7 @@ namespace eoscostarica { void rateproducer::rmrate(name user, name bp) { rmrate_aux(_self, user, bp); - if(is_eden(user)) rmrate_aux(eden_account, user, bp); + if(is_eden(user)) rmrate_aux(eden_scope, user, bp); } void rateproducer::rmrate_aux(name scope, name user, name bp) { diff --git a/docker-compose.yml b/docker-compose.yml index 38adaab3..954cc865 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -86,6 +86,7 @@ services: - postgres restart: always environment: + REACT_APP_RATING_CONTRACT: "${REACT_APP_RATING_CONTRACT}" HASURA_GRAPHQL_DATABASE_URL: "${HASURA_GRAPHQL_DATABASE_URL}" HASURA_GRAPHQL_MIGRATIONS_DIR: /migrations HASURA_GRAPHQL_METADATA_DIR: /metadata diff --git a/hapi/src/config/index.js b/hapi/src/config/index.js index 91385c63..427277d2 100644 --- a/hapi/src/config/index.js +++ b/hapi/src/config/index.js @@ -5,5 +5,7 @@ const massiveDB = (async () => await massive(massiveConfig))() module.exports = { massiveConfig, - massiveDB + massiveDB, + defaultContractScope: process.env.HAPI_RATING_CONTRACT, + edenContractScope: 'eden' } \ No newline at end of file diff --git a/hapi/src/libs/sync-bp-stats.js b/hapi/src/libs/sync-bp-stats.js index ffd0ca6d..a0ad1285 100644 --- a/hapi/src/libs/sync-bp-stats.js +++ b/hapi/src/libs/sync-bp-stats.js @@ -1,12 +1,11 @@ -const { massiveDB } = require('../config') +const { massiveDB, defaultContractScope, edenContractScope } = require('../config') const eosjs = require('eosjs') const fetch = require('node-fetch') - const HAPI_RATING_CONTRACT = process.env.HAPI_RATING_CONTRACT || 'rateproducer' -const getBpStats = async bp => { +const getBpStats = async (bp, scope) => { const rpc = new eosjs.JsonRpc( process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr', { fetch } @@ -16,7 +15,7 @@ const getBpStats = async bp => { return await rpc.get_table_rows({ json: true, // Get the response as json code: HAPI_RATING_CONTRACT, // Contract that we target - scope: HAPI_RATING_CONTRACT, // Account that owns the data + scope, // Account that owns the data table: 'stats', // Table name lower_bound: bp, // block producer PK limit: 1, // Maximum number of rows that we want to get @@ -27,18 +26,37 @@ const getBpStats = async bp => { } const updateBpStats = async bpName => { - try { - const bpStat = await getBpStats(bpName) - - if (!bpStat.rows.length || !bpStat.rows[0].bp === bpName) - return 'Did not find ratings for BP: ' + bpName + const CONTRACT_SCOPES = [defaultContractScope, edenContractScope] + CONTRACT_SCOPES.forEach(async (scope) => { + try { + const bpStat = await getBpStats(bpName, scope) + + if (!bpStat.rows.length || !bpStat.rows[0].bp === bpName) + return 'Did not find ratings for BP: ' + bpName + + const stat = bpStat.rows[0] + + switch(scope) { + case edenContractScope: + await updateBpStatsEden(bpName, stat) + break + default: + await updateBpStatsDefault(bpName, stat) + } + } catch (err) { console.log(`sync-bp-stats: ${err}`) } + }) +} - const stat = bpStat.rows[0] +const updateBpStatsDefault = async (bpName, stat) => { + const resultRatingsSave = await (await massiveDB).ratings_stats.save(stat) + const dbResult = resultRatingsSave ? resultRatingsSave : await (await massiveDB).ratings_stats.insert(stat) + console.log(`Default save or insert of ${bpName} was ${dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL'}`) +} - const resultRatingsSave = await (await massiveDB).ratings_stats.save(stat) - const dbResult = resultRatingsSave ? resultRatingsSave : await (await massiveDB).ratings_stats.insert(stat) - console.log(`Save or insert of ${bpName} was ${dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL'}`) - } catch (err) { console.log(`Error: ${err}`) } +const updateBpStatsEden = async (bpName, stat) => { + const resultRatingsSave = await (await massiveDB).eden_ratings_stats.save(stat) + const dbResult = resultRatingsSave ? resultRatingsSave : await (await massiveDB).eden_ratings_stats.insert(stat) + console.log(`Eden save or insert of ${bpName} was ${dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL'}`) } module.exports = updateBpStats diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql index eca1ea24..63ac1f7f 100644 --- a/hasura/metadata/actions.graphql +++ b/hasura/metadata/actions.graphql @@ -1,23 +1,23 @@ type Mutation { - rateProducer ( + rateProducer( ratingInput: RatingInput! ): RatingOutput } input RatingInput { - user : String! - producer : String! + user: String! + producer: String! } type RatingOutput { - message : String! - uniq_rating : String - user : String - bp : String - ratings : jsonb + message: String! + uniq_rating: String + user: String + bp: String + ratings: jsonb } type deleteUserRateOutput { - message : String! + message: String! } diff --git a/hasura/metadata/databases/default/tables/public_eden_ratings_stats.yaml b/hasura/metadata/databases/default/tables/public_eden_ratings_stats.yaml new file mode 100644 index 00000000..1b05d817 --- /dev/null +++ b/hasura/metadata/databases/default/tables/public_eden_ratings_stats.yaml @@ -0,0 +1,3 @@ +table: + name: eden_ratings_stats + schema: public diff --git a/hasura/metadata/databases/default/tables/tables.yaml b/hasura/metadata/databases/default/tables/tables.yaml index e3fc7110..a16bf83e 100644 --- a/hasura/metadata/databases/default/tables/tables.yaml +++ b/hasura/metadata/databases/default/tables/tables.yaml @@ -1,3 +1,4 @@ +- "!include public_eden_ratings_stats.yaml" - "!include public_producers.yaml" - "!include public_producers_list.yaml" - "!include public_proxies.yaml" diff --git a/webapp/makefile b/webapp/makefile index 43d2c277..7d98078b 100644 --- a/webapp/makefile +++ b/webapp/makefile @@ -24,6 +24,7 @@ build-docker: ./Dockerfile @docker build \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_WEBAPP):$(VERSION) --target server \ -t $(DOCKER_REGISTRY)/$(IMAGE_NAME_WEBAPP):$(LATEST_TAG) --target server \ + --build-arg REACT_APP_RATING_CONTRACT="$(REACT_APP_RATING_CONTRACT)" \ --build-arg REACT_APP_GRAPHQL_HTTP_URL="$(REACT_APP_GRAPHQL_HTTP_URL)" \ --build-arg REACT_APP_GRAPHQL_WS_URL="$(REACT_APP_GRAPHQL_WS_URL)" \ --build-arg REACT_APP_EOS_API_URL="$(REACT_APP_EOS_API_URL)" \ diff --git a/webapp/src/config/index.js b/webapp/src/config/index.js index 86672920..a4822d00 100644 --- a/webapp/src/config/index.js +++ b/webapp/src/config/index.js @@ -1,13 +1,9 @@ -const config = { - appName: 'EOSRate', - contract: 'rateproducer', - eosApiHost: process.env.REACT_APP_EOS_API_HOST, - eosApiPort: process.env.REACT_APP_EOS_API_PORT, - eosApiProtocol: process.env.REACT_APP_EOS_API_PROTOCOL, - eosApiUri: `${process.env.REACT_APP_EOS_API_PROTOCOL}://${process.env.REACT_APP_EOS_API_HOST}:${process.env.REACT_APP_EOS_API_PORT}`, - eosChainId: process.env.REACT_APP_EOS_CHAIN_ID, - blockExplorer: process.env.REACT_APP_BLOCK_EXPLORER, - networkMonitor: process.env.REACT_APP_NETWORK_MONITOR_URL -} - -export default config +export const appName = 'EOSRate' +export const contract = process.env.REACT_APP_RATING_CONTRACT || 'rateproducer' +export const eosApiHost = process.env.REACT_APP_EOS_API_HOST +export const eosApiPort = process.env.REACT_APP_EOS_API_PORT +export const eosApiProtocol = process.env.REACT_APP_EOS_API_PROTOCOL +export const eosApiUri = `${process.env.REACT_APP_EOS_API_PROTOCOL}://${process.env.REACT_APP_EOS_API_HOST}:${process.env.REACT_APP_EOS_API_PORT}` +export const eosChainId = process.env.REACT_APP_EOS_CHAIN_ID +export const blockExplorer = process.env.REACT_APP_BLOCK_EXPLORER +export const networkMonitor = process.env.REACT_APP_NETWORK_MONITOR_URL diff --git a/webapp/src/models/BlockProducer/blockProducers.js b/webapp/src/models/BlockProducer/blockProducers.js index b7838206..79f19575 100644 --- a/webapp/src/models/BlockProducer/blockProducers.js +++ b/webapp/src/models/BlockProducer/blockProducers.js @@ -8,6 +8,7 @@ import { getRpc } from 'utils/eosjsUtils' import QUERY_PRODUCER from './query_get_producer_by' import QUERY_RATING from './query_get_bp_rating_by' import MUTATION_UPDATE_RATING from './mutation_update_rate' +import { contract } from '../../config' const initialState = { filters: {}, @@ -197,8 +198,8 @@ const Proxies = { const { rows: rateStat } = await rpc.get_table_rows({ json: true, - code: 'rateproducer', - scope: 'rateproducer', + code: contract, + scope: contract, table: 'stats', lower_bound: bp, limit: 1, diff --git a/webapp/src/routes/account/index.js b/webapp/src/routes/account/index.js index e440c8fd..2f967a77 100644 --- a/webapp/src/routes/account/index.js +++ b/webapp/src/routes/account/index.js @@ -21,7 +21,7 @@ import CloseIcon from '@material-ui/icons/Close' import _get from 'lodash.get' import TitlePage from 'components/title-page' -import config from 'config' +import { contract } from '../../config' import styles from './styles' @@ -40,7 +40,7 @@ const Account = ({ ual }) => { const transaction = { actions: [ { - account: config.contract, + account: contract, name: 'rmrate', authorization: [ { diff --git a/webapp/src/routes/block-producers/block-producer-rate.js b/webapp/src/routes/block-producers/block-producer-rate.js index b536d64d..e5ce0252 100644 --- a/webapp/src/routes/block-producers/block-producer-rate.js +++ b/webapp/src/routes/block-producers/block-producer-rate.js @@ -26,7 +26,7 @@ import { makeStyles } from '@material-ui/core/styles' import TitlePage from 'components/title-page' import Radar from 'components/radar' -import config from 'config' +import { contract, blockExplorer } from '../../config' import getBPRadarData from 'utils/getBPRadarData' import SliderRatingSection from './slider-rating-section' @@ -195,7 +195,7 @@ const BlockProducerRate = ({ account, ual }) => { permission: 'active' } ], - account: config.contract, + account: contract, name: 'rate', data: { user: accountName, bp: account, ...getRatingData(true) } } @@ -496,7 +496,7 @@ const BlockProducerRate = ({ account, ual }) => { rel='noopener' target='_blank' style={{ color: 'white' }} - href={`${config.blockExplorer}/transaction/${lastTransactionId}`} + href={`${blockExplorer}/transaction/${lastTransactionId}`} > {t('details')} diff --git a/webapp/src/routes/index.js b/webapp/src/routes/index.js index 9ed26eaa..17a5e29b 100644 --- a/webapp/src/routes/index.js +++ b/webapp/src/routes/index.js @@ -8,7 +8,7 @@ import ProxyProfile from './proxies/proxy-profile' import Help from './help' import TermsOfUse from './termsOfUse' import About from './about' -import config from '../config' +import { networkMonitor } from '../config' export default [ { @@ -52,7 +52,7 @@ export default [ target: '_self' }, { - path: config.networkMonitor, + path: networkMonitor, drawerLabel: 'drawerLinkNetworkMonitor', target: '_blank' }, diff --git a/webapp/src/routes/termsOfUse/index.js b/webapp/src/routes/termsOfUse/index.js index b56f3100..860bc434 100644 --- a/webapp/src/routes/termsOfUse/index.js +++ b/webapp/src/routes/termsOfUse/index.js @@ -3,9 +3,8 @@ import Box from '@material-ui/core/Box' import { makeStyles } from '@material-ui/styles' import { useTranslation } from 'react-i18next' import { RicardianContract } from '@eoscostarica/eoscr-components' - +import { contract } from '../../config' import TitlePage from 'components/title-page' - import styles from './styles' const useStyles = makeStyles(styles) @@ -18,7 +17,7 @@ const TermsOfUse = () => { diff --git a/webapp/src/utils/ualAuthenticators.js b/webapp/src/utils/ualAuthenticators.js index 315f5386..5102b5a8 100644 --- a/webapp/src/utils/ualAuthenticators.js +++ b/webapp/src/utils/ualAuthenticators.js @@ -5,23 +5,28 @@ import { TokenPocket } from 'ual-token-pocket' import { MeetOne } from 'ual-meetone' import { Anchor } from 'ual-anchor' -import config from 'config' +import { + appName, + eosChainId, + eosApiProtocol, + eosApiHost, + eosApiPort +} from '../config' export const network = { chainId: - config.eosChainId || + eosChainId || '2a02a0053e5a8cf73a56ba0fda11e4d92e0238a4a2aa74fccf46d5a910746840', rpcEndpoints: [ { blockchain: 'eos', - protocol: config.eosApiProtocol || 'https', - host: config.eosApiHost || 'jungle.eosio.cr', - port: parseInt(config.eosApiPort || '443') + protocol: eosApiProtocol || 'https', + host: eosApiHost || 'jungle.eosio.cr', + port: parseInt(eosApiPort || '443') } ] } -const appName = config.appName || 'EOSRate' const lynx = new Lynx([network]) const ledger = new Ledger([network]) const tokenPocket = new TokenPocket([network]) From 9993e81fdadb952352961e6635bd5438b484a9c8 Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Tue, 17 Aug 2021 08:41:49 -0600 Subject: [PATCH 44/54] Missing eden ratings migration (#684) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * add(link sidebar): Add network Monitor in sidebar * fix(user-data): fix lost user data * fix(rating): fix rating acction * fix(voting-tool): align elements * fix(db): missing eden ratings migration Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez --- .../down.sql | 1 + .../up.sql | 17 +++++++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 hasura/migrations/default/1629210777277_create_table_public_eden_ratings_stats/down.sql create mode 100644 hasura/migrations/default/1629210777277_create_table_public_eden_ratings_stats/up.sql diff --git a/hasura/migrations/default/1629210777277_create_table_public_eden_ratings_stats/down.sql b/hasura/migrations/default/1629210777277_create_table_public_eden_ratings_stats/down.sql new file mode 100644 index 00000000..f9792f3a --- /dev/null +++ b/hasura/migrations/default/1629210777277_create_table_public_eden_ratings_stats/down.sql @@ -0,0 +1 @@ +DROP TABLE "public"."eden_ratings_stats"; diff --git a/hasura/migrations/default/1629210777277_create_table_public_eden_ratings_stats/up.sql b/hasura/migrations/default/1629210777277_create_table_public_eden_ratings_stats/up.sql new file mode 100644 index 00000000..9f949aa8 --- /dev/null +++ b/hasura/migrations/default/1629210777277_create_table_public_eden_ratings_stats/up.sql @@ -0,0 +1,17 @@ +CREATE TABLE "public"."eden_ratings_stats" ("bp" varchar NOT NULL, "ratings_cntr" integer, "average" numeric, "transparency" numeric, "infrastructure" numeric, "trustiness" numeric, "community" numeric, "development" numeric, "created_at" timestamptz DEFAULT now(), "updated_at" timestamptz DEFAULT now(), PRIMARY KEY ("bp") ); +CREATE OR REPLACE FUNCTION "public"."set_current_timestamp_updated_at"() +RETURNS TRIGGER AS $$ +DECLARE + _new record; +BEGIN + _new := NEW; + _new."updated_at" = NOW(); + RETURN _new; +END; +$$ LANGUAGE plpgsql; +CREATE TRIGGER "set_public_eden_ratings_stats_updated_at" +BEFORE UPDATE ON "public"."eden_ratings_stats" +FOR EACH ROW +EXECUTE PROCEDURE "public"."set_current_timestamp_updated_at"(); +COMMENT ON TRIGGER "set_public_eden_ratings_stats_updated_at" ON "public"."eden_ratings_stats" +IS 'trigger to set value of column "updated_at" to current timestamp on row update'; From 94c3f66f583617fe81e60eeef37bb98ebe1d86c7 Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Thu, 19 Aug 2021 00:21:47 -0600 Subject: [PATCH 45/54] Update voting tool component (#683) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * add(link sidebar): Add network Monitor in sidebar * fix(design): Align BP cards in all screen resolutions * fix(bp page): Fix broke design in bp page * fix(voting-tool): apply changes on design Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez --- .../compare-tool/compare-graph-view.js | 22 +++++++++++++--- webapp/src/components/compare-tool/index.js | 6 ++++- webapp/src/components/compare-tool/styles.js | 6 +++++ webapp/src/routes/block-producers/index.js | 25 ++++++++++++++----- 4 files changed, 49 insertions(+), 10 deletions(-) diff --git a/webapp/src/components/compare-tool/compare-graph-view.js b/webapp/src/components/compare-tool/compare-graph-view.js index b2b9595d..3882b152 100644 --- a/webapp/src/components/compare-tool/compare-graph-view.js +++ b/webapp/src/components/compare-tool/compare-graph-view.js @@ -16,6 +16,7 @@ import Help from '@material-ui/icons/HelpOutlineRounded' import { useMediaQuery } from '@material-ui/core' import { useTranslation } from 'react-i18next' import Switch from '@material-ui/core/Switch' +import CloseIcon from '@material-ui/icons/Close' import _get from 'lodash.get' import Radar from 'components/radar' @@ -137,6 +138,7 @@ const CompareGraphView = ({ isProxy, userInfo, width, + handleOnClear, handleOnClose, onHandleVote, setIsCollapsedView, @@ -154,8 +156,13 @@ const CompareGraphView = ({ }, [isDesktop]) return ( - - + + @@ -167,6 +174,13 @@ const CompareGraphView = ({ + {isDesktop && ( + + + + + + )} {t('clearSelection')} @@ -290,6 +304,7 @@ CompareGraphView.propTypes = { className: PropTypes.string, isProxy: PropTypes.bool, userInfo: PropTypes.object, + handleOnClear: PropTypes.func, handleOnClose: PropTypes.func, onHandleVote: PropTypes.func, setIsCollapsedView: PropTypes.func, @@ -301,6 +316,7 @@ CompareGraphView.defaultProps = { isProxy: false, userInfo: { proxy: '', producers: [], isUser: false }, onHandleVote: () => {}, + handleOnClear: () => {}, handleOnClose: () => {}, setIsCollapsedView: () => {}, isCollapsedView: true diff --git a/webapp/src/components/compare-tool/index.js b/webapp/src/components/compare-tool/index.js index 90a67452..69c659f1 100644 --- a/webapp/src/components/compare-tool/index.js +++ b/webapp/src/components/compare-tool/index.js @@ -26,6 +26,7 @@ const CompareTool = ({ onHandleVote, userInfo, message, + handleOnClear, setMessage, handleOnClose }) => { @@ -78,6 +79,7 @@ const CompareTool = ({ selected={selectedData} isProxy={isProxy} userInfo={{ proxy, producers, isUser: Boolean(userInfo) }} + handleOnClear={handleOnClear} handleOnClose={handleOnClose} onHandleVote={onHandleVote} isCollapsedView={isCollapsedView} @@ -102,7 +104,7 @@ const CompareTool = ({ /> From f24c5b43bfa7f4cce3e77967438e27e447c9a49f Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Thu, 19 Aug 2021 12:03:21 -0600 Subject: [PATCH 46/54] Show Eden rating (#689) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * add(link sidebar): Add network Monitor in sidebar * fix(user-data): fix lost user data * fix(rating): fix rating acction * fix(voting-tool): align elements * fix(db): missing eden ratings migration * feat(bp-profile): show bp eden rating * fix(rating): fix bug when user do rating * fix(content): change console message Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez --- hapi/src/config/index.js | 2 +- hapi/src/index.js | 4 +- hapi/src/libs/sync-bp-stats.js | 115 +++++++++++++----- hapi/src/libs/sync-user-rating.js | 3 +- hasura/metadata/actions.graphql | 1 + .../models/BlockProducer/blockProducers.js | 28 +++++ .../BlockProducer/mutation_update_rate.js | 1 + .../BlockProducer/query_get_eden_stats.js | 13 ++ .../block-producers/block-producer-profile.js | 23 +++- .../block-producers/block-producer-rate.js | 20 ++- .../general-information-profile.js | 42 +------ 11 files changed, 171 insertions(+), 81 deletions(-) create mode 100644 webapp/src/models/BlockProducer/query_get_eden_stats.js diff --git a/hapi/src/config/index.js b/hapi/src/config/index.js index 427277d2..985b31b2 100644 --- a/hapi/src/config/index.js +++ b/hapi/src/config/index.js @@ -6,6 +6,6 @@ const massiveDB = (async () => await massive(massiveConfig))() module.exports = { massiveConfig, massiveDB, - defaultContractScope: process.env.HAPI_RATING_CONTRACT, + defaultContractScope: process.env.HAPI_RATING_CONTRACT || 'rateproducer', edenContractScope: 'eden' } \ No newline at end of file diff --git a/hapi/src/index.js b/hapi/src/index.js index 33f6ff9d..7fcf3d2a 100644 --- a/hapi/src/index.js +++ b/hapi/src/index.js @@ -43,10 +43,10 @@ const init = async () => { if (!isValidAccountName.isValidAccountName) throw new Error(isValidAccountName.message) - updateBpStats(producer) + const resultEden = await updateBpStats(producer) const result = await updateUserRatings(user, producer) - return { message: 'rate block producer was successfully!', ...result } + return { resultEden: resultEden, ...result } } catch (error) { console.error('ratebp', error) diff --git a/hapi/src/libs/sync-bp-stats.js b/hapi/src/libs/sync-bp-stats.js index a0ad1285..765f9a4a 100644 --- a/hapi/src/libs/sync-bp-stats.js +++ b/hapi/src/libs/sync-bp-stats.js @@ -1,16 +1,19 @@ -const { massiveDB, defaultContractScope, edenContractScope } = require('../config') +const { + massiveDB, + defaultContractScope, + edenContractScope +} = require('../config') const eosjs = require('eosjs') const fetch = require('node-fetch') const HAPI_RATING_CONTRACT = process.env.HAPI_RATING_CONTRACT || 'rateproducer' - const getBpStats = async (bp, scope) => { const rpc = new eosjs.JsonRpc( process.env.HAPI_EOS_API_ENDPOINT || 'https://jungle.eosio.cr', { fetch } ) - + try { return await rpc.get_table_rows({ json: true, // Get the response as json @@ -22,41 +25,93 @@ const getBpStats = async (bp, scope) => { reverse: false, // Optional: Get reversed data show_payer: false // Optional: Show ram payer }) - } catch (e) { return e } + } catch (e) { + return e + } } -const updateBpStats = async bpName => { - const CONTRACT_SCOPES = [defaultContractScope, edenContractScope] - CONTRACT_SCOPES.forEach(async (scope) => { - try { - const bpStat = await getBpStats(bpName, scope) - - if (!bpStat.rows.length || !bpStat.rows[0].bp === bpName) - return 'Did not find ratings for BP: ' + bpName - - const stat = bpStat.rows[0] - - switch(scope) { - case edenContractScope: - await updateBpStatsEden(bpName, stat) - break - default: - await updateBpStatsDefault(bpName, stat) - } - } catch (err) { console.log(`sync-bp-stats: ${err}`) } - }) +const updateBpStats = async (bpName) => { + // const CONTRACT_SCOPES = [defaultContractScope, edenContractScope] + + try { + const edenResult = await getEdenBpStats(bpName) + await getDefaultBpStats(bpName) + + return edenResult + + } catch (err) { + console.error(`sync-bp-stats: ${err}`) + } + console.log('END FUNCTION UPDATE BP STATS') +} + +const getEdenBpStats = async (bpName) => { + + try { + const bpStat = await getBpStats(bpName, edenContractScope) + + if (!bpStat.rows.length || !bpStat.rows[0].bp === bpName) + return 'Did not find ratings for BP: ' + bpName + + const stat = bpStat.rows[0] + + const edenResult = await updateBpStatsEden(bpName, stat) + + return edenResult + + } catch (err) { + console.error(`sync-bp-stats: ${err}`) + } + console.log('END FUNCTION UPDATE BP STATS') +} + +const getDefaultBpStats = async (bpName) => { + + try { + const bpStat = await getBpStats(bpName, defaultContractScope) + + if (!bpStat.rows.length || !bpStat.rows[0].bp === bpName) + return 'Did not find ratings for BP: ' + bpName + + const stat = bpStat.rows[0] + + return await updateBpStatsDefault(bpName, stat) + + } catch (err) { + console.error(`sync-bp-stats: ${err}`) + } + console.log('END FUNCTION UPDATE BP STATS') } const updateBpStatsDefault = async (bpName, stat) => { - const resultRatingsSave = await (await massiveDB).ratings_stats.save(stat) - const dbResult = resultRatingsSave ? resultRatingsSave : await (await massiveDB).ratings_stats.insert(stat) - console.log(`Default save or insert of ${bpName} was ${dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL'}`) + const db = await massiveDB + const resultRatingsSave = await db.ratings_stats.save(stat) + const dbResult = resultRatingsSave + ? resultRatingsSave + : await db.ratings_stats.insert(stat) + console.log( + `Default save or insert of ${bpName} was ${ + dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL' + }` + ) } const updateBpStatsEden = async (bpName, stat) => { - const resultRatingsSave = await (await massiveDB).eden_ratings_stats.save(stat) - const dbResult = resultRatingsSave ? resultRatingsSave : await (await massiveDB).eden_ratings_stats.insert(stat) - console.log(`Eden save or insert of ${bpName} was ${dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL'}`) + try { + const db = await massiveDB + const resultRatingsSave = await db.eden_ratings_stats.save(stat) + const dbResult = resultRatingsSave + ? resultRatingsSave + : await db.eden_ratings_stats.insert(stat) + console.log( + `Eden save or insert of ${bpName} was ${ + dbResult ? 'SUCCESSFULL' : 'UNSUCCESSFULL' + }` + ) + return { bp: dbResult.bp, average: dbResult.average, ratings_cntr: dbResult.ratings_cntr } + } catch (error) { + console.log('Error:', error) + } } module.exports = updateBpStats diff --git a/hapi/src/libs/sync-user-rating.js b/hapi/src/libs/sync-user-rating.js index d89f8492..6e7ef160 100644 --- a/hapi/src/libs/sync-user-rating.js +++ b/hapi/src/libs/sync-user-rating.js @@ -70,7 +70,8 @@ const updateUserRatings = async (userAccount, bpAccount) => { uniq_rating: blockProducer.uniq_rating, user: blockProducer.user, bp: blockProducer.bp, - ratings + ratings, + message: 'Block producer rated successfully!' } } catch (error) { console.error('updateUserRatings', error) diff --git a/hasura/metadata/actions.graphql b/hasura/metadata/actions.graphql index 63ac1f7f..fcc6914e 100644 --- a/hasura/metadata/actions.graphql +++ b/hasura/metadata/actions.graphql @@ -11,6 +11,7 @@ input RatingInput { type RatingOutput { message: String! + resultEden: jsonb uniq_rating: String user: String bp: String diff --git a/webapp/src/models/BlockProducer/blockProducers.js b/webapp/src/models/BlockProducer/blockProducers.js index 79f19575..c1428885 100644 --- a/webapp/src/models/BlockProducer/blockProducers.js +++ b/webapp/src/models/BlockProducer/blockProducers.js @@ -7,6 +7,7 @@ import { getRpc } from 'utils/eosjsUtils' import QUERY_PRODUCER from './query_get_producer_by' import QUERY_RATING from './query_get_bp_rating_by' +import QUERY_EDEN_RATING from './query_get_eden_stats' import MUTATION_UPDATE_RATING from './mutation_update_rate' import { contract } from '../../config' @@ -19,6 +20,7 @@ const initialState = { compareTool: false, producer: null, userRate: null, + edenRate: null, showSortSelected: false } @@ -103,6 +105,9 @@ const Proxies = { }, addUserRate(state, userRate) { return { ...state, userRate } + }, + addEdenRate(state, edenRate) { + return { ...state, edenRate } } }, effects: (dispatch) => ({ @@ -172,12 +177,33 @@ const Proxies = { }) this.addUserRate(userRatings.length ? userRatings[0].ratings : null) + dispatch.isLoading.storeIsContentLoading(false) } catch (error) { console.error('getBlockProducerRatingByOwner', error) dispatch.isLoading.storeIsContentLoading(false) } }, + async getBlockProducerEdenRating({ bp }, state) { + try { + dispatch.isLoading.storeIsContentLoading(true) + + const { + data: { eden_ratings_stats: edenRatings } + } = await apolloClient.query({ + variables: { bp }, + query: QUERY_EDEN_RATING, + fetchPolicy: 'network-only' + }) + + if (edenRatings.length > 0) this.addEdenRate(edenRatings[0]) + + dispatch.isLoading.storeIsContentLoading(false) + } catch (error) { + console.error('getBlockProducerEdenRating', error) + dispatch.isLoading.storeIsContentLoading(false) + } + }, async mutationInsertUserRating( { ual, user, bp, result, ...ratings }, state @@ -222,6 +248,7 @@ const Proxies = { return { ...producer, average: rateStat[0].average, + ratings_cntr: rateStat[0].ratings_cntr, system: { ...producer.system, parameters @@ -241,6 +268,7 @@ const Proxies = { ) this.addProducer(currentBP) + this.addEdenRate(rateProducer.resultEden) this.updateBPList(producerUpdatedList) this.getBlockProducerRatingByOwner({ bp, userAccount: user }) dispatch.user.getUserRates({ diff --git a/webapp/src/models/BlockProducer/mutation_update_rate.js b/webapp/src/models/BlockProducer/mutation_update_rate.js index 59b148a3..a48f1d7e 100644 --- a/webapp/src/models/BlockProducer/mutation_update_rate.js +++ b/webapp/src/models/BlockProducer/mutation_update_rate.js @@ -4,6 +4,7 @@ const MUTATION_UPDATE_RATING = gql` mutation updateRating($ratingInput: RatingInput!) { rateProducer(ratingInput: $ratingInput) { message + resultEden uniq_rating user bp diff --git a/webapp/src/models/BlockProducer/query_get_eden_stats.js b/webapp/src/models/BlockProducer/query_get_eden_stats.js new file mode 100644 index 00000000..f6e66d70 --- /dev/null +++ b/webapp/src/models/BlockProducer/query_get_eden_stats.js @@ -0,0 +1,13 @@ +import gql from 'graphql-tag' + +const QUERY_EDEN_RATING = gql` + query getEdenRating($bp: String) { + eden_ratings_stats(where: { bp: { _eq: $bp } }) { + bp + average + ratings_cntr + } + } +` + +export default QUERY_EDEN_RATING diff --git a/webapp/src/routes/block-producers/block-producer-profile.js b/webapp/src/routes/block-producers/block-producer-profile.js index a1440f08..4048bd8b 100644 --- a/webapp/src/routes/block-producers/block-producer-profile.js +++ b/webapp/src/routes/block-producers/block-producer-profile.js @@ -62,9 +62,11 @@ const BlockProducerProfile = ({ account, ...props }) => { const isDesktop = useMediaQuery('(min-width:767px)') const isMobile = useMediaQuery('(max-width:768px)') const [sizes, setSizes] = useState() - const { list: blockProducers, producer } = useSelector( - (state) => state.blockProducers - ) + const { + list: blockProducers, + producer, + edenRate + } = useSelector((state) => state.blockProducers) const { isContentLoading } = useSelector((state) => state.isLoading) const bpHasInformation = Boolean( producer && Object.values(producer.bpjson).length @@ -86,6 +88,9 @@ const BlockProducerProfile = ({ account, ...props }) => { const getData = async () => { !blockProducers.length && (await dispatch.blockProducers.getBPs()) dispatch.blockProducers.getBlockProducerByOwner(account) + dispatch.blockProducers.getBlockProducerEdenRating({ + bp: account + }) } getData() @@ -133,7 +138,11 @@ const BlockProducerProfile = ({ account, ...props }) => { {!isMobile && ( - + { {isMobile && ( - + )} diff --git a/webapp/src/routes/block-producers/block-producer-rate.js b/webapp/src/routes/block-producers/block-producer-rate.js index e5ce0252..75e2f218 100644 --- a/webapp/src/routes/block-producers/block-producer-rate.js +++ b/webapp/src/routes/block-producers/block-producer-rate.js @@ -23,6 +23,7 @@ import classNames from 'classnames' import Snackbar from '@material-ui/core/Snackbar' import MuiAlert from '@material-ui/lab/Alert' import { makeStyles } from '@material-ui/core/styles' +import formatNumber from 'utils/formatNumber' import TitlePage from 'components/title-page' import Radar from 'components/radar' @@ -156,11 +157,20 @@ const BlockProducerRate = ({ account, ual }) => { if (useString) { return { - community: (communityEnabled ? community : 0).toString(), - development: (developmentEnabled ? development : 0).toString(), - infrastructure: (infraEnabled ? infra : 0).toString(), - transparency: (transparencyEnabled ? transparency : 0).toString(), - trustiness: (trustinessEnabled ? trustiness : 0).toString() + community: formatNumber(communityEnabled ? community : 0, 0).toString(), + development: formatNumber( + developmentEnabled ? development : 0, + 0 + ).toString(), + infrastructure: formatNumber(infraEnabled ? infra : 0, 0).toString(), + transparency: formatNumber( + transparencyEnabled ? transparency : 0, + 0 + ).toString(), + trustiness: formatNumber( + trustinessEnabled ? trustiness : 0, + 0 + ).toString() } } diff --git a/webapp/src/routes/block-producers/general-information-profile.js b/webapp/src/routes/block-producers/general-information-profile.js index 1f258051..1160ae1a 100644 --- a/webapp/src/routes/block-producers/general-information-profile.js +++ b/webapp/src/routes/block-producers/general-information-profile.js @@ -172,7 +172,7 @@ const WebsiteLegend = ({ classes, webInfo }) => { ) } -const GeneralInformation = ({ classes, producer = {} }) => { +const GeneralInformation = ({ classes, producer = {}, edenRate = {} }) => { const { t } = useTranslation('profile') const webpageURL = _get(producer, 'system.url') @@ -296,7 +296,7 @@ const GeneralInformation = ({ classes, producer = {} }) => { variant='subtitle1' className={classNames(classes.value, classes.subTitle)} > - {_get(producer, 'ratings_cntr', null) || 0} + {_get(edenRate, 'ratings_cntr', null) || 0} @@ -309,40 +309,7 @@ const GeneralInformation = ({ classes, producer = {} }) => { variant='subtitle1' className={classNames(classes.value, classes.subTitle)} > - {getAverageValue(_get(producer, 'average', 0))} - - - - - - - - {t('tatolRates')} - - - - - - {t('rates')}: - - - {_get(producer, 'ratings_cntr', null) || 0} - - - - - - - {t('average')}: - - - {getAverageValue(_get(producer, 'average', 0))} + {getAverageValue(_get(edenRate, 'average', 0))} @@ -359,7 +326,8 @@ SocialNetworks.propTypes = { GeneralInformation.propTypes = { classes: PropTypes.object, - producer: PropTypes.oneOfType([PropTypes.object, PropTypes.bool]) + producer: PropTypes.oneOfType([PropTypes.object, PropTypes.bool]), + edenRate: PropTypes.oneOfType([PropTypes.object, PropTypes.bool]) } WebsiteLegend.propTypes = { From b4d2b30f18526b307d8b910ac965306b6f7eb303 Mon Sep 17 00:00:00 2001 From: AngeloCG97 <51149817+AngeloCG97@users.noreply.github.com> Date: Fri, 20 Aug 2021 16:24:52 -0600 Subject: [PATCH 47/54] Cannot vote for a proxy (#692) * Publish changes to prod (#566) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones * Feat/add tx link (#545) * feat: add tx link * feat: remove secrets * setup env workflow (#546) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * Fix/rate action buttons not showing (#547) * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * fix: rate buttons not showing in certains densities * Fix/hasura console config (#556) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes * fix: hasura console config Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * Fix/add missing i18n entries (#554) * Deploy to mainnet (#544) * avoid statefulsets update errors on actions runs refs #535. (#536) * deprecate demux service. refs #538 (#540) * add handler url from env var & other minor bug fixes (#542) * Add missing env var to config map (#543) * add handler url from env var & other minor bug fixes * add missing env var * fix: update some env vars * fix: update some env vars * fix: replace .env values with the previous ones Co-authored-by: Andres Gomez Co-authored-by: JustinCast * wip * wip: add env files & db_data to .gitignore * fix: remove .env files * fix: remove .env files * fix: delete unnecessary code * refactor: remove unnecessary code * fix: minimal * feat: voting tool revamp * fix: remove comments * fix: add i18n entries * fix: bug fixes Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez * docs: add env example (#565) * fix: not able to sync proxies locally (#564) * fix: update hasura version * fix: hasura version && other minor bug fixes * Fix/update hasura version (#567) * fix: remove build:staging statement * latest changes Co-authored-by: Andres Gomez Co-authored-by: JustinCast * Update push-master-environment.yaml (#576) * fix(cron): update config values (#579) * Revert "fix(cron): update config values (#579)" (#580) This reverts commit 13ecf78f0cec5c1a938a1ee0aee646828995d940. * add(link sidebar): Add network Monitor in sidebar * fix(design): Align BP cards in all screen resolutions * fix(bp page): Fix broke design in bp page * fix(voting-tool): apply changes on design * fix(proxy-component): change cards and voting tool proxy design * fix(vote-bp): change method got to top page * fix(content): delete unnecessary console.log * fix(design): delete unnecessary backgraound color Co-authored-by: Xavier <5632966+xavier506@users.noreply.github.com> Co-authored-by: Andres Gomez Co-authored-by: JustinCast Co-authored-by: Xavier Fernandez --- webapp/src/components/bp-chip-avatar/index.js | 49 ++++-- webapp/src/components/card/index.js | 70 +++++--- .../compare-tool/compare-graph-view.js | 49 +++--- webapp/src/components/compare-tool/styles.js | 11 ++ webapp/src/language/en.json | 3 +- webapp/src/language/es.json | 5 +- webapp/src/routes/block-producers/index.js | 3 +- webapp/src/routes/proxies/index.js | 159 ++++++++++++++---- webapp/src/routes/proxies/proxy-profile.js | 8 +- webapp/src/routes/proxies/styles.js | 3 +- 10 files changed, 265 insertions(+), 95 deletions(-) diff --git a/webapp/src/components/bp-chip-avatar/index.js b/webapp/src/components/bp-chip-avatar/index.js index 87b7abf6..a3ac4565 100644 --- a/webapp/src/components/bp-chip-avatar/index.js +++ b/webapp/src/components/bp-chip-avatar/index.js @@ -14,22 +14,46 @@ const ProducerChipAvatar = ({ classNames, onHandleRemove, imageURL, - defaultName + defaultName, + isProxy }) => { const backgroundColor = _get(data, 'data.pointBackgroundColor', '#597a81') const classes = useStyles({ color: backgroundColor }) return ( - - {!imageURL ? defaultName : } - - } - onDelete={() => onHandleRemove(data.owner)} - label={data.owner} - /> + <> + {isProxy && ( + + {!imageURL ? ( + defaultName + ) : ( + + )} + + } + label={data.owner} + /> + )} + {!isProxy && ( + + {!imageURL ? ( + defaultName + ) : ( + + )} + + } + onDelete={() => onHandleRemove(data.owner)} + label={data.owner} + /> + )} + ) } @@ -38,7 +62,8 @@ ProducerChipAvatar.propTypes = { classNames: PropTypes.object, onHandleRemove: PropTypes.func, imageURL: PropTypes.string, - defaultName: PropTypes.string + defaultName: PropTypes.string, + isProxy: PropTypes.any } export default memo(ProducerChipAvatar) diff --git a/webapp/src/components/card/index.js b/webapp/src/components/card/index.js index eb7961de..e51eb530 100644 --- a/webapp/src/components/card/index.js +++ b/webapp/src/components/card/index.js @@ -155,28 +155,56 @@ const CardData = ({ )}
- {useRateButton && ( - + <> + + + + )} + {!useRateButton && ( + <> + + + )} diff --git a/webapp/src/components/compare-tool/compare-graph-view.js b/webapp/src/components/compare-tool/compare-graph-view.js index 3882b152..a6fe6584 100644 --- a/webapp/src/components/compare-tool/compare-graph-view.js +++ b/webapp/src/components/compare-tool/compare-graph-view.js @@ -2,9 +2,7 @@ import React, { useState, useEffect } from 'react' import PropTypes from 'prop-types' import { makeStyles } from '@material-ui/core/styles' import Grid from '@material-ui/core/Grid' -import CardHeader from '@material-ui/core/CardHeader' import Typography from '@material-ui/core/Typography' -import Avatar from '@material-ui/core/Avatar' import FormControlLabel from '@material-ui/core/FormControlLabel' import LockOpenIcon from '@material-ui/icons/LockOpenOutlined' import LockIcon from '@material-ui/icons/LockOutlined' @@ -12,7 +10,6 @@ import Button from '@material-ui/core/Button' import Tooltip from '@material-ui/core/Tooltip' import Box from '@material-ui/core/Box' import withWidth from '@material-ui/core/withWidth' -import Help from '@material-ui/icons/HelpOutlineRounded' import { useMediaQuery } from '@material-ui/core' import { useTranslation } from 'react-i18next' import Switch from '@material-ui/core/Switch' @@ -31,30 +28,10 @@ const CompareBodyList = ({ isProxy, selectedData, classes, removeBP }) => { if (isProxy) { const proxy = selectedData[0] - const owner = _get(proxy, 'owner') - const title = _get(proxy, 'name') - const imageURL = _get(proxy, 'logo_256', null) const producers = _get(proxy, 'voter_info.producers', []) return ( <> - - {!imageURL ? ( - - ) : ( - - )} - - } - title={title || {owner}} - subheader={owner} - /> {producers.map((producer) => { const imageURL = _get(producer, 'bpjson.org.branding.logo_256', null) @@ -64,6 +41,7 @@ const CompareBodyList = ({ isProxy, selectedData, classes, removeBP }) => { onHandleRemove={removeBP} classNames={classes} imageURL={imageURL} + isProxy={isProxy} key={`data-list-name-${producer.owner}`} defaultName='P' /> @@ -166,7 +144,7 @@ const CompareGraphView = ({ - {`${t('voteToolTitle')} (${selected.length} ${t('selected')})`} + {`${t('voteToolTitle')} (${selected.length} ${t('selecteds')})`} {t('voteToolDescription')} @@ -177,7 +155,7 @@ const CompareGraphView = ({ {isDesktop && ( - + )} @@ -204,12 +182,29 @@ const CompareGraphView = ({ xs={12} style={{ textAlign: 'center', - height: '50px' + height: '90px' }} > {isProxy && selected.length > 0 && ( - {selected[0].name} + + + + {selected[0].name} + + + + + + )} {!isProxy && ( ({ display: 'flex', alignItems: 'center', height: '100%' + }, + btnRateProxies: { + backgroundColor: theme.palette.secondary.main, + color: '#ffffff', + width: '100px', + padding: '5px 20px 5px 20px', + [theme.breakpoints.up('sm')]: { + '&:hover': { + backgroundColor: theme.palette.secondary.dark + } + } } }) diff --git a/webapp/src/language/en.json b/webapp/src/language/en.json index 2680e300..5ceafa07 100644 --- a/webapp/src/language/en.json +++ b/webapp/src/language/en.json @@ -17,6 +17,7 @@ "view": "View", "remove": "Remove", "addToVote": "Add to vote", + "selected": "Selected", "details": "Details", "voting": "voting", @@ -26,7 +27,7 @@ "compareToolCollapsedSwitch": "Collapse Graphs", "voteToolTitle": "Voting Tool", "voteToolDescription": "Login to your account and vote for the selected block producers.", - "selected": "Selected", + "selecteds": "Selected", "averageCard": "Average", "rateCard": "Ratings", diff --git a/webapp/src/language/es.json b/webapp/src/language/es.json index 6566b568..a44219ee 100644 --- a/webapp/src/language/es.json +++ b/webapp/src/language/es.json @@ -16,7 +16,8 @@ "loadMore": "Cargar más", "view": "Ver", "remove": "Remover", - "addToVote": "Add to vote", + "addToVote": "Agregar para votar", + "selected": "Seleccionado", "details": "Details", "voting": "votando", @@ -26,7 +27,7 @@ "compareToolCollapsedSwitch": "Colapsar Gráficos", "voteToolTitle": "Herramienta de votación", "voteToolDescription": "Inicie sesión en su cuenta y vote por los productores de bloques seleccionados.", - "selected": "Seleccionados", + "selecteds": "Seleccionados", "averageCard": "Promedio", "rateCard": "Evaluaciones", diff --git a/webapp/src/routes/block-producers/index.js b/webapp/src/routes/block-producers/index.js index 51360936..36f0d6cf 100644 --- a/webapp/src/routes/block-producers/index.js +++ b/webapp/src/routes/block-producers/index.js @@ -55,6 +55,7 @@ const AllBps = ({ ual }) => { const accountName = _get(ual, 'activeUser.accountName', null) const loadMore = () => setCurrentlyVisible(currentlyVisible + 12) + const goToTop = () => document.getElementById('mainContent').scrollTo(0, 0) const handleToggleCompareTool = () => { dispatch.blockProducers.toggleCompareTool() @@ -69,7 +70,7 @@ const AllBps = ({ ual }) => { } const handleOpenDesktopVotingTool = (value) => { - myRef.current.scrollIntoView({ block: 'start' }) + goToTop() setOpenDesktopVotingTool(value) } diff --git a/webapp/src/routes/proxies/index.js b/webapp/src/routes/proxies/index.js index b7732701..30027f71 100644 --- a/webapp/src/routes/proxies/index.js +++ b/webapp/src/routes/proxies/index.js @@ -3,6 +3,7 @@ import PropTypes from 'prop-types' import { useDispatch, useSelector } from 'react-redux' import Grid from '@material-ui/core/Grid' import Button from '@material-ui/core/Button' +import { useMediaQuery } from '@material-ui/core' import { makeStyles } from '@material-ui/core/styles' import { useTranslation } from 'react-i18next' import classNames from 'classnames' @@ -13,6 +14,7 @@ import Card from 'components/card' import CompareTool from 'components/compare-tool' import styles from './styles' +import SelectedBpsBottomSheet from './../block-producers/bottom-sheet-selected-bps' const useStyles = makeStyles(styles) @@ -31,6 +33,16 @@ const AllProxies = ({ ual }) => { const proxiesList = filtered && filtered.length ? filtered : proxies const shownList = proxiesList && proxiesList.slice(0, currentlyVisible) const hasMore = proxiesList && currentlyVisible < proxiesList.length + const isDesktop = useMediaQuery('(min-width:767px)') + const accountName = _get(ual, 'activeUser.accountName', null) + const [openVoteDrawer, setOpenVoteDrawer] = useState(false) + const [showMessage, setShowMessage] = useState(false) + const [openDesktopVotingTool, setOpenDesktopVotingTool] = useState(isDesktop) + const [ratingState, setRatingState] = useState({ + processing: false, + txError: null, + txSuccess: false + }) const loadMore = () => setCurrentlyVisible(currentlyVisible + 12) const goToTop = () => document.getElementById('mainContent').scrollTo(0, 0) @@ -47,6 +59,119 @@ const AllProxies = ({ ual }) => { } } + const handleOnClose = () => { + setOpenDesktopVotingTool(false) + } + + const handleOpenDesktopVotingTool = ( + isAdding, + producerAccountName, + value + ) => { + if (isAdding) { + if (!(selectedProxies || []).length && !compareToolVisible) + handleToggleCompareTool() + handleToggleSelected(producerAccountName, isAdding) + isDesktop ? setOpenDesktopVotingTool(value) : setOpenVoteDrawer(value) + goToTop() + } else if (!isAdding) { + if ((selectedProxies || []).length === 1 && compareToolVisible) + handleToggleCompareTool() + handleToggleSelected() + } + } + + const handleSetRatingState = () => { + setRatingState({ + ...ratingState, + txError: null, + txSuccess: false, + showChipMessage: false + }) + } + + const sendVoteProxy = async () => { + if (!accountName) { + setShowMessage(true) + + return + } + + const transaction = { + actions: [ + { + account: 'eosio', + name: 'voteproducer', + authorization: [ + { + actor: accountName, + permission: 'active' + } + ], + data: { + voter: accountName, + proxy: selectedProxies[0], + producers: [] + } + } + ] + } + + try { + setRatingState({ + ...ratingState, + txError: null, + processing: true, + txSuccess: false + }) + + await ual.activeUser.signTransaction(transaction, { + broadcast: true + }) + + setRatingState({ + ...ratingState, + processing: false, + txSuccess: true + }) + + setTimeout(() => { + setRatingState({ + ...ratingState, + txError: null, + txSuccess: false + }) + }, 2000) + setShowMessage(false) + } catch (error) { + console.warn(error) + setRatingState({ + ...ratingState, + processing: false, + txError: error.message ? error.message : error + }) + } + } + + const cmprTool = () => ( + { + handleToggleCompareTool() + handleToggleSelected() + }} + handleOnClose={handleOnClose} + /> + ) + useEffect(() => { const getData = async () => { await dispatch.blockProducers.getBPs() @@ -70,20 +195,7 @@ const AllProxies = ({ ual }) => { return (
- { - handleToggleCompareTool() - handleToggleSelected() - }} - /> + {isDesktop && openDesktopVotingTool && cmprTool()} { isSelected={ selectedProxies && selectedProxies.includes(proxy.owner) } - toggleSelection={(isAdding, producerAccountName) => () => { - if (isAdding) { - if (!(selectedProxies || []).length && !compareToolVisible) - handleToggleCompareTool() - handleToggleSelected(producerAccountName, isAdding) - goToTop() - } else if (!isAdding) { - if ( - (selectedProxies || []).length === 1 && - compareToolVisible - ) - handleToggleCompareTool() - handleToggleSelected() - } - }} + toggleSelection={handleOpenDesktopVotingTool} data={proxy} imageURL={_get(proxy, 'logo_256')} owner={_get(proxy, 'owner')} @@ -129,6 +227,9 @@ const AllProxies = ({ ual }) => { ))} + + {cmprTool()} + @@ -231,12 +233,21 @@ const CompareGraphView = ({ height: mobileMedium ? '225px' : '105px' }} > - + {selected.length > 0 ? ( + + ) : ( + + {t('noSelectedBP')} + + )} )} {!isProxy && ( @@ -260,7 +271,7 @@ const CompareGraphView = ({ className={classes.centerBox} style={{ width: '50%', - justifyContent: 'flex-end', + justifyContent: 'start', display: 'flex' }} > @@ -271,7 +282,7 @@ const CompareGraphView = ({ variant='contained' onClick={onHandleVote} > - {t('btnVoteBPs')} + {t('voteToolToggle')} @@ -280,12 +291,18 @@ const CompareGraphView = ({ {isDesktop && ( - + {selected.length > 0 ? ( + + ) : ( + + {t('noSelectedBP')} + + )} )} diff --git a/webapp/src/components/compare-tool/compare-slider-view.js b/webapp/src/components/compare-tool/compare-slider-view.js index c4d2b5ad..9a439a7c 100644 --- a/webapp/src/components/compare-tool/compare-slider-view.js +++ b/webapp/src/components/compare-tool/compare-slider-view.js @@ -25,7 +25,7 @@ const CompareSliderView = ({ const [sizes, setSizes] = useState() useEffect(() => { - setSizes(isDesktop ? 400 : 240) + setSizes(isDesktop ? 400 : 250) }, [isDesktop]) return ( diff --git a/webapp/src/components/compare-tool/index.js b/webapp/src/components/compare-tool/index.js index 69c659f1..71c1f022 100644 --- a/webapp/src/components/compare-tool/index.js +++ b/webapp/src/components/compare-tool/index.js @@ -8,6 +8,7 @@ import _get from 'lodash.get' import Switch from '@material-ui/core/Switch' import Snackbar from '@material-ui/core/Snackbar' import MuiAlert from '@material-ui/lab/Alert' +import clsx from 'clsx' import CompareGraphView from './compare-graph-view' import CompareSliderView from './compare-slider-view' @@ -72,7 +73,9 @@ const CompareTool = ({ } return ( -
+
{isCollapsedView ? ( - {t('btnVoteBPs')} + {t('voteToolToggle')} )} diff --git a/webapp/src/components/compare-tool/styles.js b/webapp/src/components/compare-tool/styles.js index 4fcfe626..43a179e6 100644 --- a/webapp/src/components/compare-tool/styles.js +++ b/webapp/src/components/compare-tool/styles.js @@ -164,5 +164,11 @@ export default (theme) => ({ backgroundColor: theme.palette.secondary.dark } } + }, + reliefGrid: { + border: '1px solid #f8f8f', + boxShadow: + 'inset 2px 2px 2px #fff, inset -1px 0 2px rgba(0,0,0,.1), 1px 3px 3px rgba(0,0,0,.1)', + backgroundColor: '#fff' } }) diff --git a/webapp/src/components/radar/index.js b/webapp/src/components/radar/index.js index c2673ffe..7a646905 100644 --- a/webapp/src/components/radar/index.js +++ b/webapp/src/components/radar/index.js @@ -8,7 +8,7 @@ import getRadarLabelName from 'utils/getRadarLabelName' const RadarData = ({ bpData, height, showLabel, width, ...props }) => { const { t } = useTranslation('translations') const labels = getRadarLabelName(t) - const [sizes, setSizes] = useState({ width: 240, height: 240 }) + const [sizes, setSizes] = useState({ width: 250, height: 250 }) const bpValidData = bpData.datasets && bpData.datasets.length ? { ...bpData, labels } diff --git a/webapp/src/language/en.json b/webapp/src/language/en.json index 5ceafa07..be4bab0d 100644 --- a/webapp/src/language/en.json +++ b/webapp/src/language/en.json @@ -26,8 +26,10 @@ "voteToolToggle": "Vote", "compareToolCollapsedSwitch": "Collapse Graphs", "voteToolTitle": "Voting Tool", + "noBPSelected": "No BPs selected", + "noSelectedBP": "No block producers have been selected yet. Click on “Add to vote” and proceed to vote.", "voteToolDescription": "Login to your account and vote for the selected block producers.", - "selecteds": "Selected", + "chosen": "Selected", "averageCard": "Average", "rateCard": "Ratings", diff --git a/webapp/src/language/es.json b/webapp/src/language/es.json index a44219ee..112df9b4 100644 --- a/webapp/src/language/es.json +++ b/webapp/src/language/es.json @@ -11,7 +11,7 @@ "availableToRate": "Usted puede Calificar a los Productores de Bloques", "notAvailableToRate": "Usted debe votar por un proxy o al menos por 21 producers", "voteWithoutLogin": "Necesitas iniciar sesión para votar", - "btnVoteBPs": "Vote por estos BPs", + "btnVoteBPs": "Votar", "clearSelection": "Borrar selección", "loadMore": "Cargar más", "view": "Ver", @@ -26,8 +26,10 @@ "voteToolToggle": "Votar", "compareToolCollapsedSwitch": "Colapsar Gráficos", "voteToolTitle": "Herramienta de votación", + "noBPSelected": "No PBs seleccionados", + "noSelectedBP": "Aún no se ha seleccionado ningún productor de bloques. Haga clic en “Agregar para votar” y proceda a votar.", "voteToolDescription": "Inicie sesión en su cuenta y vote por los productores de bloques seleccionados.", - "selecteds": "Seleccionados", + "chosen": "Seleccionados", "averageCard": "Promedio", "rateCard": "Evaluaciones", diff --git a/webapp/src/routes/block-producers/block-producer-profile.js b/webapp/src/routes/block-producers/block-producer-profile.js index 4048bd8b..242749c9 100644 --- a/webapp/src/routes/block-producers/block-producer-profile.js +++ b/webapp/src/routes/block-producers/block-producer-profile.js @@ -81,7 +81,7 @@ const BlockProducerProfile = ({ account, ...props }) => { const webInfo = _get(producer, 'general_info', null) useEffect(() => { - setSizes(isDesktop ? 400 : 240) + setSizes(isDesktop ? 400 : 250) }, [isDesktop]) useEffect(() => { diff --git a/webapp/src/routes/block-producers/block-producer-rate.js b/webapp/src/routes/block-producers/block-producer-rate.js index 75e2f218..639e5759 100644 --- a/webapp/src/routes/block-producers/block-producer-rate.js +++ b/webapp/src/routes/block-producers/block-producer-rate.js @@ -73,7 +73,7 @@ const BlockProducerRate = ({ account, ual }) => { const bPLogo = _get(producer, 'bpjson.org.branding.logo_256', null) useEffect(() => { - setSizes(isDesktop ? 400 : 240) + setSizes(isDesktop ? 400 : 250) }, [isDesktop]) function Alert(props) { diff --git a/webapp/src/routes/home/cover.js b/webapp/src/routes/home/cover.js index 3bdf7541..30ff6864 100644 --- a/webapp/src/routes/home/cover.js +++ b/webapp/src/routes/home/cover.js @@ -23,7 +23,7 @@ const HomeCover = ({ blockProducer }) => { const [sizes, setSizes] = useState() useEffect(() => { - setSizes(isDesktop ? 400 : 240) + setSizes(isDesktop ? 400 : 250) }, [isDesktop]) return ( diff --git a/webapp/src/routes/proxies/proxy-profile.js b/webapp/src/routes/proxies/proxy-profile.js index a092eef3..657e7fe5 100644 --- a/webapp/src/routes/proxies/proxy-profile.js +++ b/webapp/src/routes/proxies/proxy-profile.js @@ -147,7 +147,7 @@ const ProxyProfile = ({ account, ual, ...props }) => { }, [account, accountName, setShowMessage]) useEffect(() => { - setSizes(isDesktop ? 400 : 240) + setSizes(isDesktop ? 400 : 250) }, [isDesktop]) return ( diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 771323bd..fb94e142 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -3917,11 +3917,16 @@ character-reference-invalid@^1.0.0: resolved "https://registry.yarnpkg.com/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz#083329cda0eae272ab3dbbf37e9a382c13af1560" integrity sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg== -chart.js@^3.4.1, chart.js@^3.5.0: +chart.js@^3.5.0: version "3.5.0" resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.5.0.tgz#6eb075332d4ebbbb20a94e5a07a234052ed6c4fb" integrity sha512-J1a4EAb1Gi/KbhwDRmoovHTRuqT8qdF0kZ4XgwxpGethJHUdDrkqyPYwke0a+BuvSeUxPf8Cos6AX2AB8H8GLA== +chart.js@^3.5.1: + version "3.5.1" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.5.1.tgz#73e24d23a4134a70ccdb5e79a917f156b6f3644a" + integrity sha512-m5kzt72I1WQ9LILwQC4syla/LD/N413RYv2Dx2nnTkRS9iv/ey1xLTt0DnPc/eWV4zI+BgEgDYBIzbQhZHc/PQ== + check-types@^11.1.1: version "11.1.2" resolved "https://registry.yarnpkg.com/check-types/-/check-types-11.1.2.tgz#86a7c12bf5539f6324eb0e70ca8896c0e38f3e2f" From bb8cf34ca3f48ccbeec30b13713cbb6475fdb088 Mon Sep 17 00:00:00 2001 From: Leister Francisco Alvarez Campos Date: Thu, 26 Aug 2021 13:59:48 -0600 Subject: [PATCH 54/54] fix(hapi): solve unhandle db connection error (#706) Co-authored-by: Leister Alvarez Campos --- hapi/src/config/index.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/hapi/src/config/index.js b/hapi/src/config/index.js index 8fb20894..b16a5106 100644 --- a/hapi/src/config/index.js +++ b/hapi/src/config/index.js @@ -1,7 +1,16 @@ const massive = require('massive') const massiveConfig = require('./server.config') -const massiveDB = (async () => await massive(massiveConfig))() +const massiveDB = (async () => { + try { + return await massive(massiveConfig) + } catch (err) { + console.log('---- Failed to connect to database ----') + console.log(err) + + return null + } +})() module.exports = { massiveConfig,