diff --git a/.env.unix.example b/.env.unix.example
index dcb45d886a4f4c90de85959a7874b54201c2eb80..54986336db71fa576456e6638245f6a36574a34b 100644
--- a/.env.unix.example
+++ b/.env.unix.example
@@ -12,12 +12,11 @@ METADATA_PASSWORD=dbrepo
AUTH_DB=keycloak
AUTH_USERNAME=root
AUTH_PASSWORD=dbrepo
-BROKER_ENDPOINT=http://broker-service:15672
+BROKER_ENDPOINT=http://broker-service:15672/admin/broker
BROKER_USERNAME=fda
BROKER_PASSWORD=fda
KEYCLOAK_ADMIN=fda
KEYCLOAK_ADMIN_PASSWORD=fda
-BROKER_CONSUMERS=2
WEBSITE=http://localhost
LOG_LEVEL=trace # error, warning, info, debug, trace
DOI_URL="https://doi.org"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8978694f11ceb1d20db159ea4952e02168f4ce24..88eb3dcbc16a7cea54a474d5809eaed1c39851e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,15 +1,3 @@
-before_script:
- - "docker version"
- - "docker compose version"
- - "docker system prune -f"
- - "mvn --version"
- - "python3 --version"
- - "df / -h"
- - "docker logout"
- - "docker logout ghcr.io"
- - "docker logout registry.hub.docker.com"
- - "docker logout ${AZURE_REPO}"
-
variables:
HOSTALIASES: ./hosts
DOCKER_TLS_CERTDIR: /certs
@@ -50,6 +38,21 @@ build-search-sync-agent:
script:
- "make build-search-sync-agent"
+build-frontend:
+ stage: build-frontend
+ script:
+ - "make build-frontend"
+
+build-docker:
+ image: docker:24-dind
+ stage: build-docker
+ needs:
+ - build-metadata-service
+ - build-analyse-service
+ script:
+ - "cp .env.unix.example .env"
+ - "make build-docker"
+
test-metadata-service:
stage: test-backend
needs:
@@ -118,21 +121,6 @@ test-frontend:
path: ./dbrepo-ui/coverage/cobertura-coverage.xml
coverage: '/TOTAL.*?([0-9]{1,3})%/'
-build-docker:
- stage: build-docker
- needs:
- - build-metadata-service
- - build-analyse-service
- script:
- - bash .scripts/docker-prune.sh
- - cp .env.unix.example .env
- - make build-docker
-
-build-frontend:
- stage: build-frontend
- script:
- - make build-frontend
-
scan-analyse-service:
stage: scan-docker
needs:
@@ -233,7 +221,7 @@ scan-metadata-service:
reports:
container_scanning: ./.trivy/trivy-metadata-service-report.json
-scan-proxy:
+scan-search-db:
stage: scan-docker
needs:
- build-docker
@@ -243,7 +231,7 @@ scan-proxy:
- master
allow_failure: true
script:
- - make scan-proxy
+ - make scan-search-db
cache:
paths:
- .trivycache/
@@ -251,9 +239,9 @@ scan-proxy:
when: always
expire_in: 1 days
reports:
- container_scanning: ./.trivy/trivy-proxy-report.json
+ container_scanning: ./.trivy/trivy-search-db-report.json
-scan-search-db:
+scan-data-db:
stage: scan-docker
needs:
- build-docker
@@ -263,7 +251,7 @@ scan-search-db:
- master
allow_failure: true
script:
- - make scan-search-db
+ - make scan-data-db
cache:
paths:
- .trivycache/
@@ -271,7 +259,27 @@ scan-search-db:
when: always
expire_in: 1 days
reports:
- container_scanning: ./.trivy/trivy-search-db-report.json
+ container_scanning: ./.trivy/trivy-data-db-report.json
+
+scan-metadata-db:
+ stage: scan-docker
+ needs:
+ - build-docker
+ only:
+ refs:
+ - dev
+ - master
+ allow_failure: true
+ script:
+ - make scan-metadata-db
+ cache:
+ paths:
+ - .trivycache/
+ artifacts:
+ when: always
+ expire_in: 1 days
+ reports:
+ container_scanning: ./.trivy/trivy-metadata-db-report.json
scan-ui:
stage: scan-docker
@@ -301,7 +309,8 @@ release-latest:
- scan-broker-service
- scan-gateway-service
- scan-metadata-service
- - scan-proxy
+ - scan-metadata-db
+ - scan-data-db
- scan-search-db
- scan-ui
only:
@@ -321,7 +330,8 @@ release-version:
- scan-broker-service
- scan-gateway-service
- scan-metadata-service
- - scan-proxy
+ - scan-metadata-db
+ - scan-data-db
- scan-search-db
- scan-ui
only:
diff --git a/Makefile b/Makefile
index 76976ea1099f5547784314d4ea48b1afda240e9b..bb91b0e5e47a49c108e69e7411fa627b93b20e0f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,6 @@
TAG ?= latest
TRIVY_VERSION ?= v0.41.0
-ELASTIC_VERSION ?= 8.7.1
-NGINX_VERSION ?= 1.25.0-alpine-slim
AZURE_REPO ?= dbrepo.azurecr.io
all: build
@@ -23,7 +21,7 @@ build-analyse-service:
build-docker:
docker build -t dbrepo-metadata-service:build --target build dbrepo-metadata-service
- docker build ./dbrepo-log-service -t dbrepo-log-service:latest
+ docker build -t dbrepo-search-sync-agent:build --target build dbrepo-search-sync-agent
docker compose build --parallel
build-frontend:
@@ -33,7 +31,7 @@ build-frontend:
build-clients:
bash ./.gitlab/swagger/generate.sh
-tag: tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-broker-service tag-metadata-service tag-search-sync-agent tag-log-service tag-log-service-dashboard
+tag: tag-analyse-service tag-authentication-service tag-metadata-db tag-ui tag-broker-service tag-metadata-service tag-search-sync-agent
tag-analyse-service:
docker tag dbrepo-analyse-service:latest "dbrepo/analyse-service:${TAG}"
@@ -67,15 +65,7 @@ tag-search-db:
docker tag dbrepo-search-db:latest "dbrepo/search-db:${TAG}"
docker tag dbrepo-search-db:latest "${AZURE_REPO}/dbrepo/search-db:${TAG}"
-tag-log-service:
- docker tag dbrepo-log-service:latest "dbrepo/log-service:${TAG}"
- docker tag dbrepo-log-service:latest "${AZURE_REPO}/dbrepo/log-service:${TAG}"
-
-tag-log-service-dashboard:
- docker tag dbrepo-log-service-dashboard:latest "dbrepo/log-service-dashboard:${TAG}"
- docker tag dbrepo-log-service-dashboard:latest "${AZURE_REPO}/dbrepo/log-service-dashboard:${TAG}"
-
-release: build-docker tag release-analyse-service release-authentication-service release-metadata-db release-ui release-broker-service release-metadata-service release-search-sync-agent release-log-service release-search-db release-log-service-dashboard
+release: build-docker tag release-analyse-service release-authentication-service release-metadata-db release-ui release-broker-service release-metadata-service release-search-sync-agent
release-analyse-service: tag-analyse-service
docker push "dbrepo/analyse-service:${TAG}"
@@ -109,26 +99,18 @@ release-metadata-service: tag-metadata-service
docker push "dbrepo/metadata-service:${TAG}"
docker push "${AZURE_REPO}/dbrepo/metadata-service:${TAG}"
-release-log-service: tag-log-service
- docker push "dbrepo/log-service:${TAG}"
- docker push "${AZURE_REPO}/dbrepo/log-service:${TAG}"
-
-release-log-service-dashboard: tag-log-service-dashboard
- docker push "dbrepo/log-service-dashboard:${TAG}"
- docker push "${AZURE_REPO}/dbrepo/log-service-dashboard:${TAG}"
-
test-backend: test-metadata-service test-analyse-service test-search-sync-agent
test-search-sync-agent: build-search-sync-agent
mvn -f ./dbrepo-search-sync-agent/pom.xml clean test verify
-test-metadata-service: build-metadata-service
+test-metadata-service: build-metadata-service teardown
mvn -f ./dbrepo-metadata-service/pom.xml clean test verify
test-analyse-service: build-analyse-service
bash ./dbrepo-analyse-service/test.sh
-scan: scan-analyse-service scan-authentication-service scan-broker-service scan-gateway-service scan-metadata-db scan-metadata-service scan-search-db scan-ui scan-search-sync-agent
+scan: scan-analyse-service scan-authentication-service scan-broker-service scan-gateway-service scan-metadata-db scan-metadata-service scan-search-db scan-ui scan-search-sync-agent scan-data-db
scan-analyse-service:
trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-analyse-service-report.json dbrepo-analyse-service:latest
@@ -146,10 +128,10 @@ scan-broker-service:
trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-broker-service:latest
scan-gateway-service:
- docker pull "nginx:${NGINX_VERSION}"
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-gateway-service-report.json "nginx:${NGINX_VERSION}"
- trivy image --insecure --exit-code 0 "nginx:${NGINX_VERSION}"
- trivy image --insecure --exit-code 1 --severity CRITICAL "nginx:${NGINX_VERSION}"
+ docker pull "nginx:1.25.0-alpine-slim"
+ trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-gateway-service-report.json "nginx:1.25.0-alpine-slim"
+ trivy image --insecure --exit-code 0 "nginx:1.25.0-alpine-slim"
+ trivy image --insecure --exit-code 1 --severity CRITICAL "nginx:1.25.0-alpine-slim"
scan-metadata-db:
trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-metadata-db-report.json dbrepo-metadata-db:latest
@@ -167,10 +149,15 @@ scan-search-sync-agent:
trivy image --insecure --exit-code 1 --severity CRITICAL dbrepo-search-sync-agent:latest
scan-search-db:
- docker pull "elasticsearch:${ELASTIC_VERSION}"
- trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-search-db-report.json "elasticsearch:${ELASTIC_VERSION}"
- trivy image --insecure --exit-code 0 "elasticsearch:${ELASTIC_VERSION}"
- trivy image --insecure --exit-code 1 --severity CRITICAL "elasticsearch:${ELASTIC_VERSION}"
+ trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-search-db-report.json "dbrepo-search-db"
+ trivy image --insecure --exit-code 0 "dbrepo-search-db"
+ trivy image --insecure --exit-code 1 --severity CRITICAL "dbrepo-search-db"
+
+scan-data-db:
+ docker pull "bitnami/mariadb:10.5"
+ trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-search-db-report.json "bitnami/mariadb:10.5"
+ trivy image --insecure --exit-code 0 "bitnami/mariadb:10.5"
+ trivy image --insecure --exit-code 1 --severity CRITICAL "bitnami/mariadb:10.5"
scan-ui:
trivy image --insecure --exit-code 0 --format template --template "@.trivy/gitlab.tpl" -o ./.trivy/trivy-ui-report.json dbrepo-ui:latest
diff --git a/dbrepo-broker-service/Dockerfile b/dbrepo-broker-service/Dockerfile
index 0813cf4a38450ca2fa09fca4bd1c0f2b112b66df..78bc9bb462d61dda0def30fbd5ac70b45cde95f1 100644
--- a/dbrepo-broker-service/Dockerfile
+++ b/dbrepo-broker-service/Dockerfile
@@ -1,25 +1,15 @@
###### FIRST STAGE ######
-FROM dbrepo-metadata-db:latest as dependency
-MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
-
-###### SECOND STAGE ######
FROM rabbitmq:3-management-alpine as runtime
-
-ENV RABBITMQ_DEFAULT_VHOST=dbrepo
-
-RUN apk --no-cache add curl
+MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
COPY ./rabbitmq.conf /etc/rabbitmq/rabbitmq.conf
WORKDIR /app
-ENV JWT_PUBKEY="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB"
-ENV JWT_CERT="MIICmzCCAYMCBgGG3GWyBTANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqqcdDYFZZb28M0tEJzEP77FmD/Xqioyj9zWX6VwUSOMAgmMmn8eqs9hT9T0a+q4YTo9tUW1PNbUpwprA5b4Uk04DcIajxDVMUR/PjcHytmkqwVskq9AZW/Vngdoo+8tSbuIybwe/3Vwt266hbHpDcM97a+DXcYooRl7tQWCEX7RP27wQrMD9epDQ6IgKayZg9vC9/03dsIqwH9jXQRiZlFvwiEKhX2aY7lPGBaCK414JO00K/Z49iov9TRa/IYVbSt5qwgrx6DcqsBSPwOnI6A85UGfeUEZ/7coVJiL7RvBlsllapsL9eWTbQajVh94k9Ei3sibEPbtH+U2OAM78zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAASnN1Cuif1sdfEK2kWAURSXGJCohCROLWdKFjaeHPRaEfpbFJsgxW0Yj3nwX5O3bUlOWoTyENwnXSsXMQsqnNi+At32CKaKO8+AkhAbgQL9F0B+KeJwmYv3cUj5N/LYkJjBvZBzUZ4Ugu5dcxH0k7AktLAIwimkyEnxTNolOA3UyrGGpREr8MCKWVr10RFuOpF/0CsJNNwbHXzalO9D756EUcRWZ9VSg6QVNso0YYRKTnILWDn9hcTRnqGy3SHo3anFTqQZ+BB57YbgFWy6udC0LYRB3zdp6zNti87eu/VEymiDY/mmo1AB8Tm0b6vxFz4AKcL3ax5qS6YnZ9efSzk="
-
-COPY ./init.sh ./init.sh
-COPY ./service_ready /usr/bin/service_ready
-COPY ./docker-entrypoint.sh ./docker-entrypoint.sh
+COPY ./cert.pem ./cert.pem
+COPY ./pubkey.pem ./pubkey.pem
-HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD service_ready
+RUN rabbitmq-plugins enable --offline rabbitmq_prometheus rabbitmq_mqtt rabbitmq_auth_backend_oauth2 rabbitmq_auth_mechanism_ssl
-ENTRYPOINT [ "bash", "/app/docker-entrypoint.sh" ]
\ No newline at end of file
+EXPOSE 5672
+EXPOSE 15672
diff --git a/dbrepo-broker-service/cert.pem b/dbrepo-broker-service/cert.pem
new file mode 100644
index 0000000000000000000000000000000000000000..e66555558cfa59a12b3d754401e9f84fef7299e4
--- /dev/null
+++ b/dbrepo-broker-service/cert.pem
@@ -0,0 +1,3 @@
+-----BEGIN CERTIFICATE-----
+MIICmzCCAYMCBgGG3GWyBTANBgkqhkiG9w0BAQsFADARMQ8wDQYDVQQDDAZkYnJlcG8wHhcNMjMwMzEzMTkxMzE3WhcNMzMwMzEzMTkxNDU3WjARMQ8wDQYDVQQDDAZkYnJlcG8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCqqcdDYFZZb28M0tEJzEP77FmD/Xqioyj9zWX6VwUSOMAgmMmn8eqs9hT9T0a+q4YTo9tUW1PNbUpwprA5b4Uk04DcIajxDVMUR/PjcHytmkqwVskq9AZW/Vngdoo+8tSbuIybwe/3Vwt266hbHpDcM97a+DXcYooRl7tQWCEX7RP27wQrMD9epDQ6IgKayZg9vC9/03dsIqwH9jXQRiZlFvwiEKhX2aY7lPGBaCK414JO00K/Z49iov9TRa/IYVbSt5qwgrx6DcqsBSPwOnI6A85UGfeUEZ/7coVJiL7RvBlsllapsL9eWTbQajVh94k9Ei3sibEPbtH+U2OAM78zAgMBAAEwDQYJKoZIhvcNAQELBQADggEBAASnN1Cuif1sdfEK2kWAURSXGJCohCROLWdKFjaeHPRaEfpbFJsgxW0Yj3nwX5O3bUlOWoTyENwnXSsXMQsqnNi+At32CKaKO8+AkhAbgQL9F0B+KeJwmYv3cUj5N/LYkJjBvZBzUZ4Ugu5dcxH0k7AktLAIwimkyEnxTNolOA3UyrGGpREr8MCKWVr10RFuOpF/0CsJNNwbHXzalO9D756EUcRWZ9VSg6QVNso0YYRKTnILWDn9hcTRnqGy3SHo3anFTqQZ+BB57YbgFWy6udC0LYRB3zdp6zNti87eu/VEymiDY/mmo1AB8Tm0b6vxFz4AKcL3ax5qS6YnZ9efSzk=
+-----END CERTIFICATE-----
\ No newline at end of file
diff --git a/dbrepo-broker-service/docker-entrypoint.sh b/dbrepo-broker-service/docker-entrypoint.sh
deleted file mode 100755
index f87b1de958836577f3e8547ad6d9d0b768d8e721..0000000000000000000000000000000000000000
--- a/dbrepo-broker-service/docker-entrypoint.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# load jwt certificates
-bash ./init.sh
-
-# enable prometheus plugin
-(sleep 10; rabbitmq-plugins enable rabbitmq_prometheus rabbitmq_mqtt rabbitmq_auth_backend_oauth2 rabbitmq_auth_mechanism_ssl; touch ./ready) &
-
-rabbitmq-server
\ No newline at end of file
diff --git a/dbrepo-broker-service/init.sh b/dbrepo-broker-service/init.sh
deleted file mode 100644
index afcf6f35644190aa0faafcdd3374626f008123af..0000000000000000000000000000000000000000
--- a/dbrepo-broker-service/init.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-echo "init pubkey ..."
-rm -f /app/pubkey.pem /app/cert.pem
-cat << EOF > /app/pubkey.pem
------BEGIN RSA PUBLIC KEY-----
-${JWT_PUBKEY}
------END RSA PUBLIC KEY-----
-EOF
-echo "init cert ..."
-cat << EOF > /app/cert.pem
------BEGIN CERTIFICATE-----
-${JWT_CERT}
------END CERTIFICATE-----
-EOF
\ No newline at end of file
diff --git a/dbrepo-broker-service/pubkey.pem b/dbrepo-broker-service/pubkey.pem
new file mode 100644
index 0000000000000000000000000000000000000000..9e4e9308e115194765587bb0451e85f98996f1c6
--- /dev/null
+++ b/dbrepo-broker-service/pubkey.pem
@@ -0,0 +1,3 @@
+-----BEGIN RSA PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
+-----END RSA PUBLIC KEY-----
\ No newline at end of file
diff --git a/dbrepo-broker-service/rabbitmq.conf b/dbrepo-broker-service/rabbitmq.conf
index 6b93149a71c2ee79baa1151ca186be7e4a9a7254..e1883b4b825a9f9a6aa79a050fc01d8f8a1efdf0 100644
--- a/dbrepo-broker-service/rabbitmq.conf
+++ b/dbrepo-broker-service/rabbitmq.conf
@@ -1,5 +1,5 @@
# user
-default_vhost = /
+default_vhost = dbrepo
default_user = fda
default_pass = fda
default_user_tags.administrator = true
@@ -10,5 +10,24 @@ default_permissions.write = .*
# enable http outside localhost
listeners.tcp.1 = 0.0.0.0:5672
+# management prefix (https://www.rabbitmq.com/management.html#path-prefix)
+management.path_prefix = /admin/broker
+
# logging
-log.file.level = warning
+log.console = true
+log.console.level = warning
+
+# Obviously your authentication server cannot vouch for itself, so you'll need another backend with at least one user in
+# it. You should probably use the internal database
+auth_backends.1 = rabbit_auth_backend_oauth2
+auth_backends.2 = rabbit_auth_backend_internal
+
+# OAuth 2.0 files
+auth_oauth2.resource_server_id = rabbitmq
+#auth_oauth2.additional_scopes_key = my_custom_scope_key
+auth_oauth2.preferred_username_claims.1 = client_id
+auth_oauth2.default_key = t2OCeCheJ9uwoBbNQjG_nN6WKiLcceTIAZmiTbGODFM
+auth_oauth2.signing_keys.t2OCeCheJ9uwoBbNQjG_nN6WKiLcceTIAZmiTbGODFM = /app/cert.pem
+auth_oauth2.signing_keys.id2 = /app/pubkey.pem
+auth_oauth2.algorithms.1 = HS256
+auth_oauth2.algorithms.2 = RS256
diff --git a/dbrepo-broker-service/service_ready b/dbrepo-broker-service/service_ready
deleted file mode 100755
index 31bdd3aa9c19917336cafee2bf208bd212cf2cc7..0000000000000000000000000000000000000000
--- a/dbrepo-broker-service/service_ready
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-if [ -f ./ready ]; then
- echo "service is ready and accepting connections"
- exit 0
-fi
-exit 1
\ No newline at end of file
diff --git a/dbrepo-gateway-service/dbrepo.conf b/dbrepo-gateway-service/dbrepo.conf
index 21bf03a9343dff69d3acedbeabd24db4c39a8a0a..febc598168359b86944d59d8a577e744b91ca768 100644
--- a/dbrepo-gateway-service/dbrepo.conf
+++ b/dbrepo-gateway-service/dbrepo.conf
@@ -30,26 +30,34 @@ upstream upload {
server upload-service:1080;
}
-upstream log-dashboard {
- server log-dashboard:5601;
+upstream search-db-dashboard {
+ server search-db-dashboard:5601;
}
server {
listen 80 default_server;
server_name _;
- location /api/auth {
- rewrite /api/auth/(.*) /$1 break;
+ location /admin/dashboard {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://authentication;
+ proxy_pass http://search-db-dashboard;
+ proxy_read_timeout 90;
+ }
+
+ location /admin/broker {
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://broker;
proxy_read_timeout 90;
}
location /api/broker {
- rewrite /api/broker/(.*) /api/$1 break;
+ rewrite /api/broker/(.*) /admin/broker/api/$1 break;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -67,32 +75,31 @@ server {
proxy_read_timeout 90;
}
- location /pid {
- rewrite /pid/(.*) /api/pid/$1 break;
+ location /api/upload {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://metadata;
+ proxy_pass http://upload;
proxy_read_timeout 90;
}
- location /api/upload {
+ location /broker {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://upload;
+ proxy_pass http://broker;
proxy_read_timeout 90;
}
- location /retrieve {
- rewrite /retrieve/(.*) /$1 break;
+ location /api/auth {
+ rewrite /api/auth/(.*) /$1 break;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
- proxy_pass http://search;
+ proxy_pass http://authentication;
proxy_read_timeout 90;
}
@@ -105,6 +112,26 @@ server {
proxy_read_timeout 90;
}
+ location /pid {
+ rewrite /pid/(.*) /api/pid/$1 break;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://metadata;
+ proxy_read_timeout 90;
+ }
+
+ location /retrieve {
+ rewrite /retrieve/(.*) /$1 break;
+ proxy_set_header Host $host;
+ proxy_set_header X-Real-IP $remote_addr;
+ proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ proxy_set_header X-Forwarded-Proto $scheme;
+ proxy_pass http://search;
+ proxy_read_timeout 90;
+ }
+
location / {
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
diff --git a/dbrepo-metadata-db/Dockerfile b/dbrepo-metadata-db/Dockerfile
index 68c1a96a1f67d0ba1b14e82da95bb0c9f2406838..587c7b80d61c4b02b640a9ac51e56b3c855fbb8f 100644
--- a/dbrepo-metadata-db/Dockerfile
+++ b/dbrepo-metadata-db/Dockerfile
@@ -1,15 +1,6 @@
FROM bitnami/mariadb:10.5 as runtime
-ENV METADATA_DB=fda
-ENV METADATA_USERNAME=root
-ENV METADATA_PASSWORD=dbrepo
-ENV MARIADB_DATABASE="${METADATA_DB}"
-ENV MARIADB_ROOT_PASSWORD="${METADATA_PASSWORD}"
-
-# force lower-case table names
-COPY ./51-dbrepo.cnf /opt/bitnami/mariadb/conf/my_custom.cnf
-
-# Scripts are copied to /docker-entrypoint-initdb.d/ in docker-compose from analyze service
-HEALTHCHECK --interval=10s --timeout=5s --retries=12 CMD mysqladmin ping --user="$METADATA_USERNAME" --password="$METADATA_PASSWORD" --silent
+ENV MARIADB_DATABASE=fda
+ENV MARIADB_ROOT_PASSWORD=dbrepo
COPY ./setup-schema.sql /docker-entrypoint-initdb.d/setup-schema.sql
\ No newline at end of file
diff --git a/dbrepo-metadata-db/setup-schema.sql b/dbrepo-metadata-db/setup-schema.sql
index 8da039c555a4deeb7a90c1b352633ce85ccd30c6..b6561d250327203abf02b3ffc26f0d41b949a2a6 100644
--- a/dbrepo-metadata-db/setup-schema.sql
+++ b/dbrepo-metadata-db/setup-schema.sql
@@ -77,7 +77,7 @@ CREATE TABLE IF NOT EXISTS `fda`.`mdb_licenses`
identifier character varying(255) NOT NULL,
uri text NOT NULL,
PRIMARY KEY (identifier),
- UNIQUE (uri)
+ UNIQUE (uri(200))
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `fda`.`mdb_databases`
@@ -145,6 +145,7 @@ CREATE TABLE IF NOT EXISTS `fda`.`mdb_columns`
dfID bigint,
cName VARCHAR(100),
internal_name VARCHAR(100) NOT NULL,
+ alias VARCHAR(100),
Datatype ENUM ('CHAR','VARCHAR','BINARY','VARBINARY','TINYBLOB','TINYTEXT','TEXT','BLOB','MEDIUMTEXT','MEDIUMBLOB','LONGTEXT','LONGBLOB','ENUM','SET','BIT','TINYINT','BOOL','SMALLINT','MEDIUMINT','INT','BIGINT','FLOAT','DOUBLE','DECIMAL','DATE','DATETIME','TIMESTAMP','TIME','YEAR'),
length INT NULL,
ordinal_position INTEGER NOT NULL,
@@ -280,7 +281,7 @@ CREATE TABLE IF NOT EXISTS `fda`.`mdb_concepts`
created timestamp NOT NULL DEFAULT NOW(),
created_by character varying(36) NOT NULL,
PRIMARY KEY (id),
- UNIQUE (uri),
+ UNIQUE (uri(200)),
FOREIGN KEY (created_by) REFERENCES mdb_users (id)
) WITH SYSTEM VERSIONING;
@@ -293,7 +294,7 @@ CREATE TABLE IF NOT EXISTS `fda`.`mdb_units`
created timestamp NOT NULL DEFAULT NOW(),
created_by character varying(36) NOT NULL,
PRIMARY KEY (id),
- UNIQUE (uri),
+ UNIQUE (uri(200)),
FOREIGN KEY (created_by) REFERENCES mdb_users (id)
) WITH SYSTEM VERSIONING;
@@ -349,18 +350,16 @@ CREATE TABLE IF NOT EXISTS `fda`.`mdb_banner_messages`
CREATE TABLE IF NOT EXISTS `fda`.`mdb_ontologies`
(
- id bigint NOT NULL AUTO_INCREMENT,
- prefix VARCHAR(8) NOT NULL,
- uri TEXT NOT NULL,
+ id bigint NOT NULL AUTO_INCREMENT,
+ prefix VARCHAR(8) NOT NULL,
+ uri TEXT NOT NULL,
uri_pattern TEXT,
- sparql_endpoint TEXT NULL,
+ sparql_endpoint TEXT NULL,
last_modified timestamp,
- created timestamp NOT NULL DEFAULT NOW(),
- created_by character varying(36) NOT NULL,
+ created timestamp NOT NULL DEFAULT NOW(),
UNIQUE (prefix),
- UNIQUE (uri),
- PRIMARY KEY (id),
- FOREIGN KEY (created_by) REFERENCES mdb_users (id)
+ UNIQUE (uri(200)),
+ PRIMARY KEY (id)
) WITH SYSTEM VERSIONING;
CREATE TABLE IF NOT EXISTS `fda`.`mdb_view_columns`
diff --git a/dbrepo-metadata-service/Dockerfile b/dbrepo-metadata-service/Dockerfile
index 92c2c42cf14b207792fe7604f3f1f5f93c9b881d..f88b37c5ec15bad047103c445298aa48569c4078 100644
--- a/dbrepo-metadata-service/Dockerfile
+++ b/dbrepo-metadata-service/Dockerfile
@@ -36,10 +36,9 @@ ENV ADMIN_MAIL="noreply@localhost"
ENV BASE_URL="http://localhost"
ENV GRANT_PRIVILEGES="SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE"
ENV BROKER_CONSUMERS=2
-ENV BROKER_ENDPOINT="http://broker-service:15672"
+ENV BROKER_ENDPOINT="http://broker-service:15672/admin/broker"
ENV BROKER_USERNAME=fda
-ENV CLIENT_ID="dbrepo-client"
-ENV DBREPO_CLIENT_SECRET="MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG"
+ENV BROKER_PASSWORD=fda
ENV DELETED_RECORD=persistent
ENV EARLIEST_DATESTAMP="2022-09-17T18:23:00Z"
ENV GRANULARITY="YYYY-MM-DDThh:mm:ssZ"
@@ -47,12 +46,15 @@ ENV JWT_ISSUER="http://localhost/realms/dbrepo"
ENV JWT_PUBKEY="MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB"
ENV LOG_LEVEL=debug
ENV METADATA_DB=fda
-ENV METADATA_PASSWORD=dbrepo
+ENV METADATA_HOST=metadata-db
+ENV METADATA_JDBC_EXTRA_ARGS=""
ENV METADATA_USERNAME=root
+ENV METADATA_PASSWORD=dbrepo
ENV NOT_SUPPORTED_KEYWORDS=\\*,AVG,BIT_AND,BIT_OR,BIT_XOR,COUNT,COUNTDISTINCT,GROUP_CONCAT,JSON_ARRAYAGG,JSON_OBJECTAGG,MAX,MIN,STD,STDDEV,STDDEV_POP,STDDEV_SAMP,SUM,VARIANCE,VAR_POP,VAR_SAMP,--
ENV PID_BASE="http://localhost/pid/"
ENV REPOSITORY_NAME="Example Repository"
ENV SEARCH_USERNAME=admin
+ENV SEARCH_PASSWORD=admin
ENV SHARED_FILESYSTEM=/tmp
ENV USER_NETWORK=userdb
ENV WEBSITE="http://localhost"
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryResultDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryResultDto.java
index ac21249ec5f26fe582c2f48e11c99dc800b9e7a9..d64bfd4db378c5807cdc68cf1db3419201fc7b22 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryResultDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/query/QueryResultDto.java
@@ -22,6 +22,9 @@ public class QueryResultDto {
@NotNull(message = "result set is required")
private List<Map<String, Object>> result;
+ @NotNull(message = "headers is required")
+ private List<Map<String, Integer>> headers;
+
@NotNull(message = "query id is required")
private Long id;
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java
index 4745442c0a7c59dd0f1e8ce8dcd7d8c7276ef610..e811991912c8188ae0506d8bc344eb53f208e90d 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnBriefDto.java
@@ -37,6 +37,9 @@ public class ColumnBriefDto {
@Schema(example = "mdb_date")
private String internalName;
+ @Schema
+ private String alias;
+
@NotNull
@JsonProperty("column_type")
@Schema(example = "date")
diff --git a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
index 48b0745c6cd715cadb4005bf54e3d60b26f67c91..eb748f1ec48dbceeff66923a056bfb125eee2c3a 100644
--- a/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
+++ b/dbrepo-metadata-service/api/src/main/java/at/tuwien/api/database/table/columns/ColumnDto.java
@@ -53,6 +53,10 @@ public class ColumnDto {
@Schema(example = "mdb_date")
private String internalName;
+ @Field(name = "alias", type = FieldType.Keyword)
+ @Schema
+ private String alias;
+
@JsonProperty("date_format")
@Field(name = "date_format", includeInParent = true, type = FieldType.Nested)
private ImageDateDto dateFormat;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
index f3141e1ab1112c7baf4d8307d7cb097390ad66ef..fe6edc3e4f8f5fcb06011bc0d9ef0fc694c4f094 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/Table.java
@@ -3,6 +3,7 @@ package at.tuwien.entities.database.table;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.columns.TableColumn;
import at.tuwien.entities.database.table.constraints.Constraints;
+import at.tuwien.entities.user.User;
import lombok.*;
import lombok.extern.log4j.Log4j2;
import net.sf.jsqlparser.statement.select.FromItem;
@@ -44,10 +45,27 @@ public class Table {
@Column(name = "created_by", columnDefinition = "VARCHAR(36)")
private UUID createdBy;
+ @ToString.Exclude
+ @org.springframework.data.annotation.Transient
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumns({
+ @JoinColumn(name = "created_by", referencedColumnName = "ID", insertable = false, updatable = false)
+ })
+ private User creator;
+
+
@JdbcTypeCode(java.sql.Types.VARCHAR)
@Column(name = "owned_by", columnDefinition = "VARCHAR(36)")
private UUID ownedBy;
+ @ToString.Exclude
+ @org.springframework.data.annotation.Transient
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumns({
+ @JoinColumn(name = "owned_by", referencedColumnName = "ID", insertable = false, updatable = false)
+ })
+ private User owner;
+
@Column(name = "tname", nullable = false)
private String name;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
index 364b74b02ac61f7ce8fe7b24149220c33aada07d..98c5d5d8895fb4839f539db0331fd23f9bedf7fd 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java
@@ -66,10 +66,8 @@ public class TableColumn implements Comparable<TableColumn> {
@Column
private Integer indexLength;
- @Transient
- @ToString.Exclude
- @org.springframework.data.annotation.Transient
- private transient String alias;
+ @Column
+ private String alias;
@Column(name = "datatype", nullable = false)
@Enumerated(EnumType.STRING)
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessage.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessage.java
index f3cf82d4997a7b67de2b0ee834615fd56a379cb4..b268e3f5a05ae8f547cd7dc22418b3a3b2bec030 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessage.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/maintenance/BannerMessage.java
@@ -34,6 +34,12 @@ public class BannerMessage {
@Column(nullable = false)
private String message;
+ @Column
+ private String link;
+
+ @Column
+ private String linkText;
+
@Column(columnDefinition = "TIMESTAMP")
private Instant displayStart;
diff --git a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/semantics/Ontology.java b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/semantics/Ontology.java
index 708dd8f64b8dd48aa21e1255a874929fa9a72fa7..2a683f4ae29b838e50579073d515b97eb5ae24b3 100644
--- a/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/semantics/Ontology.java
+++ b/dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/semantics/Ontology.java
@@ -43,10 +43,6 @@ public class Ontology {
@Column
private String sparqlEndpoint;
- @JdbcTypeCode(java.sql.Types.VARCHAR)
- @Column(name = "createdBy", nullable = false, columnDefinition = "VARCHAR(36)")
- private UUID createdBy;
-
@CreatedDate
@Column(nullable = false, updatable = false, columnDefinition = "TIMESTAMP")
private Instant created;
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerRemoteException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerRemoteException.java
new file mode 100644
index 0000000000000000000000000000000000000000..922462d2ee95b4cfea228b64cab7f80e40fa7661
--- /dev/null
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerRemoteException.java
@@ -0,0 +1,21 @@
+package at.tuwien.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
+public class BrokerRemoteException extends Exception {
+
+ public BrokerRemoteException(String msg) {
+ super(msg);
+ }
+
+ public BrokerRemoteException(String msg, Throwable thr) {
+ super(msg, thr);
+ }
+
+ public BrokerRemoteException(Throwable thr) {
+ super(thr);
+ }
+
+}
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostCreationException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostCreationException.java
deleted file mode 100644
index bb3b2690dc7c1348cb33ac0f147d6be320aa7267..0000000000000000000000000000000000000000
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostCreationException.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package at.tuwien.exception;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.NOT_ACCEPTABLE)
-public class BrokerVirtualHostCreationException extends Exception {
-
- public BrokerVirtualHostCreationException(String msg) {
- super(msg);
- }
-
- public BrokerVirtualHostCreationException(String msg, Throwable thr) {
- super(msg, thr);
- }
-
- public BrokerVirtualHostCreationException(Throwable thr) {
- super(thr);
- }
-}
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostModificationException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostModificationException.java
new file mode 100644
index 0000000000000000000000000000000000000000..a9fda0c9d43ffc61ff5205c5f4eabf0ebadd32f0
--- /dev/null
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/BrokerVirtualHostModificationException.java
@@ -0,0 +1,20 @@
+package at.tuwien.exception;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+@ResponseStatus(code = HttpStatus.NOT_ACCEPTABLE)
+public class BrokerVirtualHostModificationException extends Exception {
+
+ public BrokerVirtualHostModificationException(String msg) {
+ super(msg);
+ }
+
+ public BrokerVirtualHostModificationException(String msg, Throwable thr) {
+ super(msg, thr);
+ }
+
+ public BrokerVirtualHostModificationException(Throwable thr) {
+ super(thr);
+ }
+}
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/KeycloakRemoteException.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/KeycloakRemoteException.java
index 594d70340303f18a3504324d75a445d1457158de..6616739278b0b02b8160d09e94c87f304f809628 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/KeycloakRemoteException.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/exception/KeycloakRemoteException.java
@@ -3,7 +3,7 @@ package at.tuwien.exception;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
-@ResponseStatus(code = HttpStatus.LOCKED)
+@ResponseStatus(code = HttpStatus.SERVICE_UNAVAILABLE)
public class KeycloakRemoteException extends Exception {
public KeycloakRemoteException(String msg) {
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/DatabaseMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/DatabaseMapper.java
index a889b2ee10a01328a477e4acf247f7fcc079bd84..5890c1b0193d7808e82cfa25943e908c771b9d6d 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/DatabaseMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/DatabaseMapper.java
@@ -163,9 +163,9 @@ public interface DatabaseMapper {
}
default PreparedStatement rawGrantCreatorAccessQuery(Connection connection, String databaseName, String username,
- String priviliges) throws QueryMalformedException {
+ String privileges) throws QueryMalformedException {
final StringBuilder statement = new StringBuilder("GRANT ")
- .append(priviliges)
+ .append(privileges)
.append(" ON ")
.append(databaseName)
.append(".* TO `")
diff --git a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/QueryMapper.java b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/QueryMapper.java
index 70b5815d64e476b32c7fe1ae6372b7df25ffb8c0..d4d1fb168ab8bdf0fa03d361b5467cb4809d9598 100644
--- a/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/QueryMapper.java
+++ b/dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/QueryMapper.java
@@ -85,7 +85,13 @@ public interface QueryMapper {
int[] idx = new int[]{1};
final Map<String, Object> map = new HashMap<>();
for (final TableColumn column : columns) {
- final String columnOrAlias = column.getAlias() != null ? column.getAlias() : column.getInternalName();
+ final String columnOrAlias;
+ if (column.getAlias() != null) {
+ log.debug("column {} has alias {}", column.getInternalName(), column.getAlias());
+ columnOrAlias = column.getAlias();
+ } else {
+ columnOrAlias = column.getInternalName();
+ }
if (List.of(TableColumnType.BLOB, TableColumnType.TINYBLOB, TableColumnType.MEDIUMBLOB, TableColumnType.LONGBLOB).contains(column.getColumnType())) {
log.debug("column {} is of type blob", columnOrAlias);
final Blob blob = result.getBlob(idx[0]++);
@@ -100,8 +106,16 @@ public interface QueryMapper {
}
resultList.add(map);
}
+ final int[] idx = new int[]{0};
+ final List<Map<String, Integer>> headers = columns.stream()
+ .map(c -> (Map<String, Integer>) new LinkedHashMap<String, Integer>(){{
+ put(c.getAlias() != null ? c.getAlias() : c.getInternalName(), idx[0]++);
+ }})
+ .toList();
+ log.debug("created ordered header list: {}", headers);
return QueryResultDto.builder()
.result(resultList)
+ .headers(headers)
.build();
}
@@ -627,15 +641,10 @@ public interface QueryMapper {
return statement.toString();
}
- default String queryToRawTimestampedQuery(String query, Database database, Instant timestamp, Boolean selection, Long page, Long size)
- throws ImageNotSupportedException, QueryMalformedException {
- log.trace("mapping query to timestamped query, query={}, database={}, timestamp={}, selection={}, page={}, size={}",
- query, database, timestamp, selection, page, size);
+ default String queryToRawTimestampedQuery(String query, Instant timestamp, Boolean selection, Long page, Long size) {
+ log.trace("mapping query to timestamped query, query={}, timestamp={}, selection={}, page={}, size={}",
+ query, timestamp, selection, page, size);
/* param check */
- if (!database.getContainer().getImage().getName().equals("mariadb")) {
- log.error("Currently only MariaDB is supported");
- throw new ImageNotSupportedException("Currently only MariaDB is supported");
- }
if (timestamp == null) {
log.error("Timestamp is null");
throw new IllegalArgumentException("Please provide a timestamp before");
@@ -655,13 +664,6 @@ public interface QueryMapper {
query = query.substring(0, query.length() - 1);
}
/* query check (this is enforced by the db also) */
- if (Stream.of("count").anyMatch(query::contains)) {
- log.error("Query contains unsupported operation, one of {}", List.of("COUNT"));
- }
- if (Stream.of("delete", "update", "truncate", "create", "drop").anyMatch(query::contains)) {
- log.error("Query attempts to modify the database");
- throw new QueryMalformedException("Query attempts to modify the database");
- }
final StringBuilder sb = new StringBuilder();
if (selection) {
/* is not a count query */
@@ -704,14 +706,9 @@ public interface QueryMapper {
return columnsToRawFindAllQuery(table.getInternalName(), table.getColumns(), timestamp, size, page);
}
- default String viewToRawFindAllQuery(View view, Long size, Long page)
- throws ImageNotSupportedException {
+ default String viewToRawFindAllQuery(View view, Long size, Long page) {
log.trace("mapping view to find all query, view={}, size={}, page={}", view, size, page);
/* param check */
- if (!view.getDatabase().getContainer().getImage().getName().equals("mariadb")) {
- log.error("Currently only MariaDB is supported");
- throw new ImageNotSupportedException("Currently only MariaDB is supported");
- }
return columnsToRawFindAllQuery(view.getInternalName(), view.getColumns(), null, size, page);
}
@@ -796,17 +793,7 @@ public interface QueryMapper {
return date.atStartOfDay(ZoneId.of("UTC"))
.toInstant();
}
- case TIMESTAMP -> {
- if (column.getDateFormat() == null) {
- log.error("Missing date format for column {} of table {}", column.getId(),
- column.getTable().getId());
- throw new IllegalArgumentException("Missing date format");
- }
- log.trace("mapping {} to timestamp with format '{}'", data, column.getDateFormat());
- return Timestamp.valueOf(data.toString())
- .toInstant();
- }
- case DATETIME -> {
+ case TIMESTAMP, DATETIME -> {
if (column.getDateFormat() == null) {
log.error("Missing date format for column {} of table {}", column.getId(),
column.getTable().getId());
@@ -817,36 +804,36 @@ public interface QueryMapper {
.toInstant();
}
case BINARY, VARBINARY, BIT -> {
- log.trace("mapping {} to binary", data);
+ log.trace("mapping {} -> binary", data);
return Long.parseLong(String.valueOf(data), 2);
}
case TEXT, CHAR, VARCHAR, TINYTEXT, MEDIUMTEXT, LONGTEXT, ENUM, SET -> {
- log.trace("mapping {} to character array", data);
+ log.trace("mapping {} -> string", data);
return String.valueOf(data);
}
case BIGINT -> {
- log.trace("mapping {} to bigint number", data);
+ log.trace("mapping {} -> biginteger", data);
return new BigInteger(String.valueOf(data));
}
case INT, TINYINT, SMALLINT, MEDIUMINT -> {
- log.trace("mapping {} to int number", data);
+ log.trace("mapping {} -> integer", data);
return Integer.parseInt(String.valueOf(data));
}
case DECIMAL, FLOAT, DOUBLE -> {
- log.trace("mapping {} to decimal number", data);
+ log.trace("mapping {} -> double", data);
return Double.valueOf(String.valueOf(data));
}
case BOOL -> {
- log.trace("mapping {} to boolean", data);
+ log.trace("mapping {} -> boolean", data);
return Boolean.valueOf(String.valueOf(data));
}
case TIME -> {
- log.trace("mapping {} to time", data);
+ log.trace("mapping {} -> time", data);
return String.valueOf(data);
}
case YEAR -> {
final String tmp = String.valueOf(data);
- log.trace("mapping {} to year", tmp);
+ log.trace("mapping {} -> year", tmp);
return tmp.substring(0, tmp.indexOf('-'));
}
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
index 4c77a4ac257500f57fb03c03819e6a1c0c14d858..c114506501c05e943bb78298dd0a93d0e72d2533 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/DatabaseEndpoint.java
@@ -2,7 +2,6 @@ package at.tuwien.endpoints;
import at.tuwien.api.database.*;
import at.tuwien.api.error.ApiErrorDto;
-import at.tuwien.api.user.UserDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.DatabaseAccess;
import at.tuwien.entities.user.User;
@@ -84,7 +83,7 @@ public class DatabaseEndpoint {
}
@PostMapping
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@PreAuthorize("hasAuthority('create-database')")
@Timed(value = "database.create", description = "Time needed to create a database")
@Operation(summary = "Create database", security = @SecurityRequirement(name = "bearerAuth"))
@@ -140,8 +139,8 @@ public class DatabaseEndpoint {
throws ImageNotSupportedException, ContainerNotFoundException, DatabaseMalformedException,
AmqpException, ContainerConnectionException, UserNotFoundException,
DatabaseNotFoundException, DatabaseNameExistsException, DatabaseConnectionException,
- QueryMalformedException, NotAllowedException, BrokerVirtualHostCreationException, QueryStoreException,
- BrokerVirtualHostGrantException, KeycloakRemoteException, AccessDeniedException {
+ QueryMalformedException, NotAllowedException, BrokerVirtualHostModificationException, QueryStoreException,
+ BrokerVirtualHostGrantException, KeycloakRemoteException, AccessDeniedException, BrokerRemoteException {
log.debug("endpoint create database, createDto={}, principal={}", createDto,
principal);
final User user = userService.findByUsername(principal.getName());
@@ -272,7 +271,7 @@ public class DatabaseEndpoint {
}
@DeleteMapping("/{id}")
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@PreAuthorize("hasAuthority('delete-database')")
@Timed(value = "database.delete", description = "Time needed to delete a database")
@Operation(summary = "Delete some database", security = @SecurityRequirement(name = "bearerAuth"))
@@ -321,7 +320,7 @@ public class DatabaseEndpoint {
public ResponseEntity<?> delete(@NotNull @PathVariable Long id, Principal principal)
throws DatabaseNotFoundException, ImageNotSupportedException, DatabaseMalformedException, AmqpException,
QueryMalformedException, UserNotFoundException, BrokerVirtualHostGrantException,
- DatabaseConnectionException, KeycloakRemoteException, AccessDeniedException {
+ DatabaseConnectionException, KeycloakRemoteException, AccessDeniedException, BrokerRemoteException {
log.debug("endpoint delete database, id={}, principal={}", id,
principal);
final Database database = databaseService.findById(id);
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/QueryEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/QueryEndpoint.java
index 65f4ca6ff63c1e92e4df314b1106ea3437649120..bd494caa52da8176cfaa2c5aaf859ac43c3c78c5 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/QueryEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/QueryEndpoint.java
@@ -101,8 +101,8 @@ public class QueryEndpoint {
endpointValidator.validateOnlyAccessOrPublic(databaseId, queryId, principal);
/* execute */
final Query query = storeService.findOne(databaseId, queryId, principal);
- final QueryResultDto result = queryService.reExecute(databaseId, query, page, size,
- sortDirection, sortColumn, principal);
+ final QueryResultDto result = queryService.reExecute(databaseId, query, page, size, sortDirection, sortColumn,
+ principal);
result.setId(queryId);
log.trace("re-execute query resulted in result {}", result);
return ResponseEntity.status(HttpStatus.ACCEPTED)
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
index c4d587c99ca7cb153d5ebf3617aae58d62806348..e2c6b94814aa6eed26b282fd5c8e8d45281322d6 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/UserEndpoint.java
@@ -6,6 +6,7 @@ import at.tuwien.api.user.*;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.mapper.UserMapper;
+import at.tuwien.service.AuthenticationService;
import at.tuwien.service.DatabaseService;
import at.tuwien.service.MessageQueueService;
import at.tuwien.service.UserService;
@@ -42,15 +43,16 @@ public class UserEndpoint {
private final UserService userService;
private final DatabaseService databaseService;
private final MessageQueueService messageQueueService;
-
+ private final AuthenticationService authenticationService;
@Autowired
public UserEndpoint(UserMapper userMapper, UserService userService, DatabaseService databaseService,
- MessageQueueService messageQueueService) {
+ MessageQueueService messageQueueService, AuthenticationService authenticationService) {
this.userMapper = userMapper;
this.userService = userService;
this.databaseService = databaseService;
this.messageQueueService = messageQueueService;
+ this.authenticationService = authenticationService;
}
@GetMapping
@@ -75,7 +77,7 @@ public class UserEndpoint {
}
@PostMapping
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
@PreAuthorize("!isAuthenticated()")
@Timed(value = "user.create", description = "Time needed to create a user in the metadata database")
@Operation(summary = "Create user")
@@ -85,8 +87,11 @@ public class UserEndpoint {
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = UserBriefDto.class))}),
+ @ApiResponse(responseCode = "400",
+ description = "Parameters are not well-formed (likely email)",
+ content = {@Content(mediaType = "application/json")}),
@ApiResponse(responseCode = "404",
- description = "Realm or default role not found",
+ description = "default role not found",
content = {@Content(
mediaType = "application/json",
schema = @Schema(implementation = ApiErrorDto.class))}),
@@ -102,15 +107,35 @@ public class UserEndpoint {
schema = @Schema(implementation = ApiErrorDto.class))}),
})
public ResponseEntity<UserBriefDto> create(@NotNull @Valid @RequestBody SignupRequestDto data)
- throws RealmNotFoundException, UserAlreadyExistsException, UserEmailAlreadyExistsException,
- UserNotFoundException, KeycloakRemoteException, AccessDeniedException, BrokerVirtualHostCreationException {
+ throws UserAlreadyExistsException, UserEmailAlreadyExistsException, UserNotFoundException,
+ KeycloakRemoteException, AccessDeniedException, BrokerRemoteException,
+ BrokerVirtualHostModificationException {
log.debug("endpoint create a user, data={}", data);
/* check */
userService.validateUsernameNotExists(data.getUsername());
userService.validateEmailNotExists(data.getEmail());
/* create */
- final UserBriefDto dto = userMapper.userToUserBriefDto(userService.create(data));
- messageQueueService.createUser(dto.getUsername());
+ authenticationService.create(data);
+ final at.tuwien.api.keycloak.UserDto keycloakUserDto = authenticationService.findByUsername(data.getUsername());
+ try {
+ messageQueueService.createUser(data.getUsername());
+ } catch (BrokerRemoteException e) {
+ try {
+ authenticationService.delete(keycloakUserDto.getId());
+ } catch (UserNotFoundException e2) {
+ /* ignore */
+ }
+ throw new BrokerRemoteException(e);
+ } catch (BrokerVirtualHostModificationException e) {
+ try {
+ authenticationService.delete(keycloakUserDto.getId());
+ } catch (UserNotFoundException e2) {
+ /* ignore */
+ }
+ throw new BrokerVirtualHostModificationException(e);
+ }
+ final User user = userService.create(data, keycloakUserDto.getId());
+ final UserBriefDto dto = userMapper.userToUserBriefDto(user);
log.trace("create user resulted in dto {}", dto);
return ResponseEntity.status(HttpStatus.CREATED)
.body(dto);
@@ -275,6 +300,7 @@ public class UserEndpoint {
}
/* modify password */
userService.updatePassword(id, data);
+ authenticationService.updatePassword(id, data);
return ResponseEntity.accepted()
.build();
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
index 0d06774fa070a0d959b664983b960133b966cafd..0958d094742f71266de1a496fb31e21c556840f8 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/endpoints/ViewEndpoint.java
@@ -193,7 +193,7 @@ public class ViewEndpoint {
final Database database = databaseService.find(databaseId);
log.trace("find view for database {}", database);
final ViewDto view = viewMapper.viewToViewDto(viewService.findById(databaseId, viewId, principal));
- log.trace("find find resulted in view {}", view);
+ log.trace("find view resulted in view {}", view);
return ResponseEntity.ok(view);
}
@@ -345,11 +345,11 @@ public class ViewEndpoint {
}
}
/* find */
- log.trace("find view data for database {}", database);
+ log.debug("find view data for database with id {}", databaseId);
final View view = viewService.findById(databaseId, viewId, principal);
final QueryResultDto result = queryService.viewFindAll(databaseId, view, page, size, principal);
- log.trace("execute view {}", view);
- log.trace("find view data resulted in result {}", result);
+ log.trace("execute view data for view with id {}", viewId);
+ log.debug("find view data resulted in result {}", result);
return ResponseEntity.ok()
.body(result);
}
@@ -367,12 +367,12 @@ public class ViewEndpoint {
log.debug("endpoint find view data count, databaseId={}, viewId={}, principal={}",
databaseId, viewId, principal);
/* find */
- final Database database = databaseService.find(databaseId);
- log.trace("find view data for database {}", database);
+ databaseService.find(databaseId);
+ log.debug("find view data count for database with id {}", databaseId);
final View view = viewService.findById(databaseId, viewId, principal);
final Long result = queryService.viewCount(databaseId, view, principal);
- log.trace("execute view {}", view);
- log.trace("find view data resulted in result {}", result);
+ log.trace("execute view data count for view with id {}", viewId);
+ log.debug("find view data count resulted in result {}", result);
return ResponseEntity.ok()
.body(result);
}
diff --git a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
index b792981dfc61eea5763f456f51d0fd3749454b43..0e10da264304a879b6dcf72b2716e16b4fbaba09 100644
--- a/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
+++ b/dbrepo-metadata-service/rest-service/src/main/java/at/tuwien/handlers/ApiExceptionHandler.java
@@ -40,17 +40,29 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
}
@Hidden
- @ResponseStatus(HttpStatus.LOCKED)
+ @ResponseStatus(HttpStatus.SERVICE_UNAVAILABLE)
@ExceptionHandler(KeycloakRemoteException.class)
public ResponseEntity<ApiErrorDto> handle(KeycloakRemoteException e, WebRequest request) {
final ApiErrorDto response = ApiErrorDto.builder()
- .status(HttpStatus.LOCKED)
+ .status(HttpStatus.SERVICE_UNAVAILABLE)
.message(e.getLocalizedMessage())
.code("error.metadata.keycloak")
.build();
return new ResponseEntity<>(response, new HttpHeaders(), response.getStatus());
}
+ @Hidden
+ @ResponseStatus(HttpStatus.SERVICE_UNAVAILABLE)
+ @ExceptionHandler(BrokerRemoteException.class)
+ public ResponseEntity<ApiErrorDto> handle(BrokerRemoteException e, WebRequest request) {
+ final ApiErrorDto response = ApiErrorDto.builder()
+ .status(HttpStatus.SERVICE_UNAVAILABLE)
+ .message(e.getLocalizedMessage())
+ .code("error.metadata.broker")
+ .build();
+ return new ResponseEntity<>(response, new HttpHeaders(), response.getStatus());
+ }
+
@Hidden
@ResponseStatus(HttpStatus.CONFLICT)
@ExceptionHandler(ContainerAlreadyExistsException.class)
@@ -233,8 +245,8 @@ public class ApiExceptionHandler extends ResponseEntityExceptionHandler {
@Hidden
@ResponseStatus(HttpStatus.NOT_ACCEPTABLE)
- @ExceptionHandler(BrokerVirtualHostCreationException.class)
- public ResponseEntity<ApiErrorDto> handle(BrokerVirtualHostCreationException e, WebRequest request) {
+ @ExceptionHandler(BrokerVirtualHostModificationException.class)
+ public ResponseEntity<ApiErrorDto> handle(BrokerVirtualHostModificationException e, WebRequest request) {
final ApiErrorDto response = ApiErrorDto.builder()
.status(HttpStatus.NOT_ACCEPTABLE)
.message(e.getLocalizedMessage())
diff --git a/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml b/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml
index 9727e956103365a0fae5cd37bdd52c09ed1308f3..c772dad5299dd515d78a11c815cd05b7f530023f 100644
--- a/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml
+++ b/dbrepo-metadata-service/rest-service/src/main/resources/application-local.yml
@@ -56,7 +56,7 @@ fda:
issuer: http://localhost/realms/dbrepo
public_key: MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB
keycloak:
- endpoint: "http://authentication-service:8080/api/auth"
+ endpoint: "http://authentication-service:8080"
username: fda
password: fda
consumers: 2
diff --git a/dbrepo-metadata-service/rest-service/src/main/resources/application.yml b/dbrepo-metadata-service/rest-service/src/main/resources/application.yml
index 66f1cb64cf5de896aa936030de5aa4b8cc38fb3d..716a170ec8da13ae3e6f8f00034c67143d40ae30 100644
--- a/dbrepo-metadata-service/rest-service/src/main/resources/application.yml
+++ b/dbrepo-metadata-service/rest-service/src/main/resources/application.yml
@@ -4,7 +4,7 @@ spring:
autoconfigure:
exclude: org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration, org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration
datasource:
- url: "jdbc:mariadb://metadata-db:3306/${METADATA_DB}"
+ url: "jdbc:mariadb://${METADATA_HOST}:3306/${METADATA_DB}${METADATA_JDBC_EXTRA_ARGS}"
driver-class-name: org.mariadb.jdbc.Driver
username: "${METADATA_USERNAME}"
password: "${METADATA_PASSWORD}"
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/MariaDbContainerConfig.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/MariaDbContainerConfig.java
index 42e1d3b2bc700df0962a5864c5d6aac99c1a8c3a..1d61a1108d8ceba8c2eaabaee35a6f1efcfd98d3 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/MariaDbContainerConfig.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/config/MariaDbContainerConfig.java
@@ -32,7 +32,7 @@ public class MariaDbContainerConfig {
private boolean started = false;
public static synchronized CustomMariaDBContainer getInstance() {
- if(instance == null) {
+ if (instance == null) {
instance = new CustomMariaDBContainer(BaseTest.IMAGE_1_NAME + ":" + BaseTest.IMAGE_1_VERSION);
instance.withImagePullPolicy(PullPolicy.alwaysPull());
instance.addFixedExposedPort(BaseTest.CONTAINER_1_PORT, BaseTest.IMAGE_1_PORT);
@@ -56,7 +56,8 @@ public class MariaDbContainerConfig {
@Override
public synchronized void start() {
- if(!started) {
+ if (!started) {
+ super.stop();
super.start();
started = true;
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
index d9ae17223957d0014fb074fac4c20784bb53d4dc..c13d6ed419a8a72ec078fb0c8da92a32a77ed620 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
@@ -4,7 +4,6 @@ import at.tuwien.BaseUnitTest;
import at.tuwien.annotations.MockAmqp;
import at.tuwien.annotations.MockOpensearch;
import at.tuwien.api.database.*;
-import at.tuwien.api.user.UserDto;
import at.tuwien.entities.container.Container;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.DatabaseAccess;
@@ -116,8 +115,8 @@ public class DatabaseEndpointUnitTest extends BaseUnitTest {
public void create_succeeds() throws UserNotFoundException, BrokerVirtualHostGrantException,
DatabaseNameExistsException, NotAllowedException, ContainerConnectionException, DatabaseMalformedException,
QueryStoreException, DatabaseConnectionException, QueryMalformedException, DatabaseNotFoundException,
- ImageNotSupportedException, AmqpException, BrokerVirtualHostCreationException, ContainerNotFoundException,
- KeycloakRemoteException, AccessDeniedException {
+ ImageNotSupportedException, AmqpException, BrokerVirtualHostModificationException, ContainerNotFoundException,
+ KeycloakRemoteException, AccessDeniedException, BrokerRemoteException {
final DatabaseCreateDto request = DatabaseCreateDto.builder()
.cid(CONTAINER_1_ID)
.name(DATABASE_1_NAME)
@@ -399,7 +398,7 @@ public class DatabaseEndpointUnitTest extends BaseUnitTest {
@WithMockUser(username = USER_2_USERNAME, authorities = {"delete-database"})
public void delete_hasRole_succeeds() throws UserNotFoundException, BrokerVirtualHostGrantException,
DatabaseConnectionException, QueryMalformedException, DatabaseNotFoundException, ImageNotSupportedException,
- AmqpException, DatabaseMalformedException, KeycloakRemoteException, AccessDeniedException {
+ AmqpException, DatabaseMalformedException, KeycloakRemoteException, AccessDeniedException, BrokerRemoteException {
/* test */
delete_generic(DATABASE_2_ID, DATABASE_2, USER_2_PRINCIPAL);
@@ -429,8 +428,8 @@ public class DatabaseEndpointUnitTest extends BaseUnitTest {
Principal principal) throws UserNotFoundException, DatabaseNameExistsException,
NotAllowedException, ContainerConnectionException, DatabaseMalformedException, QueryStoreException,
DatabaseConnectionException, QueryMalformedException, DatabaseNotFoundException, ImageNotSupportedException,
- AmqpException, BrokerVirtualHostCreationException, ContainerNotFoundException,
- BrokerVirtualHostGrantException, KeycloakRemoteException, AccessDeniedException {
+ AmqpException, BrokerVirtualHostModificationException, ContainerNotFoundException,
+ BrokerVirtualHostGrantException, KeycloakRemoteException, AccessDeniedException, BrokerRemoteException {
/* mock */
doNothing()
@@ -499,7 +498,7 @@ public class DatabaseEndpointUnitTest extends BaseUnitTest {
public void delete_generic(Long databaseId, Database database, Principal principal)
throws DatabaseNotFoundException, UserNotFoundException, DatabaseConnectionException,
QueryMalformedException, ImageNotSupportedException, AmqpException, DatabaseMalformedException,
- BrokerVirtualHostGrantException, KeycloakRemoteException, AccessDeniedException {
+ BrokerVirtualHostGrantException, KeycloakRemoteException, AccessDeniedException, BrokerRemoteException {
/* mock */
if (database != null) {
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
index 21b81f10e9ee1e4d095b7eba00b6ebae3d4b0470..a7ed7c0c77bf08bceb36bf6f59b0e49a69212e2f 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/UserEndpointUnitTest.java
@@ -7,6 +7,7 @@ import at.tuwien.api.auth.SignupRequestDto;
import at.tuwien.api.user.*;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
+import at.tuwien.service.AuthenticationService;
import at.tuwien.service.MessageQueueService;
import at.tuwien.service.UserService;
import lombok.extern.log4j.Log4j2;
@@ -44,6 +45,9 @@ public class UserEndpointUnitTest extends BaseUnitTest {
@MockBean
private MessageQueueService messageQueueService;
+ @MockBean
+ private AuthenticationService authenticationService;
+
@Autowired
private UserEndpoint userEndpoint;
@@ -66,8 +70,8 @@ public class UserEndpointUnitTest extends BaseUnitTest {
@Test
@WithAnonymousUser
public void create_anonymous_succeeds() throws UserNotFoundException, UserEmailAlreadyExistsException,
- RealmNotFoundException, UserAlreadyExistsException, KeycloakRemoteException,
- at.tuwien.exception.AccessDeniedException, BrokerVirtualHostCreationException {
+ UserAlreadyExistsException, KeycloakRemoteException,
+ at.tuwien.exception.AccessDeniedException, BrokerRemoteException, BrokerVirtualHostModificationException {
final SignupRequestDto request = SignupRequestDto.builder()
.email(USER_1_EMAIL)
.username(USER_1_USERNAME)
@@ -75,7 +79,7 @@ public class UserEndpointUnitTest extends BaseUnitTest {
.build();
/* test */
- create_generic(request, USER_1);
+ create_generic(request, USER_1, USER_1_KEYCLOAK_DTO, USER_1_ID);
}
@Test
@@ -89,7 +93,7 @@ public class UserEndpointUnitTest extends BaseUnitTest {
/* test */
assertThrows(org.springframework.security.access.AccessDeniedException.class, () -> {
- create_generic(request, null);
+ create_generic(request, null, null, null);
});
}
@@ -302,16 +306,22 @@ public class UserEndpointUnitTest extends BaseUnitTest {
assertEquals(2, body.size());
}
- protected void create_generic(SignupRequestDto data, User user) throws UserEmailAlreadyExistsException,
- RealmNotFoundException, UserAlreadyExistsException, UserNotFoundException, KeycloakRemoteException,
- AccessDeniedException, BrokerVirtualHostCreationException {
+ protected void create_generic(SignupRequestDto data, User user, at.tuwien.api.keycloak.UserDto userDto, UUID id)
+ throws UserEmailAlreadyExistsException, UserAlreadyExistsException, UserNotFoundException,
+ KeycloakRemoteException, AccessDeniedException, BrokerRemoteException,
+ BrokerVirtualHostModificationException {
/* mock */
- when(userService.create(data))
+ when(userService.create(data, id))
.thenReturn(user);
doNothing()
.when(messageQueueService)
.createUser(anyString());
+ when(authenticationService.findByUsername(data.getUsername()))
+ .thenReturn(userDto);
+ doNothing()
+ .when(authenticationService)
+ .create(any(SignupRequestDto.class));
/* test */
final ResponseEntity<UserBriefDto> response = userEndpoint.create(data);
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java
index ef9682a26d73a567883962dcc285cbb32fb88de3..7e1fd0accb8827f49ba149a62e8d653467c14be8 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java
@@ -3,7 +3,8 @@ package at.tuwien.gateway;
import at.tuwien.BaseUnitTest;
import at.tuwien.annotations.MockAmqp;
import at.tuwien.annotations.MockOpensearch;
-import at.tuwien.exception.BrokerVirtualHostCreationException;
+import at.tuwien.exception.BrokerRemoteException;
+import at.tuwien.exception.BrokerVirtualHostModificationException;
import at.tuwien.exception.BrokerVirtualHostGrantException;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
@@ -37,7 +38,7 @@ public class BrokerServiceGatewayTest extends BaseUnitTest {
private BrokerServiceGateway brokerServiceGateway;
@Test
- public void createVirtualHost_succeeds() throws BrokerVirtualHostCreationException {
+ public void createVirtualHost_succeeds() throws BrokerVirtualHostModificationException, BrokerRemoteException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.CREATED)
.build();
@@ -59,13 +60,13 @@ public class BrokerServiceGatewayTest extends BaseUnitTest {
.thenReturn(mock);
/* test */
- assertThrows(BrokerVirtualHostCreationException.class, () -> {
+ assertThrows(BrokerVirtualHostModificationException.class, () -> {
brokerServiceGateway.createVirtualHost(VIRTUAL_HOST_CREATE_DTO);
});
}
@Test
- public void grantPermission_exchangeNoRightsBefore_succeeds() throws BrokerVirtualHostGrantException {
+ public void grantPermission_exchangeNoRightsBefore_succeeds() throws BrokerVirtualHostGrantException, BrokerRemoteException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.CREATED)
.build();
@@ -78,7 +79,7 @@ public class BrokerServiceGatewayTest extends BaseUnitTest {
}
@Test
- public void grantPermission_exchangeRightsSame_succeeds() throws BrokerVirtualHostGrantException {
+ public void grantPermission_exchangeRightsSame_succeeds() throws BrokerVirtualHostGrantException, BrokerRemoteException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.NO_CONTENT)
.build();
@@ -106,7 +107,7 @@ public class BrokerServiceGatewayTest extends BaseUnitTest {
}
@Test
- public void grantPermission_virtualHostNoRightsBefore_succeeds() throws BrokerVirtualHostGrantException {
+ public void grantPermission_virtualHostNoRightsBefore_succeeds() throws BrokerRemoteException, BrokerVirtualHostGrantException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.CREATED)
.build();
@@ -119,7 +120,7 @@ public class BrokerServiceGatewayTest extends BaseUnitTest {
}
@Test
- public void grantPermission_virtualHostRightsSame_succeeds() throws BrokerVirtualHostGrantException {
+ public void grantPermission_virtualHostRightsSame_succeeds() throws BrokerRemoteException, BrokerVirtualHostGrantException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.NO_CONTENT)
.build();
@@ -147,7 +148,7 @@ public class BrokerServiceGatewayTest extends BaseUnitTest {
}
@Test
- public void createUser_succeeds() throws BrokerVirtualHostCreationException {
+ public void createUser_succeeds() throws BrokerRemoteException, BrokerVirtualHostModificationException {
final ResponseEntity<Void> mock = ResponseEntity.status(HttpStatus.NO_CONTENT)
.build();
@@ -169,7 +170,7 @@ public class BrokerServiceGatewayTest extends BaseUnitTest {
.thenReturn(mock);
/* test */
- assertThrows(BrokerVirtualHostCreationException.class, () -> {
+ assertThrows(BrokerVirtualHostModificationException.class, () -> {
brokerServiceGateway.createUser(USER_1_USERNAME);
});
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java
index eb6a70c6dd0f5fee845d8f5a9df3e3ab26ae64dc..de9e5ac7360396bb4baf635bd7ca594f5f9f23e0 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mapper/QueryMapperTest.java
@@ -7,6 +7,7 @@ import at.tuwien.entities.container.image.ContainerImageDate;
import at.tuwien.entities.database.table.columns.TableColumn;
import at.tuwien.entities.database.table.columns.TableColumnType;
import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,6 +29,7 @@ public class QueryMapperTest extends BaseUnitTest {
private QueryMapper queryMapper;
@Test
+ @Disabled("timezone issue")
public void dataColumnToObject_succeeds() {
final TableColumn request = TableColumn.builder()
.id(1L)
@@ -40,8 +42,6 @@ public class QueryMapperTest extends BaseUnitTest {
.table(TABLE_1)
.build();
- /* mock */
-
/* test */
final Object response = queryMapper.dataColumnToObject("2022-05-12 14:50:54.0", request);
assertEquals(Instant.ofEpochSecond(1652359854), (Instant) response);
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/SwaggerComponentTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/SwaggerEndpointMvcTest.java
similarity index 85%
rename from dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/SwaggerComponentTest.java
rename to dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/SwaggerEndpointMvcTest.java
index c19bd4bc018cb102665690188d3ab575bff44cfb..c07446eee592ebdb8d2b7d7e631fdc9f10eca927 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/SwaggerComponentTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/SwaggerEndpointMvcTest.java
@@ -1,16 +1,14 @@
-package at.tuwien.endpoints;
+package at.tuwien.mvc;
import at.tuwien.BaseUnitTest;
import at.tuwien.annotations.MockAmqp;
import at.tuwien.annotations.MockOpensearch;
-import at.tuwien.repository.sdb.DatabaseIdxRepository;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.test.web.servlet.MockMvc;
@@ -24,7 +22,7 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
@SpringBootTest
@MockAmqp
@MockOpensearch
-public class SwaggerComponentTest extends BaseUnitTest {
+public class SwaggerEndpointMvcTest extends BaseUnitTest {
@Autowired
private MockMvc mockMvc;
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/UserEndpointMvcTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/UserEndpointMvcTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..44e4c35fcc3cbfa133a258f440a0fa0ef8b604f6
--- /dev/null
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/UserEndpointMvcTest.java
@@ -0,0 +1,109 @@
+package at.tuwien.mvc;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.annotations.MockAmqp;
+import at.tuwien.annotations.MockOpensearch;
+import at.tuwien.api.auth.CreateUserDto;
+import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.keycloak.UserCreateDto;
+import at.tuwien.exception.BrokerRemoteException;
+import at.tuwien.exception.KeycloakRemoteException;
+import at.tuwien.gateway.BrokerServiceGateway;
+import at.tuwien.gateway.KeycloakGateway;
+import at.tuwien.gateway.impl.KeycloakGatewayImpl;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static at.tuwien.test.utils.ObjectUtil.asJsonString;
+import static org.mockito.Mockito.*;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+@Log4j2
+@ExtendWith(SpringExtension.class)
+@AutoConfigureMockMvc
+@SpringBootTest
+@MockAmqp
+@MockOpensearch
+public class UserEndpointMvcTest extends BaseUnitTest {
+
+ @MockBean
+ private BrokerServiceGateway brokerServiceGateway;
+
+ @MockBean
+ private KeycloakGatewayImpl keycloakGateway;
+
+ @Autowired
+ private MockMvc mockMvc;
+
+ @Test
+ public void createUser_malformed_fails() throws Exception {
+ final SignupRequestDto request = SignupRequestDto.builder()
+ .username(USER_1_USERNAME)
+ .password(USER_1_PASSWORD)
+ .email("invalid_email")
+ .build();
+
+ /* mock */
+ doNothing()
+ .when(brokerServiceGateway)
+ .createUser(USER_1_USERNAME);
+
+ /* test */
+ this.mockMvc.perform(post("/api/user")
+ .content(asJsonString(request))
+ .contentType(MediaType.APPLICATION_JSON)
+ .accept(MediaType.APPLICATION_JSON))
+ .andDo(print())
+ .andExpect(status().is(400));
+ }
+
+ @Test
+ public void createUser_keycloakOffline_503_fails() throws Exception {
+
+ /* mock */
+ doThrow(KeycloakRemoteException.class)
+ .when(keycloakGateway)
+ .createUser(any(UserCreateDto.class));
+
+ /* test */
+ this.mockMvc.perform(post("/api/user")
+ .content(asJsonString(USER_1_SIGNUP_REQUEST_DTO))
+ .contentType(MediaType.APPLICATION_JSON)
+ .accept(MediaType.APPLICATION_JSON))
+ .andDo(print())
+ .andExpect(status().is(503));
+ }
+
+ @Test
+ public void createUser_brokerOffline_503_fails() throws Exception {
+
+ /* mock */
+ doNothing()
+ .when(keycloakGateway)
+ .createUser(any(UserCreateDto.class));
+ when(keycloakGateway.findByUsername(USER_1_USERNAME))
+ .thenReturn(USER_1_KEYCLOAK_DTO);
+ doThrow(BrokerRemoteException.class)
+ .when(brokerServiceGateway)
+ .createUser(USER_1_USERNAME);
+
+ /* test */
+ this.mockMvc.perform(post("/api/user")
+ .content(asJsonString(USER_1_SIGNUP_REQUEST_DTO))
+ .contentType(MediaType.APPLICATION_JSON)
+ .accept(MediaType.APPLICATION_JSON))
+ .andDo(print())
+ .andExpect(status().is(503));
+ }
+
+}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
index ac7360e38d2551dc3d61ad9de7d3489b896b75de..9b96beefef1efe37882ed3e2ca875b11b86ebaed 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewIdxRepositoryIntegrationTest.java
@@ -77,7 +77,7 @@ public class ViewIdxRepositoryIntegrationTest extends BaseUnitTest {
private static final OpensearchContainer opensearchContainer = new OpensearchContainer(DockerImageName.parse("opensearchproject/opensearch:2.8.0"));
@DynamicPropertySource
- static void elasticsearchProperties(DynamicPropertyRegistry registry) {
+ static void openSearchProperties(DynamicPropertyRegistry registry) {
final int idx = opensearchContainer.getHttpHostAddress().lastIndexOf(':');
registry.add("spring.opensearch.host", () -> "127.0.0.1");
registry.add("spring.opensearch.port", () -> opensearchContainer.getHttpHostAddress().substring(idx + 1));
@@ -93,7 +93,7 @@ public class ViewIdxRepositoryIntegrationTest extends BaseUnitTest {
TABLE_2.setColumns(TABLE_2_COLUMNS);
/* metadata database */
imageRepository.save(IMAGE_1);
- userRepository.save(USER_1);
+ userRepository.saveAll(List.of(USER_1, USER_2));
containerRepository.save(CONTAINER_1);
databaseRepository.save(DATABASE_1_SIMPLE);
tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE));
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java
index 844d798d6773db2094e15ce15183c7c1e71dfdf0..bcb12ab0b35c9508881190004f501ddc84ff5138 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/repository/ViewRepositoryIntegrationTest.java
@@ -55,8 +55,7 @@ public class ViewRepositoryIntegrationTest extends BaseUnitTest {
@BeforeEach
public void beforeEach() {
imageRepository.save(IMAGE_1);
- userRepository.save(USER_1);
- userRepository.save(USER_2);
+ userRepository.saveAll(List.of(USER_1, USER_2, USER_3));
containerRepository.saveAll(List.of(CONTAINER_1_SIMPLE, CONTAINER_2_SIMPLE));
databaseRepository.saveAll(List.of(DATABASE_1_SIMPLE, DATABASE_2_SIMPLE));
tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE, TABLE_3_SIMPLE, TABLE_4_SIMPLE, TABLE_5_SIMPLE, TABLE_6_SIMPLE, TABLE_7_SIMPLE));
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..1f4240a8647e00668c77220a93b155622e4c6fa8
--- /dev/null
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/AuthenticationServiceIntegrationTest.java
@@ -0,0 +1,87 @@
+package at.tuwien.service;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.annotations.MockAmqp;
+import at.tuwien.annotations.MockOpensearch;
+import at.tuwien.entities.user.User;
+import at.tuwien.exception.*;
+import at.tuwien.gateway.KeycloakGateway;
+import dasniko.testcontainers.keycloak.KeycloakContainer;
+import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+import org.testcontainers.images.PullPolicy;
+import org.testcontainers.junit.jupiter.Container;
+import org.testcontainers.junit.jupiter.Testcontainers;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Log4j2
+@Testcontainers
+@EnableAutoConfiguration(exclude = RabbitAutoConfiguration.class)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
+@SpringBootTest
+@ExtendWith(SpringExtension.class)
+@MockAmqp
+@MockOpensearch
+public class AuthenticationServiceIntegrationTest extends BaseUnitTest {
+
+ @Autowired
+ private AuthenticationService authenticationService;
+
+ @Autowired
+ private KeycloakGateway keycloakGateway;
+
+ @Container
+ private static KeycloakContainer keycloakContainer = new KeycloakContainer("quay.io/keycloak/keycloak:21.0")
+ .withImagePullPolicy(PullPolicy.alwaysPull())
+ .withAdminUsername("fda")
+ .withAdminPassword("fda")
+ .withRealmImportFile("./dbrepo-realm.json")
+ .withEnv("KC_HOSTNAME_STRICT_HTTPS", "false");
+
+ @DynamicPropertySource
+ static void keycloakProperties(DynamicPropertyRegistry registry) {
+ registry.add("fda.keycloak.endpoint", () -> "http://localhost:" + keycloakContainer.getMappedPort(8080));
+ }
+
+ @Test
+ public void delete_succeeds() throws UserNotFoundException, KeycloakRemoteException, AccessDeniedException,
+ UserEmailAlreadyExistsException, UserAlreadyExistsException {
+
+ /* mock */
+ try {
+ keycloakGateway.deleteUser(keycloakGateway.findByUsername(USER_1_USERNAME).getId());
+ } catch (Exception e) {
+ /* ignore */
+ }
+ keycloakGateway.createUser(USER_1_KEYCLOAK_SIGNUP_REQUEST);
+
+ /* test */
+ authenticationService.delete(keycloakGateway.findByUsername(USER_1_USERNAME).getId());
+ }
+
+ @Test
+ public void create_succeeds() throws UserNotFoundException, KeycloakRemoteException, AccessDeniedException,
+ UserEmailAlreadyExistsException, UserAlreadyExistsException {
+
+ /* mock */
+ try {
+ keycloakGateway.deleteUser(keycloakGateway.findByUsername(USER_1_USERNAME).getId());
+ } catch (Exception e) {
+ /* ignore */
+ }
+
+ /* test */
+ authenticationService.create(USER_1_SIGNUP_REQUEST_DTO);
+ }
+
+}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
index 67de4364b64bc0dcc5d5f32612a89bbcb5945f03..5fd4fdf02b04b37fe8f913c7e2fa85a7b34fcef2 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java
@@ -6,10 +6,12 @@ import at.tuwien.annotations.MockOpensearch;
import at.tuwien.api.database.*;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
+import at.tuwien.config.QueryConfig;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.gateway.KeycloakGateway;
+import at.tuwien.mapper.DatabaseMapper;
import at.tuwien.repository.mdb.*;
import at.tuwien.repository.sdb.DatabaseIdxRepository;
import at.tuwien.service.impl.MariaDbServiceImpl;
@@ -17,6 +19,7 @@ import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.Answers;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
@@ -26,13 +29,14 @@ import org.testcontainers.containers.MariaDBContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
+import java.sql.Connection;
import java.sql.SQLException;
import java.sql.SQLInvalidAuthorizationSpecException;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
@Log4j2
@Testcontainers
@@ -46,6 +50,9 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
@MockBean
private DatabaseIdxRepository databaseIdxRepository;
+ @MockBean
+ private QueryConfig queryConfig;
+
@Autowired
private UserRepository userRepository;
@@ -109,6 +116,8 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
.thenReturn(DATABASE_1_DTO);
when(databaseIdxRepository.save(any(DatabaseDto.class)))
.thenReturn(DATABASE_1_DTO);
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
/* test */
generic_create(DATABASE_1_CREATE, DATABASE_1);
@@ -123,6 +132,8 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
.thenReturn(DATABASE_1_DTO);
when(databaseIdxRepository.save(any(DatabaseDto.class)))
.thenReturn(DATABASE_1_DTO);
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
/* test */
generic_create(DATABASE_1_CREATE, DATABASE_1);
@@ -139,6 +150,8 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
when(databaseIdxRepository.save(any(DatabaseDto.class)))
.thenReturn(DATABASE_2_DTO)
.thenReturn(DATABASE_3_DTO);
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
/* test */
generic_create(DATABASE_2_CREATE, DATABASE_2);
@@ -155,6 +168,8 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
when(databaseIdxRepository.save(any(DatabaseDto.class)))
.thenReturn(DATABASE_3_DTO)
.thenReturn(DATABASE_2_DTO);
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
/* test */
generic_create(DATABASE_3_CREATE, DATABASE_3);
@@ -169,11 +184,31 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
databaseRepository.deleteAll();
when(databaseIdxRepository.save(any(DatabaseDto.class)))
.thenReturn(DATABASE_1_DTO);
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
final Database database = generic_create(DATABASE_1_CREATE, DATABASE_1);
/* test */
- MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), mariaDBContainer.getMappedPort(3306), database.getInternalName(), USER_1_USERNAME, USER_1_PASSWORD);
+ MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), 3308, database.getInternalName(), USER_1_USERNAME, USER_1_PASSWORD);
+ }
+
+ @Test
+ public void create_existsRollbackSucceeds_fails() throws Exception {
+
+ /* mock */
+ MariaDbConfig.dropDatabase(CONTAINER_1, DATABASE_1_INTERNALNAME);
+ databaseRepository.deleteAll();
+ when(databaseIdxRepository.save(any(DatabaseDto.class)))
+ .thenReturn(DATABASE_1_DTO);
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("" /* (1) */, "SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE"/* (2) */);
+
+ /* test */
+ assertThrows(DatabaseMalformedException.class, () -> {
+ databaseService.create(DATABASE_1_CREATE, USER_1_PRINCIPAL); // (1)
+ });
+ generic_create(DATABASE_1_CREATE, DATABASE_1); // (2)
}
@Test
@@ -184,22 +219,28 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
databaseAccessRepository.save(DATABASE_1_USER_3_READ_ACCESS);
when(databaseIdxRepository.save(any(DatabaseDto.class)))
.thenReturn(DATABASE_1_DTO);
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
/* test */
assertThrows(SQLInvalidAuthorizationSpecException.class, () -> {
- MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), mariaDBContainer.getMappedPort(3306), USER_3_USERNAME, USER_4_PASSWORD);
+ MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), 3308, USER_3_USERNAME, USER_4_PASSWORD);
});
databaseService.updatePassword(User.builder()
- .id(USER_3_ID)
- .username(USER_3_USERNAME)
- .mariadbPassword(USER_4_DATABASE_PASSWORD)
+ .id(USER_3_ID)
+ .username(USER_3_USERNAME)
+ .mariadbPassword(USER_4_DATABASE_PASSWORD)
.build());
- MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), mariaDBContainer.getMappedPort(3306), USER_3_USERNAME, USER_4_PASSWORD);
+ MariaDbConfig.getPrivileges(mariaDBContainer.getHost(), 3308, USER_3_USERNAME, USER_4_PASSWORD);
}
@Test
public void create_queryStore_succeeds() throws Exception {
+ /* mock */
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
+
/* test */
generic_insert(QUERY_4_STATEMENT, 1L);
}
@@ -207,6 +248,10 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
@Test
public void create_queryStoreSameQueryHash_succeeds() throws Exception {
+ /* mock */
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
+
/* test */
generic_insert(QUERY_4_STATEMENT, 1L);
generic_insert(QUERY_5_STATEMENT, 2L);
@@ -216,6 +261,10 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
@Test
public void create_systemProcedure_succeeds() throws Exception {
+ /* mock */
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
+
/* test */
generic_system_insert(CONTAINER_1_PRIVILEGED_USERNAME, CONTAINER_1_PRIVILEGED_PASSWORD);
}
@@ -223,6 +272,10 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
@Test
public void create_systemProcedure_fails() {
+ /* mock */
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
+
/* test */
assertThrows(SQLException.class, () -> {
generic_system_insert("junit1", "junit1");
@@ -232,6 +285,10 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
@Test
public void create_userProcedureRoot_succeeds() throws SQLException, QueryMalformedException {
+ /* mock */
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
+
/* test */
generic_user_insert(CONTAINER_1_PRIVILEGED_USERNAME, CONTAINER_1_PRIVILEGED_PASSWORD);
}
@@ -244,6 +301,8 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
MariaDbConfig.createInitDatabase(CONTAINER_1, DATABASE_3);
mariaDbConfig.grantUserPermissions(CONTAINER_1, DATABASE_3, "junit1");
databaseAccessRepository.save(DATABASE_3_USER_1_WRITE_ALL_ACCESS);
+ when(queryConfig.getGrantPrivileges())
+ .thenReturn("SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE");
/* test */
generic_user_insert("junit1", "junit1");
@@ -275,7 +334,7 @@ public class DatabaseServiceIntegrationTest extends BaseUnitTest {
}
@Test
- public void transfer_succeeds() throws DatabaseNotFoundException, UserNotFoundException{
+ public void transfer_succeeds() throws DatabaseNotFoundException, UserNotFoundException {
final DatabaseTransferDto request = DatabaseTransferDto.builder()
.username(USER_2_USERNAME)
.build();
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
index 73429969253b1e2ea7761d20d995c4ba95a52716..92236fbb31b2c70db18906792c5c5a0068ef0b1d 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java
@@ -100,7 +100,7 @@ public class DatabaseServiceUnitTest extends BaseUnitTest {
}
@Test
- public void create_notFound_fails() throws UserNotFoundException, KeycloakRemoteException, AccessDeniedException {
+ public void create_notFound_fails() throws UserNotFoundException {
final DatabaseCreateDto request = DatabaseCreateDto.builder()
.cid(CONTAINER_1_ID)
.name(DATABASE_1_NAME)
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
index 580a9d454526e0c66ed2a39e3c187efc06c59e6a..f31408c4865ee20159d10e556be72d0023ac15b0 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java
@@ -87,7 +87,7 @@ public class IdentifierServiceIntegrationTest extends BaseUnitTest {
private static final OpensearchContainer opensearchContainer = new OpensearchContainer(DockerImageName.parse("opensearchproject/opensearch:2.8.0"));
@DynamicPropertySource
- static void elasticsearchProperties(DynamicPropertyRegistry registry) {
+ static void openSearchProperties(DynamicPropertyRegistry registry) {
final int idx = opensearchContainer.getHttpHostAddress().lastIndexOf(':');
registry.add("spring.opensearch.host", () -> "127.0.0.1");
registry.add("spring.opensearch.port", () -> opensearchContainer.getHttpHostAddress().substring(idx + 1));
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java
index b68d07b0df8de1599b9c0918b304b26cf72787cb..8e9c2cb7b9609238afdbf9dd0c05b2a301c0d050 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java
@@ -4,7 +4,8 @@ import at.tuwien.BaseUnitTest;
import at.tuwien.annotations.MockOpensearch;
import at.tuwien.api.amqp.PermissionDto;
import at.tuwien.exception.AmqpException;
-import at.tuwien.exception.BrokerVirtualHostCreationException;
+import at.tuwien.exception.BrokerRemoteException;
+import at.tuwien.exception.BrokerVirtualHostModificationException;
import at.tuwien.exception.BrokerVirtualHostGrantException;
import at.tuwien.repository.mdb.DatabaseRepository;
import at.tuwien.repository.mdb.TableRepository;
@@ -85,14 +86,14 @@ public class MessageQueueServiceIntegrationTest extends BaseUnitTest {
}
@Test
- public void createUser_succeeds() throws BrokerVirtualHostCreationException {
+ public void createUser_succeeds() throws BrokerRemoteException, BrokerVirtualHostModificationException {
/* test */
messageQueueService.createUser(USER_1_USERNAME);
}
@Test
- public void updatePermissions_empty_succeeds() throws BrokerVirtualHostGrantException {
+ public void updatePermissions_empty_succeeds() throws BrokerRemoteException, BrokerVirtualHostGrantException {
/* test */
final PermissionDto permissions = updatePermissions_generic();
@@ -104,7 +105,7 @@ public class MessageQueueServiceIntegrationTest extends BaseUnitTest {
}
@Test
- public void updatePermissions_owner_succeeds() throws BrokerVirtualHostGrantException {
+ public void updatePermissions_owner_succeeds() throws BrokerRemoteException, BrokerVirtualHostGrantException {
/* mock */
when(databaseRepository.findConfigureAccess(USER_1_ID))
@@ -124,7 +125,7 @@ public class MessageQueueServiceIntegrationTest extends BaseUnitTest {
}
@Test
- public void updatePermissions_ownerNoAccess_succeeds() throws BrokerVirtualHostGrantException {
+ public void updatePermissions_ownerNoAccess_succeeds() throws BrokerRemoteException, BrokerVirtualHostGrantException {
/* mock */
when(databaseRepository.findConfigureAccess(USER_1_ID))
@@ -163,7 +164,7 @@ public class MessageQueueServiceIntegrationTest extends BaseUnitTest {
/* ## GENERIC TEST CASES ## */
/* ################################################################################################### */
- protected PermissionDto updatePermissions_generic() throws BrokerVirtualHostGrantException {
+ protected PermissionDto updatePermissions_generic() throws BrokerRemoteException, BrokerVirtualHostGrantException {
/* mock */
amqpUtils.createUser(USER_1_USERNAME, USER_1_RABBITMQ_CREATE_DTO);
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
index 5628f041c988611bb0cdf0a2bda9f3cb16dfe68f..32f61193982e764f573ccfd92ee5e5b60593c355 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueryServiceIntegrationTest.java
@@ -23,6 +23,8 @@ import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.DynamicPropertyRegistry;
+import org.springframework.test.context.DynamicPropertySource;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.testcontainers.containers.MariaDBContainer;
import org.testcontainers.junit.jupiter.Container;
@@ -85,8 +87,7 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
MariaDbConfig.createInitDatabase(CONTAINER_1, DATABASE_1);
/* metadata database */
imageRepository.save(IMAGE_1);
- userRepository.save(USER_1);
- userRepository.save(USER_2);
+ userRepository.saveAll(List.of(USER_1, USER_2, USER_3));
containerRepository.saveAll(List.of(CONTAINER_1_SIMPLE, CONTAINER_2_SIMPLE));
databaseRepository.saveAll(List.of(DATABASE_1_SIMPLE, DATABASE_2_SIMPLE));
tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE, TABLE_3_SIMPLE, TABLE_4_SIMPLE, TABLE_5_SIMPLE, TABLE_6_SIMPLE, TABLE_7_SIMPLE));
@@ -299,8 +300,10 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
.statement("SELECT n.`firstname`, n.`lastname`, n.`birth`, n.`reminder`, z.`animal_name`, z.`legs` FROM `likes` l JOIN `names` n ON l.`name_id` = n.`id` JOIN `mock_view` z ON z.`id` = l.`zoo_id`")
.build();
- /* test */
+ /* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
+
+ /* test */
final QueryResultDto response = queryService.execute(DATABASE_2_ID, request, USER_1_PRINCIPAL, 0L, 100L, null, null);
assertEquals(4L, response.getResultNumber());
assertNotNull(response.getResult());
@@ -336,8 +339,10 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
.statement("SELECT `location`, `lng` FROM `weather_location` WHERE `lat` IS NULL")
.build();
- /* test */
+ /* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
+
+ /* test */
final QueryResultDto response = queryService.execute(DATABASE_1_ID, request, USER_1_PRINCIPAL,
0L, 100L, null, null);
assertEquals(1L, response.getResultNumber());
@@ -356,8 +361,10 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
.statement("SELECT `location` FROM `weather_location` WHERE `lat` IS NULL")
.build();
- /* test */
+ /* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
+
+ /* test */
final QueryResultDto response = queryService.execute(DATABASE_1_ID, request, USER_1_PRINCIPAL,
0L, 100L, null, null);
assertEquals(1L, response.getResultNumber());
@@ -377,8 +384,10 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
.statement("SELECT `lat`, `lng` FROM `weather_location` WHERE `lat` IS NULL")
.build();
- /* test */
+ /* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
+
+ /* test */
final QueryResultDto response = queryService.execute(DATABASE_1_ID, request, USER_1_PRINCIPAL,
0L, 100L, null, null);
assertEquals(1L, response.getResultNumber());
@@ -393,8 +402,10 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
.statement("SELECT aus.location as a, loc.location from weather_aus aus, weather_location loc")
.build();
- /* test */
+ /* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
+
+ /* test */
final QueryResultDto response = queryService.execute(DATABASE_1_ID, request, USER_1_PRINCIPAL, 0L, 100L, null, null);
assertEquals(9L, response.getResultNumber());
assertNotNull(response.getResult());
@@ -428,7 +439,7 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
.statement("SELECT aus.location as a, loc.location from weather.weather_aus aus, weather.weather_location loc")
.build();
- /* mock */
+ /* pre-condition */
Thread.sleep(1000) /* wait for test container some more */;
/* test */
@@ -457,6 +468,36 @@ public class QueryServiceIntegrationTest extends BaseUnitTest {
assertEquals("Vienna", result.get(8).get("location"));
}
+ @Test
+ public void viewFindAll_succeeds() throws DatabaseConnectionException, TableMalformedException,
+ DatabaseNotFoundException, ImageNotSupportedException, QueryMalformedException, UserNotFoundException,
+ InterruptedException, ViewMalformedException, PaginationException, ViewNotFoundException {
+
+ /* pre-condition */
+ Thread.sleep(1000) /* wait for test container some more */;
+
+ /* test */
+ final QueryResultDto response = queryService.viewFindAll(DATABASE_1_ID, VIEW_2, 0L, 10L, USER_1_PRINCIPAL);
+ assertNotNull(response.getResult());
+ final List<Map<String, Object>> result = response.getResult();
+ /* values */
+ assertEquals(0.6, result.get(0).get("rainfall"));
+ assertEquals("Albury", result.get(0).get("loc"));
+ assertEquals(13.4, result.get(0).get("mintemp"));
+ assertEquals(0.0, result.get(1).get("rainfall"));
+ assertEquals("Albury", result.get(1).get("loc"));
+ assertEquals(7.4, result.get(1).get("mintemp"));
+ assertEquals(0.0, result.get(2).get("rainfall"));
+ assertEquals("Albury", result.get(2).get("loc"));
+ assertEquals(12.9, result.get(2).get("mintemp"));
+ /* ordering */
+ final String[] keys = result.get(0).keySet().toArray(new String[0]);
+ assertEquals("date", keys[0]);
+ assertEquals("loc", keys[1]);
+ assertEquals("rainfall", keys[2]);
+ assertEquals("mintemp", keys[3]);
+ }
+
@Test
public void count_emptySet_succeeds() throws DatabaseConnectionException, TableMalformedException,
DatabaseNotFoundException, ImageNotSupportedException, QueryMalformedException, UserNotFoundException,
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
index c5669b5407ea0225db338a63b204364895ebf1c4..4be1fb518bebd3dcc00d03bf092903a2a63f396d 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java
@@ -10,6 +10,7 @@ import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
import at.tuwien.config.RabbitMqConfig;
import at.tuwien.exception.AmqpException;
+import at.tuwien.exception.BrokerRemoteException;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.listener.impl.RabbitMqListenerImpl;
import at.tuwien.repository.mdb.DatabaseRepository;
@@ -208,7 +209,7 @@ public class QueueServiceIntegrationTest extends BaseUnitTest {
@Test
@Disabled("Not testable")
- public void restore_succeeds() throws AmqpException, IOException {
+ public void restore_succeeds() throws AmqpException, IOException, BrokerRemoteException {
/* mock */
when(tableRepository.findAll())
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java
index e7d733a529676037691575ccd27d352e46f84c5c..13012ab5bb0084d7f58bdc0d24b913ea9e3633dc 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/StoreServiceIntegrationModifyTest.java
@@ -79,8 +79,7 @@ public class StoreServiceIntegrationModifyTest extends BaseUnitTest {
/* metadata database */
imageRepository.save(IMAGE_1);
containerRepository.save(CONTAINER_1);
- userRepository.save(USER_1);
- userRepository.save(USER_5);
+ userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4, USER_5));
databaseRepository.save(DATABASE_1_SIMPLE);
tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE));
tableColumnRepository.saveAll(TABLE_1_COLUMNS);
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
index 8d632a4ef037dfb56fd69494f043f9a91bec3602..17b54ee71a59560bf59de877a4e5eede3f5dd0a3 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationReadTest.java
@@ -62,7 +62,7 @@ public class TableServiceIntegrationReadTest extends BaseUnitTest {
@BeforeEach
public void beforeEach() throws SQLException {
imageRepository.save(IMAGE_1);
- userRepository.saveAll(List.of(USER_1, USER_2));
+ userRepository.saveAll(List.of(USER_1, USER_2, USER_3));
containerRepository.save(CONTAINER_1_SIMPLE);
containerRepository.save(CONTAINER_2_SIMPLE);
databaseRepository.save(DATABASE_1_SIMPLE);
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
index ad229d6aa39d0d6eb4e6d9c8bf8515f8dd2f571d..ba29bea0102b62422c9f725799cf6ec00f21999c 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java
@@ -8,7 +8,6 @@ import at.tuwien.api.user.*;
import at.tuwien.entities.user.User;
import at.tuwien.exception.*;
import at.tuwien.repository.mdb.UserRepository;
-import dasniko.testcontainers.keycloak.KeycloakContainer;
import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -18,12 +17,8 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.test.context.DynamicPropertyRegistry;
-import org.springframework.test.context.DynamicPropertySource;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional;
-import org.testcontainers.images.PullPolicy;
-import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
import java.util.List;
@@ -46,19 +41,6 @@ public class UserServiceIntegrationTest extends BaseUnitTest {
@Autowired
private UserService userService;
- @Container
- private static KeycloakContainer keycloakContainer = new KeycloakContainer("quay.io/keycloak/keycloak:21.0")
- .withImagePullPolicy(PullPolicy.alwaysPull())
- .withAdminUsername("fda")
- .withAdminPassword("fda")
- .withRealmImportFile("./dbrepo-realm.json")
- .withEnv("KC_HOSTNAME_STRICT_HTTPS", "false");
-
- @DynamicPropertySource
- static void elasticsearchProperties(DynamicPropertyRegistry registry) {
- registry.add("fda.keycloak.endpoint", () -> "http://localhost:" + keycloakContainer.getMappedPort(8080));
- }
-
@BeforeEach
public void beforeEach() {
userRepository.save(USER_1);
@@ -100,38 +82,10 @@ public class UserServiceIntegrationTest extends BaseUnitTest {
.build();
/* test */
- final User response = userService.create(request);
+ final User response = userService.create(request, USER_2_ID);
assertEquals(USER_2_USERNAME, response.getUsername());
}
- @Test
- public void create_nonUniqueUsername_fails() {
- final SignupRequestDto request = SignupRequestDto.builder()
- .username(USER_1_USERNAME)
- .password(USER_2_PASSWORD)
- .email(USER_2_EMAIL)
- .build();
-
- /* test */
- assertThrows(UserEmailAlreadyExistsException.class, () -> {
- userService.create(request);
- });
- }
-
- @Test
- public void create_nonUniqueEmail_fails() {
- final SignupRequestDto request = SignupRequestDto.builder()
- .username(USER_2_USERNAME)
- .password(USER_2_PASSWORD)
- .email(USER_1_EMAIL)
- .build();
-
- /* test */
- assertThrows(UserAlreadyExistsException.class, () -> {
- userService.create(request);
- });
- }
-
@Test
@Transactional
public void modify_succeeds() throws UserNotFoundException {
@@ -178,7 +132,7 @@ public class UserServiceIntegrationTest extends BaseUnitTest {
.username(USER_3_USERNAME)
.password(USER_3_PASSWORD)
.email(USER_3_EMAIL)
- .build());
+ .build(), USER_3_ID);
/* test */
userService.updatePassword(user.getId(), request);
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
index 35fc49b369dd59cff21217a05d54bcf8a07f7096..c5660860ded2c91c65ff500e3a912c1b7d588724 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/UserServiceUnitTest.java
@@ -92,7 +92,7 @@ public class UserServiceUnitTest extends BaseUnitTest {
.thenReturn(USER_1_KEYCLOAK_DTO);
/* test */
- final User response = userService.create(USER_1_SIGNUP_REQUEST_DTO);
+ final User response = userService.create(USER_1_SIGNUP_REQUEST_DTO, USER_1_ID);
assertEquals(USER_1_ID, response.getId());
assertEquals(USER_1_USERNAME, response.getUsername());
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
index 3ce4672df421ea673deadd3b7a398f62ee04099f..bc5b260aee74d80099bc4b016503d177f38cd904 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java
@@ -6,6 +6,7 @@ import at.tuwien.api.database.ViewCreateDto;
import at.tuwien.config.MariaDbConfig;
import at.tuwien.config.MariaDbContainerConfig;
import at.tuwien.entities.database.View;
+import at.tuwien.entities.database.table.columns.TableColumn;
import at.tuwien.exception.*;
import at.tuwien.repository.mdb.*;
import lombok.extern.log4j.Log4j2;
@@ -39,7 +40,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
@Log4j2
@Testcontainers
@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
-@EnableAutoConfiguration(exclude= RabbitAutoConfiguration.class)
+@EnableAutoConfiguration(exclude = RabbitAutoConfiguration.class)
@SpringBootTest
@ExtendWith(SpringExtension.class)
@MockAmqp
@@ -79,7 +80,7 @@ public class ViewServiceIntegrationTest extends BaseUnitTest {
private static final OpensearchContainer opensearchContainer = new OpensearchContainer(DockerImageName.parse("opensearchproject/opensearch:2.8.0"));
@DynamicPropertySource
- static void elasticsearchProperties(DynamicPropertyRegistry registry) {
+ static void openSearchProperties(DynamicPropertyRegistry registry) {
final int idx = opensearchContainer.getHttpHostAddress().lastIndexOf(':');
registry.add("spring.opensearch.host", () -> "127.0.0.1");
registry.add("spring.opensearch.port", () -> opensearchContainer.getHttpHostAddress().substring(idx + 1));
@@ -97,7 +98,7 @@ public class ViewServiceIntegrationTest extends BaseUnitTest {
public void beforeEach() {
/* metadata database */
imageRepository.save(IMAGE_1);
- userRepository.saveAll(List.of(USER_1, USER_2));
+ userRepository.saveAll(List.of(USER_1, USER_2, USER_3));
containerRepository.saveAll(List.of(CONTAINER_1_SIMPLE, CONTAINER_2_SIMPLE));
databaseRepository.saveAll(List.of(DATABASE_1_SIMPLE, DATABASE_2_SIMPLE));
tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE, TABLE_3_SIMPLE, TABLE_4_SIMPLE, TABLE_5_SIMPLE, TABLE_6_SIMPLE, TABLE_7_SIMPLE));
@@ -173,4 +174,34 @@ public class ViewServiceIntegrationTest extends BaseUnitTest {
assertNull(row2.get("lng"));
}
+ @Test
+ public void create_withAlias_succeeds() throws DatabaseNotFoundException, UserNotFoundException,
+ DatabaseConnectionException, ViewMalformedException, QueryMalformedException {
+ final ViewCreateDto request = ViewCreateDto.builder()
+ .name(VIEW_2_NAME + "_with_alias")
+ .query(VIEW_2_QUERY)
+ .isPublic(VIEW_2_PUBLIC)
+ .build();
+
+ /* test */
+ final View response = viewService.create(DATABASE_1_ID, request, USER_1_PRINCIPAL);
+ assertEquals(VIEW_2_NAME + "_with_alias", response.getName());
+ assertEquals(VIEW_2_INTERNAL_NAME + "_with_alias", response.getInternalName());
+ assertEquals(VIEW_2_QUERY, response.getQuery());
+ final List<TableColumn> columns = response.getColumns();
+ assertEquals(4, columns.size());
+ final TableColumn column0 = columns.get(0);
+ assertEquals("date", column0.getInternalName());
+ assertNull(column0.getAlias());
+ final TableColumn column1 = columns.get(1);
+ assertEquals("location", column1.getInternalName());
+ assertEquals("loc", column1.getAlias());
+ final TableColumn column2 = columns.get(2);
+ assertEquals("rainfall", column2.getInternalName());
+ assertNull(column2.getAlias());
+ final TableColumn column3 = columns.get(3);
+ assertEquals("mintemp", column3.getInternalName());
+ assertNull(column3.getAlias());
+ }
+
}
diff --git a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java
index a1e884e3374496b22aa96dfbbdf8a968037c293d..d29f53845a291cf7737c431b936aff629cf02ae2 100644
--- a/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java
+++ b/dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceIntegrationTest.java
@@ -77,7 +77,7 @@ public class ViewServicePersistenceIntegrationTest extends BaseUnitTest {
public void beforeEach() {
/* metadata database */
imageRepository.save(IMAGE_1);
- userRepository.saveAll(List.of(USER_1, USER_2));
+ userRepository.saveAll(List.of(USER_1, USER_2, USER_3));
containerRepository.saveAll(List.of(CONTAINER_1_SIMPLE, CONTAINER_2_SIMPLE));
databaseRepository.saveAll(List.of(DATABASE_1_SIMPLE, DATABASE_2_SIMPLE));
tableRepository.saveAll(List.of(TABLE_1_SIMPLE, TABLE_2_SIMPLE, TABLE_3_SIMPLE, TABLE_4_SIMPLE, TABLE_5_SIMPLE, TABLE_6_SIMPLE, TABLE_7_SIMPLE));
diff --git a/dbrepo-metadata-service/rest-service/src/test/resources/application.properties b/dbrepo-metadata-service/rest-service/src/test/resources/application.properties
index 025a23176df6e0b655b927abf4a45fb9611870e7..9002d61ea23c22e68787be490ab9a15df260e67e 100644
--- a/dbrepo-metadata-service/rest-service/src/test/resources/application.properties
+++ b/dbrepo-metadata-service/rest-service/src/test/resources/application.properties
@@ -16,9 +16,8 @@ spring.jpa.hibernate.ddl-auto=create
# logging
logging.level.root=error
-logging.level.at.tuwien.=trace
-logging.level.org.hibernate.SQL=debug
-logging.level.org.hibernate.type=trace
+logging.level.at.tuwien.=debug
+logging.level.at.tuwien.service.impl.=trace
# rabbitmq
fda.broker.endpoint=http://localhost:15672
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java
index ba38f6118fce9c18829ed8cf5c96d9866a37cb47..7e55074f7e1197aaa1e60c1e83ee31e8e5905531 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/BrokerServiceGateway.java
@@ -4,47 +4,66 @@ import at.tuwien.api.amqp.ConsumerDto;
import at.tuwien.api.amqp.CreateVirtualHostDto;
import at.tuwien.api.amqp.GrantVirtualHostPermissionsDto;
import at.tuwien.api.user.ExchangeUpdatePermissionsDto;
-import at.tuwien.exception.BrokerVirtualHostCreationException;
+import at.tuwien.exception.BrokerRemoteException;
+import at.tuwien.exception.BrokerVirtualHostModificationException;
import at.tuwien.exception.BrokerVirtualHostGrantException;
import java.util.List;
public interface BrokerServiceGateway {
- List<ConsumerDto> findAllConsumers();
+ /**
+ * Finds all active consumers on the virtual host "dbrepo".
+ *
+ * @return The list of active consumers.
+ * @throws BrokerRemoteException The Broker Service did not respond within the 3s timeout.
+ */
+ List<ConsumerDto> findAllConsumers() throws BrokerRemoteException;
/**
* Create virtual host at the queue service.
*
* @param data The virtual host.
- * @throws BrokerVirtualHostCreationException The queue service did not respond within the 3s timeout.
+ * @throws BrokerVirtualHostModificationException The virtual host could not be created.
+ * @throws BrokerRemoteException The Broker Service did not respond within the 3s timeout.
*/
- void createVirtualHost(CreateVirtualHostDto data) throws BrokerVirtualHostCreationException;
+ void createVirtualHost(CreateVirtualHostDto data) throws BrokerVirtualHostModificationException, BrokerRemoteException;
/**
* Grants a user permission at a virtual host in the queue service.
*
* @param username The username of the user.
* @param data The grant data.
- * @throws BrokerVirtualHostGrantException The queue service did not respond within the 3s timeout.
+ * @throws BrokerVirtualHostGrantException The permissions could not be granted.
+ * @throws BrokerRemoteException The Broker Service did not respond within the 3s timeout.
+ */
+ void grantPermission(String username, ExchangeUpdatePermissionsDto data) throws BrokerVirtualHostGrantException, BrokerRemoteException;
+
+ /**
+ * Create user on the broker service with given username.
+ *
+ * @param username The username.
+ * @throws BrokerRemoteException The Broker Service did not respond within the 3s timeout.
+ * @throws BrokerVirtualHostModificationException The user could not be created.
*/
- void grantPermission(String username, ExchangeUpdatePermissionsDto data)
- throws BrokerVirtualHostGrantException;
+ void createUser(String username) throws BrokerRemoteException, BrokerVirtualHostModificationException;
/**
- * Create user on the broker service
+ * Deletes a user on the broker service with given username.
*
- * @param username The new username.
- * @throws BrokerVirtualHostCreationException The user could not be created.
+ * @param username The username.
+ * @throws BrokerRemoteException The Broker Service did not respond within the 3s timeout.
+ * @throws BrokerVirtualHostModificationException The user could not be deleted.
*/
- void createUser(String username) throws BrokerVirtualHostCreationException;
+ void deleteUser(String username) throws BrokerRemoteException, BrokerVirtualHostModificationException;
/**
* Grants a user permission at a virtual host in the queue service.
*
* @param username The username of the user.
* @param data The grant data.
- * @throws BrokerVirtualHostGrantException The queue service did not respond within the 3s timeout.
+ * @throws BrokerRemoteException The Broker Service did not respond within the 3s timeout.
+ * @throws BrokerVirtualHostGrantException The permissions could not be granted.
*/
- void grantPermission(String username, GrantVirtualHostPermissionsDto data) throws BrokerVirtualHostGrantException;
+ void grantPermission(String username, GrantVirtualHostPermissionsDto data) throws BrokerRemoteException, BrokerVirtualHostGrantException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
index 612ee2eb372cbee0f0c10067d55eba0d2029f988..3614e43fcbbbc21c8f9808974355b97b0d6750a4 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/KeycloakGateway.java
@@ -9,11 +9,47 @@ import java.util.UUID;
public interface KeycloakGateway {
+ /**
+ * Creates a user at the Authentication Service with given credentials.
+ *
+ * @param data The user credentials.
+ * @throws AccessDeniedException The admin token could not be obtained.
+ * @throws KeycloakRemoteException The Authentication Service was not able to respond within the 3s timeout.
+ * @throws UserAlreadyExistsException The user already exists at the Authentication Service.
+ * @throws UserEmailAlreadyExistsException The user email already exists in the metadata database.
+ */
void createUser(UserCreateDto data) throws AccessDeniedException, KeycloakRemoteException, UserAlreadyExistsException, UserEmailAlreadyExistsException;
+ /**
+ * Deletes a user at the Authentication Service with given user id.
+ *
+ * @param id The user id.
+ * @throws KeycloakRemoteException The Authentication Service was not able to respond within the 3s timeout.
+ * @throws AccessDeniedException The admin token could not be obtained.
+ * @throws UserNotFoundException The user was not found at the Authentication Service.
+ */
+ void deleteUser(UUID id) throws KeycloakRemoteException, AccessDeniedException, UserNotFoundException;
+
+ /**
+ * Update the credentials for a given user.
+ *
+ * @param id The user id.
+ * @param password The user credential.
+ * @throws AccessDeniedException The admin token could not be obtained.
+ * @throws KeycloakRemoteException The Authentication Service was not able to respond within the 3s timeout.
+ */
void updateUserCredentials(UUID id, UserPasswordDto password) throws AccessDeniedException,
KeycloakRemoteException;
+ /**
+ * Finds a user in the metadata database by given username.
+ *
+ * @param username The user username.
+ * @return The updated user.
+ * @throws AccessDeniedException The admin token could not be obtained.
+ * @throws UserNotFoundException The user was not found,
+ * @throws KeycloakRemoteException The Authentication Service was not able to respond within the 3s timeout.
+ */
UserDto findByUsername(String username) throws AccessDeniedException, UserNotFoundException,
KeycloakRemoteException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java
index 52de16e2f364e3ea6f4896763dc0514cc0331a64..a13de9f29ccc761a16aaa4dd5cf18ab11283acf1 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/BrokerServiceGatewayImpl.java
@@ -5,19 +5,16 @@ import at.tuwien.api.amqp.CreateUserDto;
import at.tuwien.api.amqp.CreateVirtualHostDto;
import at.tuwien.api.amqp.GrantVirtualHostPermissionsDto;
import at.tuwien.api.user.ExchangeUpdatePermissionsDto;
-import at.tuwien.config.AmqpConfig;
import at.tuwien.config.GatewayConfig;
-import at.tuwien.exception.BrokerVirtualHostCreationException;
+import at.tuwien.exception.BrokerRemoteException;
+import at.tuwien.exception.BrokerVirtualHostModificationException;
import at.tuwien.exception.BrokerVirtualHostGrantException;
import at.tuwien.gateway.BrokerServiceGateway;
import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.codec.binary.Base64;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.core.env.Environment;
import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -25,50 +22,54 @@ import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
import java.net.URI;
-import java.nio.charset.Charset;
-import java.util.Arrays;
import java.util.List;
@Slf4j
@Service
public class BrokerServiceGatewayImpl implements BrokerServiceGateway {
- private final Environment environment;
private final RestTemplate restTemplate;
private final GatewayConfig gatewayConfig;
private final static String VIRTUAL_SERVER = "dbrepo";
@Autowired
- public BrokerServiceGatewayImpl(Environment environment, GatewayConfig gatewayConfig,
+ public BrokerServiceGatewayImpl(GatewayConfig gatewayConfig,
@Qualifier("brokerRestTemplate") RestTemplate restTemplate) {
- this.environment = environment;
this.restTemplate = restTemplate;
this.gatewayConfig = gatewayConfig;
}
- private String parseUrl(String path) {
- final String url = "/api" + path;
- log.debug("parse url: {}", url);
- return url;
- }
-
@Override
- public void createVirtualHost(CreateVirtualHostDto data) throws BrokerVirtualHostCreationException {
- final ResponseEntity<Void> response = restTemplate.exchange(parseUrl("/vhost"), HttpMethod.POST,
- new HttpEntity<>(data), Void.class);
+ public void createVirtualHost(CreateVirtualHostDto data) throws BrokerVirtualHostModificationException, BrokerRemoteException {
+ final String url = "/api/vhost";
+ log.trace("POST {}{}", gatewayConfig.getBrokerEndpoint(), url);
+ final ResponseEntity<Void> response;
+ try {
+ response = restTemplate.exchange(url, HttpMethod.POST, new HttpEntity<>(data), Void.class);
+ } catch (Exception e) {
+ log.error("Failed to create virtual host: remote host answered unexpected: {}", e.getMessage());
+ throw new BrokerRemoteException("Failed to create virtual host: remote host answered unexpected", e);
+ }
if (!response.getStatusCode().equals(HttpStatus.CREATED)) {
log.error("Failed to create virtual host: {}", response.getStatusCode());
- throw new BrokerVirtualHostCreationException("Failed to create virtual host");
+ throw new BrokerVirtualHostModificationException("Failed to create virtual host");
}
log.info("Create virtual host with name {}", data.getName());
}
@Override
public void grantPermission(String username, ExchangeUpdatePermissionsDto data)
- throws BrokerVirtualHostGrantException {
- final ResponseEntity<Void> response = restTemplate.exchange(parseUrl("/topic-permissions/dbrepo/" + username), HttpMethod.PUT,
- new HttpEntity<>(data), Void.class);
+ throws BrokerVirtualHostGrantException, BrokerRemoteException {
+ final String url = "/api/topic-permissions/dbrepo/" + username;
+ log.trace("PUT {}{}", gatewayConfig.getBrokerEndpoint(), url);
+ final ResponseEntity<Void> response;
+ try {
+ response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(data), Void.class);
+ } catch (Exception e) {
+ log.error("Failed to grant permissions: remote host answered unexpected: {}", e.getMessage());
+ throw new BrokerRemoteException("Failed to grant permissions: remote host answered unexpected", e);
+ }
if (!response.getStatusCode().equals(HttpStatus.CREATED) && !response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
log.error("Failed to grant exchange: {}", response.getStatusCode());
throw new BrokerVirtualHostGrantException("Failed to grant exchange");
@@ -77,25 +78,57 @@ public class BrokerServiceGatewayImpl implements BrokerServiceGateway {
}
@Override
- public void createUser(String username) throws BrokerVirtualHostCreationException {
+ public void createUser(String username) throws BrokerRemoteException, BrokerVirtualHostModificationException {
final CreateUserDto data = CreateUserDto.builder()
.passwordHash("")
.tags("")
.build();
- final ResponseEntity<Void> response = restTemplate.exchange(parseUrl("/users/" + username), HttpMethod.PUT,
- new HttpEntity<>(data), Void.class);
+ final String url = "/api/users/" + username;
+ log.trace("PUT {}{}", gatewayConfig.getBrokerEndpoint(), url);
+ final ResponseEntity<Void> response;
+ try {
+ response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(data), Void.class);
+ } catch (Exception e) {
+ log.error("Failed to create user: remote host answered unexpected: {}", e.getMessage());
+ throw new BrokerRemoteException("Failed to create user: remote host answered unexpected", e);
+ }
if (!response.getStatusCode().equals(HttpStatus.CREATED) && !response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
log.error("Failed to create user: {}", response.getStatusCode());
- throw new BrokerVirtualHostCreationException("Failed to create user");
+ throw new BrokerVirtualHostModificationException("Failed to create user");
}
log.info("Created user with username {}", username);
}
@Override
- public void grantPermission(String username, GrantVirtualHostPermissionsDto data)
- throws BrokerVirtualHostGrantException {
- final ResponseEntity<Void> response = restTemplate.exchange(parseUrl("/permissions/dbrepo/" + username), HttpMethod.PUT,
- new HttpEntity<>(data), Void.class);
+ public void deleteUser(String username) throws BrokerRemoteException, BrokerVirtualHostModificationException {
+ final String url = "/api/users/" + username;
+ log.trace("DELETE {}{}", gatewayConfig.getBrokerEndpoint(), url);
+ final ResponseEntity<Void> response;
+ try {
+ response = restTemplate.exchange(url, HttpMethod.DELETE, new HttpEntity<>(null), Void.class);
+ } catch (Exception e) {
+ log.error("Failed to delete user: remote host answered unexpected: {}", e.getMessage());
+ throw new BrokerRemoteException("Failed to delete user: remote host answered unexpected", e);
+ }
+ if (!response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
+ log.error("Failed to delete user: {}", response.getStatusCode());
+ throw new BrokerVirtualHostModificationException("Failed to create user");
+ }
+ log.info("Deleted user with username {}", username);
+ }
+
+ @Override
+ public void grantPermission(String username, GrantVirtualHostPermissionsDto data) throws BrokerRemoteException,
+ BrokerVirtualHostGrantException {
+ final String url = "/api/permissions/dbrepo/" + username;
+ log.trace("PUT {}{}", gatewayConfig.getBrokerEndpoint(), url);
+ final ResponseEntity<Void> response;
+ try {
+ response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(data), Void.class);
+ } catch (Exception e) {
+ log.error("Failed to create permissions: remote host answered unexpected: {}", e.getMessage());
+ throw new BrokerRemoteException("Failed to create permissions: remote host answered unexpected", e);
+ }
if (!response.getStatusCode().equals(HttpStatus.CREATED) && !response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
log.error("Failed to grant virtual host: {}", response.getStatusCode());
throw new BrokerVirtualHostGrantException("Failed to grant virtual host");
@@ -104,19 +137,19 @@ public class BrokerServiceGatewayImpl implements BrokerServiceGateway {
}
@Override
- public List<ConsumerDto> findAllConsumers() {
- final StringBuilder urlBuilder = new StringBuilder(gatewayConfig.getBrokerEndpoint())
- .append("/api");
- if (Arrays.stream(environment.getActiveProfiles()).noneMatch(p -> p.equals("junit"))) {
- urlBuilder.append("/broker");
- }
- urlBuilder.append("/consumers/")
- .append(VIRTUAL_SERVER);
+ public List<ConsumerDto> findAllConsumers() throws BrokerRemoteException {
+ final String url = "/api/consumers/" + VIRTUAL_SERVER;
log.trace("gateway broker find all consumers, virtual server={}", VIRTUAL_SERVER);
- final URI findUri = URI.create(urlBuilder.toString());
- final ResponseEntity<List<ConsumerDto>> response = restTemplate.exchange(findUri, HttpMethod.GET,
- HttpEntity.EMPTY, new ParameterizedTypeReference<>() {
- });
+ log.trace("GET {}{}", gatewayConfig.getBrokerEndpoint(), url);
+ final ResponseEntity<List<ConsumerDto>> response;
+ try {
+ response = restTemplate.exchange(URI.create(url), HttpMethod.GET, HttpEntity.EMPTY,
+ new ParameterizedTypeReference<>() {
+ });
+ } catch (Exception e) {
+ log.error("Failed to find consumers: remote host answered unexpected: {}", e.getMessage());
+ throw new BrokerRemoteException("Failed to find consumers: remote host answered unexpected", e);
+ }
return response.getBody();
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
index 05602afae5a9879c8a03978202d8e1933f875225..6f29d138ffb858c526e1e18b0f76c0d27cb5d99c 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/gateway/impl/KeycloakGatewayImpl.java
@@ -33,7 +33,7 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
this.keycloakConfig = keycloakConfig;
}
- public TokenDto obtainToken() throws AccessDeniedException {
+ public TokenDto obtainToken() throws AccessDeniedException, KeycloakRemoteException {
final HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
final MultiValueMap<String, String> payload = new LinkedMultiValueMap<>();
@@ -41,13 +41,17 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
payload.add("password", keycloakConfig.getKeycloakPassword());
payload.add("grant_type", "password");
payload.add("client_id", "admin-cli");
+ final String url = keycloakConfig.getKeycloakEndpoint() + "/realms/master/protocol/openid-connect/token";
+ log.debug("request admin token from url {}", url);
final ResponseEntity<TokenDto> response;
try {
- response = restTemplate.exchange("/realms/master/protocol/openid-connect/token",
- HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
+ response = restTemplate.exchange(url, HttpMethod.POST, new HttpEntity<>(payload, headers), TokenDto.class);
} catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
log.error("Failed to obtain admin token: {}", e.getMessage());
throw new AccessDeniedException("Failed to obtain admin token: " + e.getMessage());
+ } catch (Exception e) {
+ log.error("Failed to create user: remote host answered unexpected: {}", e.getMessage());
+ throw new KeycloakRemoteException("Failed to create user: remote host answered unexpected", e);
}
return response.getBody();
}
@@ -59,10 +63,11 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
final HttpHeaders headers = new HttpHeaders();
headers.set("Accept", "application/json");
headers.set("Authorization", "Bearer " + obtainToken().getAccessToken());
+ final String url = keycloakConfig.getKeycloakEndpoint() + "/admin/realms/dbrepo/users";
+ log.debug("create user at url {}", url);
final ResponseEntity<Void> response;
try {
- response = restTemplate.exchange("/admin/realms/dbrepo/users", HttpMethod.POST,
- new HttpEntity<>(data, headers), Void.class);
+ response = restTemplate.exchange(url, HttpMethod.POST, new HttpEntity<>(data, headers), Void.class);
} catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
log.error("Failed to create user: {}", e.getMessage());
throw new KeycloakRemoteException("Failed to create user: " + e.getMessage());
@@ -74,11 +79,43 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
log.error("Conflict when creating user: {}", e.getMessage());
throw new UserAlreadyExistsException("Conflict when creating user: " + e.getMessage());
}
+ } catch (Exception e) {
+ log.error("Failed to create user: remote host answered unexpected: {}", e.getMessage());
+ throw new KeycloakRemoteException("Failed to create user: remote host answered unexpected", e);
}
if (!response.getStatusCode().equals(HttpStatus.CREATED)) {
log.error("Failed to create user: status {} was not expected", response.getStatusCode().value());
throw new KeycloakRemoteException("Failed to create user: status " + response.getStatusCode().value() + "was not expected");
}
+ log.info("Created user {} at authentication service", data.getUsername());
+ }
+
+ @Override
+ public void deleteUser(UUID id) throws KeycloakRemoteException, AccessDeniedException, UserNotFoundException {
+ /* obtain admin token */
+ final HttpHeaders headers = new HttpHeaders();
+ headers.set("Accept", "application/json");
+ headers.set("Authorization", "Bearer " + obtainToken().getAccessToken());
+ final String url = keycloakConfig.getKeycloakEndpoint() + "/admin/realms/dbrepo/users/" + id;
+ log.debug("delete user at url {}", url);
+ final ResponseEntity<Void> response;
+ try {
+ response = restTemplate.exchange(url, HttpMethod.DELETE, new HttpEntity<>(null, headers), Void.class);
+ } catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
+ log.error("Failed to delete user: {}", e.getMessage());
+ throw new KeycloakRemoteException("Failed to delete user: " + e.getMessage());
+ } catch (HttpClientErrorException.NotFound e) {
+ log.error("User does not exist: {}", e.getMessage());
+ throw new UserNotFoundException("User does not exist: " + e.getMessage());
+ } catch (Exception e) {
+ log.error("Failed to delete user: remote host answered unexpected: {}", e.getMessage());
+ throw new KeycloakRemoteException("Failed to delete user: remote host answered unexpected", e);
+ }
+ if (!response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
+ log.error("Failed to delete user: status {} was not expected", response.getStatusCode().value());
+ throw new KeycloakRemoteException("Failed to delete user: status " + response.getStatusCode().value() + "was not expected");
+ }
+ log.info("Deleted user {} at authentication service", id);
}
@Override
@@ -89,18 +126,23 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
headers.set("Accept", "application/json");
headers.set("Authorization", "Bearer " + obtainToken().getAccessToken());
final UpdateCredentialsDto payload = userMapper.passwordToUpdateCredentialsDto(data.getPassword());
+ final String url = keycloakConfig.getKeycloakEndpoint() + "/admin/realms/dbrepo/users/" + id;
+ log.debug("update user credentials at url {}", url);
final ResponseEntity<Void> response;
try {
- response = restTemplate.exchange("/admin/realms/dbrepo/users/" + id, HttpMethod.PUT,
- new HttpEntity<>(payload, headers), Void.class);
+ response = restTemplate.exchange(url, HttpMethod.PUT, new HttpEntity<>(payload, headers), Void.class);
} catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
log.error("Failed to update user credentials: {}", e.getMessage());
throw new KeycloakRemoteException("Failed to update user credentials: " + e.getMessage());
+ } catch (Exception e) {
+ log.error("Failed to create user: remote host answered unexpected: {}", e.getMessage());
+ throw new KeycloakRemoteException("Failed to create user: remote host answered unexpected", e);
}
if (!response.getStatusCode().equals(HttpStatus.NO_CONTENT)) {
log.error("Failed to update user credentials: status {} was not expected", response.getStatusCode().value());
throw new KeycloakRemoteException("Failed to update user credentials: status " + response.getStatusCode().value() + "was not expected");
}
+ log.info("Updated user {} password at authentication service", id);
}
@Override
@@ -110,13 +152,17 @@ public class KeycloakGatewayImpl implements KeycloakGateway {
final HttpHeaders headers = new HttpHeaders();
headers.set("Accept", "application/json");
headers.set("Authorization", "Bearer " + obtainToken().getAccessToken());
+ final String url = keycloakConfig.getKeycloakEndpoint() + "/admin/realms/dbrepo/users/?username=" + username;
+ log.debug("find user from url {}", url);
final ResponseEntity<UserDto[]> response;
try {
- response = restTemplate.exchange("/admin/realms/dbrepo/users/?username=" + username,
- HttpMethod.GET, new HttpEntity<>(null, headers), UserDto[].class);
+ response = restTemplate.exchange(url, HttpMethod.GET, new HttpEntity<>(null, headers), UserDto[].class);
} catch (ResourceAccessException | HttpServerErrorException.ServiceUnavailable e) {
log.error("Failed to find user: {}", e.getMessage());
throw new KeycloakRemoteException("Failed to find user: " + e.getMessage());
+ } catch (Exception e) {
+ log.error("Failed to create user: remote host answered unexpected: {}", e.getMessage());
+ throw new KeycloakRemoteException("Failed to create user: remote host answered unexpected", e);
}
final UserDto[] body = response.getBody();
if (body == null || body.length != 1) {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/listener/MessageQueueListener.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/listener/MessageQueueListener.java
index f6c0d703b0783e57ca580a58436ddd48a8abc468..7b5c1ffa2cf16f1996372a085f7a0958f36cf931 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/listener/MessageQueueListener.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/listener/MessageQueueListener.java
@@ -1,6 +1,7 @@
package at.tuwien.listener;
import at.tuwien.exception.AmqpException;
+import at.tuwien.exception.BrokerRemoteException;
import org.springframework.scheduling.annotation.Scheduled;
import java.util.concurrent.TimeUnit;
@@ -13,5 +14,5 @@ public interface MessageQueueListener {
* @throws AmqpException The consumer could not be created.
*/
@Scheduled(fixedDelay = 5, initialDelay = 300, timeUnit = TimeUnit.SECONDS)
- void updateConsumers() throws AmqpException;
+ void updateConsumers() throws AmqpException, BrokerRemoteException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/listener/impl/RabbitMqListenerImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/listener/impl/RabbitMqListenerImpl.java
index cb6c74658562238f4d17d0d86b12ef104d4d849c..cc454351e616943f6179ab5a2bce9b43a91b9972 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/listener/impl/RabbitMqListenerImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/listener/impl/RabbitMqListenerImpl.java
@@ -1,6 +1,7 @@
package at.tuwien.listener.impl;
import at.tuwien.exception.AmqpException;
+import at.tuwien.exception.BrokerRemoteException;
import at.tuwien.listener.MessageQueueListener;
import at.tuwien.service.MessageQueueService;
import lombok.extern.log4j.Log4j2;
@@ -23,7 +24,7 @@ public class RabbitMqListenerImpl implements MessageQueueListener {
@Override
@Scheduled(fixedDelay = 5, initialDelay = 300, timeUnit = TimeUnit.SECONDS)
@Transactional(readOnly = true)
- public void updateConsumers() throws AmqpException {
+ public void updateConsumers() throws AmqpException, BrokerRemoteException {
messageQueueService.restore();
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java
new file mode 100644
index 0000000000000000000000000000000000000000..a39e0d66c20348a35d5d2fcafbbd7ab1a364fd85
--- /dev/null
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/AuthenticationService.java
@@ -0,0 +1,47 @@
+package at.tuwien.service;
+
+import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.keycloak.UserDto;
+import at.tuwien.api.user.UserPasswordDto;
+import at.tuwien.exception.*;
+
+import java.util.UUID;
+
+public interface AuthenticationService {
+
+ /**
+ * Create a user at the Authentication Service with given credentials.
+ *
+ * @param data The credentials.
+ * @throws AccessDeniedException The admin token could not be obtained.
+ * @throws KeycloakRemoteException The Authentication Service was not able to respond within the 3s timeout.
+ * @throws UserAlreadyExistsException The user already exists at the Authentication Service.
+ * @throws UserEmailAlreadyExistsException The user email already exists in the metadata database.
+ */
+ void create(SignupRequestDto data) throws KeycloakRemoteException, AccessDeniedException,
+ UserEmailAlreadyExistsException, UserAlreadyExistsException;
+
+ /**
+ * Deletes a user at the Authentication Service with given user id.
+ *
+ * @param userId The user id.
+ * @throws KeycloakRemoteException The Authentication Service was not able to respond within the 3s timeout.
+ * @throws AccessDeniedException The admin token could not be obtained.
+ * @throws UserNotFoundException The user was not found at the Authentication Service.
+ */
+ void delete(UUID userId) throws UserNotFoundException, KeycloakRemoteException, AccessDeniedException;
+
+ /**
+ * Finds a user with given username.
+ *
+ * @param username The username.
+ * @return The user, if successful.
+ * @throws UserNotFoundException The user was not found at the Authentication Service.
+ * @throws KeycloakRemoteException The Authentication Service was not able to respond within the 3s timeout.
+ * @throws AccessDeniedException The admin token could not be obtained.
+ */
+ UserDto findByUsername(String username) throws UserNotFoundException, KeycloakRemoteException,
+ AccessDeniedException;
+
+ void updatePassword(UUID id, UserPasswordDto data) throws KeycloakRemoteException, AccessDeniedException;
+}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/MessageQueueService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/MessageQueueService.java
index bfd0d4a1d32f1c2817f67ec57a977fe94b6016af..3d21c91a521e6e581f1ac7886f5d98bd44fdfc82 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/MessageQueueService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/MessageQueueService.java
@@ -1,11 +1,11 @@
package at.tuwien.service;
-import at.tuwien.api.user.UserDto;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.user.User;
import at.tuwien.exception.AmqpException;
-import at.tuwien.exception.BrokerVirtualHostCreationException;
+import at.tuwien.exception.BrokerRemoteException;
+import at.tuwien.exception.BrokerVirtualHostModificationException;
import at.tuwien.exception.BrokerVirtualHostGrantException;
import jakarta.annotation.PostConstruct;
@@ -43,13 +43,22 @@ public interface MessageQueueService {
void create(Table table) throws AmqpException;
/**
- * Create user on the broker service
+ * Create user on the broker service with given username.
*
* @param username The username.
- * @throws BrokerVirtualHostCreationException The user could not be created.
+ * @throws BrokerRemoteException The user could not be created.
+ * @throws BrokerVirtualHostModificationException The Broker Service did not respond within the 3s timeout.
*/
- void createUser(String username) throws BrokerVirtualHostCreationException;
+ void createUser(String username) throws BrokerRemoteException, BrokerVirtualHostModificationException;
+ /**
+ * Delete a user on the broker service with given username.
+ *
+ * @param username The username.
+ * @throws BrokerRemoteException The user could not be deleted.
+ * @throws BrokerVirtualHostModificationException The Broker Service did not respond within the 3s timeout.
+ */
+ void deleteUser(String username) throws BrokerRemoteException, BrokerVirtualHostModificationException;
/**
* Updates the virtual host permissions in the Broker Service for a user with given principal.
@@ -57,7 +66,7 @@ public interface MessageQueueService {
* @param user The user.
* @throws BrokerVirtualHostGrantException The Broker Service refused to grant the permissions.
*/
- void updatePermissions(User user) throws BrokerVirtualHostGrantException;
+ void updatePermissions(User user) throws BrokerVirtualHostGrantException, BrokerRemoteException;
/**
* Deletes an exchange for a database.
@@ -82,5 +91,5 @@ public interface MessageQueueService {
*
* @throws AmqpException The consumer could not be created.
*/
- void restore() throws AmqpException;
+ void restore() throws AmqpException, BrokerRemoteException;
}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/QueryService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/QueryService.java
index e974f6eac844814716a6f8c791e4f806aeadf893..534b30c69b1007dbed44cb14813b4cc34d84e572 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/QueryService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/QueryService.java
@@ -66,10 +66,10 @@ public interface QueryService {
* @throws ColumnParseException The column mapping/parsing failed.
* @throws QueryMalformedException The query is malformed.
*/
- QueryResultDto reExecute(Long databaseId, Query query, Long page, Long size,
- SortType sortDirection, String sortColumn, Principal principal)
- throws QueryMalformedException, DatabaseNotFoundException, ImageNotSupportedException, ColumnParseException,
- DatabaseConnectionException, TableMalformedException, QueryStoreException, UserNotFoundException;
+ QueryResultDto reExecute(Long databaseId, Query query, Long page, Long size, SortType sortDirection,
+ String sortColumn, Principal principal) throws QueryMalformedException,
+ DatabaseNotFoundException, ImageNotSupportedException, ColumnParseException, DatabaseConnectionException,
+ TableMalformedException, QueryStoreException, UserNotFoundException;
/**
* Re-Executes the count-statement of an arbitrary query on the database. We allow the user to only view
@@ -151,10 +151,10 @@ public interface QueryService {
* @throws ViewMalformedException The table is malformed.
* @throws QueryMalformedException The query is malformed.
*/
- QueryResultDto viewFindAll(Long databaseId, View view,
- Long page, Long size, Principal principal) throws ViewNotFoundException, DatabaseNotFoundException,
- ImageNotSupportedException, DatabaseConnectionException, ViewMalformedException, PaginationException,
- QueryMalformedException, UserNotFoundException, TableMalformedException;
+ QueryResultDto viewFindAll(Long databaseId, View view, Long page, Long size, Principal principal)
+ throws ViewNotFoundException, DatabaseNotFoundException, ImageNotSupportedException,
+ DatabaseConnectionException, ViewMalformedException, PaginationException, QueryMalformedException,
+ UserNotFoundException, TableMalformedException;
/**
* Finds one query by database id and query id.
@@ -171,9 +171,9 @@ public interface QueryService {
* @throws QueryNotFoundException THe query was not found in the query store.
* @throws QueryMalformedException The query is malformed.
*/
- ExportResource findOne(Long databaseId, Long queryId, Principal principal)
- throws DatabaseNotFoundException, ImageNotSupportedException, TableMalformedException,
- FileStorageException, QueryStoreException, QueryNotFoundException, QueryMalformedException, DatabaseConnectionException, UserNotFoundException;
+ ExportResource findOne(Long databaseId, Long queryId, Principal principal) throws DatabaseNotFoundException,
+ ImageNotSupportedException, TableMalformedException, FileStorageException, QueryStoreException,
+ QueryNotFoundException, QueryMalformedException, DatabaseConnectionException, UserNotFoundException;
/**
* Count the total tuples for a given table id within a database id at a given time.
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java
index 3b94ad5d903eb52a0d17a5c869c2af897f205a3f..a5edcc519c9643afc2915217eaebd14df20550ac 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/UserService.java
@@ -42,7 +42,7 @@ public interface UserService {
* @return The user, if successful. False otherwise.
* @throws UserAlreadyExistsException The user already exists in the metadata database.
*/
- User create(SignupRequestDto data) throws UserAlreadyExistsException, AccessDeniedException,
+ User create(SignupRequestDto data, UUID id) throws UserAlreadyExistsException, AccessDeniedException,
KeycloakRemoteException, UserNotFoundException, UserEmailAlreadyExistsException;
/**
@@ -61,7 +61,7 @@ public interface UserService {
* @param id The user id.
* @param data The new password.
*/
- void updatePassword(UUID id, UserPasswordDto data) throws KeycloakRemoteException, AccessDeniedException, UserNotFoundException;
+ void updatePassword(UUID id, UserPasswordDto data) throws UserNotFoundException;
/**
* Updates the user theme for a user with given id.
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..4a8a6c7fb3e9a195c83fe60c512e2af2ba69a413
--- /dev/null
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/AuthenticationServiceImpl.java
@@ -0,0 +1,51 @@
+package at.tuwien.service.impl;
+
+import at.tuwien.api.auth.SignupRequestDto;
+import at.tuwien.api.keycloak.UserDto;
+import at.tuwien.api.user.UserPasswordDto;
+import at.tuwien.exception.*;
+import at.tuwien.gateway.KeycloakGateway;
+import at.tuwien.mapper.UserMapper;
+import at.tuwien.service.AuthenticationService;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.UUID;
+
+@Log4j2
+@Service
+public class AuthenticationServiceImpl implements AuthenticationService {
+
+ private final UserMapper userMapper;
+ private final KeycloakGateway keycloakGateway;
+
+ @Autowired
+ public AuthenticationServiceImpl(UserMapper userMapper, KeycloakGateway keycloakGateway) {
+ this.userMapper = userMapper;
+ this.keycloakGateway = keycloakGateway;
+ }
+
+ @Override
+ public void create(SignupRequestDto data) throws KeycloakRemoteException, AccessDeniedException,
+ UserEmailAlreadyExistsException, UserAlreadyExistsException {
+ keycloakGateway.createUser(userMapper.signupRequestDtoToUserCreateDto(data));
+ }
+
+ @Override
+ public void delete(UUID userId) throws UserNotFoundException, KeycloakRemoteException, AccessDeniedException {
+ keycloakGateway.deleteUser(userId);
+ }
+
+ @Override
+ public UserDto findByUsername(String username) throws UserNotFoundException, KeycloakRemoteException,
+ AccessDeniedException {
+ return keycloakGateway.findByUsername(username);
+ }
+
+ @Override
+ public void updatePassword(UUID id, UserPasswordDto data) throws KeycloakRemoteException, AccessDeniedException {
+ keycloakGateway.updateUserCredentials(id, data);
+ }
+
+}
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/OntologyServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/OntologyServiceImpl.java
index 424343dfc046117992249c7433ddb44925904a63..fb11a25f24c34348c616d7c1cce3d4eeb289715d 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/OntologyServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/OntologyServiceImpl.java
@@ -2,9 +2,7 @@ package at.tuwien.service.impl;
import at.tuwien.api.semantics.OntologyCreateDto;
import at.tuwien.api.semantics.OntologyModifyDto;
-import at.tuwien.api.user.UserDto;
import at.tuwien.entities.semantics.Ontology;
-import at.tuwien.entities.user.User;
import at.tuwien.exception.AccessDeniedException;
import at.tuwien.exception.KeycloakRemoteException;
import at.tuwien.exception.OntologyNotFoundException;
@@ -12,7 +10,6 @@ import at.tuwien.exception.UserNotFoundException;
import at.tuwien.mapper.OntologyMapper;
import at.tuwien.repository.mdb.OntologyRepository;
import at.tuwien.service.OntologyService;
-import at.tuwien.service.UserService;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -25,14 +22,11 @@ import java.util.Optional;
@Service
public class OntologyServiceImpl implements OntologyService {
- private final UserService userService;
private final OntologyMapper ontologyMapper;
private final OntologyRepository ontologyRepository;
@Autowired
- public OntologyServiceImpl(UserService userService, OntologyMapper ontologyMapper,
- OntologyRepository ontologyRepository) {
- this.userService = userService;
+ public OntologyServiceImpl(OntologyMapper ontologyMapper, OntologyRepository ontologyRepository) {
this.ontologyMapper = ontologyMapper;
this.ontologyRepository = ontologyRepository;
}
@@ -55,9 +49,7 @@ public class OntologyServiceImpl implements OntologyService {
@Override
public Ontology create(OntologyCreateDto data, Principal principal) throws UserNotFoundException,
KeycloakRemoteException, AccessDeniedException {
- final User user = userService.findByUsername(principal.getName());
final Ontology entity = ontologyMapper.ontologyCreateDtoToOntology(data);
- entity.setCreatedBy(user.getId());
final Ontology ontology = ontologyRepository.save(entity);
log.info("Created ontology with id {}", ontology.getId());
return ontology;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/QueryServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/QueryServiceImpl.java
index cc58dc9f55d8e31ec38626dc50c8776b363c7d3d..074737f8bfd45ff0816d9be733e21c8b923468b8 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/QueryServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/QueryServiceImpl.java
@@ -71,8 +71,8 @@ public class QueryServiceImpl extends HibernateConnector implements QueryService
@Override
@Transactional(readOnly = true)
- public QueryResultDto execute(Long databaseId, ExecuteStatementDto statement,
- Principal principal, Long page, Long size, SortType sortDirection, String sortColumn)
+ public QueryResultDto execute(Long databaseId, ExecuteStatementDto statement, Principal principal, Long page,
+ Long size, SortType sortDirection, String sortColumn)
throws DatabaseNotFoundException, ImageNotSupportedException, QueryMalformedException, QueryStoreException,
ColumnParseException, UserNotFoundException, DatabaseConnectionException, TableMalformedException,
KeycloakRemoteException, AccessDeniedException {
@@ -102,7 +102,7 @@ public class QueryServiceImpl extends HibernateConnector implements QueryService
log.error("Failed to map/parse columns: {}", e.getMessage());
throw new ColumnParseException("Failed to map/parse columns: " + e.getMessage(), e);
}
- final String statement = queryMapper.queryToRawTimestampedQuery(query.getQuery(), database, query.getCreated(), true, page, size);
+ final String statement = queryMapper.queryToRawTimestampedQuery(query.getQuery(), query.getCreated(), true, page, size);
final QueryResultDto dto = executeNonPersistent(databaseId, statement, columns);
dto.setId(query.getId());
dto.setResultNumber(query.getResultNumber());
@@ -126,7 +126,7 @@ public class QueryServiceImpl extends HibernateConnector implements QueryService
log.error("Failed to map/parse columns: {}", e.getMessage());
throw new ColumnParseException("Failed to map/parse columns: " + e.getMessage(), e);
}
- final String statement = queryMapper.queryToRawTimestampedQuery(query.getQuery(), database, query.getCreated(), false, null, null);
+ final String statement = queryMapper.queryToRawTimestampedQuery(query.getQuery(), query.getCreated(), false, null, null);
return executeCountNonPersistent(databaseId, statement);
}
@@ -148,8 +148,8 @@ public class QueryServiceImpl extends HibernateConnector implements QueryService
database.getContainer(), database);
try {
final Connection connection = dataSource.getConnection();
+ log.trace("preparing statement {}", statement);
final PreparedStatement preparedStatement = prepareStatement(connection, statement);
- log.trace("prepared statement {}", statement);
final ResultSet resultSet = preparedStatement.executeQuery();
return queryMapper.resultListToQueryResultDto(columns, resultSet);
} catch (SQLException e) {
@@ -194,13 +194,10 @@ public class QueryServiceImpl extends HibernateConnector implements QueryService
@Override
@Transactional(readOnly = true)
- public QueryResultDto viewFindAll(Long databaseId, View view,
- Long page, Long size, Principal principal) throws DatabaseNotFoundException,
- ImageNotSupportedException, QueryMalformedException, TableMalformedException {
- /* find */
+ public QueryResultDto viewFindAll(Long databaseId, View view, Long page, Long size, Principal principal)
+ throws DatabaseNotFoundException, QueryMalformedException, TableMalformedException {
/* run query */
- String statement = queryMapper.viewToRawFindAllQuery(view, size, page);
- return executeNonPersistent(databaseId, statement, view.getColumns());
+ return executeNonPersistent(databaseId, view.getQuery(), view.getColumns());
}
@Override
@@ -506,7 +503,7 @@ public class QueryServiceImpl extends HibernateConnector implements QueryService
}
@Transactional(readOnly = true)
- protected boolean columnMatches(TableColumn column, String tableOrView) {
+ public boolean columnMatches(TableColumn column, String tableOrView) {
if (column.getTable().getInternalName().equals(tableOrView)) {
/* matches table name */
return true;
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/RabbitMqServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/RabbitMqServiceImpl.java
index 40272285475a690f8904c7583f5c8a8f6b88d4e2..3c7758a8f715ad2d76130108a52b1f36d972ae59 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/RabbitMqServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/RabbitMqServiceImpl.java
@@ -8,7 +8,8 @@ import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.entities.user.User;
import at.tuwien.exception.AmqpException;
-import at.tuwien.exception.BrokerVirtualHostCreationException;
+import at.tuwien.exception.BrokerRemoteException;
+import at.tuwien.exception.BrokerVirtualHostModificationException;
import at.tuwien.exception.BrokerVirtualHostGrantException;
import at.tuwien.gateway.BrokerServiceGateway;
import at.tuwien.mapper.AmqpMapper;
@@ -20,7 +21,6 @@ import at.tuwien.service.TableService;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.rabbitmq.client.BuiltinExchangeType;
import com.rabbitmq.client.Channel;
-import com.rabbitmq.client.Connection;
import com.rabbitmq.client.ConnectionFactory;
import lombok.extern.log4j.Log4j2;
import org.apache.http.auth.BasicUserPrincipal;
@@ -104,12 +104,17 @@ public class RabbitMqServiceImpl implements MessageQueueService {
}
@Override
- public void createUser(String username) throws BrokerVirtualHostCreationException {
+ public void createUser(String username) throws BrokerRemoteException, BrokerVirtualHostModificationException {
brokerServiceGateway.createUser(username);
}
@Override
- public void updatePermissions(User user) throws BrokerVirtualHostGrantException {
+ public void deleteUser(String username) throws BrokerRemoteException, BrokerVirtualHostModificationException {
+ brokerServiceGateway.deleteUser(username);
+ }
+
+ @Override
+ public void updatePermissions(User user) throws BrokerRemoteException, BrokerVirtualHostGrantException {
final GrantVirtualHostPermissionsDto permissions = GrantVirtualHostPermissionsDto.builder()
.configure(amqpMapper.databaseListToPermissionString(databaseRepository.findConfigureAccess(user.getId())))
.write(amqpMapper.databaseListToPermissionString(databaseRepository.findWriteAccess(user.getId())))
@@ -145,7 +150,7 @@ public class RabbitMqServiceImpl implements MessageQueueService {
}
@Override
- public void restore() throws AmqpException {
+ public void restore() throws AmqpException, BrokerRemoteException {
final List<Table> tables = tableService.findAll();
final List<ConsumerDto> consumers = brokerServiceGateway.findAllConsumers();
for (Table table : tables) {
diff --git a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java
index d6862071b92172c548cbecf2650bb5b663ade17c..1baf6ff415e5c5b47c81974bd9d42a2588300a48 100644
--- a/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java
+++ b/dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/UserServiceImpl.java
@@ -63,18 +63,17 @@ public class UserServiceImpl implements UserService {
}
@Override
- public User create(SignupRequestDto data) throws UserAlreadyExistsException, AccessDeniedException,
+ public User create(SignupRequestDto data, UUID id) throws UserAlreadyExistsException, AccessDeniedException,
KeycloakRemoteException, UserNotFoundException, UserEmailAlreadyExistsException {
/* create at authentication service */
final User entity = User.builder()
+ .id(id)
.username(data.getUsername())
.email(data.getEmail())
.themeDark(false)
.mariadbPassword(getMariaDbPassword(data.getPassword()))
.build();
- keycloakGateway.createUser(userMapper.signupRequestDtoToUserCreateDto(data));
/* create at metadata database */
- entity.setId(keycloakGateway.findByUsername(data.getUsername()).getId());
final User user = userRepository.save(entity);
log.info("Created user with id {} in metadata database", user.getId());
/* save in open search database */
@@ -96,14 +95,10 @@ public class UserServiceImpl implements UserService {
}
@Override
- public void updatePassword(UUID id, UserPasswordDto data) throws KeycloakRemoteException, AccessDeniedException,
- UserNotFoundException {
+ public void updatePassword(UUID id, UserPasswordDto data) throws UserNotFoundException {
final User user = find(id);
user.setMariadbPassword(getMariaDbPassword(data.getPassword()));
userRepository.save(user);
- log.debug("updated password in metadata database");
- keycloakGateway.updateUserCredentials(id, data);
- log.debug("updated password in keycloak");
log.info("Updated user password with id {}", id);
}
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
index c8ee4c13fdb3fccff1703fc24a7e435b6e1ceb29..13b181972e95832f35534de480a49ed0b1bcf058 100644
--- a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/BaseTest.java
@@ -614,7 +614,7 @@ public abstract class BaseTest {
.affiliation(USER_5_AFFILIATION)
.themeDark(USER_5_THEME_DARK)
.mariadbPassword(USER_5_DATABASE_PASSWORD)
- .build();
+ .build();
public final static UUID USER_6_ID = UUID.fromString("28ff851d-d7bc-4422-959c-edd7a5b15630");
public final static String USER_6_USERNAME = "system";
@@ -2038,7 +2038,6 @@ public abstract class BaseTest {
.prefix(ONTOLOGY_1_PREFIX)
.uri(ONTOLOGY_1_URI)
.sparqlEndpoint(ONTOLOGY_1_SPARQL_ENDPOINT)
- .createdBy(ONTOLOGY_1_CREATED_BY)
.build();
public final static OntologyCreateDto ONTOLOGY_1_CREATE_DTO = OntologyCreateDto.builder()
@@ -2064,7 +2063,6 @@ public abstract class BaseTest {
.prefix(ONTOLOGY_2_PREFIX)
.uri(ONTOLOGY_2_URI)
.sparqlEndpoint(ONTOLOGY_2_SPARQL_ENDPOINT)
- .createdBy(ONTOLOGY_2_CREATED_BY)
.build();
public final static OntologyCreateDto ONTOLOGY_2_CREATE_DTO = OntologyCreateDto.builder()
@@ -2084,7 +2082,6 @@ public abstract class BaseTest {
.prefix(ONTOLOGY_3_PREFIX)
.uri(ONTOLOGY_3_URI)
.sparqlEndpoint(ONTOLOGY_3_SPARQL_ENDPOINT)
- .createdBy(ONTOLOGY_3_CREATED_BY)
.build();
public final static OntologyCreateDto ONTOLOGY_3_CREATE_DTO = OntologyCreateDto.builder()
@@ -2104,7 +2101,6 @@ public abstract class BaseTest {
.prefix(ONTOLOGY_4_PREFIX)
.uri(ONTOLOGY_4_URI)
.sparqlEndpoint(ONTOLOGY_4_SPARQL_ENDPOINT)
- .createdBy(ONTOLOGY_4_CREATED_BY)
.build();
public final static OntologyCreateDto ONTOLOGY_4_CREATE_DTO = OntologyCreateDto.builder()
@@ -2124,7 +2120,6 @@ public abstract class BaseTest {
.prefix(ONTOLOGY_5_PREFIX)
.uri(ONTOLOGY_5_URI)
.sparqlEndpoint(ONTOLOGY_5_SPARQL_ENDPOINT)
- .createdBy(ONTOLOGY_5_CREATED_BY)
.build();
public final static OntologyCreateDto ONTOLOGY_5_CREATE_DTO = OntologyCreateDto.builder()
@@ -3120,8 +3115,8 @@ public abstract class BaseTest {
public final static Long QUERY_3_ID = 3L;
public final static String QUERY_3_STATEMENT = "SELECT `location`, `mintemp` FROM `weather_aus` WHERE `mintemp` > 10";
public final static String QUERY_3_QUERY_HASH = "a3d3dd94ebc7653bb5a3b55dd8ed5e91d3d13c335c6855a1eb4eb7ca14c36ced";
- public final static Long QUERY_3_CONTAINER_ID = CONTAINER_2_ID;
- public final static Long QUERY_3_DATABASE_ID = DATABASE_2_ID;
+ public final static Long QUERY_3_CONTAINER_ID = CONTAINER_1_ID;
+ public final static Long QUERY_3_DATABASE_ID = DATABASE_1_ID;
public final static String QUERY_3_RESULT_HASH = "ff3f7cbe1b96d396957f6e39e55b8b1b577fa3d305d4795af99594cfd30cb80d";
public final static Instant QUERY_3_CREATED = Instant.now().minus(3, MINUTES);
public final static Instant QUERY_3_EXECUTION = Instant.now().minus(1, MINUTES);
@@ -5083,23 +5078,10 @@ public abstract class BaseTest {
public final static Long VIEW_2_CONTAINER_ID = CONTAINER_1_ID;
public final static Long VIEW_2_DATABASE_ID = DATABASE_1_ID;
public final static Boolean VIEW_2_PUBLIC = true;
- public final static String VIEW_2_QUERY = "select `date`, `location`, `mintemp`, `rainfall` from `weather_aus` where `location` = 'Albury'";
- public final static String VIEW_2_QUERY_HASH = "c76efcbab7e117ed286fd6c0f766178727debfeb5544633f8fbfaf2230340d17";
+ public final static String VIEW_2_QUERY = "select `date`, `location` as loc, `rainfall`, `mintemp` from `weather_aus` where `location` = 'Albury'";
+ public final static String VIEW_2_QUERY_HASH = "987fc946772ffb6d85060262dcb5df419692a1f6772ea995e3dedb53c191e984";
public final static List<TableColumn> VIEW_2_COLUMNS = List.of(TableColumn.builder()
- .id(COLUMN_1_1_ID)
- .ordinalPosition(COLUMN_1_1_ORDINALPOS)
- .table(TABLE_1)
- .name(COLUMN_1_1_NAME)
- .internalName(COLUMN_1_1_INTERNAL_NAME)
- .columnType(COLUMN_1_1_TYPE)
- .isNullAllowed(COLUMN_1_1_NULL)
- .autoGenerated(COLUMN_1_1_AUTO_GENERATED)
- .isPrimaryKey(COLUMN_1_1_PRIMARY)
- .enums(COLUMN_1_1_ENUM_VALUES)
- .sets(COLUMN_1_1_SET_VALUES)
- .build(),
- TableColumn.builder()
.id(COLUMN_1_2_ID)
.ordinalPosition(COLUMN_1_2_ORDINALPOS)
.table(TABLE_1)
@@ -5118,6 +5100,7 @@ public abstract class BaseTest {
.ordinalPosition(COLUMN_1_3_ORDINALPOS)
.table(TABLE_1)
.name(COLUMN_1_3_NAME)
+ .alias("loc")
.internalName(COLUMN_1_3_INTERNAL_NAME)
.columnType(COLUMN_1_3_TYPE)
.isNullAllowed(COLUMN_1_3_NULL)
@@ -5126,19 +5109,6 @@ public abstract class BaseTest {
.enums(COLUMN_1_3_ENUM_VALUES)
.sets(COLUMN_1_3_SET_VALUES)
.build(),
- TableColumn.builder()
- .id(COLUMN_1_4_ID)
- .ordinalPosition(COLUMN_1_4_ORDINALPOS)
- .table(TABLE_1)
- .name(COLUMN_1_4_NAME)
- .internalName(COLUMN_1_4_INTERNAL_NAME)
- .columnType(COLUMN_1_4_TYPE)
- .isNullAllowed(COLUMN_1_4_NULL)
- .autoGenerated(COLUMN_1_4_AUTO_GENERATED)
- .isPrimaryKey(COLUMN_1_4_PRIMARY)
- .enums(COLUMN_1_4_ENUM_VALUES)
- .sets(COLUMN_1_4_SET_VALUES)
- .build(),
TableColumn.builder()
.id(COLUMN_1_5_ID)
.ordinalPosition(COLUMN_1_5_ORDINALPOS)
@@ -5151,6 +5121,19 @@ public abstract class BaseTest {
.isPrimaryKey(COLUMN_1_5_PRIMARY)
.enums(COLUMN_1_5_ENUM_VALUES)
.sets(COLUMN_1_5_SET_VALUES)
+ .build(),
+ TableColumn.builder()
+ .id(COLUMN_1_4_ID)
+ .ordinalPosition(COLUMN_1_4_ORDINALPOS)
+ .table(TABLE_1)
+ .name(COLUMN_1_4_NAME)
+ .internalName(COLUMN_1_4_INTERNAL_NAME)
+ .columnType(COLUMN_1_4_TYPE)
+ .isNullAllowed(COLUMN_1_4_NULL)
+ .autoGenerated(COLUMN_1_4_AUTO_GENERATED)
+ .isPrimaryKey(COLUMN_1_4_PRIMARY)
+ .enums(COLUMN_1_4_ENUM_VALUES)
+ .sets(COLUMN_1_4_SET_VALUES)
.build());
public final static View VIEW_2 = View.builder()
@@ -5395,7 +5378,7 @@ public abstract class BaseTest {
.isPrimaryKey(COLUMN_4_7_PRIMARY)
.enums(COLUMN_4_7_ENUM_VALUES)
.sets(COLUMN_4_7_SET_VALUES)
- .build(),
+ .build(),
TableColumn.builder()
.id(COLUMN_4_9_ID)
.ordinalPosition(COLUMN_4_9_ORDINALPOS)
diff --git a/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/ObjectUtil.java b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/ObjectUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..10286fc6bd0635fc340ef538658fcb9d4c267cde
--- /dev/null
+++ b/dbrepo-metadata-service/test/src/main/java/at/tuwien/test/utils/ObjectUtil.java
@@ -0,0 +1,15 @@
+package at.tuwien.test.utils;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class ObjectUtil {
+
+ public static String asJsonString(final Object obj) {
+ try {
+ return new ObjectMapper().writeValueAsString(obj);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
diff --git a/dbrepo-search-db/Dockerfile b/dbrepo-search-db/Dockerfile
index 23929421e982c983ce6c6f0f583f242026edabd3..4c67c63dfb405f5b359fd89d6c315e33ec0ac98f 100644
--- a/dbrepo-search-db/Dockerfile
+++ b/dbrepo-search-db/Dockerfile
@@ -6,6 +6,11 @@ RUN yum install -y jq
COPY ./limits.conf /etc/security/limits.conf
+WORKDIR /app
+
+COPY ./create-indices.sh ./create-indices.sh
+COPY ./docker-entrypoint.sh ./docker-entrypoint.sh
+
WORKDIR /usr/share/opensearch
RUN chmod 0700 ./config
@@ -27,3 +32,5 @@ RUN chmod 0600 ./config/root-ca*.pem
USER opensearch
ENV DISABLE_INSTALL_DEMO_CONFIG=true
+
+ENTRYPOINT [ "bash", "/app/docker-entrypoint.sh" ]
\ No newline at end of file
diff --git a/dbrepo-search-db/create-indices.sh b/dbrepo-search-db/create-indices.sh
new file mode 100644
index 0000000000000000000000000000000000000000..c4f9329ef37bb2c79ff92b071e02e77ed9de00d3
--- /dev/null
+++ b/dbrepo-search-db/create-indices.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+until curl -sSL -o /dev/null 127.0.0.1:9200/_cat/indices 2>&1
+do
+ echo "[create-indices.sh] OpenSearch not yet ready"
+ sleep 5
+done
+echo "[create-indices.sh] OpenSearch ready"
+for index in "user" "view" "database" "identifier" "concept" "column" "table" "unit"; do
+ RES=$(curl -sSL -X PUT "127.0.0.1:9200/$index" -H "Content-Type: application/json" --data "@$index.json")
+ ACK=$(echo "$RES" | jq .acknowledged)
+ if [ $ACK ]; then
+ echo "[create-indices.sh] Created $index index"
+ else
+ echo "[create-indices.sh] Failed to create $index index: $RES"
+ fi
+done
\ No newline at end of file
diff --git a/dbrepo-search-db/docker-entrypoint.sh b/dbrepo-search-db/docker-entrypoint.sh
new file mode 100644
index 0000000000000000000000000000000000000000..174fd3292f3f8b6d317396e14d6b52d915156826
--- /dev/null
+++ b/dbrepo-search-db/docker-entrypoint.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+bash /app/create-indices.sh &
+bash /usr/share/opensearch/opensearch-docker-entrypoint.sh
\ No newline at end of file
diff --git a/dbrepo-search-db/indices/column.json b/dbrepo-search-db/indices/column.json
new file mode 100644
index 0000000000000000000000000000000000000000..f0654c92e7a4a4de579552d8f3d849905ce9f8e4
--- /dev/null
+++ b/dbrepo-search-db/indices/column.json
@@ -0,0 +1,112 @@
+{
+ "aliases": {},
+ "mappings": {
+ "properties": {
+ "auto_generated": {
+ "type": "boolean"
+ },
+ "column_type": {
+ "type": "keyword"
+ },
+ "concept": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "created": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ },
+ "description": {
+ "type": "text"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "uri": {
+ "type": "keyword"
+ }
+ }
+ },
+ "d": {
+ "type": "integer"
+ },
+ "database_id": {
+ "type": "keyword"
+ },
+ "date_format": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "created_at": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ }
+ }
+ },
+ "enums": {
+ "type": "nested"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "index_length": {
+ "type": "integer"
+ },
+ "internal_name": {
+ "type": "keyword"
+ },
+ "is_null_allowed": {
+ "type": "boolean"
+ },
+ "is_primary_key": {
+ "type": "boolean"
+ },
+ "is_public": {
+ "type": "boolean"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "sets": {
+ "type": "nested"
+ },
+ "size": {
+ "type": "integer"
+ },
+ "table_id": {
+ "type": "keyword"
+ },
+ "unit": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "created": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ },
+ "description": {
+ "type": "text"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "uri": {
+ "type": "keyword"
+ }
+ }
+ }
+ }
+ },
+ "settings": {
+ "index": {
+ "number_of_shards": "1",
+ "number_of_replicas": "1"
+ }
+ }
+}
\ No newline at end of file
diff --git a/dbrepo-search-db/indices/concept.json b/dbrepo-search-db/indices/concept.json
new file mode 100644
index 0000000000000000000000000000000000000000..8564e7ba7731f5f04edf7a3abc6b116ed36c2fc7
--- /dev/null
+++ b/dbrepo-search-db/indices/concept.json
@@ -0,0 +1,34 @@
+{
+ "aliases": {},
+ "mappings": {
+ "properties": {
+ "_class": {
+ "type": "keyword",
+ "index": false,
+ "doc_values": false
+ },
+ "created": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ },
+ "description": {
+ "type": "text"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "uri": {
+ "type": "keyword"
+ }
+ }
+ },
+ "settings": {
+ "index": {
+ "number_of_shards": "1",
+ "number_of_replicas": "1"
+ }
+ }
+}
\ No newline at end of file
diff --git a/dbrepo-search-db/indices/database.json b/dbrepo-search-db/indices/database.json
new file mode 100644
index 0000000000000000000000000000000000000000..c363ce12fc0407e0b2ec7a93dc85c56ceb7d79c5
--- /dev/null
+++ b/dbrepo-search-db/indices/database.json
@@ -0,0 +1,53 @@
+{
+ "aliases": {},
+ "mappings": {
+ "properties": {
+ "container": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "created": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ }
+ }
+ },
+ "created": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ },
+ "creator": {
+ "type": "nested",
+ "include_in_parent": true
+ },
+ "description": {
+ "type": "text"
+ },
+ "exchange_name": {
+ "type": "keyword"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "internal_name": {
+ "type": "keyword"
+ },
+ "is_public": {
+ "type": "boolean"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "owner": {
+ "type": "nested",
+ "include_in_parent": true
+ }
+ }
+ },
+ "settings": {
+ "index": {
+ "number_of_shards": "1",
+ "number_of_replicas": "1"
+ }
+ }
+}
\ No newline at end of file
diff --git a/dbrepo-search-db/indices/identifier.json b/dbrepo-search-db/indices/identifier.json
new file mode 100644
index 0000000000000000000000000000000000000000..2d2390992ad7c9cad0220555318c0d47e998c9a6
--- /dev/null
+++ b/dbrepo-search-db/indices/identifier.json
@@ -0,0 +1,235 @@
+{
+ "aliases": {},
+ "mappings": {
+ "properties": {
+ "created": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ },
+ "creator": {
+ "type": "nested",
+ "properties": {
+ "attributes": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "affiliation": {
+ "type": "keyword"
+ },
+ "orcid": {
+ "type": "keyword"
+ }
+ }
+ },
+ "firstname": {
+ "type": "keyword"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "lastname": {
+ "type": "keyword"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "username": {
+ "type": "keyword"
+ }
+ }
+ },
+ "creators": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "affiliation": {
+ "type": "keyword"
+ },
+ "affiliation_identifier": {
+ "type": "keyword"
+ },
+ "affiliation_identifier_scheme": {
+ "type": "keyword"
+ },
+ "affiliation_identifier_scheme_uri": {
+ "type": "keyword"
+ },
+ "creator_name": {
+ "type": "text"
+ },
+ "firstname": {
+ "type": "text"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "lastname": {
+ "type": "text"
+ },
+ "name_identifier": {
+ "type": "keyword"
+ },
+ "name_identifier_scheme": {
+ "type": "keyword"
+ },
+ "name_identifier_scheme_uri": {
+ "type": "keyword"
+ },
+ "name_type": {
+ "type": "keyword"
+ }
+ }
+ },
+ "database_id": {
+ "type": "keyword"
+ },
+ "descriptions": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "description": {
+ "type": "text"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "language": {
+ "type": "keyword"
+ },
+ "type": {
+ "type": "keyword"
+ }
+ }
+ },
+ "doi": {
+ "type": "keyword"
+ },
+ "execution": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ },
+ "funders": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "award_number": {
+ "type": "keyword"
+ },
+ "award_title": {
+ "type": "keyword"
+ },
+ "funder_identifier": {
+ "type": "keyword"
+ },
+ "funder_identifier_type": {
+ "type": "keyword"
+ },
+ "funder_name": {
+ "type": "keyword"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "scheme_uri": {
+ "type": "keyword"
+ }
+ }
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "language": {
+ "type": "keyword"
+ },
+ "licenses": {
+ "type": "nested",
+ "include_in_parent": true
+ },
+ "publication_day": {
+ "type": "integer"
+ },
+ "publication_month": {
+ "type": "integer"
+ },
+ "publication_year": {
+ "type": "integer"
+ },
+ "publisher": {
+ "type": "text"
+ },
+ "query": {
+ "type": "text"
+ },
+ "query_hash": {
+ "type": "text"
+ },
+ "query_id": {
+ "type": "keyword"
+ },
+ "query_normalized": {
+ "type": "text"
+ },
+ "related_identifiers": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "created": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "relation": {
+ "type": "keyword"
+ },
+ "type": {
+ "type": "keyword"
+ },
+ "value": {
+ "type": "keyword"
+ }
+ }
+ },
+ "result_hash": {
+ "type": "text"
+ },
+ "result_number": {
+ "type": "long"
+ },
+ "titles": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "id": {
+ "type": "keyword"
+ },
+ "language": {
+ "type": "keyword"
+ },
+ "title": {
+ "type": "keyword"
+ },
+ "type": {
+ "type": "keyword"
+ }
+ }
+ },
+ "type": {
+ "type": "keyword"
+ },
+ "view_id": {
+ "type": "keyword"
+ },
+ "visibility": {
+ "type": "keyword"
+ }
+ }
+ },
+ "settings": {
+ "index": {
+ "number_of_shards": "1",
+ "number_of_replicas": "1"
+ }
+ }
+}
\ No newline at end of file
diff --git a/dbrepo-search-db/indices/table.json b/dbrepo-search-db/indices/table.json
new file mode 100644
index 0000000000000000000000000000000000000000..fac3d74c765aba89d4a2981f6c563ad52199b60e
--- /dev/null
+++ b/dbrepo-search-db/indices/table.json
@@ -0,0 +1,142 @@
+{
+ "aliases": {},
+ "mappings": {
+ "properties": {
+ "constraints": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "checks": {
+ "type": "nested"
+ },
+ "foreign_keys": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "_class": {
+ "type": "keyword",
+ "index": false,
+ "doc_values": false
+ },
+ "on_delete": {
+ "type": "keyword"
+ },
+ "on_update": {
+ "type": "keyword"
+ }
+ }
+ },
+ "uniques": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "id": {
+ "type": "keyword"
+ }
+ }
+ }
+ }
+ },
+ "created": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ },
+ "creator": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "attributes": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "affiliation": {
+ "type": "keyword"
+ },
+ "orcid": {
+ "type": "keyword"
+ }
+ }
+ },
+ "firstname": {
+ "type": "keyword"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "lastname": {
+ "type": "keyword"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "username": {
+ "type": "keyword"
+ }
+ }
+ },
+ "description": {
+ "type": "text"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "internal_name": {
+ "type": "keyword"
+ },
+ "is_public": {
+ "type": "boolean"
+ },
+ "is_versioned": {
+ "type": "boolean"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "owner": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "attributes": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "affiliation": {
+ "type": "keyword"
+ },
+ "orcid": {
+ "type": "keyword"
+ }
+ }
+ },
+ "firstname": {
+ "type": "keyword"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "lastname": {
+ "type": "keyword"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "username": {
+ "type": "keyword"
+ }
+ }
+ },
+ "queue_name": {
+ "type": "keyword"
+ },
+ "routing_key": {
+ "type": "keyword"
+ }
+ }
+ },
+ "settings": {
+ "index": {
+ "number_of_shards": "1",
+ "number_of_replicas": "1"
+ }
+ }
+}
\ No newline at end of file
diff --git a/dbrepo-search-db/indices/unit.json b/dbrepo-search-db/indices/unit.json
new file mode 100644
index 0000000000000000000000000000000000000000..aeb66c7eaacbc7a4783b28a53b45360feb8e0981
--- /dev/null
+++ b/dbrepo-search-db/indices/unit.json
@@ -0,0 +1,29 @@
+{
+ "aliases": {},
+ "mappings": {
+ "properties": {
+ "created": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ },
+ "description": {
+ "type": "text"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "uri": {
+ "type": "keyword"
+ }
+ }
+ },
+ "settings": {
+ "index": {
+ "number_of_shards": "1",
+ "number_of_replicas": "1"
+ }
+ }
+}
\ No newline at end of file
diff --git a/dbrepo-search-db/indices/user.json b/dbrepo-search-db/indices/user.json
new file mode 100644
index 0000000000000000000000000000000000000000..687518d52a514fea5ac837796907a2efc326a763
--- /dev/null
+++ b/dbrepo-search-db/indices/user.json
@@ -0,0 +1,40 @@
+{
+ "aliases": {},
+ "mappings": {
+ "properties": {
+ "attributes": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "affiliation": {
+ "type": "keyword"
+ },
+ "orcid": {
+ "type": "keyword"
+ }
+ }
+ },
+ "firstname": {
+ "type": "keyword"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "lastname": {
+ "type": "keyword"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "username": {
+ "type": "keyword"
+ }
+ }
+ },
+ "settings": {
+ "index": {
+ "number_of_shards": "1",
+ "number_of_replicas": "1"
+ }
+ }
+}
\ No newline at end of file
diff --git a/dbrepo-search-db/indices/view.json b/dbrepo-search-db/indices/view.json
new file mode 100644
index 0000000000000000000000000000000000000000..9483af5c1ea832522ff2d4c16f47f49edd2b7a03
--- /dev/null
+++ b/dbrepo-search-db/indices/view.json
@@ -0,0 +1,74 @@
+{
+ "aliases": {},
+ "mappings": {
+ "properties": {
+ "created": {
+ "type": "date",
+ "format": "date_optional_time||epoch_millis"
+ },
+ "creator": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "attributes": {
+ "type": "nested",
+ "include_in_parent": true,
+ "properties": {
+ "affiliation": {
+ "type": "keyword"
+ },
+ "orcid": {
+ "type": "keyword"
+ }
+ }
+ },
+ "firstname": {
+ "type": "keyword"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "lastname": {
+ "type": "keyword"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "username": {
+ "type": "keyword"
+ }
+ }
+ },
+ "database_id": {
+ "type": "keyword"
+ },
+ "id": {
+ "type": "keyword"
+ },
+ "initial_view": {
+ "type": "boolean"
+ },
+ "internal_name": {
+ "type": "keyword"
+ },
+ "is_public": {
+ "type": "boolean"
+ },
+ "name": {
+ "type": "keyword"
+ },
+ "query": {
+ "type": "text"
+ },
+ "query_hash": {
+ "type": "keyword"
+ }
+ }
+ },
+ "settings": {
+ "index": {
+ "number_of_shards": "1",
+ "number_of_replicas": "1"
+ }
+ }
+}
\ No newline at end of file
diff --git a/dbrepo-search-sync-agent/Dockerfile b/dbrepo-search-sync-agent/Dockerfile
index 92370f5b67a78af8ad0c27e7720dac1179b6e252..0c9db041bdfea2074a730f68ffaec5dcb4ca6428 100644
--- a/dbrepo-search-sync-agent/Dockerfile
+++ b/dbrepo-search-sync-agent/Dockerfile
@@ -24,12 +24,12 @@ FROM openjdk:17-alpine as runtime
MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
ENV METADATA_DB=fda
-ENV METADATA_USERNAME=root
+ENV METADATA_HOST=metadata-db
+ENV METADATA_JDBC_EXTRA_ARGS=""
ENV METADATA_PASSWORD=dbrepo
-ENV BROKER_USERNAME=fda
-ENV BROKER_PASSWORD=fda
-ENV SEARCH_USERNAME=fda
-ENV SEARCH_PASSWORD=fda
+ENV METADATA_USERNAME=root
+ENV SEARCH_USERNAME=admin
+ENV SEARCH_PASSWORD=admin
ENV LOG_LEVEL=debug
WORKDIR /app
diff --git a/dbrepo-search-sync-agent/rest-service/src/main/resources/application.yml b/dbrepo-search-sync-agent/rest-service/src/main/resources/application.yml
index d503494105da1ece34aade527407e7aae3595ee4..e5b0e671462666c023665747656e90bd49b33e98 100644
--- a/dbrepo-search-sync-agent/rest-service/src/main/resources/application.yml
+++ b/dbrepo-search-sync-agent/rest-service/src/main/resources/application.yml
@@ -4,7 +4,7 @@ spring:
autoconfigure:
exclude: org.springframework.boot.autoconfigure.elasticsearch.ElasticsearchRestClientAutoConfiguration, org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration
datasource:
- url: "jdbc:mariadb://metadata-db:3306/${METADATA_DB}"
+ url: "jdbc:mariadb://${METADATA_HOST}:3306/${METADATA_DB}${METADATA_JDBC_EXTRA_ARGS}"
driver-class-name: org.mariadb.jdbc.Driver
username: "${METADATA_USERNAME}"
password: "${METADATA_PASSWORD}"
@@ -25,15 +25,13 @@ spring:
jdbc:
time_zone: UTC
application:
- name: search-startup-agent
+ name: search-sync-agent
opensearch:
username: "${SEARCH_USERNAME}"
password: "${SEARCH_PASSWORD}"
host: search-db
port: 9200
protocol: http
- cloud:
- loadbalancer.ribbon.enabled: false
management:
endpoints:
web:
diff --git a/dbrepo-search-sync-agent/rest-service/src/test/java/at/tuwien/app/SearchSyncComponentTest.java b/dbrepo-search-sync-agent/rest-service/src/test/java/at/tuwien/app/SearchSyncComponentTest.java
index 81e8880fd40382a364cb572c5e3d32b2a4cab8e1..d0cc176edf179a48848971c6058983cb78ff8059 100644
--- a/dbrepo-search-sync-agent/rest-service/src/test/java/at/tuwien/app/SearchSyncComponentTest.java
+++ b/dbrepo-search-sync-agent/rest-service/src/test/java/at/tuwien/app/SearchSyncComponentTest.java
@@ -120,7 +120,7 @@ public class SearchSyncComponentTest extends BaseUnitTest {
@BeforeEach
public void beforeEach() {
licenseRepository.save(LICENSE_1);
- userRepository.save(USER_1);
+ userRepository.saveAll(List.of(USER_1, USER_2));
imageRepository.save(IMAGE_1);
containerRepository.save(CONTAINER_1);
databaseRepository.save(DATABASE_1);
@@ -159,7 +159,7 @@ public class SearchSyncComponentTest extends BaseUnitTest {
assertEquals(1, units.size());
final List<UserDto> users = StreamSupport.stream(userIdxRepository.findAll().spliterator(), false)
.toList();
- assertEquals(1, users.size());
+ assertEquals(2, users.size());
final List<ViewDto> views = StreamSupport.stream(viewIdxRepository.findAll().spliterator(), false)
.toList();
assertEquals(1, views.size());
diff --git a/dbrepo-ui/Dockerfile b/dbrepo-ui/Dockerfile
index edc21168501d5ff359a273c1964227415a1aaaf0..be7719b76c8793ea47819f71fd3d48764a9cf73a 100644
--- a/dbrepo-ui/Dockerfile
+++ b/dbrepo-ui/Dockerfile
@@ -2,7 +2,6 @@ FROM node:14-alpine as build
MAINTAINER Martin Weise <martin.weise@tuwien.ac.at>
ARG TAG=latest
-ARG GIT_HASH_SHORT=git_hash
ENV HOST=0.0.0.0
ENV API=http://:80
@@ -42,6 +41,9 @@ EXPOSE 9100
ENV BROKER_USERNAME="fda"
ENV BROKER_PASSWORD="fda"
+ENV BROKER_LOGIN_URL="/admin/broker/"
+ENV KEYCLOAK_LOGIN_URL="/api/auth/"
+ENV OPENSEARCH_LOGIN_URL="/admin/dashboard/"
ENV SHARED_FILESYSTEM="/tmp"
ENV LOGO="/logo.png"
ENV SEARCH_USERNAME="admin"
@@ -51,7 +53,6 @@ ENV TITLE="Database Repository"
ENV ICON="/favicon.ico"
ENV DBREPO_CLIENT_ID="dbrepo-client"
ENV DBREPO_CLIENT_SECRET="MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG"
-ENV GIT_HASH="${GIT_HASH_SHORT}"
ENV UPLOAD_PATH="/tmp/"
ENV FORCE_SSL="false"
diff --git a/dbrepo-ui/api/query.service.js b/dbrepo-ui/api/query.service.js
index 118f97f31c2c7666bda0ad8f92b5568031c204ab..857464873a17ffaece8ce68026b7d7d4cfcbaa24 100644
--- a/dbrepo-ui/api/query.service.js
+++ b/dbrepo-ui/api/query.service.js
@@ -206,7 +206,8 @@ class QueryService {
resolve(result)
})
.catch((error) => {
- const { code, message } = error
+ const { code } = error
+ const { message } = error.response.data
console.error('Failed to re-execute view', error)
Vue.$toast.error(`[${code}] Failed to re-execute view: ${message}`)
reject(error)
@@ -223,7 +224,8 @@ class QueryService {
resolve(count)
})
.catch((error) => {
- const { code, message } = error
+ const { code } = error
+ const { message } = error.response.data
console.error('Failed to re-execute view count', error)
Vue.$toast.error(`[${code}] Failed to re-execute view count: ${message}`)
reject(error)
diff --git a/dbrepo-ui/components/query/Results.vue b/dbrepo-ui/components/query/Results.vue
index 94a61b3eb0a030810c893be8b7634ee4f2e7466d..3249f99e18ba8a3889862865a95024fd48f16ff5 100644
--- a/dbrepo-ui/components/query/Results.vue
+++ b/dbrepo-ui/components/query/Results.vue
@@ -47,8 +47,8 @@ export default {
if (this.type === 'view' && this.view && this.view.columns) {
return this.view.columns.map((c) => {
return {
- text: c.internal_name,
- value: c.internal_name,
+ text: c.alias ? c.alias : c.internal_name,
+ value: c.alias ? c.alias : c.internal_name,
sortable: false
}
})
@@ -80,13 +80,6 @@ export default {
this.loading--
})
},
- buildHeaders (firstLine) {
- return Object.keys(firstLine).map(k => ({
- text: k,
- value: k,
- sortable: false
- }))
- },
reExecute (id) {
if (id === null) {
return
@@ -136,9 +129,13 @@ export default {
}
},
mapResults (data) {
- if (data.result.length) {
- this.result.headers = this.buildHeaders(data.result[0])
- }
+ this.result.headers = data.headers.map((h) => {
+ return {
+ text: Object.keys(h)[0],
+ value: Object.keys(h)[0],
+ sortable: false
+ }
+ })
console.debug('query result', data)
this.result.rows = data.result
if (this.total < 0 && data.result_number != null) {
diff --git a/dbrepo-ui/config.js b/dbrepo-ui/config.js
index 79d165bd32f3952e59a540a83e03b53df0a9a791..998950b9bce6c7ff83ec4a20f0d2c902347249f0 100644
--- a/dbrepo-ui/config.js
+++ b/dbrepo-ui/config.js
@@ -1,19 +1,22 @@
const config = {}
-config.title = process.env.TITLE || 'Database Repository'
-config.icon = process.env.ICON || '/favicon.ico'
-config.brokerUsername = process.env.BROKER_USERNAME || 'fda'
-config.brokerPassword = process.env.BROKER_PASSWORD || 'fda'
-config.sharedFilesystem = process.env.SHARED_FILESYSTEM || '/tmp'
-config.version = process.env.VERSION || 'latest'
-config.logo = process.env.LOGO || '/logo.png'
-config.tokenMax = process.env.TOKEN_MAX || 5
-config.searchUsername = process.env.SEARCH_USERNAME || 'admin'
-config.searchPassword = process.env.SEARCH_PASSWORD || 'admin'
-config.clientId = process.env.DBREPO_CLIENT_ID || 'dbrepo-client'
-config.clientSecret = process.env.DBREPO_CLIENT_SECRET || 'MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG'
-config.defaultPublisher = process.env.DEFAULT_PID_PUBLISHER || 'Example University'
-config.doiUrl = process.env.DOI_URL || 'https://doi.org'
-config.uploadPath = process.env.UPLOAD_PATH || '/tmp/'
+config.title = process.env.TITLE
+config.icon = process.env.ICON
+config.brokerUsername = process.env.BROKER_USERNAME
+config.brokerPassword = process.env.BROKER_PASSWORD
+config.brokerLoginUrl = process.env.BROKER_LOGIN_URL
+config.keycloakLoginUrl = process.env.KEYCLOAK_LOGIN_URL
+config.openSearchUrl = process.env.OPENSEARCH_LOGIN_URL
+config.sharedFilesystem = process.env.SHARED_FILESYSTEM
+config.version = process.env.VERSION
+config.logo = process.env.LOGO
+config.tokenMax = process.env.TOKEN_MAX
+config.searchUsername = process.env.SEARCH_USERNAME
+config.searchPassword = process.env.SEARCH_PASSWORD
+config.clientId = process.env.DBREPO_CLIENT_ID
+config.clientSecret = process.env.DBREPO_CLIENT_SECRET
+config.defaultPublisher = process.env.DEFAULT_PID_PUBLISHER
+config.doiUrl = process.env.DOI_URL
+config.uploadPath = process.env.UPLOAD_PATH
module.exports = config
diff --git a/dbrepo-ui/layouts/default.vue b/dbrepo-ui/layouts/default.vue
index 42b68860142796d2b9943507aa0e5cf682bf9887..e7186187214423feec109201275b229a95736a05 100644
--- a/dbrepo-ui/layouts/default.vue
+++ b/dbrepo-ui/layouts/default.vue
@@ -9,12 +9,8 @@
</div>
<v-list-item class="mt-2">
<v-list-item-content>
- <v-list-item-subtitle>
- {{ version }}
- </v-list-item-subtitle>
- <v-list-item-title class="text-h6">
- Database Repository
- </v-list-item-title>
+ <v-list-item-subtitle v-text="version" />
+ <v-list-item-title class="text-h6" v-text="title" />
</v-list-item-content>
</v-list-item>
<v-list nav>
@@ -57,8 +53,9 @@
class="banner"
border="left"
tile
- :type="message.type"
- v-text="message.message" />
+ :type="message.type">
+ {{ message.message }}<span v-if="message.link"> — <a :href="message.link" v-text="message.link_text ? message.link_text : message.link" /></span>
+ </v-alert>
</div>
</v-navigation-drawer>
<v-form ref="form" @submit.prevent="submit">
@@ -182,6 +179,9 @@ export default {
version () {
return this.$config.version
},
+ title () {
+ return this.$config.title
+ },
canListOntologies () {
if (!this.roles) {
return false
@@ -310,6 +310,8 @@ export default {
this.$router.push({ path: '/search', query: { q: this.search } })
},
initEnvironment () {
+ this.$store.commit('SET_TITLE', this.$config.title)
+ this.$store.commit('SET_ICON', this.$config.icon)
this.$store.commit('SET_CLIENT_ID', this.$config.clientId)
this.$store.commit('SET_CLIENT_SECRET', this.$config.clientSecret)
this.$store.commit('SET_BROKER_USERNAME', this.$config.brokerUsername)
@@ -317,6 +319,7 @@ export default {
this.$store.commit('SET_SEARCH_USERNAME', this.$config.searchUsername)
this.$store.commit('SET_SEARCH_PASSWORD', this.$config.searchPassword)
this.$store.commit('SET_UPLOAD_PATH', this.$config.uploadPath)
+ console.debug('runtime config', this.$config)
}
}
}
diff --git a/dbrepo-ui/nuxt.config.js b/dbrepo-ui/nuxt.config.js
index 915fef8e63ed0357c3356c5a71d722f7eaade8b8..4d0f2aed2d116befb7bae6e91a80a26015bc5268 100644
--- a/dbrepo-ui/nuxt.config.js
+++ b/dbrepo-ui/nuxt.config.js
@@ -1,6 +1,6 @@
import path from 'path'
import colors from 'vuetify/es5/util/colors'
-import { icon, clientSecret, title, logo, version, defaultPublisher, doiUrl, clientId, uploadPath, brokerUsername, brokerPassword, searchUsername, searchPassword } from './config'
+import { icon, clientSecret, title, logo, version, defaultPublisher, doiUrl, clientId, uploadPath, brokerUsername, brokerPassword, searchUsername, searchPassword, brokerLoginUrl, keycloakLoginUrl, openSearchUrl } from './config'
const proxy = {}
@@ -98,6 +98,7 @@ export default {
proxy,
publicRuntimeConfig: {
+ title,
version,
logo,
clientId,
@@ -105,6 +106,9 @@ export default {
defaultPublisher,
brokerUsername,
brokerPassword,
+ brokerLoginUrl,
+ keycloakLoginUrl,
+ openSearchUrl,
searchUsername,
searchPassword,
doiUrl,
@@ -137,13 +141,14 @@ export default {
}
},
+ // https://github.com/nuxt/nuxt/issues/7722
build: {
babel: {
presets (env, [preset, options]) {
return [
['@babel/preset-env', {
targets: {
- node: 'current'
+ node: '14'
}
}]
]
diff --git a/dbrepo-ui/package.json b/dbrepo-ui/package.json
index ef0f2557524a58623486d44f8eab1fe95b757954..d9fc5ed0314786876d03ee1fe8f4fb74fcd94f64 100644
--- a/dbrepo-ui/package.json
+++ b/dbrepo-ui/package.json
@@ -3,7 +3,7 @@
"version": "1.0.0",
"private": true,
"scripts": {
- "dev": "NODE_ENV=development nuxt --port 3001",
+ "dev": "NODE_ENV=development nuxt --dotenv ../.env --port 3001",
"docker": "nuxt > /dev/null",
"build": "nuxt build",
"start": "nuxt start",
@@ -20,6 +20,7 @@
"test": "yarn clean && yarn test:unit && yarn test:e2e:docker && yarn coverage"
},
"dependencies": {
+ "@babel/plugin-proposal-optional-chaining": "^7.21.0",
"@babel/plugin-transform-runtime": "^7.13.9",
"@mdi/js": "^5.8.55",
"@nuxtjs/axios": "^5.13.6",
@@ -78,7 +79,6 @@
"jsdom": "^16.6.0",
"jsdom-global": "^3.0.2",
"nyc": "^15.1.0",
- "playwright": "^1.14.0",
"require-extension-hooks": "^0.3.3",
"require-extension-hooks-babel": "^1.0.0-beta.1",
"require-extension-hooks-vue": "^3.0.0",
diff --git a/dbrepo-ui/pages/database/_database_id/table/_table_id/data.vue b/dbrepo-ui/pages/database/_database_id/table/_table_id/data.vue
index 96ec047712f9e095f6bce3b186790303637edd0a..8a3df803ef2ba03aef52c1e3d5eec68ca534723e 100644
--- a/dbrepo-ui/pages/database/_database_id/table/_table_id/data.vue
+++ b/dbrepo-ui/pages/database/_database_id/table/_table_id/data.vue
@@ -142,13 +142,10 @@ export default {
return this.version.substring(0, 10) + 'T' + this.version.substring(11, 19) + 'Z'
},
canModify () {
- if (!this.user || !this.access || !this.table || !this.table.creator) {
+ if (!this.user || !this.access || !this.table) {
return false
}
- if (this.table.creator.username === this.user.username) {
- return true
- }
- if (this.access.type === 'write_own' && this.table.creator.username === this.user.username) {
+ if (this.access.type === 'write_own' && this.table.owner.id === this.user.id) {
return true
}
return this.access.type === 'write_all'
@@ -296,7 +293,8 @@ export default {
return row
})
})
- .catch(() => {
+ .catch((error) => {
+ console.error('load data resulted in error', error)
this.error = true
})
.finally(() => {
diff --git a/dbrepo-ui/pages/login.vue b/dbrepo-ui/pages/login.vue
index 95c25af89843f5e31ef859634167f92cf440abf3..e03804d65cdb3b09cc8d4139da7e906f0981b364 100644
--- a/dbrepo-ui/pages/login.vue
+++ b/dbrepo-ui/pages/login.vue
@@ -51,9 +51,17 @@
Login
</v-btn>
</v-card-actions>
- <v-card-text class="text-right">
- <a href="/api/auth/">Admin Login</a>
- </v-card-text>
+ <v-card-subtitle class="text-right">
+ <a v-if="openSearchUrl" class="mr-1" :href="openSearchUrl" target="_blank">
+ OpenSearch Admin <sup><v-icon color="primary" x-small>mdi-open-in-new</v-icon></sup>
+ </a>
+ <a v-if="rabbitMqUrl" class="mr-1" :href="rabbitMqUrl" target="_blank">
+ RabbitMQ Admin <sup><v-icon color="primary" x-small>mdi-open-in-new</v-icon></sup>
+ </a>
+ <a v-if="keycloakUrl" class="ml-1" :href="keycloakUrl" target="_blank">
+ Keycloak Admin <sup><v-icon color="primary" x-small>mdi-open-in-new</v-icon></sup>
+ </a>
+ </v-card-subtitle>
</v-card>
</v-form>
</div>
@@ -82,6 +90,15 @@ export default {
},
user () {
return this.$store.state.user
+ },
+ keycloakUrl () {
+ return this.$config.keycloakLoginUrl
+ },
+ rabbitMqUrl () {
+ return this.$config.brokerLoginUrl
+ },
+ openSearchUrl () {
+ return this.$config.openSearchUrl
}
},
mounted () {
diff --git a/dbrepo-ui/pages/signup.vue b/dbrepo-ui/pages/signup.vue
index 499bd33f16ce9d4096f6353ef49ce40b84f40dbf..ec066977ec3f541f83b5c62311572bf49355ce8e 100644
--- a/dbrepo-ui/pages/signup.vue
+++ b/dbrepo-ui/pages/signup.vue
@@ -101,7 +101,7 @@ export default {
computed: {
loadingColor () {
return this.error ? 'red lighten-2' : 'primary'
- },
+ }
},
mounted () {
this.loadUsers()
diff --git a/dbrepo-ui/static/favicon_alt.ico b/dbrepo-ui/static/favicon_alt.ico
new file mode 100644
index 0000000000000000000000000000000000000000..f8f591a5acbf4973a3626032997b322386ed2217
Binary files /dev/null and b/dbrepo-ui/static/favicon_alt.ico differ
diff --git a/dbrepo-ui/static/favicon_alt.png b/dbrepo-ui/static/favicon_alt.png
new file mode 100644
index 0000000000000000000000000000000000000000..32cfe969126f93df5632cbfb72a14845b840a3c7
Binary files /dev/null and b/dbrepo-ui/static/favicon_alt.png differ
diff --git a/dbrepo-ui/store/index.js b/dbrepo-ui/store/index.js
index 8fad6b2d54e2a4ec328b1e15268b8d6b80176e18..7cfa08e424fd0b42dc0b7b00d6202c923616e8a2 100644
--- a/dbrepo-ui/store/index.js
+++ b/dbrepo-ui/store/index.js
@@ -11,6 +11,8 @@ Vue.use(Vuex)
// https://github.com/hua1995116/webchat/blob/7c6544d3defd41cb7cf68306accea97800858bc3/client/src/store/index.js#L293
const store = new Store({
state: {
+ title: null,
+ icon: null,
token: null,
refreshToken: null,
roles: [],
@@ -30,6 +32,8 @@ const store = new Store({
uploadPath: null
},
getters: {
+ getTitle: state => state.title,
+ getIcon: state => state.icon,
getToken: state => state.token,
getRefreshToken: state => state.refreshToken,
getRoles: state => state.roles,
@@ -49,6 +53,12 @@ const store = new Store({
getUploadPath: state => state.uploadPath
},
mutations: {
+ SET_TITLE (state, title) {
+ state.title = title
+ },
+ SET_ICON (state, icon) {
+ state.icon = icon
+ },
SET_TOKEN (state, token) {
state.token = token
},
diff --git a/dbrepo-ui/yarn.lock b/dbrepo-ui/yarn.lock
index bed1a099df4019a0385ec467e9b7cc4eeef03ce5..b554015a3f6b628d33b42a02e54e6d313a0569e3 100644
--- a/dbrepo-ui/yarn.lock
+++ b/dbrepo-ui/yarn.lock
@@ -2,6 +2,11 @@
# yarn lockfile v1
+"@aashutoshrathi/word-wrap@^1.2.3":
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz#bd9154aec9983f77b3a034ecaa015c2e4201f6cf"
+ integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==
+
"@ampproject/remapping@^2.2.0":
version "2.2.1"
resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.1.tgz#99e8e11851128b8702cd57c33684f1d0f260b630"
@@ -49,295 +54,277 @@
dependencies:
"@babel/highlight" "^7.10.4"
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.18.6", "@babel/code-frame@^7.21.4":
- version "7.21.4"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.21.4.tgz#d0fa9e4413aca81f2b23b9442797bda1826edb39"
- integrity sha512-LYvhNKfwWSPpocw8GI7gpK2nq3HSDuEPC/uSYaALSJu9xjsalaaYFOq0Pwt5KmVqwEbZlDu81aLXwBOmD/Fv9g==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.22.10", "@babel/code-frame@^7.22.5":
+ version "7.22.13"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.22.13.tgz#e3c1c099402598483b7a8c46a721d1038803755e"
+ integrity sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==
dependencies:
- "@babel/highlight" "^7.18.6"
+ "@babel/highlight" "^7.22.13"
+ chalk "^2.4.2"
-"@babel/compat-data@^7.17.7", "@babel/compat-data@^7.20.5", "@babel/compat-data@^7.21.0", "@babel/compat-data@^7.21.5":
- version "7.21.7"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.21.7.tgz#61caffb60776e49a57ba61a88f02bedd8714f6bc"
- integrity sha512-KYMqFYTaenzMK4yUtf4EW9wc4N9ef80FsbMtkwool5zpwl4YrT1SdWYSTRcT94KO4hannogdS+LxY7L+arP3gA==
+"@babel/compat-data@^7.22.6", "@babel/compat-data@^7.22.9":
+ version "7.22.9"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.22.9.tgz#71cdb00a1ce3a329ce4cbec3a44f9fef35669730"
+ integrity sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==
-"@babel/core@^7.1.0", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.14.3", "@babel/core@^7.21.3", "@babel/core@^7.4.4", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0", "@babel/core@^7.8.4":
- version "7.21.8"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.21.8.tgz#2a8c7f0f53d60100ba4c32470ba0281c92aa9aa4"
- integrity sha512-YeM22Sondbo523Sz0+CirSPnbj9bG3P0CdHcBZdqUuaeOaYEFbOLoGU7lebvGP6P5J/WE9wOn7u7C4J9HvS1xQ==
+"@babel/core@^7.1.0", "@babel/core@^7.12.16", "@babel/core@^7.12.3", "@babel/core@^7.14.3", "@babel/core@^7.22.9", "@babel/core@^7.4.4", "@babel/core@^7.7.2", "@babel/core@^7.7.5", "@babel/core@^7.8.0", "@babel/core@^7.8.4":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.22.11.tgz#8033acaa2aa24c3f814edaaa057f3ce0ba559c24"
+ integrity sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==
dependencies:
"@ampproject/remapping" "^2.2.0"
- "@babel/code-frame" "^7.21.4"
- "@babel/generator" "^7.21.5"
- "@babel/helper-compilation-targets" "^7.21.5"
- "@babel/helper-module-transforms" "^7.21.5"
- "@babel/helpers" "^7.21.5"
- "@babel/parser" "^7.21.8"
- "@babel/template" "^7.20.7"
- "@babel/traverse" "^7.21.5"
- "@babel/types" "^7.21.5"
+ "@babel/code-frame" "^7.22.10"
+ "@babel/generator" "^7.22.10"
+ "@babel/helper-compilation-targets" "^7.22.10"
+ "@babel/helper-module-transforms" "^7.22.9"
+ "@babel/helpers" "^7.22.11"
+ "@babel/parser" "^7.22.11"
+ "@babel/template" "^7.22.5"
+ "@babel/traverse" "^7.22.11"
+ "@babel/types" "^7.22.11"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
- json5 "^2.2.2"
- semver "^6.3.0"
+ json5 "^2.2.3"
+ semver "^6.3.1"
"@babel/eslint-parser@^7.12.16":
- version "7.21.8"
- resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.21.8.tgz#59fb6fc4f3b017ab86987c076226ceef7b2b2ef2"
- integrity sha512-HLhI+2q+BP3sf78mFUZNCGc10KEmoUqtUT1OCdMZsN+qr4qFeLUod62/zAnF3jNQstwyasDkZnVXwfK2Bml7MQ==
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/eslint-parser/-/eslint-parser-7.22.11.tgz#cceb8c7989c241a16dd14e12a6cd725618f3f58b"
+ integrity sha512-YjOYZ3j7TjV8OhLW6NCtyg8G04uStATEUe5eiLuCZaXz2VSDQ3dsAtm2D+TuQyAqNMUK2WacGo0/uma9Pein1w==
dependencies:
"@nicolo-ribaudo/eslint-scope-5-internals" "5.1.1-v1"
eslint-visitor-keys "^2.1.0"
- semver "^6.3.0"
+ semver "^6.3.1"
-"@babel/generator@^7.0.0", "@babel/generator@^7.21.5", "@babel/generator@^7.7.2", "@babel/generator@^7.8.4":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.21.5.tgz#c0c0e5449504c7b7de8236d99338c3e2a340745f"
- integrity sha512-SrKK/sRv8GesIW1bDagf9cCG38IOMYZusoe1dfg0D8aiUe3Amvoj1QtjTPAWcfrZFvIwlleLb0gxzQidL9w14w==
+"@babel/generator@^7.0.0", "@babel/generator@^7.22.10", "@babel/generator@^7.7.2", "@babel/generator@^7.8.4":
+ version "7.22.10"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.22.10.tgz#c92254361f398e160645ac58831069707382b722"
+ integrity sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==
dependencies:
- "@babel/types" "^7.21.5"
+ "@babel/types" "^7.22.10"
"@jridgewell/gen-mapping" "^0.3.2"
"@jridgewell/trace-mapping" "^0.3.17"
jsesc "^2.5.1"
-"@babel/helper-annotate-as-pure@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz#eaa49f6f80d5a33f9a5dd2276e6d6e451be0a6bb"
- integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
+"@babel/helper-annotate-as-pure@^7.18.6", "@babel/helper-annotate-as-pure@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz#e7f06737b197d580a01edf75d97e2c8be99d3882"
+ integrity sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==
dependencies:
- "@babel/types" "^7.18.6"
+ "@babel/types" "^7.22.5"
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.21.5.tgz#817f73b6c59726ab39f6ba18c234268a519e5abb"
- integrity sha512-uNrjKztPLkUk7bpCNC0jEKDJzzkvel/W+HguzbN8krA+LPfC1CEobJEvAvGka2A/M+ViOqXdcRL0GqPUJSjx9g==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.22.5":
+ version "7.22.10"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.22.10.tgz#573e735937e99ea75ea30788b57eb52fab7468c9"
+ integrity sha512-Av0qubwDQxC56DoUReVDeLfMEjYYSN1nZrTUrWkXd7hpU73ymRANkbuDm3yni9npkn+RXy9nNbEJZEzXr7xrfQ==
dependencies:
- "@babel/types" "^7.21.5"
+ "@babel/types" "^7.22.10"
-"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.20.7", "@babel/helper-compilation-targets@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.5.tgz#631e6cc784c7b660417421349aac304c94115366"
- integrity sha512-1RkbFGUKex4lvsB9yhIfWltJM5cZKUftB2eNajaDv3dCMEp49iBG0K14uH8NnX9IPux2+mK7JGEOB0jn48/J6w==
+"@babel/helper-compilation-targets@^7.22.10", "@babel/helper-compilation-targets@^7.22.5", "@babel/helper-compilation-targets@^7.22.6", "@babel/helper-compilation-targets@^7.22.9":
+ version "7.22.10"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz#01d648bbc25dd88f513d862ee0df27b7d4e67024"
+ integrity sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==
dependencies:
- "@babel/compat-data" "^7.21.5"
- "@babel/helper-validator-option" "^7.21.0"
- browserslist "^4.21.3"
+ "@babel/compat-data" "^7.22.9"
+ "@babel/helper-validator-option" "^7.22.5"
+ browserslist "^4.21.9"
lru-cache "^5.1.1"
- semver "^6.3.0"
-
-"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0":
- version "7.21.8"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.8.tgz#205b26330258625ef8869672ebca1e0dee5a0f02"
- integrity sha512-+THiN8MqiH2AczyuZrnrKL6cAxFRRQDKW9h1YkBvbgKmAm6mwiacig1qT73DHIWMGo40GRnsEfN3LA+E6NtmSw==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.18.6"
- "@babel/helper-environment-visitor" "^7.21.5"
- "@babel/helper-function-name" "^7.21.0"
- "@babel/helper-member-expression-to-functions" "^7.21.5"
- "@babel/helper-optimise-call-expression" "^7.18.6"
- "@babel/helper-replace-supers" "^7.21.5"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
- "@babel/helper-split-export-declaration" "^7.18.6"
- semver "^6.3.0"
-
-"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
- version "7.21.8"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.8.tgz#a7886f61c2e29e21fd4aaeaf1e473deba6b571dc"
- integrity sha512-zGuSdedkFtsFHGbexAvNuipg1hbtitDLo2XE8/uf6Y9sOQV1xsYX/2pNbtedp/X0eU1pIt+kGvaqHCowkRbS5g==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.18.6"
+ semver "^6.3.1"
+
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0", "@babel/helper-create-class-features-plugin@^7.22.10", "@babel/helper-create-class-features-plugin@^7.22.11", "@babel/helper-create-class-features-plugin@^7.22.5":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz#4078686740459eeb4af3494a273ac09148dfb213"
+ integrity sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.22.5"
+ "@babel/helper-environment-visitor" "^7.22.5"
+ "@babel/helper-function-name" "^7.22.5"
+ "@babel/helper-member-expression-to-functions" "^7.22.5"
+ "@babel/helper-optimise-call-expression" "^7.22.5"
+ "@babel/helper-replace-supers" "^7.22.9"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+ "@babel/helper-split-export-declaration" "^7.22.6"
+ semver "^6.3.1"
+
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.22.5":
+ version "7.22.9"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.22.9.tgz#9d8e61a8d9366fe66198f57c40565663de0825f6"
+ integrity sha512-+svjVa/tFwsNSG4NEy1h85+HQ5imbT92Q5/bgtS7P0GTQlP8WuFdqsiABmQouhiFGyV66oGxZFpeYHza1rNsKw==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.22.5"
regexpu-core "^5.3.1"
- semver "^6.3.0"
+ semver "^6.3.1"
-"@babel/helper-define-polyfill-provider@^0.3.3":
- version "0.3.3"
- resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz#8612e55be5d51f0cd1f36b4a5a83924e89884b7a"
- integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
+"@babel/helper-define-polyfill-provider@^0.4.2":
+ version "0.4.2"
+ resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.4.2.tgz#82c825cadeeeee7aad237618ebbe8fa1710015d7"
+ integrity sha512-k0qnnOqHn5dK9pZpfD5XXZ9SojAITdCKRn2Lp6rnDGzIbaP0rHyMPk/4wsSxVBVz4RfN0q6VpXWP2pDGIoQ7hw==
dependencies:
- "@babel/helper-compilation-targets" "^7.17.7"
- "@babel/helper-plugin-utils" "^7.16.7"
+ "@babel/helper-compilation-targets" "^7.22.6"
+ "@babel/helper-plugin-utils" "^7.22.5"
debug "^4.1.1"
lodash.debounce "^4.0.8"
resolve "^1.14.2"
- semver "^6.1.2"
-
-"@babel/helper-environment-visitor@^7.18.9", "@babel/helper-environment-visitor@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.21.5.tgz#c769afefd41d171836f7cb63e295bedf689d48ba"
- integrity sha512-IYl4gZ3ETsWocUWgsFZLM5i1BYx9SoemminVEXadgLBa9TdeorzgLKm8wWLA6J1N/kT3Kch8XIk1laNzYoHKvQ==
-
-"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
- version "7.21.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz#d552829b10ea9f120969304023cd0645fa00b1b4"
- integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
- dependencies:
- "@babel/template" "^7.20.7"
- "@babel/types" "^7.21.0"
-
-"@babel/helper-hoist-variables@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz#d4d2c8fb4baeaa5c68b99cc8245c56554f926678"
- integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
- dependencies:
- "@babel/types" "^7.18.6"
-"@babel/helper-member-expression-to-functions@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.21.5.tgz#3b1a009af932e586af77c1030fba9ee0bde396c0"
- integrity sha512-nIcGfgwpH2u4n9GG1HpStW5Ogx7x7ekiFHbjjFRKXbn5zUvqO9ZgotCO4x1aNbKn/x/xOUaXEhyNHCwtFCpxWg==
- dependencies:
- "@babel/types" "^7.21.5"
+"@babel/helper-environment-visitor@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz#f06dd41b7c1f44e1f8da6c4055b41ab3a09a7e98"
+ integrity sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.18.6", "@babel/helper-module-imports@^7.21.4":
- version "7.21.4"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz#ac88b2f76093637489e718a90cec6cf8a9b029af"
- integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==
+"@babel/helper-function-name@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz#ede300828905bb15e582c037162f99d5183af1be"
+ integrity sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==
dependencies:
- "@babel/types" "^7.21.4"
+ "@babel/template" "^7.22.5"
+ "@babel/types" "^7.22.5"
-"@babel/helper-module-transforms@^7.18.6", "@babel/helper-module-transforms@^7.20.11", "@babel/helper-module-transforms@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.21.5.tgz#d937c82e9af68d31ab49039136a222b17ac0b420"
- integrity sha512-bI2Z9zBGY2q5yMHoBvJ2a9iX3ZOAzJPm7Q8Yz6YeoUjU/Cvhmi2G4QyTNyPBqqXSgTjUxRg3L0xV45HvkNWWBw==
+"@babel/helper-hoist-variables@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz#c01a007dac05c085914e8fb652b339db50d823bb"
+ integrity sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==
dependencies:
- "@babel/helper-environment-visitor" "^7.21.5"
- "@babel/helper-module-imports" "^7.21.4"
- "@babel/helper-simple-access" "^7.21.5"
- "@babel/helper-split-export-declaration" "^7.18.6"
- "@babel/helper-validator-identifier" "^7.19.1"
- "@babel/template" "^7.20.7"
- "@babel/traverse" "^7.21.5"
- "@babel/types" "^7.21.5"
+ "@babel/types" "^7.22.5"
-"@babel/helper-optimise-call-expression@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz#9369aa943ee7da47edab2cb4e838acf09d290ffe"
- integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
+"@babel/helper-member-expression-to-functions@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz#0a7c56117cad3372fbf8d2fb4bf8f8d64a1e76b2"
+ integrity sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==
dependencies:
- "@babel/types" "^7.18.6"
+ "@babel/types" "^7.22.5"
+
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz#1a8f4c9f4027d23f520bd76b364d44434a72660c"
+ integrity sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==
+ dependencies:
+ "@babel/types" "^7.22.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.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.21.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.21.5.tgz#345f2377d05a720a4e5ecfa39cbf4474a4daed56"
- integrity sha512-0WDaIlXKOX/3KfBK/dwP1oQGiPh6rjMkT7HIRv7i5RR2VUMwrx5ZL0dwBkKx7+SW1zwNdgjHd34IMk5ZjTeHVg==
-
-"@babel/helper-remap-async-to-generator@^7.18.9":
- version "7.18.9"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz#997458a0e3357080e54e1d79ec347f8a8cd28519"
- integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
- dependencies:
- "@babel/helper-annotate-as-pure" "^7.18.6"
- "@babel/helper-environment-visitor" "^7.18.9"
- "@babel/helper-wrap-function" "^7.18.9"
- "@babel/types" "^7.18.9"
-
-"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7", "@babel/helper-replace-supers@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.21.5.tgz#a6ad005ba1c7d9bc2973dfde05a1bba7065dde3c"
- integrity sha512-/y7vBgsr9Idu4M6MprbOVUfH3vs7tsIfnVWv/Ml2xgwvyH6LTngdfbf5AdsKwkJy4zgy1X/kuNrEKvhhK28Yrg==
- dependencies:
- "@babel/helper-environment-visitor" "^7.21.5"
- "@babel/helper-member-expression-to-functions" "^7.21.5"
- "@babel/helper-optimise-call-expression" "^7.18.6"
- "@babel/template" "^7.20.7"
- "@babel/traverse" "^7.21.5"
- "@babel/types" "^7.21.5"
-
-"@babel/helper-simple-access@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.21.5.tgz#d697a7971a5c39eac32c7e63c0921c06c8a249ee"
- integrity sha512-ENPDAMC1wAjR0uaCUwliBdiSl1KBJAVnMTzXqi64c2MG8MPR6ii4qf7bSXDqSFbr4W6W028/rf5ivoHop5/mkg==
- dependencies:
- "@babel/types" "^7.21.5"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
- version "7.20.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz#fbe4c52f60518cab8140d77101f0e63a8a230684"
- integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
- dependencies:
- "@babel/types" "^7.20.0"
-
-"@babel/helper-split-export-declaration@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz#7367949bc75b20c6d5a5d4a97bba2824ae8ef075"
- integrity sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==
- dependencies:
- "@babel/types" "^7.18.6"
-
-"@babel/helper-string-parser@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.21.5.tgz#2b3eea65443c6bdc31c22d037c65f6d323b6b2bd"
- integrity sha512-5pTUx3hAJaZIdW99sJ6ZUUgWq/Y+Hja7TowEnLNMm1VivRgZQL3vpBY3qUACVsvw+yQU6+YgfBVmcbLaZtrA1w==
-
-"@babel/helper-validator-identifier@^7.18.6", "@babel/helper-validator-identifier@^7.19.1":
- version "7.19.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.19.1.tgz#7eea834cf32901ffdc1a7ee555e2f9c27e249ca2"
- integrity sha512-awrNfaMtnHUr653GgGEs++LlAvW6w+DcPrOliSMXWCKo597CwL5Acf/wWdNkf/tfEQE3mjkeD1YOVZOUV/od1w==
-
-"@babel/helper-validator-option@^7.21.0":
- version "7.21.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.21.0.tgz#8224c7e13ace4bafdc4004da2cf064ef42673180"
- integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
-
-"@babel/helper-wrap-function@^7.18.9":
- version "7.20.5"
- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz#75e2d84d499a0ab3b31c33bcfe59d6b8a45f62e3"
- integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
- dependencies:
- "@babel/helper-function-name" "^7.19.0"
- "@babel/template" "^7.18.10"
- "@babel/traverse" "^7.20.5"
- "@babel/types" "^7.20.5"
-
-"@babel/helpers@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.21.5.tgz#5bac66e084d7a4d2d9696bdf0175a93f7fb63c08"
- integrity sha512-BSY+JSlHxOmGsPTydUkPf1MdMQ3M81x5xGCOVgWM3G8XH77sJ292Y2oqcp0CbbgxhqBuI46iUz1tT7hqP7EfgA==
- dependencies:
- "@babel/template" "^7.20.7"
- "@babel/traverse" "^7.21.5"
- "@babel/types" "^7.21.5"
-
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.18.6.tgz#81158601e93e2563795adcbfbdf5d64be3f2ecdf"
- integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
- dependencies:
- "@babel/helper-validator-identifier" "^7.18.6"
- chalk "^2.0.0"
+"@babel/helper-module-transforms@^7.22.5", "@babel/helper-module-transforms@^7.22.9":
+ version "7.22.9"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz#92dfcb1fbbb2bc62529024f72d942a8c97142129"
+ integrity sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==
+ dependencies:
+ "@babel/helper-environment-visitor" "^7.22.5"
+ "@babel/helper-module-imports" "^7.22.5"
+ "@babel/helper-simple-access" "^7.22.5"
+ "@babel/helper-split-export-declaration" "^7.22.6"
+ "@babel/helper-validator-identifier" "^7.22.5"
+
+"@babel/helper-optimise-call-expression@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz#f21531a9ccbff644fdd156b4077c16ff0c3f609e"
+ integrity sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==
+ dependencies:
+ "@babel/types" "^7.22.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.14.5", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295"
+ integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==
+
+"@babel/helper-remap-async-to-generator@^7.22.5", "@babel/helper-remap-async-to-generator@^7.22.9":
+ version "7.22.9"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.22.9.tgz#53a25b7484e722d7efb9c350c75c032d4628de82"
+ integrity sha512-8WWC4oR4Px+tr+Fp0X3RHDVfINGpF3ad1HIbrc8A77epiR6eMMc6jsgozkzT2uDiOOdoS9cLIQ+XD2XvI2WSmQ==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.22.5"
+ "@babel/helper-environment-visitor" "^7.22.5"
+ "@babel/helper-wrap-function" "^7.22.9"
+
+"@babel/helper-replace-supers@^7.22.5", "@babel/helper-replace-supers@^7.22.9":
+ version "7.22.9"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz#cbdc27d6d8d18cd22c81ae4293765a5d9afd0779"
+ integrity sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==
+ dependencies:
+ "@babel/helper-environment-visitor" "^7.22.5"
+ "@babel/helper-member-expression-to-functions" "^7.22.5"
+ "@babel/helper-optimise-call-expression" "^7.22.5"
+
+"@babel/helper-simple-access@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz#4938357dc7d782b80ed6dbb03a0fba3d22b1d5de"
+ integrity sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==
+ dependencies:
+ "@babel/types" "^7.22.5"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0", "@babel/helper-skip-transparent-expression-wrappers@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz#007f15240b5751c537c40e77abb4e89eeaaa8847"
+ integrity sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==
+ dependencies:
+ "@babel/types" "^7.22.5"
+
+"@babel/helper-split-export-declaration@^7.22.6":
+ version "7.22.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz#322c61b7310c0997fe4c323955667f18fcefb91c"
+ integrity sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==
+ dependencies:
+ "@babel/types" "^7.22.5"
+
+"@babel/helper-string-parser@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f"
+ integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==
+
+"@babel/helper-validator-identifier@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz#9544ef6a33999343c8740fa51350f30eeaaaf193"
+ integrity sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==
+
+"@babel/helper-validator-option@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz#de52000a15a177413c8234fa3a8af4ee8102d0ac"
+ integrity sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==
+
+"@babel/helper-wrap-function@^7.22.9":
+ version "7.22.10"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.22.10.tgz#d845e043880ed0b8c18bd194a12005cb16d2f614"
+ integrity sha512-OnMhjWjuGYtdoO3FmsEFWvBStBAe2QOgwOLsLNDjN+aaiMD8InJk1/O3HSD8lkqTjCgg5YI34Tz15KNNA3p+nQ==
+ dependencies:
+ "@babel/helper-function-name" "^7.22.5"
+ "@babel/template" "^7.22.5"
+ "@babel/types" "^7.22.10"
+
+"@babel/helpers@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.22.11.tgz#b02f5d5f2d7abc21ab59eeed80de410ba70b056a"
+ integrity sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==
+ dependencies:
+ "@babel/template" "^7.22.5"
+ "@babel/traverse" "^7.22.11"
+ "@babel/types" "^7.22.11"
+
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.22.13":
+ version "7.22.13"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.22.13.tgz#9cda839e5d3be9ca9e8c26b6dd69e7548f0cbf16"
+ integrity sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.22.5"
+ chalk "^2.4.2"
js-tokens "^4.0.0"
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.14.9", "@babel/parser@^7.18.4", "@babel/parser@^7.20.7", "@babel/parser@^7.21.5", "@babel/parser@^7.21.8", "@babel/parser@^7.7.0", "@babel/parser@^7.9.6":
- version "7.21.8"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.21.8.tgz#642af7d0333eab9c0ad70b14ac5e76dbde7bfdf8"
- integrity sha512-6zavDGdzG3gUqAdWvlLFfk+36RilI+Pwyuuh7HItyeScCWP3k6i8vKclAQ0bM/0y/Kz/xiwvxhMv9MgTJP5gmA==
-
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.18.6.tgz#da5b8f9a580acdfbe53494dba45ea389fb09a4d2"
- integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
- dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.14.9", "@babel/parser@^7.18.4", "@babel/parser@^7.20.7", "@babel/parser@^7.22.11", "@babel/parser@^7.22.5", "@babel/parser@^7.7.0", "@babel/parser@^7.9.6":
+ version "7.22.14"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.22.14.tgz#c7de58e8de106e88efca42ce17f0033209dfd245"
+ integrity sha512-1KucTHgOvaw/LzCVrEOAyXkr9rQlp0A1HiHRYnSUE9dmb8PvPW7o5sscg+5169r54n3vGlbx6GevTE/Iw/P3AQ==
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.20.7":
- version "7.20.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz#d9c85589258539a22a901033853101a6198d4ef1"
- integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
+"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.22.5.tgz#87245a21cd69a73b0b81bcda98d443d6df08f05e"
+ integrity sha512-NP1M5Rf+u2Gw9qfSO4ihjcTGW5zXTi36ITLd4/EoAcEhIZ0yjMqmftDNl3QC19CX7olhrjpyU454g/2W7X0jvQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
- "@babel/plugin-proposal-optional-chaining" "^7.20.7"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-proposal-async-generator-functions@^7.20.7":
- version "7.20.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz#bfb7276d2d573cb67ba379984a2334e262ba5326"
- integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.22.5.tgz#fef09f9499b1f1c930da8a0c419db42167d792ca"
+ integrity sha512-31Bb65aZaUwqCbWMnZPduIZxCBngHFlzyN6Dq6KAJjtx+lx6ohKHubc61OomYi7XwVD4Ol0XCVz4h+pYFR048g==
dependencies:
- "@babel/helper-environment-visitor" "^7.18.9"
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/helper-remap-async-to-generator" "^7.18.9"
- "@babel/plugin-syntax-async-generators" "^7.8.4"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+ "@babel/plugin-transform-optional-chaining" "^7.22.5"
"@babel/plugin-proposal-class-properties@^7.18.6":
version "7.18.6"
@@ -347,27 +334,18 @@
"@babel/helper-create-class-features-plugin" "^7.18.6"
"@babel/helper-plugin-utils" "^7.18.6"
-"@babel/plugin-proposal-class-static-block@^7.21.0":
- version "7.21.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz#77bdd66fb7b605f3a61302d224bdfacf5547977d"
- integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
+"@babel/plugin-proposal-decorators@^7.22.7":
+ version "7.22.10"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.22.10.tgz#d6a8c3a9018e1b13e6647f869c5ea56ff2b585d4"
+ integrity sha512-KxN6TqZzcFi4uD3UifqXElBTBNLAEH1l3vzMQj6JwJZbL2sZlThxSViOKCYY+4Ah4V4JhQ95IVB7s/Y6SJSlMQ==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.21.0"
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/plugin-syntax-class-static-block" "^7.14.5"
+ "@babel/helper-create-class-features-plugin" "^7.22.10"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-replace-supers" "^7.22.9"
+ "@babel/helper-split-export-declaration" "^7.22.6"
+ "@babel/plugin-syntax-decorators" "^7.22.10"
-"@babel/plugin-proposal-decorators@^7.21.0":
- version "7.21.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.21.0.tgz#70e0c89fdcd7465c97593edb8f628ba6e4199d63"
- integrity sha512-MfgX49uRrFUTL/HvWtmx3zmpyzMMr4MTj3d527MLlr/4RTT9G/ytFFP7qet2uM2Ve03b+BkpWUpK+lRXnQ+v9w==
- dependencies:
- "@babel/helper-create-class-features-plugin" "^7.21.0"
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/helper-replace-supers" "^7.20.7"
- "@babel/helper-split-export-declaration" "^7.18.6"
- "@babel/plugin-syntax-decorators" "^7.21.0"
-
-"@babel/plugin-proposal-dynamic-import@^7.18.6", "@babel/plugin-proposal-dynamic-import@^7.8.3":
+"@babel/plugin-proposal-dynamic-import@^7.8.3":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz#72bcf8d408799f547d759298c3c27c7e7faa4d94"
integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
@@ -375,30 +353,6 @@
"@babel/helper-plugin-utils" "^7.18.6"
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
-"@babel/plugin-proposal-export-namespace-from@^7.18.9":
- version "7.18.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz#5f7313ab348cdb19d590145f9247540e94761203"
- integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
- dependencies:
- "@babel/helper-plugin-utils" "^7.18.9"
- "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-
-"@babel/plugin-proposal-json-strings@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz#7e8788c1811c393aff762817e7dbf1ebd0c05f0b"
- integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
- dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
- "@babel/plugin-syntax-json-strings" "^7.8.3"
-
-"@babel/plugin-proposal-logical-assignment-operators@^7.20.7":
- version "7.20.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz#dfbcaa8f7b4d37b51e8bfb46d94a5aea2bb89d83"
- integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
- dependencies:
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-
"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6", "@babel/plugin-proposal-nullish-coalescing-operator@^7.8.3":
version "7.18.6"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz#fdd940a99a740e577d6c753ab6fbb43fdb9467e1"
@@ -407,34 +361,7 @@
"@babel/helper-plugin-utils" "^7.18.6"
"@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-"@babel/plugin-proposal-numeric-separator@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz#899b14fbafe87f053d2c5ff05b36029c62e13c75"
- integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
- dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
- "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-
-"@babel/plugin-proposal-object-rest-spread@^7.20.7":
- version "7.20.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz#aa662940ef425779c75534a5c41e9d936edc390a"
- integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
- dependencies:
- "@babel/compat-data" "^7.20.5"
- "@babel/helper-compilation-targets" "^7.20.7"
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
- "@babel/plugin-transform-parameters" "^7.20.7"
-
-"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz#f9400d0e6a3ea93ba9ef70b09e72dd6da638a2cb"
- integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
- dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
- "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-
-"@babel/plugin-proposal-optional-chaining@^7.20.7", "@babel/plugin-proposal-optional-chaining@^7.21.0", "@babel/plugin-proposal-optional-chaining@^7.8.3":
+"@babel/plugin-proposal-optional-chaining@^7.21.0", "@babel/plugin-proposal-optional-chaining@^7.8.3":
version "7.21.0"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz#886f5c8978deb7d30f678b2e24346b287234d3ea"
integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
@@ -451,24 +378,21 @@
"@babel/helper-create-class-features-plugin" "^7.18.6"
"@babel/helper-plugin-utils" "^7.18.6"
-"@babel/plugin-proposal-private-property-in-object@^7.21.0":
- version "7.21.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz#19496bd9883dd83c23c7d7fc45dcd9ad02dfa1dc"
- integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
+"@babel/plugin-proposal-private-property-in-object@7.21.0-placeholder-for-preset-env.2":
+ version "7.21.0-placeholder-for-preset-env.2"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz#7844f9289546efa9febac2de4cfe358a050bd703"
+ integrity sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==
+
+"@babel/plugin-proposal-private-property-in-object@^7.21.11":
+ version "7.21.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz#69d597086b6760c4126525cfa154f34631ff272c"
+ integrity sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==
dependencies:
"@babel/helper-annotate-as-pure" "^7.18.6"
"@babel/helper-create-class-features-plugin" "^7.21.0"
"@babel/helper-plugin-utils" "^7.20.2"
"@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz#af613d2cd5e643643b65cded64207b15c85cb78e"
- integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
- dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.18.6"
- "@babel/helper-plugin-utils" "^7.18.6"
-
"@babel/plugin-syntax-async-generators@^7.8.4":
version "7.8.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
@@ -497,12 +421,12 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-syntax-decorators@^7.21.0":
- version "7.21.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.21.0.tgz#d2b3f31c3e86fa86e16bb540b7660c55bd7d0e78"
- integrity sha512-tIoPpGBR8UuM4++ccWN3gifhVvQu7ZizuR1fklhRJrd5ewgbkUS+0KVFeWWxELtn18NTLoW32XV7zyOgIAiz+w==
+"@babel/plugin-syntax-decorators@^7.22.10":
+ version "7.22.10"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.22.10.tgz#7d83ea04d893c442b78ebf4c3cbac59a7211deff"
+ integrity sha512-z1KTVemBjnz+kSEilAsI4lbkPOl5TvJH7YDSY1CTIzvLWJ+KHXp+mRe8VPmfnyvqOPqar1V2gid2PleKzRUstQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.20.2"
+ "@babel/helper-plugin-utils" "^7.22.5"
"@babel/plugin-syntax-dynamic-import@^7.8.3":
version "7.8.3"
@@ -518,12 +442,19 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.3"
-"@babel/plugin-syntax-import-assertions@^7.20.0":
- version "7.20.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz#bb50e0d4bea0957235390641209394e87bdb9cc4"
- integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+"@babel/plugin-syntax-import-assertions@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz#07d252e2aa0bc6125567f742cd58619cb14dce98"
+ integrity sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-syntax-import-attributes@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.22.5.tgz#ab840248d834410b829f569f5262b9e517555ecb"
+ integrity sha512-KwvoWDeNKPETmozyFE0P2rOLqh39EoQHNjqizrI5B8Vt0ZNS7M56s7dAiAqbYfiAYOuIzIh96z3iR2ktgu3tEg==
dependencies:
- "@babel/helper-plugin-utils" "^7.19.0"
+ "@babel/helper-plugin-utils" "^7.22.5"
"@babel/plugin-syntax-import-meta@^7.10.4", "@babel/plugin-syntax-import-meta@^7.8.3":
version "7.10.4"
@@ -539,12 +470,12 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
-"@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.21.4":
- version "7.21.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.21.4.tgz#f264ed7bf40ffc9ec239edabc17a50c4f5b6fea2"
- integrity sha512-5hewiLct5OKyh6PLKEYaFclcqtIgCb6bmELouxjF6up5q3Sov7rOayW4RwhbaBL0dit8rA80GNfY+UuDp2mBbQ==
+"@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz#a6b68e84fb76e759fc3b93e901876ffabbe1d918"
+ integrity sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==
dependencies:
- "@babel/helper-plugin-utils" "^7.20.2"
+ "@babel/helper-plugin-utils" "^7.22.5"
"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
version "7.10.4"
@@ -602,318 +533,450 @@
dependencies:
"@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-syntax-typescript@^7.20.0", "@babel/plugin-syntax-typescript@^7.7.2":
- version "7.21.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.21.4.tgz#2751948e9b7c6d771a8efa59340c15d4a2891ff8"
- integrity sha512-xz0D39NvhQn4t4RNsHmDnnsaQizIlUkdtYvLs8La1BlfjQ6JEwxkJGeqJMW2tAXx+q6H+WFuUTXNdYVpEya0YA==
+"@babel/plugin-syntax-typescript@^7.22.5", "@babel/plugin-syntax-typescript@^7.7.2":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.22.5.tgz#aac8d383b062c5072c647a31ef990c1d0af90272"
+ integrity sha512-1mS2o03i7t1c6VzH6fdQ3OA8tcEIxwG18zIPRp+UY1Ihv6W+XZzBCVxExF9upussPXJ0xE9XRHwMoNs1ep/nRQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.20.2"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-arrow-functions@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.21.5.tgz#9bb42a53de447936a57ba256fbf537fc312b6929"
- integrity sha512-wb1mhwGOCaXHDTcsRYMKF9e5bbMgqwxtqa2Y1ifH96dXJPwbuLX9qHy3clhrxVqgMz7nyNXs8VkxdH8UBcjKqA==
+"@babel/plugin-syntax-unicode-sets-regex@^7.18.6":
+ version "7.18.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz#d49a3b3e6b52e5be6740022317580234a6a47357"
+ integrity sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==
dependencies:
- "@babel/helper-plugin-utils" "^7.21.5"
+ "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+ "@babel/helper-plugin-utils" "^7.18.6"
-"@babel/plugin-transform-async-to-generator@^7.20.7":
- version "7.20.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz#dfee18623c8cb31deb796aa3ca84dda9cea94354"
- integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
+"@babel/plugin-transform-arrow-functions@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz#e5ba566d0c58a5b2ba2a8b795450641950b71958"
+ integrity sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==
dependencies:
- "@babel/helper-module-imports" "^7.18.6"
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/helper-remap-async-to-generator" "^7.18.9"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-block-scoped-functions@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz#9187bf4ba302635b9d70d986ad70f038726216a8"
- integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
+"@babel/plugin-transform-async-generator-functions@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-generator-functions/-/plugin-transform-async-generator-functions-7.22.11.tgz#dbe3b1ff5a52e2e5edc4b19a60d325a675ed2649"
+ integrity sha512-0pAlmeRJn6wU84zzZsEOx1JV1Jf8fqO9ok7wofIJwUnplYo247dcd24P+cMJht7ts9xkzdtB0EPHmOb7F+KzXw==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-environment-visitor" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-remap-async-to-generator" "^7.22.9"
+ "@babel/plugin-syntax-async-generators" "^7.8.4"
-"@babel/plugin-transform-block-scoping@^7.21.0":
- version "7.21.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz#e737b91037e5186ee16b76e7ae093358a5634f02"
- integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
+"@babel/plugin-transform-async-to-generator@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.22.5.tgz#c7a85f44e46f8952f6d27fe57c2ed3cc084c3775"
+ integrity sha512-b1A8D8ZzE/VhNDoV1MSJTnpKkCG5bJo+19R4o4oy03zM7ws8yEMK755j61Dc3EyvdysbqH5BOOTquJ7ZX9C6vQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.20.2"
+ "@babel/helper-module-imports" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-remap-async-to-generator" "^7.22.5"
-"@babel/plugin-transform-classes@^7.21.0":
- version "7.21.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz#f469d0b07a4c5a7dbb21afad9e27e57b47031665"
- integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
+"@babel/plugin-transform-block-scoped-functions@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz#27978075bfaeb9fa586d3cb63a3d30c1de580024"
+ integrity sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.18.6"
- "@babel/helper-compilation-targets" "^7.20.7"
- "@babel/helper-environment-visitor" "^7.18.9"
- "@babel/helper-function-name" "^7.21.0"
- "@babel/helper-optimise-call-expression" "^7.18.6"
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/helper-replace-supers" "^7.20.7"
- "@babel/helper-split-export-declaration" "^7.18.6"
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-block-scoping@^7.22.10":
+ version "7.22.10"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz#88a1dccc3383899eb5e660534a76a22ecee64faa"
+ integrity sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-properties@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-properties/-/plugin-transform-class-properties-7.22.5.tgz#97a56e31ad8c9dc06a0b3710ce7803d5a48cca77"
+ integrity sha512-nDkQ0NfkOhPTq8YCLiWNxp1+f9fCobEjCb0n8WdbNUBc4IB5V7P1QnX9IjpSoquKrXF5SKojHleVNs2vGeHCHQ==
+ dependencies:
+ "@babel/helper-create-class-features-plugin" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-class-static-block@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-class-static-block/-/plugin-transform-class-static-block-7.22.11.tgz#dc8cc6e498f55692ac6b4b89e56d87cec766c974"
+ integrity sha512-GMM8gGmqI7guS/llMFk1bJDkKfn3v3C4KHK9Yg1ey5qcHcOlKb0QvcMrgzvxo+T03/4szNh5lghY+fEC98Kq9g==
+ dependencies:
+ "@babel/helper-create-class-features-plugin" "^7.22.11"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.22.6":
+ version "7.22.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz#e04d7d804ed5b8501311293d1a0e6d43e94c3363"
+ integrity sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.22.5"
+ "@babel/helper-compilation-targets" "^7.22.6"
+ "@babel/helper-environment-visitor" "^7.22.5"
+ "@babel/helper-function-name" "^7.22.5"
+ "@babel/helper-optimise-call-expression" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-replace-supers" "^7.22.5"
+ "@babel/helper-split-export-declaration" "^7.22.6"
globals "^11.1.0"
-"@babel/plugin-transform-computed-properties@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.21.5.tgz#3a2d8bb771cd2ef1cd736435f6552fe502e11b44"
- integrity sha512-TR653Ki3pAwxBxUe8srfF3e4Pe3FTA46uaNHYyQwIoM4oWKSoOZiDNyHJ0oIoDIUPSRQbQG7jzgVBX3FPVne1Q==
+"@babel/plugin-transform-computed-properties@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz#cd1e994bf9f316bd1c2dafcd02063ec261bb3869"
+ integrity sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==
dependencies:
- "@babel/helper-plugin-utils" "^7.21.5"
- "@babel/template" "^7.20.7"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/template" "^7.22.5"
-"@babel/plugin-transform-destructuring@^7.21.3":
- version "7.21.3"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz#73b46d0fd11cd6ef57dea8a381b1215f4959d401"
- integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==
+"@babel/plugin-transform-destructuring@^7.22.10":
+ version "7.22.10"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz#38e2273814a58c810b6c34ea293be4973c4eb5e2"
+ integrity sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==
dependencies:
- "@babel/helper-plugin-utils" "^7.20.2"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz#b286b3e7aae6c7b861e45bed0a2fafd6b1a4fef8"
- integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
+"@babel/plugin-transform-dotall-regex@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.22.5.tgz#dbb4f0e45766eb544e193fb00e65a1dd3b2a4165"
+ integrity sha512-5/Yk9QxCQCl+sOIB1WelKnVRxTJDSAIxtJLL2/pqL14ZVlbH0fUQUZa/T5/UnQtBNgghR7mfB8ERBKyKPCi7Vw==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.18.6"
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-duplicate-keys@^7.18.9":
- version "7.18.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz#687f15ee3cdad6d85191eb2a372c4528eaa0ae0e"
- integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
+"@babel/plugin-transform-duplicate-keys@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.22.5.tgz#b6e6428d9416f5f0bba19c70d1e6e7e0b88ab285"
+ integrity sha512-dEnYD+9BBgld5VBXHnF/DbYGp3fqGMsyxKbtD1mDyIA7AkTSpKXFhCVuj/oQVOoALfBs77DudA0BE4d5mcpmqw==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-exponentiation-operator@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz#421c705f4521888c65e91fdd1af951bfefd4dacd"
- integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
+"@babel/plugin-transform-dynamic-import@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dynamic-import/-/plugin-transform-dynamic-import-7.22.11.tgz#2c7722d2a5c01839eaf31518c6ff96d408e447aa"
+ integrity sha512-g/21plo58sfteWjaO0ZNVb+uEOkJNjAaHhbejrnBmu011l/eNDScmkbjCC3l4FKb10ViaGU4aOkFznSu2zRHgA==
dependencies:
- "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/plugin-syntax-dynamic-import" "^7.8.3"
-"@babel/plugin-transform-for-of@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.5.tgz#e890032b535f5a2e237a18535f56a9fdaa7b83fc"
- integrity sha512-nYWpjKW/7j/I/mZkGVgHJXh4bA1sfdFnJoOXwJuj4m3Q2EraO/8ZyrkCau9P5tbHQk01RMSt6KYLCsW7730SXQ==
+"@babel/plugin-transform-exponentiation-operator@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.22.5.tgz#402432ad544a1f9a480da865fda26be653e48f6a"
+ integrity sha512-vIpJFNM/FjZ4rh1myqIya9jXwrwwgFRHPjT3DkUA9ZLHuzox8jiXkOLvwm1H+PQIP3CqfC++WPKeuDi0Sjdj1g==
dependencies:
- "@babel/helper-plugin-utils" "^7.21.5"
+ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-function-name@^7.18.9":
- version "7.18.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz#cc354f8234e62968946c61a46d6365440fc764e0"
- integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
+"@babel/plugin-transform-export-namespace-from@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-export-namespace-from/-/plugin-transform-export-namespace-from-7.22.11.tgz#b3c84c8f19880b6c7440108f8929caf6056db26c"
+ integrity sha512-xa7aad7q7OiT8oNZ1mU7NrISjlSkVdMbNxn9IuLZyL9AJEhs1Apba3I+u5riX1dIkdptP5EKDG5XDPByWxtehw==
dependencies:
- "@babel/helper-compilation-targets" "^7.18.9"
- "@babel/helper-function-name" "^7.18.9"
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-"@babel/plugin-transform-literals@^7.18.9":
- version "7.18.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz#72796fdbef80e56fba3c6a699d54f0de557444bc"
- integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
+"@babel/plugin-transform-for-of@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz#ab1b8a200a8f990137aff9a084f8de4099ab173f"
+ integrity sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-member-expression-literals@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz#ac9fdc1a118620ac49b7e7a5d2dc177a1bfee88e"
- integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
+"@babel/plugin-transform-function-name@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz#935189af68b01898e0d6d99658db6b164205c143"
+ integrity sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-compilation-targets" "^7.22.5"
+ "@babel/helper-function-name" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-modules-amd@^7.20.11":
- version "7.20.11"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz#3daccca8e4cc309f03c3a0c4b41dc4b26f55214a"
- integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==
+"@babel/plugin-transform-json-strings@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-json-strings/-/plugin-transform-json-strings-7.22.11.tgz#689a34e1eed1928a40954e37f74509f48af67835"
+ integrity sha512-CxT5tCqpA9/jXFlme9xIBCc5RPtdDq3JpkkhgHQqtDdiTnTI0jtZ0QzXhr5DILeYifDPp2wvY2ad+7+hLMW5Pw==
dependencies:
- "@babel/helper-module-transforms" "^7.20.11"
- "@babel/helper-plugin-utils" "^7.20.2"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/plugin-syntax-json-strings" "^7.8.3"
-"@babel/plugin-transform-modules-commonjs@^7.21.5", "@babel/plugin-transform-modules-commonjs@^7.8.3":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.5.tgz#d69fb947eed51af91de82e4708f676864e5e47bc"
- integrity sha512-OVryBEgKUbtqMoB7eG2rs6UFexJi6Zj6FDXx+esBLPTCxCNxAY9o+8Di7IsUGJ+AVhp5ncK0fxWUBd0/1gPhrQ==
+"@babel/plugin-transform-literals@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz#e9341f4b5a167952576e23db8d435849b1dd7920"
+ integrity sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==
dependencies:
- "@babel/helper-module-transforms" "^7.21.5"
- "@babel/helper-plugin-utils" "^7.21.5"
- "@babel/helper-simple-access" "^7.21.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-modules-systemjs@^7.20.11":
- version "7.20.11"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz#467ec6bba6b6a50634eea61c9c232654d8a4696e"
- integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==
+"@babel/plugin-transform-logical-assignment-operators@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-logical-assignment-operators/-/plugin-transform-logical-assignment-operators-7.22.11.tgz#24c522a61688bde045b7d9bc3c2597a4d948fc9c"
+ integrity sha512-qQwRTP4+6xFCDV5k7gZBF3C31K34ut0tbEcTKxlX/0KXxm9GLcO14p570aWxFvVzx6QAfPgq7gaeIHXJC8LswQ==
dependencies:
- "@babel/helper-hoist-variables" "^7.18.6"
- "@babel/helper-module-transforms" "^7.20.11"
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/helper-validator-identifier" "^7.19.1"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-"@babel/plugin-transform-modules-umd@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz#81d3832d6034b75b54e62821ba58f28ed0aab4b9"
- integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
+"@babel/plugin-transform-member-expression-literals@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz#4fcc9050eded981a468347dd374539ed3e058def"
+ integrity sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==
dependencies:
- "@babel/helper-module-transforms" "^7.18.6"
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-named-capturing-groups-regex@^7.20.5":
- version "7.20.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz#626298dd62ea51d452c3be58b285d23195ba69a8"
- integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
+"@babel/plugin-transform-modules-amd@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.22.5.tgz#4e045f55dcf98afd00f85691a68fc0780704f526"
+ integrity sha512-R+PTfLTcYEmb1+kK7FNkhQ1gP4KgjpSO6HfH9+f8/yfp2Nt3ggBjiVpRwmwTlfqZLafYKJACy36yDXlEmI9HjQ==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.20.5"
- "@babel/helper-plugin-utils" "^7.20.2"
+ "@babel/helper-module-transforms" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-new-target@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz#d128f376ae200477f37c4ddfcc722a8a1b3246a8"
- integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
+"@babel/plugin-transform-modules-commonjs@^7.22.11", "@babel/plugin-transform-modules-commonjs@^7.8.3":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.11.tgz#d7991d3abad199c03b68ee66a64f216c47ffdfae"
+ integrity sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-module-transforms" "^7.22.9"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-simple-access" "^7.22.5"
-"@babel/plugin-transform-object-super@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz#fb3c6ccdd15939b6ff7939944b51971ddc35912c"
- integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
+"@babel/plugin-transform-modules-systemjs@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.22.11.tgz#3386be5875d316493b517207e8f1931d93154bb1"
+ integrity sha512-rIqHmHoMEOhI3VkVf5jQ15l539KrwhzqcBO6wdCNWPWc/JWt9ILNYNUssbRpeq0qWns8svuw8LnMNCvWBIJ8wA==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
- "@babel/helper-replace-supers" "^7.18.6"
+ "@babel/helper-hoist-variables" "^7.22.5"
+ "@babel/helper-module-transforms" "^7.22.9"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-validator-identifier" "^7.22.5"
-"@babel/plugin-transform-parameters@^7.20.7", "@babel/plugin-transform-parameters@^7.21.3":
- version "7.21.3"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz#18fc4e797cf6d6d972cb8c411dbe8a809fa157db"
- integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==
+"@babel/plugin-transform-modules-umd@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.22.5.tgz#4694ae40a87b1745e3775b6a7fe96400315d4f98"
+ integrity sha512-+S6kzefN/E1vkSsKx8kmQuqeQsvCKCd1fraCM7zXm4SFoggI099Tr4G8U81+5gtMdUeMQ4ipdQffbKLX0/7dBQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.20.2"
+ "@babel/helper-module-transforms" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-property-literals@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz#e22498903a483448e94e032e9bbb9c5ccbfc93a3"
- integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.22.5.tgz#67fe18ee8ce02d57c855185e27e3dc959b2e991f"
+ integrity sha512-YgLLKmS3aUBhHaxp5hi1WJTgOUb/NCuDHzGT9z9WTt3YG+CPRhJs6nprbStx6DnWM4dh6gt7SU3sZodbZ08adQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-regenerator@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.21.5.tgz#576c62f9923f94bcb1c855adc53561fd7913724e"
- integrity sha512-ZoYBKDb6LyMi5yCsByQ5jmXsHAQDDYeexT1Szvlmui+lADvfSecr5Dxd/PkrTC3pAD182Fcju1VQkB4oCp9M+w==
+"@babel/plugin-transform-new-target@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.22.5.tgz#1b248acea54ce44ea06dfd37247ba089fcf9758d"
+ integrity sha512-AsF7K0Fx/cNKVyk3a+DW0JLo+Ua598/NxMRvxDnkpCIGFh43+h/v2xyhRUYf6oD8gE4QtL83C7zZVghMjHd+iw==
dependencies:
- "@babel/helper-plugin-utils" "^7.21.5"
- regenerator-transform "^0.15.1"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-reserved-words@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz#b1abd8ebf8edaa5f7fe6bbb8d2133d23b6a6f76a"
- integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
+"@babel/plugin-transform-nullish-coalescing-operator@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-nullish-coalescing-operator/-/plugin-transform-nullish-coalescing-operator-7.22.11.tgz#debef6c8ba795f5ac67cd861a81b744c5d38d9fc"
+ integrity sha512-YZWOw4HxXrotb5xsjMJUDlLgcDXSfO9eCmdl1bgW4+/lAGdkjaEvOnQ4p5WKKdUgSzO39dgPl0pTnfxm0OAXcg==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-"@babel/plugin-transform-runtime@^7.13.9", "@babel/plugin-transform-runtime@^7.21.0":
- version "7.21.4"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.21.4.tgz#2e1da21ca597a7d01fc96b699b21d8d2023191aa"
- integrity sha512-1J4dhrw1h1PqnNNpzwxQ2UBymJUF8KuPjAAnlLwZcGhHAIqUigFW7cdK6GHoB64ubY4qXQNYknoUeks4Wz7CUA==
+"@babel/plugin-transform-numeric-separator@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-numeric-separator/-/plugin-transform-numeric-separator-7.22.11.tgz#498d77dc45a6c6db74bb829c02a01c1d719cbfbd"
+ integrity sha512-3dzU4QGPsILdJbASKhF/V2TVP+gJya1PsueQCxIPCEcerqF21oEcrob4mzjsp2Py/1nLfF5m+xYNMDpmA8vffg==
dependencies:
- "@babel/helper-module-imports" "^7.21.4"
- "@babel/helper-plugin-utils" "^7.20.2"
- babel-plugin-polyfill-corejs2 "^0.3.3"
- babel-plugin-polyfill-corejs3 "^0.6.0"
- babel-plugin-polyfill-regenerator "^0.4.1"
- semver "^6.3.0"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/plugin-syntax-numeric-separator" "^7.10.4"
-"@babel/plugin-transform-shorthand-properties@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz#6d6df7983d67b195289be24909e3f12a8f664dc9"
- integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
+"@babel/plugin-transform-object-rest-spread@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-rest-spread/-/plugin-transform-object-rest-spread-7.22.11.tgz#dbbb06ce783cd994a8f430d8cefa553e9b42ca62"
+ integrity sha512-nX8cPFa6+UmbepISvlf5jhQyaC7ASs/7UxHmMkuJ/k5xSHvDPPaibMo+v3TXwU/Pjqhep/nFNpd3zn4YR59pnw==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/compat-data" "^7.22.9"
+ "@babel/helper-compilation-targets" "^7.22.10"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
+ "@babel/plugin-transform-parameters" "^7.22.5"
-"@babel/plugin-transform-spread@^7.20.7":
- version "7.20.7"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz#c2d83e0b99d3bf83e07b11995ee24bf7ca09401e"
- integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
+"@babel/plugin-transform-object-super@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz#794a8d2fcb5d0835af722173c1a9d704f44e218c"
+ integrity sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==
dependencies:
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-replace-supers" "^7.22.5"
-"@babel/plugin-transform-sticky-regex@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz#c6706eb2b1524028e317720339583ad0f444adcc"
- integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
+"@babel/plugin-transform-optional-catch-binding@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-catch-binding/-/plugin-transform-optional-catch-binding-7.22.11.tgz#461cc4f578a127bb055527b3e77404cad38c08e0"
+ integrity sha512-rli0WxesXUeCJnMYhzAglEjLWVDF6ahb45HuprcmQuLidBJFWjNnOzssk2kuc6e33FlLaiZhG/kUIzUMWdBKaQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-"@babel/plugin-transform-template-literals@^7.18.9":
- version "7.18.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz#04ec6f10acdaa81846689d63fae117dd9c243a5e"
- integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
+"@babel/plugin-transform-optional-chaining@^7.22.12", "@babel/plugin-transform-optional-chaining@^7.22.5":
+ version "7.22.12"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.22.12.tgz#d7ebf6a88cd2f4d307b0e000ab630acd8124b333"
+ integrity sha512-7XXCVqZtyFWqjDsYDY4T45w4mlx1rf7aOgkc/Ww76xkgBiOlmjPkx36PBLHa1k1rwWvVgYMPsbuVnIamx2ZQJw==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+ "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-"@babel/plugin-transform-typeof-symbol@^7.18.9":
- version "7.18.9"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz#c8cea68263e45addcd6afc9091429f80925762c0"
- integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
+"@babel/plugin-transform-parameters@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz#c3542dd3c39b42c8069936e48717a8d179d63a18"
+ integrity sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==
dependencies:
- "@babel/helper-plugin-utils" "^7.18.9"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-typescript@^7.21.3":
- version "7.21.3"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.21.3.tgz#316c5be579856ea890a57ebc5116c5d064658f2b"
- integrity sha512-RQxPz6Iqt8T0uw/WsJNReuBpWpBqs/n7mNo18sKLoTbMp+UrEekhH+pKSVC7gWz+DNjo9gryfV8YzCiT45RgMw==
+"@babel/plugin-transform-private-methods@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-methods/-/plugin-transform-private-methods-7.22.5.tgz#21c8af791f76674420a147ae62e9935d790f8722"
+ integrity sha512-PPjh4gyrQnGe97JTalgRGMuU4icsZFnWkzicB/fUtzlKUqvsWBKEpPPfr5a2JiyirZkHxnAqkQMO5Z5B2kK3fA==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.18.6"
- "@babel/helper-create-class-features-plugin" "^7.21.0"
- "@babel/helper-plugin-utils" "^7.20.2"
- "@babel/plugin-syntax-typescript" "^7.20.0"
+ "@babel/helper-create-class-features-plugin" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/plugin-transform-unicode-escapes@^7.21.5":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.21.5.tgz#1e55ed6195259b0e9061d81f5ef45a9b009fb7f2"
- integrity sha512-LYm/gTOwZqsYohlvFUe/8Tujz75LqqVC2w+2qPHLR+WyWHGCZPN1KBpJCJn+4Bk4gOkQy/IXKIge6az5MqwlOg==
+"@babel/plugin-transform-private-property-in-object@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-private-property-in-object/-/plugin-transform-private-property-in-object-7.22.11.tgz#ad45c4fc440e9cb84c718ed0906d96cf40f9a4e1"
+ integrity sha512-sSCbqZDBKHetvjSwpyWzhuHkmW5RummxJBVbYLkGkaiTOWGxml7SXt0iWa03bzxFIx7wOj3g/ILRd0RcJKBeSQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.21.5"
+ "@babel/helper-annotate-as-pure" "^7.22.5"
+ "@babel/helper-create-class-features-plugin" "^7.22.11"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-"@babel/plugin-transform-unicode-regex@^7.18.6":
- version "7.18.6"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz#194317225d8c201bbae103364ffe9e2cea36cdca"
- integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
+"@babel/plugin-transform-property-literals@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz#b5ddabd73a4f7f26cd0e20f5db48290b88732766"
+ integrity sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.18.6"
- "@babel/helper-plugin-utils" "^7.18.6"
+ "@babel/helper-plugin-utils" "^7.22.5"
-"@babel/preset-env@^7.14.4", "@babel/preset-env@^7.20.2", "@babel/preset-env@^7.4.4":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.21.5.tgz#db2089d99efd2297716f018aeead815ac3decffb"
- integrity sha512-wH00QnTTldTbf/IefEVyChtRdw5RJvODT/Vb4Vcxq1AZvtXj6T0YeX0cAcXhI6/BdGuiP3GcNIL4OQbI2DVNxg==
- dependencies:
- "@babel/compat-data" "^7.21.5"
- "@babel/helper-compilation-targets" "^7.21.5"
- "@babel/helper-plugin-utils" "^7.21.5"
- "@babel/helper-validator-option" "^7.21.0"
- "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.20.7"
- "@babel/plugin-proposal-async-generator-functions" "^7.20.7"
- "@babel/plugin-proposal-class-properties" "^7.18.6"
- "@babel/plugin-proposal-class-static-block" "^7.21.0"
- "@babel/plugin-proposal-dynamic-import" "^7.18.6"
- "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
- "@babel/plugin-proposal-json-strings" "^7.18.6"
- "@babel/plugin-proposal-logical-assignment-operators" "^7.20.7"
- "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
- "@babel/plugin-proposal-numeric-separator" "^7.18.6"
- "@babel/plugin-proposal-object-rest-spread" "^7.20.7"
- "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
- "@babel/plugin-proposal-optional-chaining" "^7.21.0"
- "@babel/plugin-proposal-private-methods" "^7.18.6"
- "@babel/plugin-proposal-private-property-in-object" "^7.21.0"
- "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
+"@babel/plugin-transform-regenerator@^7.22.10":
+ version "7.22.10"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.22.10.tgz#8ceef3bd7375c4db7652878b0241b2be5d0c3cca"
+ integrity sha512-F28b1mDt8KcT5bUyJc/U9nwzw6cV+UmTeRlXYIl2TNqMMJif0Jeey9/RQ3C4NOd2zp0/TRsDns9ttj2L523rsw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.22.5"
+ regenerator-transform "^0.15.2"
+
+"@babel/plugin-transform-reserved-words@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.22.5.tgz#832cd35b81c287c4bcd09ce03e22199641f964fb"
+ integrity sha512-DTtGKFRQUDm8svigJzZHzb/2xatPc6TzNvAIJ5GqOKDsGFYgAskjRulbR/vGsPKq3OPqtexnz327qYpP57RFyA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-runtime@^7.13.9", "@babel/plugin-transform-runtime@^7.22.9":
+ version "7.22.10"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.22.10.tgz#89eda6daf1d3af6f36fb368766553054c8d7cd46"
+ integrity sha512-RchI7HePu1eu0CYNKHHHQdfenZcM4nz8rew5B1VWqeRKdcwW5aQ5HeG9eTUbWiAS1UrmHVLmoxTWHt3iLD/NhA==
+ dependencies:
+ "@babel/helper-module-imports" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ babel-plugin-polyfill-corejs2 "^0.4.5"
+ babel-plugin-polyfill-corejs3 "^0.8.3"
+ babel-plugin-polyfill-regenerator "^0.5.2"
+ semver "^6.3.1"
+
+"@babel/plugin-transform-shorthand-properties@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz#6e277654be82b5559fc4b9f58088507c24f0c624"
+ integrity sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-spread@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz#6487fd29f229c95e284ba6c98d65eafb893fea6b"
+ integrity sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.22.5"
+
+"@babel/plugin-transform-sticky-regex@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.22.5.tgz#295aba1595bfc8197abd02eae5fc288c0deb26aa"
+ integrity sha512-zf7LuNpHG0iEeiyCNwX4j3gDg1jgt1k3ZdXBKbZSoA3BbGQGvMiSvfbZRR3Dr3aeJe3ooWFZxOOG3IRStYp2Bw==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-template-literals@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz#8f38cf291e5f7a8e60e9f733193f0bcc10909bff"
+ integrity sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-typeof-symbol@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.22.5.tgz#5e2ba478da4b603af8673ff7c54f75a97b716b34"
+ integrity sha512-bYkI5lMzL4kPii4HHEEChkD0rkc+nvnlR6+o/qdqR6zrm0Sv/nodmyLhlq2DO0YKLUNd2VePmPRjJXSBh9OIdA==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-typescript@^7.22.11":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.22.11.tgz#9f27fb5e51585729374bb767ab6a6d9005a23329"
+ integrity sha512-0E4/L+7gfvHub7wsbTv03oRtD69X31LByy44fGmFzbZScpupFByMcgCJ0VbBTkzyjSJKuRoGN8tcijOWKTmqOA==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.22.5"
+ "@babel/helper-create-class-features-plugin" "^7.22.11"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/plugin-syntax-typescript" "^7.22.5"
+
+"@babel/plugin-transform-unicode-escapes@^7.22.10":
+ version "7.22.10"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.22.10.tgz#c723f380f40a2b2f57a62df24c9005834c8616d9"
+ integrity sha512-lRfaRKGZCBqDlRU3UIFovdp9c9mEvlylmpod0/OatICsSfuQ9YFthRo1tpTkGsklEefZdqlEFdY4A2dwTb6ohg==
+ dependencies:
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-property-regex@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-property-regex/-/plugin-transform-unicode-property-regex-7.22.5.tgz#098898f74d5c1e86660dc112057b2d11227f1c81"
+ integrity sha512-HCCIb+CbJIAE6sXn5CjFQXMwkCClcOfPCzTlilJ8cUatfzwHlWQkbtV0zD338u9dZskwvuOYTuuaMaA8J5EI5A==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-regex@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.22.5.tgz#ce7e7bb3ef208c4ff67e02a22816656256d7a183"
+ integrity sha512-028laaOKptN5vHJf9/Arr/HiJekMd41hOEZYvNsrsXqJ7YPYuX2bQxh31fkZzGmq3YqHRJzYFFAVYvKfMPKqyg==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/plugin-transform-unicode-sets-regex@^7.22.5":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-sets-regex/-/plugin-transform-unicode-sets-regex-7.22.5.tgz#77788060e511b708ffc7d42fdfbc5b37c3004e91"
+ integrity sha512-lhMfi4FC15j13eKrh3DnYHjpGj6UKQHtNKTbtc1igvAhRy4+kLhV07OpLcsN0VgDEw/MjAvJO4BdMJsHwMhzCg==
+ dependencies:
+ "@babel/helper-create-regexp-features-plugin" "^7.22.5"
+ "@babel/helper-plugin-utils" "^7.22.5"
+
+"@babel/preset-env@^7.14.4", "@babel/preset-env@^7.22.9", "@babel/preset-env@^7.4.4":
+ version "7.22.14"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.22.14.tgz#1cbb468d899f64fa71c53446f13b7ff8c0005cc1"
+ integrity sha512-daodMIoVo+ol/g+//c/AH+szBkFj4STQUikvBijRGL72Ph+w+AMTSh55DUETe8KJlPlDT1k/mp7NBfOuiWmoig==
+ dependencies:
+ "@babel/compat-data" "^7.22.9"
+ "@babel/helper-compilation-targets" "^7.22.10"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-validator-option" "^7.22.5"
+ "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.22.5"
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.22.5"
+ "@babel/plugin-proposal-private-property-in-object" "7.21.0-placeholder-for-preset-env.2"
"@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-import-assertions" "^7.20.0"
+ "@babel/plugin-syntax-import-assertions" "^7.22.5"
+ "@babel/plugin-syntax-import-attributes" "^7.22.5"
"@babel/plugin-syntax-import-meta" "^7.10.4"
"@babel/plugin-syntax-json-strings" "^7.8.3"
"@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
@@ -924,72 +987,87 @@
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
"@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.21.5"
- "@babel/plugin-transform-async-to-generator" "^7.20.7"
- "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
- "@babel/plugin-transform-block-scoping" "^7.21.0"
- "@babel/plugin-transform-classes" "^7.21.0"
- "@babel/plugin-transform-computed-properties" "^7.21.5"
- "@babel/plugin-transform-destructuring" "^7.21.3"
- "@babel/plugin-transform-dotall-regex" "^7.18.6"
- "@babel/plugin-transform-duplicate-keys" "^7.18.9"
- "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
- "@babel/plugin-transform-for-of" "^7.21.5"
- "@babel/plugin-transform-function-name" "^7.18.9"
- "@babel/plugin-transform-literals" "^7.18.9"
- "@babel/plugin-transform-member-expression-literals" "^7.18.6"
- "@babel/plugin-transform-modules-amd" "^7.20.11"
- "@babel/plugin-transform-modules-commonjs" "^7.21.5"
- "@babel/plugin-transform-modules-systemjs" "^7.20.11"
- "@babel/plugin-transform-modules-umd" "^7.18.6"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.20.5"
- "@babel/plugin-transform-new-target" "^7.18.6"
- "@babel/plugin-transform-object-super" "^7.18.6"
- "@babel/plugin-transform-parameters" "^7.21.3"
- "@babel/plugin-transform-property-literals" "^7.18.6"
- "@babel/plugin-transform-regenerator" "^7.21.5"
- "@babel/plugin-transform-reserved-words" "^7.18.6"
- "@babel/plugin-transform-shorthand-properties" "^7.18.6"
- "@babel/plugin-transform-spread" "^7.20.7"
- "@babel/plugin-transform-sticky-regex" "^7.18.6"
- "@babel/plugin-transform-template-literals" "^7.18.9"
- "@babel/plugin-transform-typeof-symbol" "^7.18.9"
- "@babel/plugin-transform-unicode-escapes" "^7.21.5"
- "@babel/plugin-transform-unicode-regex" "^7.18.6"
- "@babel/preset-modules" "^0.1.5"
- "@babel/types" "^7.21.5"
- babel-plugin-polyfill-corejs2 "^0.3.3"
- babel-plugin-polyfill-corejs3 "^0.6.0"
- babel-plugin-polyfill-regenerator "^0.4.1"
- core-js-compat "^3.25.1"
- semver "^6.3.0"
-
-"@babel/preset-modules@^0.1.5":
- version "0.1.5"
- resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
- integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
+ "@babel/plugin-syntax-unicode-sets-regex" "^7.18.6"
+ "@babel/plugin-transform-arrow-functions" "^7.22.5"
+ "@babel/plugin-transform-async-generator-functions" "^7.22.11"
+ "@babel/plugin-transform-async-to-generator" "^7.22.5"
+ "@babel/plugin-transform-block-scoped-functions" "^7.22.5"
+ "@babel/plugin-transform-block-scoping" "^7.22.10"
+ "@babel/plugin-transform-class-properties" "^7.22.5"
+ "@babel/plugin-transform-class-static-block" "^7.22.11"
+ "@babel/plugin-transform-classes" "^7.22.6"
+ "@babel/plugin-transform-computed-properties" "^7.22.5"
+ "@babel/plugin-transform-destructuring" "^7.22.10"
+ "@babel/plugin-transform-dotall-regex" "^7.22.5"
+ "@babel/plugin-transform-duplicate-keys" "^7.22.5"
+ "@babel/plugin-transform-dynamic-import" "^7.22.11"
+ "@babel/plugin-transform-exponentiation-operator" "^7.22.5"
+ "@babel/plugin-transform-export-namespace-from" "^7.22.11"
+ "@babel/plugin-transform-for-of" "^7.22.5"
+ "@babel/plugin-transform-function-name" "^7.22.5"
+ "@babel/plugin-transform-json-strings" "^7.22.11"
+ "@babel/plugin-transform-literals" "^7.22.5"
+ "@babel/plugin-transform-logical-assignment-operators" "^7.22.11"
+ "@babel/plugin-transform-member-expression-literals" "^7.22.5"
+ "@babel/plugin-transform-modules-amd" "^7.22.5"
+ "@babel/plugin-transform-modules-commonjs" "^7.22.11"
+ "@babel/plugin-transform-modules-systemjs" "^7.22.11"
+ "@babel/plugin-transform-modules-umd" "^7.22.5"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.22.5"
+ "@babel/plugin-transform-new-target" "^7.22.5"
+ "@babel/plugin-transform-nullish-coalescing-operator" "^7.22.11"
+ "@babel/plugin-transform-numeric-separator" "^7.22.11"
+ "@babel/plugin-transform-object-rest-spread" "^7.22.11"
+ "@babel/plugin-transform-object-super" "^7.22.5"
+ "@babel/plugin-transform-optional-catch-binding" "^7.22.11"
+ "@babel/plugin-transform-optional-chaining" "^7.22.12"
+ "@babel/plugin-transform-parameters" "^7.22.5"
+ "@babel/plugin-transform-private-methods" "^7.22.5"
+ "@babel/plugin-transform-private-property-in-object" "^7.22.11"
+ "@babel/plugin-transform-property-literals" "^7.22.5"
+ "@babel/plugin-transform-regenerator" "^7.22.10"
+ "@babel/plugin-transform-reserved-words" "^7.22.5"
+ "@babel/plugin-transform-shorthand-properties" "^7.22.5"
+ "@babel/plugin-transform-spread" "^7.22.5"
+ "@babel/plugin-transform-sticky-regex" "^7.22.5"
+ "@babel/plugin-transform-template-literals" "^7.22.5"
+ "@babel/plugin-transform-typeof-symbol" "^7.22.5"
+ "@babel/plugin-transform-unicode-escapes" "^7.22.10"
+ "@babel/plugin-transform-unicode-property-regex" "^7.22.5"
+ "@babel/plugin-transform-unicode-regex" "^7.22.5"
+ "@babel/plugin-transform-unicode-sets-regex" "^7.22.5"
+ "@babel/preset-modules" "0.1.6-no-external-plugins"
+ "@babel/types" "^7.22.11"
+ babel-plugin-polyfill-corejs2 "^0.4.5"
+ babel-plugin-polyfill-corejs3 "^0.8.3"
+ babel-plugin-polyfill-regenerator "^0.5.2"
+ core-js-compat "^3.31.0"
+ semver "^6.3.1"
+
+"@babel/preset-modules@0.1.6-no-external-plugins":
+ version "0.1.6-no-external-plugins"
+ resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.6-no-external-plugins.tgz#ccb88a2c49c817236861fee7826080573b8a923a"
+ integrity sha512-HrcgcIESLm9aIR842yhJ5RWan/gebQUJ6E/E5+rf0y9o6oj7w0Br+sWuL6kEQ/o/AdfvR1Je9jG18/gnpwjEyA==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
- "@babel/plugin-proposal-unicode-property-regex" "^7.4.4"
- "@babel/plugin-transform-dotall-regex" "^7.4.4"
"@babel/types" "^7.4.4"
esutils "^2.0.2"
"@babel/preset-typescript@^7.13.0":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.21.5.tgz#68292c884b0e26070b4d66b202072d391358395f"
- integrity sha512-iqe3sETat5EOrORXiQ6rWfoOg2y68Cs75B9wNxdPW4kixJxh7aXQE1KPdWLDniC24T/6dSnguF33W9j/ZZQcmA==
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.22.11.tgz#f218cd0345524ac888aa3dc32f029de5b064b575"
+ integrity sha512-tWY5wyCZYBGY7IlalfKI1rLiGlIfnwsRHZqlky0HVv8qviwQ1Uo/05M6+s+TcTCVa6Bmoo2uJW5TMFX6Wa4qVg==
dependencies:
- "@babel/helper-plugin-utils" "^7.21.5"
- "@babel/helper-validator-option" "^7.21.0"
- "@babel/plugin-syntax-jsx" "^7.21.4"
- "@babel/plugin-transform-modules-commonjs" "^7.21.5"
- "@babel/plugin-transform-typescript" "^7.21.3"
+ "@babel/helper-plugin-utils" "^7.22.5"
+ "@babel/helper-validator-option" "^7.22.5"
+ "@babel/plugin-syntax-jsx" "^7.22.5"
+ "@babel/plugin-transform-modules-commonjs" "^7.22.11"
+ "@babel/plugin-transform-typescript" "^7.22.11"
"@babel/register@^7.13.16":
- version "7.21.0"
- resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.21.0.tgz#c97bf56c2472e063774f31d344c592ebdcefa132"
- integrity sha512-9nKsPmYDi5DidAqJaQooxIhsLJiNMkGr8ypQ8Uic7cIox7UCDsM7HuUGxdGT7mSDTYbqzIdsOWzfBton/YJrMw==
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/register/-/register-7.22.5.tgz#e4d8d0f615ea3233a27b5c6ada6750ee59559939"
+ integrity sha512-vV6pm/4CijSQ8Y47RH5SopXzursN35RQINfGJkmOlcpAtGuf94miFvIPhCKGQN7WGIcsgG1BHEX2KVdTYwTwUQ==
dependencies:
clone-deep "^4.0.1"
find-cache-dir "^2.0.0"
@@ -1002,45 +1080,45 @@
resolved "https://registry.yarnpkg.com/@babel/regjsgen/-/regjsgen-0.8.0.tgz#f0ba69b075e1f05fb2825b7fad991e7adbb18310"
integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
-"@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.8.4":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.21.5.tgz#8492dddda9644ae3bda3b45eabe87382caee7200"
- integrity sha512-8jI69toZqqcsnqGGqwGS4Qb1VwLOEp4hz+CXPywcvjs60u3B4Pom/U/7rm4W8tMOYEB+E9wgD0mW1l3r8qlI9Q==
- dependencies:
- regenerator-runtime "^0.13.11"
-
-"@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.3.3":
- version "7.20.7"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.20.7.tgz#a15090c2839a83b02aa996c0b4994005841fd5a8"
- integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
- dependencies:
- "@babel/code-frame" "^7.18.6"
- "@babel/parser" "^7.20.7"
- "@babel/types" "^7.20.7"
-
-"@babel/traverse@^7.14.9", "@babel/traverse@^7.20.5", "@babel/traverse@^7.21.5", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.21.5.tgz#ad22361d352a5154b498299d523cf72998a4b133"
- integrity sha512-AhQoI3YjWi6u/y/ntv7k48mcrCXmus0t79J9qPNlk/lAsFlCiJ047RmbfMOawySTHtywXhbXgpx/8nXMYd+oFw==
- dependencies:
- "@babel/code-frame" "^7.21.4"
- "@babel/generator" "^7.21.5"
- "@babel/helper-environment-visitor" "^7.21.5"
- "@babel/helper-function-name" "^7.21.0"
- "@babel/helper-hoist-variables" "^7.18.6"
- "@babel/helper-split-export-declaration" "^7.18.6"
- "@babel/parser" "^7.21.5"
- "@babel/types" "^7.21.5"
+"@babel/runtime@^7.15.4", "@babel/runtime@^7.21.0", "@babel/runtime@^7.22.6", "@babel/runtime@^7.8.4":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.11.tgz#7a9ba3bbe406ad6f9e8dd4da2ece453eb23a77a4"
+ integrity sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==
+ dependencies:
+ regenerator-runtime "^0.14.0"
+
+"@babel/template@^7.22.5", "@babel/template@^7.3.3":
+ version "7.22.5"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.22.5.tgz#0c8c4d944509875849bd0344ff0050756eefc6ec"
+ integrity sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==
+ dependencies:
+ "@babel/code-frame" "^7.22.5"
+ "@babel/parser" "^7.22.5"
+ "@babel/types" "^7.22.5"
+
+"@babel/traverse@^7.14.9", "@babel/traverse@^7.22.11", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.2":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.22.11.tgz#71ebb3af7a05ff97280b83f05f8865ac94b2027c"
+ integrity sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==
+ dependencies:
+ "@babel/code-frame" "^7.22.10"
+ "@babel/generator" "^7.22.10"
+ "@babel/helper-environment-visitor" "^7.22.5"
+ "@babel/helper-function-name" "^7.22.5"
+ "@babel/helper-hoist-variables" "^7.22.5"
+ "@babel/helper-split-export-declaration" "^7.22.6"
+ "@babel/parser" "^7.22.11"
+ "@babel/types" "^7.22.11"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.18.6", "@babel/types@^7.18.9", "@babel/types@^7.20.0", "@babel/types@^7.20.5", "@babel/types@^7.20.7", "@babel/types@^7.21.0", "@babel/types@^7.21.4", "@babel/types@^7.21.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
- version "7.21.5"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.21.5.tgz#18dfbd47c39d3904d5db3d3dc2cc80bedb60e5b6"
- integrity sha512-m4AfNvVF2mVC/F7fDEdH2El3HzUg9It/XsCxZiOTTA3m3qYfcSVSbTfM6Q9xG+hYDniZssYhlXKKUMD5m8tF4Q==
+"@babel/types@^7.0.0", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.11", "@babel/types@^7.22.5", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0":
+ version "7.22.11"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.22.11.tgz#0e65a6a1d4d9cbaa892b2213f6159485fe632ea2"
+ integrity sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==
dependencies:
- "@babel/helper-string-parser" "^7.21.5"
- "@babel/helper-validator-identifier" "^7.19.1"
+ "@babel/helper-string-parser" "^7.22.5"
+ "@babel/helper-validator-identifier" "^7.22.5"
to-fast-properties "^2.0.0"
"@bcoe/v8-coverage@^0.2.3":
@@ -1055,225 +1133,244 @@
dependencies:
arrify "^1.0.1"
-"@csstools/cascade-layer-name-parser@^1.0.2":
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.2.tgz#35253f57c6c83d684fe396672486c644e6a84127"
- integrity sha512-xm7Mgwej/wBfLoK0K5LfntmPJzoULayl1XZY9JYgQgT29JiqNw++sLnx95u5y9zCihblzkyaRYJrsRMhIBzRdg==
+"@csstools/cascade-layer-name-parser@^1.0.3", "@csstools/cascade-layer-name-parser@^1.0.4":
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@csstools/cascade-layer-name-parser/-/cascade-layer-name-parser-1.0.4.tgz#3ff490b84660dc0592b4315029f22908f3de0577"
+ integrity sha512-zXMGsJetbLoXe+gjEES07MEGjL0Uy3hMxmnGtVBrRpVKr5KV9OgCB09zr/vLrsEtoVQTgJFewxaU8IYSAE4tjg==
-"@csstools/color-helpers@^2.0.0":
- version "2.0.0"
- resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-2.0.0.tgz#4ac578cb00b4e853b94f2250267d85ba957c4fc9"
- integrity sha512-VcPjEnp07RNgz/D+oI2uIALg+IPCSl6mj0XhA3pl3F2bM2B95vgzatExmmzSg/X0zkh+R2v+jFY/J2pV/bnwpw==
+"@csstools/color-helpers@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@csstools/color-helpers/-/color-helpers-3.0.1.tgz#16013825e8c730de164a5dad27c299abae2eee18"
+ integrity sha512-Tsp6FcSPaPN/+4T7iBPxBVopJUs7bimnNx4yuWeGXkH084Vro/y8fmrGg1LGSWH8SU6YuH20fP5Rtqtb979jyw==
-"@csstools/css-calc@^1.1.1":
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-1.1.1.tgz#c622728b7f0c9aae70952623c2b0d3d114752987"
- integrity sha512-Nh+iLCtjlooTzuR0lpmB8I6hPX/VupcGQ3Z1U2+wgJJ4fa8+cWkub+lCsbZcYPzBGsZLEL8fQAg+Na5dwEFJxg==
+"@csstools/css-calc@^1.1.3":
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/@csstools/css-calc/-/css-calc-1.1.3.tgz#75e07eec075f1f3df0ce25575dab3d63da2bd680"
+ integrity sha512-7mJZ8gGRtSQfQKBQFi5N0Z+jzNC0q8bIkwojP1W0w+APzEqHu5wJoGVsvKxVnVklu9F8tW1PikbBRseYnAdv+g==
-"@csstools/css-color-parser@^1.1.2":
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-1.1.2.tgz#e5956c0fe9c30d9f228b0e37173ff61f0dd89dad"
- integrity sha512-MjW/VspbFSkvbuou7tUUu2+FAlAR7VJ/PA69M9EGKltThbONC8nyW33wHRzNvLzRLGstZLEO5X5oR7IMhMDi0A==
+"@csstools/css-color-parser@^1.3.0":
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/@csstools/css-color-parser/-/css-color-parser-1.3.0.tgz#e360fa8abbb64556475caf55137338cfe4ba6752"
+ integrity sha512-jgudbE+TXZLssSTGFRCkJF9gAM8ABZ2c9/gbLupwA8Y1SpcddxK2z74/MOSdWuboUHbshei8uSQNbp9Wu1Bx+Q==
dependencies:
- "@csstools/color-helpers" "^2.0.0"
- "@csstools/css-calc" "^1.1.1"
+ "@csstools/color-helpers" "^3.0.1"
+ "@csstools/css-calc" "^1.1.3"
-"@csstools/css-parser-algorithms@^2.1.1":
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.1.1.tgz#7b62e6412a468a2d1096ed267edd1e4a7fd4a119"
- integrity sha512-viRnRh02AgO4mwIQb2xQNJju0i+Fh9roNgmbR5xEuG7J3TGgxjnE95HnBLgsFJOJOksvcfxOUCgODcft6Y07cA==
+"@csstools/css-parser-algorithms@^2.3.0", "@csstools/css-parser-algorithms@^2.3.1":
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/@csstools/css-parser-algorithms/-/css-parser-algorithms-2.3.1.tgz#ec4fc764ba45d2bb7ee2774667e056aa95003f3a"
+ integrity sha512-xrvsmVUtefWMWQsGgFffqWSK03pZ1vfDki4IVIIUxxDKnGBzqNgv0A7SB1oXtVNEkcVO8xi1ZrTL29HhSu5kGA==
-"@csstools/css-tokenizer@^2.1.1":
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.1.1.tgz#07ae11a0a06365d7ec686549db7b729bc036528e"
- integrity sha512-GbrTj2Z8MCTUv+52GE0RbFGM527xuXZ0Xa5g0Z+YN573uveS4G0qi6WNOMyz3yrFM/jaILTTwJ0+umx81EzqfA==
+"@csstools/css-tokenizer@^2.1.1", "@csstools/css-tokenizer@^2.2.0":
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/@csstools/css-tokenizer/-/css-tokenizer-2.2.0.tgz#9d70e6dcbe94e44c7400a2929928db35c4de32b5"
+ integrity sha512-wErmsWCbsmig8sQKkM6pFhr/oPha1bHfvxsUY5CYSQxwyhA9Ulrs8EqCgClhg4Tgg2XapVstGqSVcz0xOYizZA==
-"@csstools/media-query-list-parser@^2.0.4":
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.0.4.tgz#466bd254041530dfd1e88bcb1921e8ca4af75b6a"
- integrity sha512-GyYot6jHgcSDZZ+tLSnrzkR7aJhF2ZW6d+CXH66mjy5WpAQhZD4HDke2OQ36SivGRWlZJpAz7TzbW6OKlEpxAA==
+"@csstools/media-query-list-parser@^2.1.2", "@csstools/media-query-list-parser@^2.1.4":
+ version "2.1.4"
+ resolved "https://registry.yarnpkg.com/@csstools/media-query-list-parser/-/media-query-list-parser-2.1.4.tgz#0017f99945f6c16dd81a7aacf6821770933c3a5c"
+ integrity sha512-V/OUXYX91tAC1CDsiY+HotIcJR+vPtzrX8pCplCpT++i8ThZZsq5F5dzZh/bDM3WUOjrvC1ljed1oSJxMfjqhw==
-"@csstools/postcss-cascade-layers@^3.0.1":
- version "3.0.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-3.0.1.tgz#d839386e90428b448e3f75276bc01d516e852a0d"
- integrity sha512-dD8W98dOYNOH/yX4V4HXOhfCOnvVAg8TtsL+qCGNoKXuq5z2C/d026wGWgySgC8cajXXo/wNezS31Glj5GcqrA==
+"@csstools/postcss-cascade-layers@^4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-4.0.0.tgz#21f8556de640f9f9ccfb950c49a886280fe5497e"
+ integrity sha512-dVPVVqQG0FixjM9CG/+8eHTsCAxRKqmNh6H69IpruolPlnEF1611f2AoLK8TijTSAsqBSclKd4WHs1KUb/LdJw==
dependencies:
- "@csstools/selector-specificity" "^2.0.2"
- postcss-selector-parser "^6.0.10"
+ "@csstools/selector-specificity" "^3.0.0"
+ postcss-selector-parser "^6.0.13"
-"@csstools/postcss-color-function@^2.2.1":
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-2.2.1.tgz#fa28cc742c29ae63dbe0812dd9a03998a67dd318"
- integrity sha512-T52iiqmzyKk09B9iNTQbuWa9Tn83SztXY7o6r2+j+o1BS/7+CiCjTgN2HgzybDmx8cr6XYhQ1BzqgV9tJzhrmw==
+"@csstools/postcss-color-function@^3.0.2":
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-3.0.2.tgz#7aaf941f8bcdc597287b05956e5859c429d740fe"
+ integrity sha512-sfEBBWVMNPE3mHllI+FR43W2qy7eIjqCySAoivPFV068yKbUy6mH8Sra5Gjar54M3p2qvH8S/6KPlvEDBTvrmg==
dependencies:
- "@csstools/css-color-parser" "^1.1.2"
- "@csstools/css-parser-algorithms" "^2.1.1"
- "@csstools/css-tokenizer" "^2.1.1"
- "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+ "@csstools/css-color-parser" "^1.3.0"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.0"
-"@csstools/postcss-color-mix-function@^1.0.1":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-1.0.1.tgz#587f7df69d40f84c7bb4e9d7f178266cb7f6851b"
- integrity sha512-NSVrzjVcI4TMzDfh6GKZXvEuelT81xpXzruuTNJrwKMTZXEBHY9G2gvmr0eC0wwmL8EF1TblXyPPfBbZobvfXg==
+"@csstools/postcss-color-mix-function@^2.0.2":
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-color-mix-function/-/postcss-color-mix-function-2.0.2.tgz#d39e54d4325e1a14784e4aa82676cc9e04636a0d"
+ integrity sha512-121MUtL/fv+lO9FQJKP05UAKC6xYl4hZYyWl+pGbfXIa3KkgCbcMfhkIc0zV2JpwsB5uhls81bwl+XJKhKwECw==
dependencies:
- "@csstools/css-color-parser" "^1.1.2"
- "@csstools/css-parser-algorithms" "^2.1.1"
- "@csstools/css-tokenizer" "^2.1.1"
- "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+ "@csstools/css-color-parser" "^1.3.0"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.0"
-"@csstools/postcss-font-format-keywords@^2.0.2":
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-2.0.2.tgz#d798d96f4af6cddcfee459f598c976e6011042d2"
- integrity sha512-iKYZlIs6JsNT7NKyRjyIyezTCHLh4L4BBB3F5Nx7Dc4Z/QmBgX+YJFuUSar8IM6KclGiAUFGomXFdYxAwJydlA==
+"@csstools/postcss-exponential-functions@^1.0.0":
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-exponential-functions/-/postcss-exponential-functions-1.0.0.tgz#2e558ad2856e0c737d9cb98a5d91cfe8d785c9f6"
+ integrity sha512-FPndJ/7oGlML7/4EhLi902wGOukO0Nn37PjwOQGc0BhhjQPy3np3By4d3M8s9Cfmp9EHEKgUHRN2DQ5HLT/hTw==
+ dependencies:
+ "@csstools/css-calc" "^1.1.3"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
+
+"@csstools/postcss-font-format-keywords@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-3.0.0.tgz#9ca3a3ca67122862addf8a1c0c61a6db02dea1cc"
+ integrity sha512-ntkGj+1uDa/u6lpjPxnkPcjJn7ChO/Kcy08YxctOZI7vwtrdYvFhmE476dq8bj1yna306+jQ9gzXIG/SWfOaRg==
dependencies:
postcss-value-parser "^4.2.0"
-"@csstools/postcss-gradients-interpolation-method@^3.0.4":
- version "3.0.4"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-3.0.4.tgz#c03402087c41feee0115f714cc87696e6424ba92"
- integrity sha512-GgKoY7OlvL65UPigEdlrvMAUCR5kOQCjtue2/36TPrBNoRS6KM2KOqmjIVsxEwYYwK+L28pdnM8r10m03hhZxA==
+"@csstools/postcss-gradients-interpolation-method@^4.0.2":
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-gradients-interpolation-method/-/postcss-gradients-interpolation-method-4.0.2.tgz#355595cfdb3f679361645ded3eccf047f023b9c4"
+ integrity sha512-ogriVRZFMgV/oS4pwuXTdFJ7I+saq0oSHzev/XsvXOoRHXOK9jB2q6zEfl3o1Edl0X2wHmacwtfRk8RBmopnYw==
dependencies:
- "@csstools/css-color-parser" "^1.1.2"
- "@csstools/css-parser-algorithms" "^2.1.1"
- "@csstools/css-tokenizer" "^2.1.1"
- "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+ "@csstools/css-color-parser" "^1.3.0"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.0"
-"@csstools/postcss-hwb-function@^2.2.1":
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-2.2.1.tgz#ab50918104e4ef500c42e55e4ccdd27fc33d52b9"
- integrity sha512-eiqB4DIs+xqProAly7KwIgE04oze1YHb0QSCw/Y7062d9gpw+Cdif3Y0Z+Te+U7JROYdO0/0j91A6Qy8fo/Rlw==
+"@csstools/postcss-hwb-function@^3.0.2":
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-3.0.2.tgz#1be05b598901864a54ef8d75b0a52ea94ce7e91d"
+ integrity sha512-K4W97KaMnCLUS7/hfdxsM10ghPtIwfYP+VGUwpMgNYa7LVwE+9vkL/N/hzwqSShICtWD6doX1yAT0qcKUbgs0w==
dependencies:
- "@csstools/css-color-parser" "^1.1.2"
- "@csstools/css-parser-algorithms" "^2.1.1"
- "@csstools/css-tokenizer" "^2.1.1"
+ "@csstools/css-color-parser" "^1.3.0"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
-"@csstools/postcss-ic-unit@^2.0.2":
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-2.0.2.tgz#5a5e481c53977deec3d63793788eec924d4c5f7d"
- integrity sha512-N84qGTJkfLTPj2qOG5P4CIqGjpZBbjOEMKMn+UjO5wlb9lcBTfBsxCF0lQsFdWJUzBHYFOz19dL66v71WF3Pig==
+"@csstools/postcss-ic-unit@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-3.0.0.tgz#bbc55170d880daa3cc096ee160e8f2492a48e881"
+ integrity sha512-FH3+zfOfsgtX332IIkRDxiYLmgwyNk49tfltpC6dsZaO4RV2zWY6x9VMIC5cjvmjlDO7DIThpzqaqw2icT8RbQ==
dependencies:
- "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.0"
postcss-value-parser "^4.2.0"
-"@csstools/postcss-is-pseudo-class@^3.2.0":
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-3.2.0.tgz#1277cc187bdb075013341dab42b4140d1cafae27"
- integrity sha512-uooelBL99jMg8ZD6xy0Pj1hSalchWmplcin00eI+JHpv1jW2iwbi1cn2UnVsToM4JLwJSZFzTSWCgSpmlyhe3A==
+"@csstools/postcss-is-pseudo-class@^4.0.0":
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-4.0.0.tgz#954c489cf207a7cfeaf4d96d39fac50757dc48cf"
+ integrity sha512-0I6siRcDymG3RrkNTSvHDMxTQ6mDyYE8awkcaHNgtYacd43msl+4ZWDfQ1yZQ/viczVWjqJkLmPiRHSgxn5nZA==
dependencies:
- "@csstools/selector-specificity" "^2.0.0"
- postcss-selector-parser "^6.0.10"
+ "@csstools/selector-specificity" "^3.0.0"
+ postcss-selector-parser "^6.0.13"
-"@csstools/postcss-logical-float-and-clear@^1.0.1":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-float-and-clear/-/postcss-logical-float-and-clear-1.0.1.tgz#d255ea7aad18880930b63d8a04164f56182f2ecf"
- integrity sha512-eO9z2sMLddvlfFEW5Fxbjyd03zaO7cJafDurK4rCqyRt9P7aaWwha0LcSzoROlcZrw1NBV2JAp2vMKfPMQO1xw==
+"@csstools/postcss-logical-float-and-clear@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-float-and-clear/-/postcss-logical-float-and-clear-2.0.0.tgz#15e1b5d16dce01ad1e676167d0909e3958234eb5"
+ integrity sha512-Wki4vxsF6icRvRz8eF9bPpAvwaAt0RHwhVOyzfoFg52XiIMjb6jcbHkGxwpJXP4DVrnFEwpwmrz5aTRqOW82kg==
-"@csstools/postcss-logical-resize@^1.0.1":
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-resize/-/postcss-logical-resize-1.0.1.tgz#826d3de929d7d786c32c2c118f78e813a1c2cdec"
- integrity sha512-x1ge74eCSvpBkDDWppl+7FuD2dL68WP+wwP2qvdUcKY17vJksz+XoE1ZRV38uJgS6FNUwC0AxrPW5gy3MxsDHQ==
+"@csstools/postcss-logical-resize@^2.0.0":
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-resize/-/postcss-logical-resize-2.0.0.tgz#751bd5aab335c9973e346e3edacb2a0a16fa8296"
+ integrity sha512-lCQ1aX8c5+WI4t5EoYf3alTzJNNocMqTb+u1J9CINdDhFh1fjovqK+0aHalUHsNstZmzFPNzIkU4Mb3eM9U8SA==
dependencies:
postcss-value-parser "^4.2.0"
-"@csstools/postcss-logical-viewport-units@^1.0.3":
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-1.0.3.tgz#63e212954015ecdc493878601c3daa4da6ba6714"
- integrity sha512-6zqcyRg9HSqIHIPMYdt6THWhRmE5/tyHKJQLysn2TeDf/ftq7Em9qwMTx98t2C/7UxIsYS8lOiHHxAVjWn2WUg==
+"@csstools/postcss-logical-viewport-units@^2.0.1":
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-logical-viewport-units/-/postcss-logical-viewport-units-2.0.1.tgz#2921034d11d60ea7340ebe795bb4fe60f32ebbae"
+ integrity sha512-R5s19SscS7CHoxvdYNMu2Y3WDwG4JjdhsejqjunDB1GqfzhtHSvL7b5XxCkUWqm2KRl35hI6kJ4HEaCDd/3BXg==
dependencies:
- "@csstools/css-tokenizer" "^2.1.1"
+ "@csstools/css-tokenizer" "^2.2.0"
-"@csstools/postcss-media-minmax@^1.0.2":
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.0.2.tgz#77efc4fdd96c7ff97f0d714c940187d25fd87619"
- integrity sha512-DsEykSINZTqlBefi1uSQBym1Rj0NQOj92dLRd5jUQpSy8yBVaXXmkiUgBUbb+gQh8imAdqPpz2v4sAUnw8yXXA==
+"@csstools/postcss-media-minmax@^1.0.7":
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-media-minmax/-/postcss-media-minmax-1.0.7.tgz#6701cf1141d28b5240de9bfae083c8a0af0daa00"
+ integrity sha512-5LGLdu8cJgRPmvkjUNqOPKIKeHbyQmoGKooB5Rh0mp5mLaNI9bl+IjFZ2keY0cztZYsriJsGf6Lu8R5XetuwoQ==
dependencies:
- "@csstools/css-calc" "^1.1.1"
- "@csstools/css-parser-algorithms" "^2.1.1"
- "@csstools/css-tokenizer" "^2.1.1"
- "@csstools/media-query-list-parser" "^2.0.4"
+ "@csstools/css-calc" "^1.1.3"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/media-query-list-parser" "^2.1.4"
-"@csstools/postcss-media-queries-aspect-ratio-number-values@^1.0.2":
- version "1.0.2"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-1.0.2.tgz#23ca3c3decc79d9089c2028ded20a97a2c784eee"
- integrity sha512-rOSR5p+5m0joXUoitYgCyMqNCu97yfLsLG3cnNaM8VeJRCWHGEu5hE9Gv0M7n9A4wo2pYF8QqaxkTlWbSJY9Fg==
+"@csstools/postcss-media-queries-aspect-ratio-number-values@^2.0.2":
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-media-queries-aspect-ratio-number-values/-/postcss-media-queries-aspect-ratio-number-values-2.0.2.tgz#8cb8865ad6311756b5de5179fb65b9c008406b69"
+ integrity sha512-kQJR6NvTRidsaRjCdHGjra2+fLoFiDQOm5B2aZrhmXqng/hweXjruboKzB326rxQO2L0m0T+gCKbZgyuncyhLg==
dependencies:
- "@csstools/css-parser-algorithms" "^2.1.1"
- "@csstools/css-tokenizer" "^2.1.1"
- "@csstools/media-query-list-parser" "^2.0.4"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/media-query-list-parser" "^2.1.4"
-"@csstools/postcss-nested-calc@^2.0.2":
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-nested-calc/-/postcss-nested-calc-2.0.2.tgz#a0857650ef88b1aa7b094c7ea8ea1378c35695e0"
- integrity sha512-jbwrP8rN4e7LNaRcpx3xpMUjhtt34I9OV+zgbcsYAAk6k1+3kODXJBf95/JMYWhu9g1oif7r06QVUgfWsKxCFw==
+"@csstools/postcss-nested-calc@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-nested-calc/-/postcss-nested-calc-3.0.0.tgz#b9069f5e1c2ea08de3840a5922e39af4e0ecf4b1"
+ integrity sha512-HsB66aDWAouOwD/GcfDTS0a7wCuVWaTpXcjl5VKP0XvFxDiU+r0T8FG7xgb6ovZNZ+qzvGIwRM+CLHhDgXrYgQ==
dependencies:
postcss-value-parser "^4.2.0"
-"@csstools/postcss-normalize-display-values@^2.0.1":
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-2.0.1.tgz#35dc188c5b4713cf902959fe3c8ce613fcb7543e"
- integrity sha512-TQT5g3JQ5gPXC239YuRK8jFceXF9d25ZvBkyjzBGGoW5st5sPXFVQS8OjYb9IJ/K3CdfK4528y483cgS2DJR/w==
+"@csstools/postcss-normalize-display-values@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-3.0.0.tgz#de995eeafe217ac1854a7135b1db44c57487e9ea"
+ integrity sha512-6Nw55PRXEKEVqn3bzA8gRRPYxr5tf5PssvcE5DRA/nAxKgKtgNZMCHCSd1uxTCWeyLnkf6h5tYRSB0P1Vh/K/A==
dependencies:
postcss-value-parser "^4.2.0"
-"@csstools/postcss-oklab-function@^2.2.1":
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-2.2.1.tgz#4f8f4d8d69e6e479e094b5d327c7b259352e8b81"
- integrity sha512-g4wrVopp6xXr1KetUK4Lj36P+PFPwvUUtd2gaqo7X/0xgJHmMtKMPhD9p77H9bmIpPtkIYQ8b7+7cdmrWNEVAw==
+"@csstools/postcss-oklab-function@^3.0.2":
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-3.0.2.tgz#50b057d5791293388a180a3fbcf256638edce7f1"
+ integrity sha512-tr7HjHDaDvRcnzK559l3VcpfhiAd0ga1jhThGR/tONfVzOVssG9x0QLg0LpLrlx7+niGgHL1SdfgHmFiTJjGIw==
dependencies:
- "@csstools/css-color-parser" "^1.1.2"
- "@csstools/css-parser-algorithms" "^2.1.1"
- "@csstools/css-tokenizer" "^2.1.1"
- "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+ "@csstools/css-color-parser" "^1.3.0"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.0"
-"@csstools/postcss-progressive-custom-properties@^2.0.0", "@csstools/postcss-progressive-custom-properties@^2.1.0":
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-2.1.1.tgz#82df9314451db63bf7f4975a4d32f148e85db490"
- integrity sha512-6p8eO5+j+9hn4h2Klr9dbmya0GIb9SRrnPaCxqR1muVlV1waAZq6YkmlApEwXrox9qxggSwGZD5TnLRIY9f7WA==
+"@csstools/postcss-progressive-custom-properties@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-3.0.0.tgz#bb86ae4bb7f2206b0cf6e9b8f0bfc191f67271d8"
+ integrity sha512-2/D3CCL9DN2xhuUTP8OKvKnaqJ1j4yZUxuGLsCUOQ16wnDAuMLKLkflOmZF5tsPh/02VPeXRmqIN+U595WAulw==
dependencies:
postcss-value-parser "^4.2.0"
-"@csstools/postcss-scope-pseudo-class@^2.0.2":
+"@csstools/postcss-relative-color-syntax@^2.0.2":
version "2.0.2"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-scope-pseudo-class/-/postcss-scope-pseudo-class-2.0.2.tgz#6325e1e3b321093c59b008ec670bb772e17f06fe"
- integrity sha512-6Pvo4uexUCXt+Hz5iUtemQAcIuCYnL+ePs1khFR6/xPgC92aQLJ0zGHonWoewiBE+I++4gXK3pr+R1rlOFHe5w==
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-relative-color-syntax/-/postcss-relative-color-syntax-2.0.2.tgz#cf02471e8e71fdc8bfc668b1e60d27bd705b883d"
+ integrity sha512-sn2zqcM8QPj4wN2okdNbK0JdwhZU506EEmIeSybh2UOJgTorbyQS7ak2sJ+2Y4LDYr4rPGBs/hBFmyYgoostdg==
dependencies:
- postcss-selector-parser "^6.0.10"
+ "@csstools/css-color-parser" "^1.3.0"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.0"
-"@csstools/postcss-stepped-value-functions@^2.1.1":
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-2.1.1.tgz#f31aa0e7bd0ce3e4a0450573e1e27ce5e602b100"
- integrity sha512-YCvdF0GCZK35nhLgs7ippcxDlRVe5QsSht3+EghqTjnYnyl3BbWIN6fYQ1dKWYTJ+7Bgi41TgqQFfJDcp9Xy/w==
+"@csstools/postcss-scope-pseudo-class@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-scope-pseudo-class/-/postcss-scope-pseudo-class-3.0.0.tgz#23f32181b7de9a33e7c7c71f7620b78284955b82"
+ integrity sha512-GFNVsD97OuEcfHmcT0/DAZWAvTM/FFBDQndIOLawNc1Wq8YqpZwBdHa063Lq+Irk7azygTT+Iinyg3Lt76p7rg==
dependencies:
- "@csstools/css-calc" "^1.1.1"
- "@csstools/css-parser-algorithms" "^2.1.1"
- "@csstools/css-tokenizer" "^2.1.1"
+ postcss-selector-parser "^6.0.13"
-"@csstools/postcss-text-decoration-shorthand@^2.2.3":
- version "2.2.3"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-2.2.3.tgz#e634a488aa5ba252907deb787ad6cc24b8c2bb0a"
- integrity sha512-PADJidg/tdhDk120aWlGuDxsp5ZTc9Nx7GhJ8t0qBCk5fOgLK6V3DsB9X6sOAhDokIihXKzjtUu15puac5McWw==
+"@csstools/postcss-stepped-value-functions@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-3.0.1.tgz#c337a8ae09bec13cdf6c95f63a58b407f6965557"
+ integrity sha512-y1sykToXorFE+5cjtp//xAMWEAEple0kcZn2QhzEFIZDDNvGOCp5JvvmmPGsC3eDlj6yQp70l9uXZNLnimEYfA==
dependencies:
- "@csstools/color-helpers" "^2.0.0"
+ "@csstools/css-calc" "^1.1.3"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
+
+"@csstools/postcss-text-decoration-shorthand@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-3.0.1.tgz#c15bb95fe075ee4972c8fbc2fe4644a547cb6823"
+ integrity sha512-a5Ojrf31XfdsmFhbLR41JG8HD9d7mWeOqROUJpTi9MTJDAHeJstvhrmpHS39C11luwSHanLou4v3PI9xLbWolQ==
+ dependencies:
+ "@csstools/color-helpers" "^3.0.1"
postcss-value-parser "^4.2.0"
-"@csstools/postcss-trigonometric-functions@^2.1.1":
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-2.1.1.tgz#871a2048b0f81495d6cd8858ffb1fb04231ca741"
- integrity sha512-XcXmHEFfHXhvYz40FtDlA4Fp4NQln2bWTsCwthd2c+MCnYArUYU3YaMqzR5CrKP3pMoGYTBnp5fMqf1HxItNyw==
+"@csstools/postcss-trigonometric-functions@^3.0.1":
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-3.0.1.tgz#06148aa8624b69a6573adb40ed27d3d019875caa"
+ integrity sha512-hW+JPv0MPQfWC1KARgvJI6bisEUFAZWSvUNq/khGCupYV/h6Z9R2ZFz0Xc633LXBst0ezbXpy7NpnPurSx5Klw==
dependencies:
- "@csstools/css-calc" "^1.1.1"
- "@csstools/css-parser-algorithms" "^2.1.1"
- "@csstools/css-tokenizer" "^2.1.1"
+ "@csstools/css-calc" "^1.1.3"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
-"@csstools/postcss-unset-value@^2.0.1":
- version "2.0.1"
- resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-2.0.1.tgz#67091dd6cff556bff896c95053eb070cc6b21c25"
- integrity sha512-oJ9Xl29/yU8U7/pnMJRqAZd4YXNCfGEdcP4ywREuqm/xMqcgDNDppYRoCGDt40aaZQIEKBS79LytUDN/DHf0Ew==
+"@csstools/postcss-unset-value@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/postcss-unset-value/-/postcss-unset-value-3.0.0.tgz#6d2f08140b41d3e70d805ccd2baaf64a6f59fdac"
+ integrity sha512-P0JD1WHh3avVyKKRKjd0dZIjCEeaBer8t1BbwGMUDtSZaLhXlLNBqZ8KkqHzYWXOJgHleXAny2/sx8LYl6qhEA==
-"@csstools/selector-specificity@^2.0.0", "@csstools/selector-specificity@^2.0.1", "@csstools/selector-specificity@^2.0.2":
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
- integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
+"@csstools/selector-specificity@^3.0.0":
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-3.0.0.tgz#798622546b63847e82389e473fd67f2707d82247"
+ integrity sha512-hBI9tfBtuPIi885ZsZ32IMEU/5nlZH/KOVYJCOh7gyMxaVLGmLedYqFN6Ui1LXkI8JlC8IsuC0rF0btcRZKd5g==
"@discoveryjs/json-ext@0.5.7":
version "0.5.7"
@@ -1529,41 +1626,36 @@
"@jridgewell/sourcemap-codec" "^1.4.10"
"@jridgewell/trace-mapping" "^0.3.9"
-"@jridgewell/resolve-uri@3.1.0":
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
- integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+"@jridgewell/resolve-uri@^3.1.0":
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
+ integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
"@jridgewell/set-array@^1.0.1":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
-"@jridgewell/source-map@^0.3.2":
- version "0.3.3"
- resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.3.tgz#8108265659d4c33e72ffe14e33d6cc5eb59f2fda"
- integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==
+"@jridgewell/source-map@^0.3.3":
+ version "0.3.5"
+ resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
+ integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
dependencies:
"@jridgewell/gen-mapping" "^0.3.0"
"@jridgewell/trace-mapping" "^0.3.9"
-"@jridgewell/sourcemap-codec@1.4.14":
- version "1.4.14"
- resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
- integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
-
-"@jridgewell/sourcemap-codec@^1.4.10":
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
version "1.4.15"
resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
- version "0.3.18"
- resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz#25783b2086daf6ff1dcb53c9249ae480e4dd4cd6"
- integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
+ version "0.3.19"
+ resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811"
+ integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==
dependencies:
- "@jridgewell/resolve-uri" "3.1.0"
- "@jridgewell/sourcemap-codec" "1.4.14"
+ "@jridgewell/resolve-uri" "^3.1.0"
+ "@jridgewell/sourcemap-codec" "^1.4.14"
"@mdi/js@^5.8.55":
version "5.9.55"
@@ -1614,40 +1706,41 @@
mkdirp "^1.0.4"
rimraf "^3.0.2"
-"@nuxt/babel-preset-app@2.16.3":
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.16.3.tgz#223c98c6799b7ca293fece960b5db59eb9c0115e"
- integrity sha512-FZnQUnnXvGTXPnnwAMa9gRmSu16Wn796NffzwBzKQHoKVkal2HJcZ+D7/EnqeqVd8dFijFCrdquEj1WoastUSA==
+"@nuxt/babel-preset-app@2.17.1":
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/@nuxt/babel-preset-app/-/babel-preset-app-2.17.1.tgz#481ac0f47c873c89c16d6de4e72d0319f1654326"
+ integrity sha512-V/6ELr8n7VQtBefJcT6K5KRPp5NxUFTCVHcZmrY8d4tyd6ad1WKp8uQGF6+cYKRzpEyMLn8yvu0+lD0CzraOrw==
dependencies:
- "@babel/compat-data" "^7.21.0"
- "@babel/core" "^7.21.3"
- "@babel/helper-compilation-targets" "^7.20.7"
- "@babel/helper-module-imports" "^7.18.6"
+ "@babel/compat-data" "^7.22.9"
+ "@babel/core" "^7.22.9"
+ "@babel/helper-compilation-targets" "^7.22.9"
+ "@babel/helper-module-imports" "^7.22.5"
"@babel/plugin-proposal-class-properties" "^7.18.6"
- "@babel/plugin-proposal-decorators" "^7.21.0"
+ "@babel/plugin-proposal-decorators" "^7.22.7"
"@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
"@babel/plugin-proposal-optional-chaining" "^7.21.0"
"@babel/plugin-proposal-private-methods" "^7.18.6"
- "@babel/plugin-transform-runtime" "^7.21.0"
- "@babel/preset-env" "^7.20.2"
- "@babel/runtime" "^7.21.0"
+ "@babel/plugin-proposal-private-property-in-object" "^7.21.11"
+ "@babel/plugin-transform-runtime" "^7.22.9"
+ "@babel/preset-env" "^7.22.9"
+ "@babel/runtime" "^7.22.6"
"@vue/babel-preset-jsx" "^1.4.0"
- core-js "^3.19.0"
- core-js-compat "^3.29.1"
+ core-js "^3.31.1"
+ core-js-compat "^3.31.1"
regenerator-runtime "^0.13.11"
-"@nuxt/builder@2.16.3":
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.16.3.tgz#7c30bbf00c7c9a7d27d24a24414f2a20fd00f0d6"
- integrity sha512-yQWqr1YnlgOyqT/au1rgORAL3BkH2gJ4Dn2o5DDUGZQZLnkhEAYB5WblTk8e78xENhjfzIYF3pqzxMhMqNxqBw==
+"@nuxt/builder@2.17.1":
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/@nuxt/builder/-/builder-2.17.1.tgz#c42dcf07697cd83a499260dd3978f15331141320"
+ integrity sha512-gW0zkpxpYwrcYHLyDY6pGlL647WFEX3kCFvd/dhb64X+piHCusXuzAL0O7fh+/+MpV+Tbt7VUQ/nhxjlXraIHA==
dependencies:
- "@nuxt/devalue" "^2.0.0"
- "@nuxt/utils" "2.16.3"
- "@nuxt/vue-app" "2.16.3"
- "@nuxt/webpack" "2.16.3"
+ "@nuxt/devalue" "^2.0.2"
+ "@nuxt/utils" "2.17.1"
+ "@nuxt/vue-app" "2.17.1"
+ "@nuxt/webpack" "2.17.1"
chalk "^4.1.2"
chokidar "^3.5.3"
- consola "^2.15.3"
+ consola "^3.2.3"
fs-extra "^10.1.0"
glob "^8.1.0"
hash-sum "^2.0.0"
@@ -1657,21 +1750,21 @@
serialize-javascript "^6.0.1"
upath "^2.0.1"
-"@nuxt/cli@2.16.3":
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.16.3.tgz#ef211391daaacceef508cdb1ab4d8dfc616923f7"
- integrity sha512-zml8eW+1MkSquGwL8ywyb6T8N5tPpt85Zl9imxcyR79lukcnzmfIhlz4o25rEtrpii5wKTbebmHE7vldJcu/bA==
+"@nuxt/cli@2.17.1":
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/@nuxt/cli/-/cli-2.17.1.tgz#0ccdaa277981ce32833f445c6a6846bcf3d80470"
+ integrity sha512-YLrs8dHtHGfnz86Rrl2KegtgOTKU4nJPUZDsRctbsuwqMJimkFn06Tj+n01fBXH9uHUREEStDx5on6O1NsCicw==
dependencies:
- "@nuxt/config" "2.16.3"
- "@nuxt/utils" "2.16.3"
+ "@nuxt/config" "2.17.1"
+ "@nuxt/utils" "2.17.1"
boxen "^5.1.2"
chalk "^4.1.2"
compression "^1.7.4"
connect "^3.7.0"
- consola "^2.15.3"
+ consola "^3.2.3"
crc "^4.3.2"
defu "^6.1.2"
- destr "^1.2.2"
+ destr "^2.0.0"
execa "^5.1.1"
exit "^0.1.2"
fs-extra "^10.1.0"
@@ -1681,9 +1774,9 @@
minimist "^1.2.8"
opener "1.5.2"
pretty-bytes "^5.6.0"
- semver "^7.3.8"
+ semver "^7.5.4"
serve-static "^1.15.0"
- std-env "^3.3.2"
+ std-env "^3.3.3"
upath "^2.0.1"
wrap-ansi "^7.0.0"
@@ -1701,36 +1794,36 @@
upath "^2.0.1"
vue-template-compiler "^2.6.14"
-"@nuxt/config@2.16.3":
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.16.3.tgz#88addc90535a120ed32ef53f4c2a1cb09a662809"
- integrity sha512-hBvr5/b5CS6UdXPgB8q/jvQHS0Bprf+b0hknL6ks4EkxhtNKM1Et3a0s3V3Gh/odLkkJ9yrtihFF+CymzBm6ew==
+"@nuxt/config@2.17.1":
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/@nuxt/config/-/config-2.17.1.tgz#f44d73a535394eea756bd291187bbd7b799886e1"
+ integrity sha512-yn9XbBdIKgRkHP7pRzYAgZY/j5GRSV2KM42nXFNDaBWbv6X619Y4fbhrabi+0y2o6EG93n1BvgIfcHzwbEAaKw==
dependencies:
- "@nuxt/utils" "2.16.3"
- consola "^2.15.3"
+ "@nuxt/utils" "2.17.1"
+ consola "^3.2.3"
defu "^6.1.2"
- destr "^1.2.2"
- dotenv "^16.0.3"
+ destr "^2.0.0"
+ dotenv "^16.3.1"
lodash "^4.17.21"
- rc9 "^2.0.1"
- std-env "^3.3.2"
- ufo "^1.1.1"
-
-"@nuxt/core@2.16.3":
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.16.3.tgz#185860c73a980285e895106cb506db2a7f7891da"
- integrity sha512-74351lKHZUxg3LxgtxUOCfTn6RHZZ4KtLKkGVr1YBkEuk/EtsOtkGUZI6psDk0RkXmxBtRk075neMfmaD7RAlQ==
- dependencies:
- "@nuxt/config" "2.16.3"
- "@nuxt/server" "2.16.3"
- "@nuxt/utils" "2.16.3"
- consola "^2.15.3"
+ rc9 "^2.1.1"
+ std-env "^3.3.3"
+ ufo "^1.1.2"
+
+"@nuxt/core@2.17.1":
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/@nuxt/core/-/core-2.17.1.tgz#061e79995033fc8554b68c1dc319353e31b61a9f"
+ integrity sha512-FQhJ4KM3taMfS+rZGtEsHt06EGKBDquDGS5rGqhXHBCMeFPR0lq90S0bojaaOVhRIQ8CsKXuDTBt5M2oiaesMQ==
+ dependencies:
+ "@nuxt/config" "2.17.1"
+ "@nuxt/server" "2.17.1"
+ "@nuxt/utils" "2.17.1"
+ consola "^3.2.3"
fs-extra "^10.1.0"
hable "^3.0.0"
hash-sum "^2.0.0"
lodash "^4.17.21"
-"@nuxt/devalue@^2.0.0":
+"@nuxt/devalue@^2.0.2":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@nuxt/devalue/-/devalue-2.0.2.tgz#5749f04df13bda4c863338d8dabaf370f45ef7c7"
integrity sha512-GBzP8zOc7CGWyFQS6dv1lQz8VVpz5C2yRszbXufwG/9zhStTIH50EtD87NmWbTMwXDvZLNg8GIpb1UFdH93JCA==
@@ -1745,20 +1838,20 @@
error-stack-parser "^2.0.0"
string-width "^4.2.3"
-"@nuxt/generator@2.16.3":
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.16.3.tgz#a3467d474eed7ab1db85e21dea75c18015871576"
- integrity sha512-I0dvArAHOpru66quBSpZYl6urrc8rbs7MzNS33qq55qJZ8vtvm3pTYJgpeHm7CrmCcWEP/GLxLUvSUShtwkfzQ==
+"@nuxt/generator@2.17.1":
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/@nuxt/generator/-/generator-2.17.1.tgz#a74e7e5b438c6bd67c708154e28df4e42a473509"
+ integrity sha512-nOabIOBW6ET57p+HsZurzgvraPxt933s4lgYc+I0k15QLvdrqHqGgW3HpFlbhhxBaFOP1KqdKCfz4rn/iszMKg==
dependencies:
- "@nuxt/utils" "2.16.3"
+ "@nuxt/utils" "2.17.1"
chalk "^4.1.2"
- consola "^2.15.3"
+ consola "^3.2.3"
defu "^6.1.2"
devalue "^2.0.1"
fs-extra "^10.1.0"
html-minifier "^4.0.0"
node-html-parser "^6.1.5"
- ufo "^1.1.1"
+ ufo "^1.1.2"
"@nuxt/loading-screen@^2.0.4":
version "2.0.4"
@@ -1780,17 +1873,17 @@
consola "^2.15.0"
node-fetch "^2.6.7"
-"@nuxt/server@2.16.3":
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.16.3.tgz#c95c7975c0194d767d794a42de6f8b6c14456ebb"
- integrity sha512-BN2yqUGytFlM77B0J8os8lnqNQcTT0qDC2lllglrM5F6KPv5rhKyN5khMNPruO5u2vf2JNkXIaUrJYNc4bzKpQ==
+"@nuxt/server@2.17.1":
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/@nuxt/server/-/server-2.17.1.tgz#7451ce85249f66e56a86df9c9bc15f3642aa69b6"
+ integrity sha512-dlUqR7r6+sdX1HkDgLghjDU/yLVvZdEK5OsT1bGbGzqMdlPPx0q1nvTrA+pyKsN9xnJarZqiKZahh6lBSKy+Cg==
dependencies:
- "@nuxt/utils" "2.16.3"
- "@nuxt/vue-renderer" "2.16.3"
+ "@nuxt/utils" "2.17.1"
+ "@nuxt/vue-renderer" "2.17.1"
"@nuxtjs/youch" "^4.2.3"
compression "^1.7.4"
connect "^3.7.0"
- consola "^2.15.3"
+ consola "^3.2.3"
etag "^1.8.1"
fresh "^0.5.2"
fs-extra "^10.1.0"
@@ -1801,7 +1894,7 @@
serve-placeholder "^2.0.1"
serve-static "^1.15.0"
server-destroy "^1.0.1"
- ufo "^1.1.1"
+ ufo "^1.1.2"
"@nuxt/telemetry@^1.4.1":
version "1.4.1"
@@ -1837,31 +1930,31 @@
get-port "^5.1.1"
got "^11.8.2"
-"@nuxt/utils@2.16.3":
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.16.3.tgz#2cac10aed3c58cb2531d7dd72086e109e087c375"
- integrity sha512-M0W1v4gZDMXyt1MnCoDijIvoV7Xu8NwdbHqWB9gyxIGvoycjNmWWu6yT4LkymZx2c2JUxWTVp6VoUKUWW5P46Q==
+"@nuxt/utils@2.17.1":
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/@nuxt/utils/-/utils-2.17.1.tgz#648e354f4f2a35fd77f3cdb11676382d94a5d4ae"
+ integrity sha512-6wzFb13zMgQnIS/HQ0uA04iKfme1aIGJVk7rLlEeyDqCjNqsGmzn4QNn3CTNqS7G6KY1Vtc8RHlbXFHHEu3vdw==
dependencies:
- consola "^2.15.3"
+ consola "^3.2.3"
create-require "^1.1.1"
fs-extra "^10.1.0"
hash-sum "^2.0.0"
- jiti "^1.18.2"
+ jiti "^1.19.1"
lodash "^4.17.21"
proper-lockfile "^4.1.2"
- semver "^7.3.8"
+ semver "^7.5.4"
serialize-javascript "^6.0.1"
- signal-exit "^3.0.7"
- ua-parser-js "^1.0.34"
- ufo "^1.1.1"
+ signal-exit "^4.0.2"
+ ua-parser-js "^1.0.35"
+ ufo "^1.1.2"
-"@nuxt/vue-app@2.16.3":
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.16.3.tgz#aee071c2da23633cde180ba663544ae97bace2f4"
- integrity sha512-Lacweyb3K0tRcHKIYVbAkGEptnXy0aNzXVF/n0niTMqtyWQ16pp2md3Ab0vcYXZf8Ya1Yy1NB8FhPqPYjG8OtA==
+"@nuxt/vue-app@2.17.1":
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/@nuxt/vue-app/-/vue-app-2.17.1.tgz#3f78d017c91330d126cc6d2ef94854fa4bada7a3"
+ integrity sha512-r9+2XkK9BqAOZUplG3Yjqvrynfzn2rrWCwWTwjoUbNHSpeoR9WajyUySXjPOsBRVQdIgvl4o2it5p2OBDGsa2g==
dependencies:
- node-fetch-native "^1.0.2"
- ufo "^1.1.1"
+ node-fetch-native "^1.2.0"
+ ufo "^1.1.2"
unfetch "^5.0.0"
vue "^2.7.10"
vue-client-only "^2.1.0"
@@ -1871,38 +1964,38 @@
vue-template-compiler "^2.7.14"
vuex "^3.6.2"
-"@nuxt/vue-renderer@2.16.3":
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.16.3.tgz#1f004ace66d84956860702d9f4e2fd85f4026796"
- integrity sha512-w46NiRZaAOU55S2UyTzGJqO7alO2YGgPFfy3HVOA5iXdNnpHwIBeVUIPLpmv6qByWxyu4OAOQu6pDURTWtaJdA==
+"@nuxt/vue-renderer@2.17.1":
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/@nuxt/vue-renderer/-/vue-renderer-2.17.1.tgz#6d8e3321b755afa85707d330b0a3c55d5bb07ae1"
+ integrity sha512-qAfqaKxsJe06wZs7t/XZNQ2Y0nE4AmsnU58ks+/5+lrJShQrHayzwFJKND6KbRgp8TpeDQQdRaU3ln/sOQGipA==
dependencies:
- "@nuxt/devalue" "^2.0.0"
- "@nuxt/utils" "2.16.3"
- consola "^2.15.3"
+ "@nuxt/devalue" "^2.0.2"
+ "@nuxt/utils" "2.17.1"
+ consola "^3.2.3"
defu "^6.1.2"
fs-extra "^10.1.0"
lodash "^4.17.21"
lru-cache "^5.1.1"
- ufo "^1.1.1"
+ ufo "^1.1.2"
vue "^2.7.10"
vue-meta "^2.4.0"
vue-server-renderer "^2.7.14"
-"@nuxt/webpack@2.16.3":
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.16.3.tgz#4754f77f94978c06eb8f4c356f6bdd5ff9a14d16"
- integrity sha512-VHXTMQj+8bUaaeIZKH4z2Ip/TnO4GuvpFV6GL7D+wjGMB+qeSsTPlWS7/FQxOt86uKEzpMz9w4jPJTYzgLV6pg==
+"@nuxt/webpack@2.17.1":
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/@nuxt/webpack/-/webpack-2.17.1.tgz#147df3fdd10f7041abbd63b63f2bcaec505e5352"
+ integrity sha512-862dGUOPyUGZ2a5uMe83v15/6CTovoiw5i5p1B6S714Qb6jvSpEEECJxpq7zCpR/WvRs73Dtw+2oCuRptuPSBA==
dependencies:
- "@babel/core" "^7.21.3"
- "@nuxt/babel-preset-app" "2.16.3"
+ "@babel/core" "^7.22.9"
+ "@nuxt/babel-preset-app" "2.17.1"
"@nuxt/friendly-errors-webpack-plugin" "^2.5.2"
- "@nuxt/utils" "2.16.3"
+ "@nuxt/utils" "2.17.1"
babel-loader "^8.3.0"
cache-loader "^4.1.0"
- caniuse-lite "^1.0.30001467"
- consola "^2.15.3"
+ caniuse-lite "^1.0.30001515"
+ consola "^3.2.3"
css-loader "^5.2.7"
- cssnano "^5.1.15"
+ cssnano "^6.0.1"
eventsource-polyfill "^0.9.6"
extract-css-chunks-webpack-plugin "^4.9.0"
file-loader "^6.2.0"
@@ -1915,19 +2008,19 @@
optimize-css-assets-webpack-plugin "^6.0.1"
pify "^5.0.0"
pnp-webpack-plugin "^1.7.0"
- postcss "^8.4.21"
+ postcss "^8.4.26"
postcss-import "^15.1.0"
postcss-import-resolver "^2.0.0"
postcss-loader "^4.3.0"
- postcss-preset-env "^8.0.1"
+ postcss-preset-env "^9.0.0"
postcss-url "^10.1.3"
- semver "^7.3.8"
- std-env "^3.3.2"
+ semver "^7.5.4"
+ std-env "^3.3.3"
style-resources-loader "^1.5.0"
terser-webpack-plugin "^4.2.3"
thread-loader "^3.0.4"
time-fix-plugin "^2.0.7"
- ufo "^1.1.1"
+ ufo "^1.1.2"
upath "^2.0.1"
url-loader "^4.1.1"
vue-loader "^15.10.1"
@@ -1935,9 +2028,9 @@
vue-template-compiler "^2.7.14"
watchpack "^2.4.0"
webpack "^4.46.0"
- webpack-bundle-analyzer "^4.8.0"
- webpack-dev-middleware "^5.3.3"
- webpack-hot-middleware "^2.25.3"
+ webpack-bundle-analyzer "^4.9.0"
+ webpack-dev-middleware "^5.0.0"
+ webpack-hot-middleware "^2.25.4"
webpack-node-externals "^3.0.0"
webpackbar "^5.0.2"
@@ -2009,6 +2102,11 @@
mustache "^2.3.0"
stack-trace "0.0.10"
+"@one-ini/wasm@0.1.1":
+ version "0.1.1"
+ resolved "https://registry.yarnpkg.com/@one-ini/wasm/-/wasm-0.1.1.tgz#6013659736c9dbfccc96e8a9c2b3de317df39323"
+ integrity sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==
+
"@polka/url@^1.0.0-next.20":
version "1.0.0-next.21"
resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
@@ -2063,9 +2161,9 @@
integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.14":
- version "7.20.0"
- resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.0.tgz#61bc5a4cae505ce98e1e36c5445e4bee060d8891"
- integrity sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==
+ version "7.20.1"
+ resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.20.1.tgz#916ecea274b0c776fec721e333e55762d3a9614b"
+ integrity sha512-aACu/U/omhdk15O4Nfb+fHgH/z3QsfQzpnvRZhYhThms83ZnAOZz7zZAWO7mn2yyNQaA4xTO8GLK3uqFU4bYYw==
dependencies:
"@babel/parser" "^7.20.7"
"@babel/types" "^7.20.7"
@@ -2089,11 +2187,11 @@
"@babel/types" "^7.0.0"
"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
- version "7.18.5"
- resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.18.5.tgz#c107216842905afafd3b6e774f6f935da6f5db80"
- integrity sha512-enCvTL8m/EHS/zIvJno9nE+ndYPh1/oNFzRYRmtUqJICG2VnCSBzMLW5VN2KCQU91f23tsNKR8v7VJJQMatl7Q==
+ version "7.20.1"
+ resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.20.1.tgz#dd6f1d2411ae677dcb2db008c962598be31d6acf"
+ integrity sha512-MitHFXnhtgwsGZWtT68URpOvLN4EREih1u3QtQiN4VdAxWKRVvGCSvw/Qth0M0Qq3pJpnGOu5JaM/ydK7OGbqg==
dependencies:
- "@babel/types" "^7.3.0"
+ "@babel/types" "^7.20.7"
"@types/cacheable-request@^6.0.1":
version "6.0.3"
@@ -2149,9 +2247,9 @@
"@types/istanbul-lib-report" "*"
"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
- version "7.0.11"
- resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
- integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
+ version "7.0.12"
+ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.12.tgz#d70faba7039d5fca54c83c7dbab41051d2b6f6cb"
+ integrity sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==
"@types/json5@^0.0.29":
version "0.0.29"
@@ -2166,9 +2264,9 @@
"@types/node" "*"
"@types/node@*":
- version "20.1.0"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-20.1.0.tgz#258805edc37c327cf706e64c6957f241ca4c4c20"
- integrity sha512-O+z53uwx64xY7D6roOi4+jApDGFg0qn6WHcxe5QeqjMaTezBO/mxdfFXIVAVVyNWKx84OmPB3L8kbVYOTeN34A==
+ version "20.5.7"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-20.5.7.tgz#4b8ecac87fbefbc92f431d09c30e176fc0a7c377"
+ integrity sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==
"@types/normalize-package-data@^2.4.0":
version "2.4.1"
@@ -2181,9 +2279,9 @@
integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
"@types/prettier@^2.1.5":
- version "2.7.2"
- resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.2.tgz#6c2324641cc4ba050a8c710b2b251b377581fbf0"
- integrity sha512-KufADq8uQqo1pYKVIYzfKbJfBAc0sOeXqGbFaSpv8MRmC/zXgowNZmFcbngndGk922QDmOASEXUZCaY48gs4cg==
+ version "2.7.3"
+ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.7.3.tgz#3e51a17e291d01d17d3fc61422015a933af7a08f"
+ integrity sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==
"@types/responselike@^1.0.0":
version "1.0.0"
@@ -2208,9 +2306,9 @@
integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==
"@types/uglify-js@*":
- version "3.17.1"
- resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.17.1.tgz#e0ffcef756476410e5bce2cb01384ed878a195b5"
- integrity sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g==
+ version "3.17.2"
+ resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.17.2.tgz#a2ba86fd524f6281a7655463338c546f845b29c3"
+ integrity sha512-9SjrHO54LINgC/6Ehr81NjAxAYvwEZqjUHLjJYvC4Nmr9jbLQCIZbWSvl4vXQkkmR1UAuaKDycau3O1kWGFyXQ==
dependencies:
source-map "^0.6.1"
@@ -2391,9 +2489,9 @@
prettier "^1.18.2 || ^2.0.0"
"@vue/test-utils@^1.2.0":
- version "1.3.5"
- resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.3.5.tgz#7beba75901c3a08a48b5657b63de02094dc40719"
- integrity sha512-ezdlDNoxi5m/eP5Chg34AjnmNplrik4fyzB2DB9Yqa32OpywV8IvHqK9eCf+nIVsHFBejjV00agPFYRH2/D3Hg==
+ version "1.3.6"
+ resolved "https://registry.yarnpkg.com/@vue/test-utils/-/test-utils-1.3.6.tgz#6656bd8fa44dd088b4ad80ff1ee28abe7e5ddf87"
+ integrity sha512-udMmmF1ts3zwxUJEIAj5ziioR900reDrt6C9H3XpWPsLBx2lpHKoA4BTdd9HNIYbkGltWw+JjWJ+5O6QBwiyEw==
dependencies:
dom-event-types "^1.0.0"
lodash "^4.17.15"
@@ -2605,10 +2703,10 @@ 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.0.4, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0:
- version "8.8.2"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a"
- integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==
+acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.8.2:
+ version "8.10.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5"
+ integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==
agent-base@6:
version "6.0.2"
@@ -2846,17 +2944,29 @@ array.prototype.flat@^1.2.3:
es-abstract "^1.20.4"
es-shim-unscopables "^1.0.0"
-array.prototype.reduce@^1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.5.tgz#6b20b0daa9d9734dd6bc7ea66b5bbce395471eac"
- integrity sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==
+array.prototype.reduce@^1.0.6:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/array.prototype.reduce/-/array.prototype.reduce-1.0.6.tgz#63149931808c5fc1e1354814923d92d45f7d96d5"
+ integrity sha512-UW+Mz8LG/sPSU8jRDCjVr6J/ZKAGpHfwrZ6kWTG5qCxIEiXdVshqGnu5vEZA8S1y6X4aCSbQZ0/EEsfvEvBiSg==
dependencies:
call-bind "^1.0.2"
- define-properties "^1.1.4"
- es-abstract "^1.20.4"
+ define-properties "^1.2.0"
+ es-abstract "^1.22.1"
es-array-method-boxes-properly "^1.0.0"
is-string "^1.0.7"
+arraybuffer.prototype.slice@^1.0.1:
+ version "1.0.1"
+ resolved "https://registry.yarnpkg.com/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz#9b5ea3868a6eebc30273da577eb888381c0044bb"
+ integrity sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==
+ dependencies:
+ array-buffer-byte-length "^1.0.0"
+ call-bind "^1.0.2"
+ define-properties "^1.2.0"
+ get-intrinsic "^1.2.1"
+ is-array-buffer "^3.0.2"
+ is-shared-array-buffer "^1.0.2"
+
arrgv@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/arrgv/-/arrgv-1.0.2.tgz#025ed55a6a433cad9b604f8112fc4292715a6ec0"
@@ -2915,13 +3025,13 @@ atob@^2.1.2:
resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-autoprefixer@^10.4.14:
- version "10.4.14"
- resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.14.tgz#e28d49902f8e759dd25b153264e862df2705f79d"
- integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==
+autoprefixer@^10.4.15:
+ version "10.4.15"
+ resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.15.tgz#a1230f4aeb3636b89120b34a1f513e2f6834d530"
+ integrity sha512-KCuPB8ZCIqFdA4HwKXsvz7j6gvSDNhDP7WnUjBleRkKjPdvCmHFuQ77ocavI8FT6NdvlBnE2UFr2H4Mycn8Vew==
dependencies:
- browserslist "^4.21.5"
- caniuse-lite "^1.0.30001464"
+ browserslist "^4.21.10"
+ caniuse-lite "^1.0.30001520"
fraction.js "^4.2.0"
normalize-range "^0.1.2"
picocolors "^1.0.0"
@@ -2995,9 +3105,9 @@ available-typed-arrays@^1.0.5:
integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
axios-retry@^3.1.9:
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.4.0.tgz#f464dbe9408e5aa78fa319afd38bb69b533d8854"
- integrity sha512-VdgaP+gHH4iQYCCNUWF2pcqeciVOdGrBBAYUfTY+wPcO5Ltvp/37MLFNCmJKo7Gj3SHvCSdL8ouI1qLYJN3liA==
+ version "3.7.0"
+ resolved "https://registry.yarnpkg.com/axios-retry/-/axios-retry-3.7.0.tgz#d5007755d257b97e08d846089976f838b9db9ef9"
+ integrity sha512-ZTnCkJbRtfScvwiRnoVskFAfvU0UG3xNcsjwTR0mawSbIJoothxn67gKsMaNAFHRXJ1RmuLhmZBzvyXi3+9WyQ==
dependencies:
"@babel/runtime" "^7.15.4"
is-retry-allowed "^2.2.0"
@@ -3010,9 +3120,9 @@ axios@^0.21.1:
follow-redirects "^1.14.0"
axios@^1.3.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/axios/-/axios-1.4.0.tgz#38a7bf1224cd308de271146038b551d725f0be1f"
- integrity sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/axios/-/axios-1.5.0.tgz#f02e4af823e2e46a9768cfc74691fdd0517ea267"
+ integrity sha512-D4DdjDo5CY50Qms0qGQTTw6Q44jl7zRwY7bthds06pUGfChBCTcQs+N743eFWGEd6pRTMd6A+I87aWyFV5wiZQ==
dependencies:
follow-redirects "^1.15.0"
form-data "^4.0.0"
@@ -3099,29 +3209,29 @@ babel-plugin-module-resolver@^4.1.0:
reselect "^4.0.0"
resolve "^1.13.1"
-babel-plugin-polyfill-corejs2@^0.3.3:
- version "0.3.3"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz#5d1bd3836d0a19e1b84bbf2d9640ccb6f951c122"
- integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
+babel-plugin-polyfill-corejs2@^0.4.5:
+ version "0.4.5"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.5.tgz#8097b4cb4af5b64a1d11332b6fb72ef5e64a054c"
+ integrity sha512-19hwUH5FKl49JEsvyTcoHakh6BE0wgXLLptIyKZ3PijHc/Ci521wygORCUCCred+E/twuqRyAkE02BAWPmsHOg==
dependencies:
- "@babel/compat-data" "^7.17.7"
- "@babel/helper-define-polyfill-provider" "^0.3.3"
- semver "^6.1.1"
+ "@babel/compat-data" "^7.22.6"
+ "@babel/helper-define-polyfill-provider" "^0.4.2"
+ semver "^6.3.1"
-babel-plugin-polyfill-corejs3@^0.6.0:
- version "0.6.0"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz#56ad88237137eade485a71b52f72dbed57c6230a"
- integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
+babel-plugin-polyfill-corejs3@^0.8.3:
+ version "0.8.3"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.8.3.tgz#b4f719d0ad9bb8e0c23e3e630c0c8ec6dd7a1c52"
+ integrity sha512-z41XaniZL26WLrvjy7soabMXrfPWARN25PZoriDEiLMxAp50AUW3t35BGQUMg5xK3UrpVTtagIDklxYa+MhiNA==
dependencies:
- "@babel/helper-define-polyfill-provider" "^0.3.3"
- core-js-compat "^3.25.1"
+ "@babel/helper-define-polyfill-provider" "^0.4.2"
+ core-js-compat "^3.31.0"
-babel-plugin-polyfill-regenerator@^0.4.1:
- version "0.4.1"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz#390f91c38d90473592ed43351e801a9d3e0fd747"
- integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
+babel-plugin-polyfill-regenerator@^0.5.2:
+ version "0.5.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.5.2.tgz#80d0f3e1098c080c8b5a65f41e9427af692dc326"
+ integrity sha512-tAlOptU0Xj34V1Y2PNTL4Y0FOJMDB6bZmoW39FeCQIhigGLkqu3Fj6uiXpxIf6Ij274ENdYx64y6Au+ZKlb1IA==
dependencies:
- "@babel/helper-define-polyfill-provider" "^0.3.3"
+ "@babel/helper-define-polyfill-provider" "^0.4.2"
babel-preset-current-node-syntax@^1.0.0:
version "1.0.1"
@@ -3379,15 +3489,15 @@ browserify-zlib@^0.2.0:
dependencies:
pako "~1.0.5"
-browserslist@^4.0.0, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
- version "4.21.5"
- resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.5.tgz#75c5dae60063ee641f977e00edd3cfb2fb7af6a7"
- integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
+browserslist@^4.0.0, browserslist@^4.21.10, browserslist@^4.21.4, browserslist@^4.21.9:
+ version "4.21.10"
+ resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.21.10.tgz#dbbac576628c13d3b2231332cb2ec5a46e015bb0"
+ integrity sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==
dependencies:
- caniuse-lite "^1.0.30001449"
- electron-to-chromium "^1.4.284"
- node-releases "^2.0.8"
- update-browserslist-db "^1.0.10"
+ caniuse-lite "^1.0.30001517"
+ electron-to-chromium "^1.4.477"
+ node-releases "^2.0.13"
+ update-browserslist-db "^1.0.11"
bser@2.1.1:
version "2.1.1"
@@ -3542,9 +3652,9 @@ cacheable-request@^6.0.0:
responselike "^1.0.2"
cacheable-request@^7.0.2:
- version "7.0.2"
- resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
- integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
+ version "7.0.4"
+ resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.4.tgz#7a33ebf08613178b403635be7b899d3e69bbe817"
+ integrity sha512-v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==
dependencies:
clone-response "^1.0.2"
get-stream "^5.1.0"
@@ -3633,10 +3743,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.30001449, caniuse-lite@^1.0.30001464, caniuse-lite@^1.0.30001467:
- version "1.0.30001486"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001486.tgz#56a08885228edf62cbe1ac8980f2b5dae159997e"
- integrity sha512-uv7/gXuHi10Whlj0pp5q/tsK/32J2QSqVRKQhs2j8VsDCjgyruAh/eEXHF822VqO9yT6iZKw3nRwZRSPBE9OQg==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001515, caniuse-lite@^1.0.30001517, caniuse-lite@^1.0.30001520:
+ version "1.0.30001525"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001525.tgz#d2e8fdec6116ffa36284ca2c33ef6d53612fe1c8"
+ integrity sha512-/3z+wB4icFt3r0USMwxujAqRvaD/B7rvGTsKhbhSQErVrJvkZCLhgNLJxU8MevahQVH6hCU9FsHdNUFbiwmE7Q==
chalk@^1.1.3:
version "1.1.3"
@@ -3649,7 +3759,7 @@ chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"
-chalk@^2.0.0, chalk@^2.3.2, chalk@^2.4.1:
+chalk@^2.3.2, 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==
@@ -3759,9 +3869,9 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
safe-buffer "^5.0.1"
cjs-module-lexer@^1.0.0:
- version "1.2.2"
- resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40"
- integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==
+ version "1.2.3"
+ resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.3.tgz#6c370ab19f8a3394e318fe682686ec0ac684d107"
+ integrity sha512-0TNiGstbQmCFwt4akjjBg5pLRTSyj/PkWQ1ZoO2zntmg9yLqSRxwEa4iCfQLGjqhiqBfOJa7W/E8wfGrTDmlZQ==
class-utils@^0.3.5:
version "0.3.6"
@@ -3879,9 +3989,9 @@ code-excerpt@^3.0.0:
convert-to-spaces "^1.0.1"
collect-v8-coverage@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
- integrity sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
+ integrity sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==
collection-visit@^1.0.0:
version "1.0.0"
@@ -3945,6 +4055,11 @@ combined-stream@^1.0.8:
dependencies:
delayed-stream "~1.0.0"
+commander@^10.0.0:
+ version "10.0.1"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-10.0.1.tgz#881ee46b4f77d1c1dccc5823433aa39b022cbe06"
+ integrity sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==
+
commander@^2.19.0, commander@^2.20.0:
version "2.20.3"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
@@ -4085,6 +4200,11 @@ consola@^2.10.1, consola@^2.11.3, consola@^2.15.0, consola@^2.15.3, consola@^2.6
resolved "https://registry.yarnpkg.com/consola/-/consola-2.15.3.tgz#2e11f98d6a4be71ff72e0bdf07bd23e12cb61550"
integrity sha512-9vAdYbHj6x2fLKC4+oPH0kFzY/orMZyG2Aj+kNylHxKGJ/Ed4dpNyAQYwJOdqO4zdM7XpVHmyejQDcQHrnuXbw==
+consola@^3.2.3:
+ version "3.2.3"
+ resolved "https://registry.yarnpkg.com/consola/-/consola-3.2.3.tgz#0741857aa88cfa0d6fd53f1cff0375136e98502f"
+ integrity sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==
+
console-browserify@^1.1.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
@@ -4166,22 +4286,22 @@ copy-descriptor@^0.1.0:
resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
integrity sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==
-core-js-compat@^3.25.1, core-js-compat@^3.29.1:
- version "3.30.2"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.30.2.tgz#83f136e375babdb8c80ad3c22d67c69098c1dd8b"
- integrity sha512-nriW1nuJjUgvkEjIot1Spwakz52V9YkYHZAQG6A1eCgC8AA1p0zngrQEP9R0+V6hji5XilWKG1Bd0YRppmGimA==
+core-js-compat@^3.31.0, core-js-compat@^3.31.1:
+ version "3.32.1"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.32.1.tgz#55f9a7d297c0761a8eb1d31b593e0f5b6ffae964"
+ integrity sha512-GSvKDv4wE0bPnQtjklV101juQ85g6H3rm5PDP20mqlS5j0kXF3pP97YvAu5hl+uFHqMictp3b2VxOHljWMAtuA==
dependencies:
- browserslist "^4.21.5"
+ browserslist "^4.21.10"
core-js@^2.0.0:
version "2.6.12"
resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec"
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
-core-js@^3.19.0, core-js@^3.6.5:
- version "3.30.2"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.30.2.tgz#6528abfda65e5ad728143ea23f7a14f0dcf503fc"
- integrity sha512-uBJiDmwqsbJCWHAwjrx3cvjbMXP7xD72Dmsn5LOJpiRmE3WbBbN5rCqQ2Qh6Ek6/eOrjlWngEynBWo4VxerQhg==
+core-js@^3.31.1, core-js@^3.6.5:
+ version "3.32.1"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.32.1.tgz#a7d8736a3ed9dd05940c3c4ff32c591bb735be77"
+ integrity sha512-lqufgNn9NLnESg5mQeYsxQP5w7wrViSj0jr/kv6ECQiByzQkrn1MKvV0L3acttpDqfQrHLwr2KCMgX5b8X+lyQ==
core-util-is@~1.0.0:
version "1.0.3"
@@ -4278,25 +4398,25 @@ crypto-random-string@^2.0.0:
resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
-css-blank-pseudo@^5.0.2:
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-5.0.2.tgz#3df5cd950f64de960974da05e76954fd3d7442f9"
- integrity sha512-aCU4AZ7uEcVSUzagTlA9pHciz7aWPKA/YzrEkpdSopJ2pvhIxiQ5sYeMz1/KByxlIo4XBdvMNJAVKMg/GRnhfw==
+css-blank-pseudo@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-6.0.0.tgz#2bc6f812a5f60296c04c55b1696bad4300dcdbcc"
+ integrity sha512-VbfLlOWO7sBHBTn6pwDQzc07Z0SDydgDBfNfCE0nvrehdBNv9RKsuupIRa/qal0+fBZhAALyQDPMKz5lnvcchw==
dependencies:
- postcss-selector-parser "^6.0.10"
+ postcss-selector-parser "^6.0.13"
css-declaration-sorter@^6.3.1:
- version "6.4.0"
- resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.0.tgz#630618adc21724484b3e9505bce812def44000ad"
- integrity sha512-jDfsatwWMWN0MODAFuHszfjphEXfNw9JUAhmY4pLu3TyTU+ohUpsbVtbU+1MZn4a47D9kqh03i4eyOm+74+zew==
+ version "6.4.1"
+ resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz#28beac7c20bad7f1775be3a7129d7eae409a3a71"
+ integrity sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==
-css-has-pseudo@^5.0.2:
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-5.0.2.tgz#8798118c705d858b7aeb9d839a39edd901c1cc83"
- integrity sha512-q+U+4QdwwB7T9VEW/LyO6CFrLAeLqOykC5mDqJXc7aKZAhDbq7BvGT13VGJe+IwBfdN2o3Xdw2kJ5IxwV1Sc9Q==
+css-has-pseudo@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-6.0.0.tgz#b8c8f39a19bc83c5be59fd251510a7e443c47968"
+ integrity sha512-X+r+JBuoO37FBOWVNhVJhxtSBUFHgHbrcc0CjFT28JEdOw1qaDwABv/uunyodUuSy2hMPe9j/HjssxSlvUmKjg==
dependencies:
- "@csstools/selector-specificity" "^2.0.1"
- postcss-selector-parser "^6.0.10"
+ "@csstools/selector-specificity" "^3.0.0"
+ postcss-selector-parser "^6.0.13"
postcss-value-parser "^4.2.0"
css-loader@^5.2.6, css-loader@^5.2.7:
@@ -4315,10 +4435,10 @@ css-loader@^5.2.6, css-loader@^5.2.7:
schema-utils "^3.0.0"
semver "^7.3.5"
-css-prefers-color-scheme@^8.0.2:
- version "8.0.2"
- resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-8.0.2.tgz#a0671f54eb19ed0d30b952574c0af11ec355fb6d"
- integrity sha512-OvFghizHJ45x7nsJJUSYLyQNTzsCU8yWjxAc/nhPQg1pbs18LMoET8N3kOweFDPy0JV0OSXN2iqRFhPBHYOeMA==
+css-prefers-color-scheme@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-9.0.0.tgz#7e9b74062655ea15490e359cb456a3b9f4c93327"
+ integrity sha512-03QGAk/FXIRseDdLb7XAiu6gidQ0Nd8945xuM7VFVPpc6goJsG9uIO8xQjTxwbPdPIIV4o4AJoOJyt8gwDl67g==
css-select@^4.1.3:
version "4.3.0"
@@ -4358,15 +4478,31 @@ css-tree@^1.1.2, css-tree@^1.1.3:
mdn-data "2.0.14"
source-map "^0.6.1"
+css-tree@^2.2.1:
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.3.1.tgz#10264ce1e5442e8572fc82fbe490644ff54b5c20"
+ integrity sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==
+ dependencies:
+ mdn-data "2.0.30"
+ source-map-js "^1.0.1"
+
+css-tree@~2.2.0:
+ version "2.2.1"
+ resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-2.2.1.tgz#36115d382d60afd271e377f9c5f67d02bd48c032"
+ integrity sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==
+ dependencies:
+ mdn-data "2.0.28"
+ source-map-js "^1.0.1"
+
css-what@^6.0.1, css-what@^6.1.0:
version "6.1.0"
resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
-cssdb@^7.5.3:
- version "7.5.4"
- resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.5.4.tgz#e34dafee5184d67634604e345e389ca79ac179ea"
- integrity sha512-fGD+J6Jlq+aurfE1VDXlLS4Pt0VtNlu2+YgfGOdMxRyl/HQ9bDiHTwSck1Yz8A97Dt/82izSK6Bp/4nVqacOsg==
+cssdb@^7.7.1:
+ version "7.7.1"
+ resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-7.7.1.tgz#759e333f516e47f26dd2c7be06147d4f4716356d"
+ integrity sha512-kM+Fs0BFyhJNeE6wbOrlnRsugRdL6vn7QcON0aBDZ7XRd7RI2pMlk+nxoHuTb4Et+aBobXgK0I+6NGLA0LLgTw==
cssesc@^2.0.0:
version "2.0.0"
@@ -4413,12 +4549,52 @@ cssnano-preset-default@^5.2.14:
postcss-svgo "^5.1.0"
postcss-unique-selectors "^5.1.1"
+cssnano-preset-default@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.0.1.tgz#2a93247140d214ddb9f46bc6a3562fa9177fe301"
+ integrity sha512-7VzyFZ5zEB1+l1nToKyrRkuaJIx0zi/1npjvZfbBwbtNTzhLtlvYraK/7/uqmX2Wb2aQtd983uuGw79jAjLSuQ==
+ dependencies:
+ css-declaration-sorter "^6.3.1"
+ cssnano-utils "^4.0.0"
+ postcss-calc "^9.0.0"
+ postcss-colormin "^6.0.0"
+ postcss-convert-values "^6.0.0"
+ postcss-discard-comments "^6.0.0"
+ postcss-discard-duplicates "^6.0.0"
+ postcss-discard-empty "^6.0.0"
+ postcss-discard-overridden "^6.0.0"
+ postcss-merge-longhand "^6.0.0"
+ postcss-merge-rules "^6.0.1"
+ postcss-minify-font-values "^6.0.0"
+ postcss-minify-gradients "^6.0.0"
+ postcss-minify-params "^6.0.0"
+ postcss-minify-selectors "^6.0.0"
+ postcss-normalize-charset "^6.0.0"
+ postcss-normalize-display-values "^6.0.0"
+ postcss-normalize-positions "^6.0.0"
+ postcss-normalize-repeat-style "^6.0.0"
+ postcss-normalize-string "^6.0.0"
+ postcss-normalize-timing-functions "^6.0.0"
+ postcss-normalize-unicode "^6.0.0"
+ postcss-normalize-url "^6.0.0"
+ postcss-normalize-whitespace "^6.0.0"
+ postcss-ordered-values "^6.0.0"
+ postcss-reduce-initial "^6.0.0"
+ postcss-reduce-transforms "^6.0.0"
+ postcss-svgo "^6.0.0"
+ postcss-unique-selectors "^6.0.0"
+
cssnano-utils@^3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
-cssnano@^5.0.2, cssnano@^5.1.15:
+cssnano-utils@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-4.0.0.tgz#d1da885ec04003ab19505ff0e62e029708d36b08"
+ integrity sha512-Z39TLP+1E0KUcd7LGyF4qMfu8ZufI0rDzhdyAMsa/8UyNUU8wpS0fhdBxbQbv32r64ea00h4878gommRVg2BHw==
+
+cssnano@^5.0.2:
version "5.1.15"
resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.15.tgz#ded66b5480d5127fcb44dac12ea5a983755136bf"
integrity sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==
@@ -4427,6 +4603,14 @@ cssnano@^5.0.2, cssnano@^5.1.15:
lilconfig "^2.0.3"
yaml "^1.10.2"
+cssnano@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.0.1.tgz#87c38c4cd47049c735ab756d7e77ac3ca855c008"
+ integrity sha512-fVO1JdJ0LSdIGJq68eIxOqFpIJrZqXUsBt8fkrBcztCQqAjQD51OhZp7tc0ImcbwXD4k7ny84QTV90nZhmqbkg==
+ dependencies:
+ cssnano-preset-default "^6.0.1"
+ lilconfig "^2.1.0"
+
csso@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
@@ -4434,6 +4618,13 @@ csso@^4.2.0:
dependencies:
css-tree "^1.1.2"
+csso@^5.0.5:
+ version "5.0.5"
+ resolved "https://registry.yarnpkg.com/csso/-/csso-5.0.5.tgz#f9b7fe6cc6ac0b7d90781bb16d5e9874303e2ca6"
+ integrity sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==
+ dependencies:
+ css-tree "~2.2.0"
+
cssom@^0.4.4:
version "0.4.4"
resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
@@ -4474,9 +4665,9 @@ custom-error-instance@2.1.1:
integrity sha512-p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg==
cyclist@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
- integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==
+ version "1.0.2"
+ resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.2.tgz#673b5f233bf34d8e602b949429f8171d9121bea3"
+ integrity sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==
data-urls@^2.0.0:
version "2.0.0"
@@ -4547,9 +4738,9 @@ debug@^3.2.7:
ms "^2.1.1"
decache@^4.6.0:
- version "4.6.1"
- resolved "https://registry.yarnpkg.com/decache/-/decache-4.6.1.tgz#5928bfab97a6fcf22a65047a3d07999af36efaf0"
- integrity sha512-ohApBM8u9ygepJCjgBrEZSSxPjc0T/PJkD+uNyxXPkqudyUpdXpwJYp0VISm2WrPVzASU6DZyIi6BWdyw7uJ2Q==
+ version "4.6.2"
+ resolved "https://registry.yarnpkg.com/decache/-/decache-4.6.2.tgz#c1df1325a2f36d53922e08f33380f083148199cd"
+ integrity sha512-2LPqkLeu8XWHU8qNCS3kcF6sCcb5zIzvWaAHYSvPfwhdd7mHuah29NssMzrTYyHN4F5oFy2ko9OBYxegtU0FEw==
dependencies:
callsite "^1.0.0"
@@ -4604,7 +4795,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:
+deep-is@^0.1.3:
version "0.1.4"
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
@@ -4708,9 +4899,9 @@ depd@2.0.0:
integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
des.js@^1.0.0:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
- integrity sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==
+ version "1.1.0"
+ resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.1.0.tgz#1d37f5766f3bbff4ee9638e871a8768c173b81da"
+ integrity sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==
dependencies:
inherits "^2.0.1"
minimalistic-assert "^1.0.0"
@@ -4720,6 +4911,11 @@ destr@^1.2.2:
resolved "https://registry.yarnpkg.com/destr/-/destr-1.2.2.tgz#7ba9befcafb645a50e76b260449c63927b51e22f"
integrity sha512-lrbCJwD9saUQrqUfXvl6qoM+QN3W7tLV5pAOs+OqOmopCCz/JkE05MHedJR1xfk4IAnZuJXPVuN5+7jNA2ZCiA==
+destr@^2.0.0:
+ version "2.0.1"
+ resolved "https://registry.yarnpkg.com/destr/-/destr-2.0.1.tgz#2fc7bddc256fed1183e03f8d148391dde4023cb2"
+ integrity sha512-M1Ob1zPSIvlARiJUkKqvAZ3VAqQY6Jcuth/pBKQ2b1dX/Qx0OnJ8Vux6J2H5PTMQeRzWrrbTu70VxBfv/OPDJA==
+
destroy@1.2.0, destroy@^1.0.4:
version "1.2.0"
resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
@@ -4878,10 +5074,10 @@ dot-prop@^5.2.0:
dependencies:
is-obj "^2.0.0"
-dotenv@^16.0.3:
- version "16.0.3"
- resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.0.3.tgz#115aec42bac5053db3c456db30cc243a5a836a07"
- integrity sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==
+dotenv@^16.0.3, dotenv@^16.3.1:
+ version "16.3.1"
+ resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-16.3.1.tgz#369034de7d7e5b120972693352a3bf112172cc3e"
+ integrity sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==
dotenv@^8.1.0:
version "8.6.0"
@@ -4913,25 +5109,25 @@ duplexify@^3.4.2, duplexify@^3.6.0:
readable-stream "^2.0.0"
stream-shift "^1.0.0"
-editorconfig@^0.15.3:
- version "0.15.3"
- resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-0.15.3.tgz#bef84c4e75fb8dcb0ce5cee8efd51c15999befc5"
- integrity sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==
+editorconfig@^1.0.3:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/editorconfig/-/editorconfig-1.0.4.tgz#040c9a8e9a6c5288388b87c2db07028aa89f53a3"
+ integrity sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==
dependencies:
- commander "^2.19.0"
- lru-cache "^4.1.5"
- semver "^5.6.0"
- sigmund "^1.0.1"
+ "@one-ini/wasm" "0.1.1"
+ commander "^10.0.0"
+ minimatch "9.0.1"
+ semver "^7.5.3"
ee-first@1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
-electron-to-chromium@^1.4.284:
- version "1.4.385"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.385.tgz#1afd8d6280d510145148777b899ff481c65531ff"
- integrity sha512-L9zlje9bIw0h+CwPQumiuVlfMcV4boxRjFIWDcLfFqTZNbkwOExBzfmswytHawObQX4OUhtNv8gIiB21kOurIg==
+electron-to-chromium@^1.4.477:
+ version "1.4.508"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.508.tgz#5641ff2f5ba11df4bd960fe6a2f9f70aa8b9af96"
+ integrity sha512-FFa8QKjQK/A5QuFr2167myhMesGrhlOBD+3cYNxO9/S4XzHEXesyTD/1/xF644gC8buFPz3ca6G1LOQD0tZrrg==
elliptic@^6.5.3:
version "6.5.4"
@@ -4996,11 +5192,12 @@ enhanced-resolve@^4.1.1, enhanced-resolve@^4.5.0:
tapable "^1.0.0"
enquirer@^2.3.5:
- version "2.3.6"
- resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
- integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+ version "2.4.1"
+ resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56"
+ integrity sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==
dependencies:
ansi-colors "^4.1.1"
+ strip-ansi "^6.0.1"
entities@^2.0.0:
version "2.2.0"
@@ -5038,18 +5235,19 @@ error-stack-parser@^2.0.0:
dependencies:
stackframe "^1.3.4"
-es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
- version "1.21.2"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.21.2.tgz#a56b9695322c8a185dc25975aa3b8ec31d0e7eff"
- integrity sha512-y/B5POM2iBnIxCiernH1G7rC9qQoM77lLIMQLuob0zhp8C56Po81+2Nj0WFKnd0pNReDTnkYryc+zhOzpEIROg==
+es-abstract@^1.20.4, es-abstract@^1.22.1:
+ version "1.22.1"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.22.1.tgz#8b4e5fc5cefd7f1660f0f8e1a52900dfbc9d9ccc"
+ integrity sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==
dependencies:
array-buffer-byte-length "^1.0.0"
+ arraybuffer.prototype.slice "^1.0.1"
available-typed-arrays "^1.0.5"
call-bind "^1.0.2"
es-set-tostringtag "^2.0.1"
es-to-primitive "^1.2.1"
function.prototype.name "^1.1.5"
- get-intrinsic "^1.2.0"
+ get-intrinsic "^1.2.1"
get-symbol-description "^1.0.0"
globalthis "^1.0.3"
gopd "^1.0.1"
@@ -5069,14 +5267,18 @@ es-abstract@^1.19.0, es-abstract@^1.20.4, es-abstract@^1.21.2:
object-inspect "^1.12.3"
object-keys "^1.1.1"
object.assign "^4.1.4"
- regexp.prototype.flags "^1.4.3"
+ regexp.prototype.flags "^1.5.0"
+ safe-array-concat "^1.0.0"
safe-regex-test "^1.0.0"
string.prototype.trim "^1.2.7"
string.prototype.trimend "^1.0.6"
string.prototype.trimstart "^1.0.6"
+ typed-array-buffer "^1.0.0"
+ typed-array-byte-length "^1.0.0"
+ typed-array-byte-offset "^1.0.0"
typed-array-length "^1.0.4"
unbox-primitive "^1.0.2"
- which-typed-array "^1.1.9"
+ which-typed-array "^1.1.10"
es-array-method-boxes-properly@^1.0.0:
version "1.0.0"
@@ -5144,14 +5346,13 @@ escape-string-regexp@^4.0.0:
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==
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.1.0.tgz#ba93bbb7a43986d29d6041f99f5262da773e2e17"
+ integrity sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==
dependencies:
esprima "^4.0.1"
estraverse "^5.2.0"
esutils "^2.0.2"
- optionator "^0.8.1"
optionalDependencies:
source-map "~0.6.1"
@@ -5169,13 +5370,13 @@ eslint-config-standard@^14.1.1:
integrity sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg==
eslint-import-resolver-node@^0.3.3:
- version "0.3.7"
- resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.7.tgz#83b375187d412324a1963d84fa664377a23eb4d7"
- integrity sha512-gozW2blMLJCeFpBwugLTGyvVjNoeo1knonXAcatC6bjPBZitotxdWf7Gimr25N4c0AAOo4eOUfaG82IJPDpqCA==
+ version "0.3.9"
+ resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz#d4eaac52b8a2e7c3cd1903eb00f7e053356118ac"
+ integrity sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==
dependencies:
debug "^3.2.7"
- is-core-module "^2.11.0"
- resolve "^1.22.1"
+ is-core-module "^2.13.0"
+ resolve "^1.22.4"
eslint-loader@^4.0.2:
version "4.0.2"
@@ -5614,14 +5815,14 @@ fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
fast-diff@^1.1.2, fast-diff@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03"
- integrity sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/fast-diff/-/fast-diff-1.3.0.tgz#ece407fa550a64d638536cd727e129c61616e0f0"
+ integrity sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==
fast-glob@^3.2.9:
- version "3.2.12"
- resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.12.tgz#7f39ec99c2e6ab030337142da9e0c18f37afae80"
- integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
+ version "3.3.1"
+ resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
+ integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
dependencies:
"@nodelib/fs.stat" "^2.0.2"
"@nodelib/fs.walk" "^1.2.3"
@@ -5634,7 +5835,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:
+fast-levenshtein@^2.0.6:
version "2.0.6"
resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
@@ -5782,11 +5983,12 @@ find-up@^4.0.0, find-up@^4.1.0:
path-exists "^4.0.0"
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==
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.1.0.tgz#0e54ab4a1a60fe87e2946b6b00657f1c99e1af3f"
+ integrity sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==
dependencies:
- flatted "^3.1.0"
+ flatted "^3.2.7"
+ keyv "^4.5.3"
rimraf "^3.0.2"
flat@^5.0.2:
@@ -5794,7 +5996,7 @@ flat@^5.0.2:
resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
-flatted@^3.0.5, flatted@^3.1.0:
+flatted@^3.0.5, flatted@^3.2.7:
version "3.2.7"
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.7.tgz#609f39207cb614b89d0765b477cb2d437fbf9787"
integrity sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==
@@ -5856,9 +6058,9 @@ forwarded@0.2.0:
integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
fraction.js@^4.2.0:
- version "4.2.0"
- resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
- integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
+ version "4.3.5"
+ resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.5.tgz#4e43c82c446e5dd64fd06aeb0cdab52f915fd110"
+ integrity sha512-58DncB2bO/8ZvTHapG7U2KEbeFFyUbbrFFkHakecpdUSqJrQnEuBeTUPEggIVkx5cnugZJ4IVzk2Nbb32MOxBg==
fragment-cache@^0.2.1:
version "0.2.1"
@@ -5915,10 +6117,10 @@ fs-minipass@^2.0.0:
dependencies:
minipass "^3.0.0"
-fs-monkey@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
- integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
+fs-monkey@^1.0.4:
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.4.tgz#ee8c1b53d3fe8bb7e5d2c5c5dfc0168afdd2f747"
+ integrity sha512-INM/fWAxMICjttnD0DX1rBvinKskj5G1w+oy/pnm9u/tSlnBrzFonJMcalKJ30P8RRsPzKcCG7Q8l0jx5Fh9YQ==
fs-write-stream-atomic@^1.0.8:
version "1.0.10"
@@ -5944,9 +6146,9 @@ fsevents@^1.2.7:
nan "^2.12.1"
fsevents@^2.3.2, 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==
+ version "2.3.3"
+ resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+ integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
function-bind@^1.1.1:
version "1.1.1"
@@ -5954,21 +6156,21 @@ function-bind@^1.1.1:
integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
function.prototype.name@^1.1.5:
- version "1.1.5"
- resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.5.tgz#cce0505fe1ffb80503e6f9e46cc64e46a12a9621"
- integrity sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==
+ version "1.1.6"
+ resolved "https://registry.yarnpkg.com/function.prototype.name/-/function.prototype.name-1.1.6.tgz#cdf315b7d90ee77a4c6ee216c3c3362da07533fd"
+ integrity sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==
dependencies:
call-bind "^1.0.2"
- define-properties "^1.1.3"
- es-abstract "^1.19.0"
- functions-have-names "^1.2.2"
+ define-properties "^1.2.0"
+ es-abstract "^1.22.1"
+ functions-have-names "^1.2.3"
functional-red-black-tree@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
-functions-have-names@^1.2.2, functions-have-names@^1.2.3:
+functions-have-names@^1.2.3:
version "1.2.3"
resolved "https://registry.yarnpkg.com/functions-have-names/-/functions-have-names-1.2.3.tgz#0404fe4ee2ba2f607f0e0ec3c80bae994133b834"
integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
@@ -5990,13 +6192,14 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
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.1.3, get-intrinsic@^1.2.0:
- version "1.2.0"
- resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.0.tgz#7ad1dc0535f3a2904bba075772763e5051f6d05f"
- integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
+ version "1.2.1"
+ resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.1.tgz#d295644fed4505fc9cde952c37ee12b477a83d82"
+ integrity sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==
dependencies:
function-bind "^1.1.1"
has "^1.0.3"
+ has-proto "^1.0.1"
has-symbols "^1.0.3"
get-package-type@^0.1.0:
@@ -6105,7 +6308,7 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, gl
once "^1.3.0"
path-is-absolute "^1.0.0"
-glob@^8.0.3, glob@^8.1.0:
+glob@^8.1.0:
version "8.1.0"
resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
@@ -6129,9 +6332,9 @@ globals@^11.1.0:
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
globals@^13.6.0, globals@^13.9.0:
- version "13.20.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.20.0.tgz#ea276a1e508ffd4f1612888f9d1bad1e2717bf82"
- integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
+ version "13.21.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.21.0.tgz#163aae12f34ef502f5153cfbdd3600f36c63c571"
+ integrity sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==
dependencies:
type-fest "^0.20.2"
@@ -6387,9 +6590,9 @@ html-encoding-sniffer@^2.0.1:
whatwg-encoding "^1.0.5"
html-entities@^2.1.0:
- version "2.3.3"
- resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.3.tgz#117d7626bece327fc8baace8868fa6f5ef856e46"
- integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.4.0.tgz#edd0cee70402584c8c76cc2c0556db09d1f45061"
+ integrity sha512-igBTJcNNNhvZFRtm8uA6xMY6xYleeDwn3PeBCkDz7tHttv4F2hsDI2aPgNERWzvRcNYHNT3ymRaQzllmXj4YsQ==
html-escaper@^2.0.0:
version "2.0.2"
@@ -6774,10 +6977,10 @@ is-ci@^2.0.0:
dependencies:
ci-info "^2.0.0"
-is-core-module@^2.11.0:
- version "2.12.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.12.0.tgz#36ad62f6f73c8253fd6472517a12483cf03e7ec4"
- integrity sha512-RECHCBCd/viahWmwj6enj19sKbHfJrddi/6cBDsNTKbNq0f7VeaUkBo60BqzvPqo/W54ChS62Z5qyun7cfOMqQ==
+is-core-module@^2.13.0:
+ version "2.13.0"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db"
+ integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==
dependencies:
has "^1.0.3"
@@ -7017,15 +7220,11 @@ is-symbol@^1.0.2, is-symbol@^1.0.3:
has-symbols "^1.0.2"
is-typed-array@^1.1.10, is-typed-array@^1.1.9:
- version "1.1.10"
- resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.10.tgz#36a5b5cb4189b575d1a3e4b08536bfb485801e3f"
- integrity sha512-PJqgEHiWZvMpaFZ3uTc8kHPM4+4ADTlDniuQL7cU/UDA0Ql7F70yGfHph3cLNe+c9toaigv+DFzTJKhc2CtO6A==
+ version "1.1.12"
+ resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.12.tgz#d0bab5686ef4a76f7a73097b95470ab199c57d4a"
+ integrity sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==
dependencies:
- available-typed-arrays "^1.0.5"
- call-bind "^1.0.2"
- for-each "^0.3.3"
- gopd "^1.0.1"
- has-tostringtag "^1.0.0"
+ which-typed-array "^1.1.11"
is-typedarray@^1.0.0:
version "1.0.0"
@@ -7152,12 +7351,12 @@ istanbul-lib-processinfo@^2.0.2:
uuid "^8.3.2"
istanbul-lib-report@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
- integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz#908305bac9a5bd175ac6a74489eafd0fc2445a7d"
+ integrity sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==
dependencies:
istanbul-lib-coverage "^3.0.0"
- make-dir "^3.0.0"
+ make-dir "^4.0.0"
supports-color "^7.1.0"
istanbul-lib-source-maps@^4.0.0:
@@ -7170,9 +7369,9 @@ istanbul-lib-source-maps@^4.0.0:
source-map "^0.6.1"
istanbul-reports@^3.0.2, istanbul-reports@^3.1.3:
- version "3.1.5"
- resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.5.tgz#cc9a6ab25cb25659810e4785ed9d9fb742578bae"
- integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
+ version "3.1.6"
+ resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.6.tgz#2544bcab4768154281a2f0870471902704ccaa1a"
+ integrity sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==
dependencies:
html-escaper "^2.0.0"
istanbul-lib-report "^3.0.0"
@@ -7591,10 +7790,10 @@ jest@^27.0.2:
import-local "^3.0.2"
jest-cli "^27.5.1"
-jiti@^1.16.2, jiti@^1.18.2:
- version "1.18.2"
- resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.18.2.tgz#80c3ef3d486ebf2450d9335122b32d121f2a83cd"
- integrity sha512-QAdOptna2NYiSSpv0O/BwoHBSmz4YhpzJHyi+fnMRTXFjp7B8i/YG5Z8IfusxB1ufjcD2Sre1F3R+nX3fvy7gg==
+jiti@^1.16.2, jiti@^1.19.1:
+ version "1.19.3"
+ resolved "https://registry.yarnpkg.com/jiti/-/jiti-1.19.3.tgz#ef554f76465b3c2b222dc077834a71f0d4a37569"
+ integrity sha512-5eEbBDQT/jF1xg6l36P+mWGGoH9Spuy0PCdSr2dtWRDGC6ph/w9ZCL4lmESW8f8F7MwT3XKescfP0wnZWAKL9w==
jose@^4.9.2:
version "4.14.4"
@@ -7612,13 +7811,13 @@ js-base64@^3.7.2:
integrity sha512-3MEt5DTINKqfScXKfJFrRbxkrnk2AxPWGBL/ycjz4dK8iqiSJ06UxD8jh8xuh6p10TX4t2+7FsBYVxxQbMg+qA==
js-beautify@^1.6.12:
- version "1.14.7"
- resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.7.tgz#9206296de33f86dc106d3e50a35b7cf8729703b2"
- integrity sha512-5SOX1KXPFKx+5f6ZrPsIPEY7NwKeQz47n3jm2i+XeHx9MoRsfQenlOP13FQhWvg8JRS0+XLO6XYUQ2GX+q+T9A==
+ version "1.14.9"
+ resolved "https://registry.yarnpkg.com/js-beautify/-/js-beautify-1.14.9.tgz#a5db728bc5a0d84d3b1a597c376b29bd4d39c8e5"
+ integrity sha512-coM7xq1syLcMyuVGyToxcj2AlzhkDjmfklL8r0JgJ7A76wyGMpJ1oA35mr4APdYNO/o/4YY8H54NQIJzhMbhBg==
dependencies:
config-chain "^1.1.13"
- editorconfig "^0.15.3"
- glob "^8.0.3"
+ editorconfig "^1.0.3"
+ glob "^8.1.0"
nopt "^6.0.0"
js-cookie@^3.0.0:
@@ -7739,7 +7938,7 @@ json5@^1.0.1, json5@^1.0.2:
dependencies:
minimist "^1.2.0"
-json5@^2.1.1, json5@^2.1.2, json5@^2.2.2:
+json5@^2.1.1, json5@^2.1.2, json5@^2.2.3:
version "2.2.3"
resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283"
integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==
@@ -7772,10 +7971,10 @@ keyv@^3.0.0:
dependencies:
json-buffer "3.0.0"
-keyv@^4.0.0:
- version "4.5.2"
- resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.2.tgz#0e310ce73bf7851ec702f2eaf46ec4e3805cce56"
- integrity sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==
+keyv@^4.0.0, keyv@^4.5.3:
+ version "4.5.3"
+ resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.3.tgz#00873d2b046df737963157bd04f294ca818c9c25"
+ integrity sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==
dependencies:
json-buffer "3.0.1"
@@ -7875,15 +8074,7 @@ levn@^0.4.1:
prelude-ls "^1.2.1"
type-check "~0.4.0"
-levn@~0.3.0:
- version "0.3.0"
- resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
- integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
- dependencies:
- prelude-ls "~1.1.2"
- type-check "~0.3.2"
-
-lilconfig@^2.0.3:
+lilconfig@^2.0.3, lilconfig@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
@@ -8027,6 +8218,16 @@ lodash.debounce@^4.0.8:
resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
+lodash.escape@^4.0.1:
+ version "4.0.1"
+ resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-4.0.1.tgz#c9044690c21e04294beaa517712fded1fa88de98"
+ integrity sha512-nXEOnb/jK9g0DYMr1/Xvq6l5xMD7GDG55+GSYIYmS0G4tBk/hURD4JR9WCavs04t33WmJx9kCyp9vJ+mr4BOUw==
+
+lodash.flatten@^4.4.0:
+ version "4.4.0"
+ resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
+ integrity sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==
+
lodash.flattendeep@^4.4.0:
version "4.4.0"
resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
@@ -8037,6 +8238,11 @@ lodash.get@^4.4.2:
resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
integrity sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==
+lodash.invokemap@^4.6.0:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/lodash.invokemap/-/lodash.invokemap-4.6.0.tgz#1748cda5d8b0ef8369c4eb3ec54c21feba1f2d62"
+ integrity sha512-CfkycNtMqgUlfjfdh2BhKO/ZXrP8ePOX5lEU/g0R3ItJcnuxWDwokMGKx1hWcfOikmyOVx6X9IwWnDGlgKl61w==
+
lodash.islength@^4.0.1:
version "4.0.1"
resolved "https://registry.yarnpkg.com/lodash.islength/-/lodash.islength-4.0.1.tgz#4e9868d452575d750affd358c979543dc20ed577"
@@ -8057,6 +8263,11 @@ lodash.merge@^4.6.1, lodash.merge@^4.6.2:
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+lodash.pullall@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/lodash.pullall/-/lodash.pullall-4.2.0.tgz#9d98b8518b7c965b0fae4099bd9fb7df8bbf38ba"
+ integrity sha512-VhqxBKH0ZxPpLhiu68YD1KnHmbhQJQctcipvmFnqIBDYzcIHzf3Zpu0tpeOKtR4x76p9yohc506eGdOjTmyIBg==
+
lodash.template@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
@@ -8095,6 +8306,11 @@ lodash.uniqby@4.5.0:
lodash._baseiteratee "~4.7.0"
lodash._baseuniq "~4.6.0"
+lodash.uniqby@^4.7.0:
+ version "4.7.0"
+ resolved "https://registry.yarnpkg.com/lodash.uniqby/-/lodash.uniqby-4.7.0.tgz#d99c07a669e9e6d24e1362dfe266c67616af1302"
+ integrity sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==
+
lodash.zip@^4.2.0:
version "4.2.0"
resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020"
@@ -8135,7 +8351,7 @@ lowercase-keys@^2.0.0:
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
-lru-cache@^4.1.2, lru-cache@^4.1.5:
+lru-cache@^4.1.2:
version "4.1.5"
resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
@@ -8179,6 +8395,13 @@ make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0, make-dir@~3.1.0:
dependencies:
semver "^6.0.0"
+make-dir@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-4.0.0.tgz#c3c2307a771277cd9638305f915c29ae741b614e"
+ integrity sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==
+ dependencies:
+ semver "^7.5.3"
+
makeerror@1.0.12:
version "1.0.12"
resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a"
@@ -8245,6 +8468,16 @@ mdn-data@2.0.14:
resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
+mdn-data@2.0.28:
+ version "2.0.28"
+ resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.28.tgz#5ec48e7bef120654539069e1ae4ddc81ca490eba"
+ integrity sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==
+
+mdn-data@2.0.30:
+ version "2.0.30"
+ resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.30.tgz#ce4df6f80af6cfbe218ecd5c552ba13c4dfa08cc"
+ integrity sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==
+
media-typer@0.3.0:
version "0.3.0"
resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@@ -8259,11 +8492,11 @@ mem@^8.0.0:
mimic-fn "^3.1.0"
memfs@^3.4.3:
- version "3.5.1"
- resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.5.1.tgz#f0cd1e2bfaef58f6fe09bfb9c2288f07fea099ec"
- integrity sha512-UWbFJKvj5k+nETdteFndTpYxdeTMox/ULeqX5k/dpaQJCCFmj5EeKv3dBcyO2xmkRAx2vppRu5dVG7SOtsGOzA==
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.6.0.tgz#d7a2110f86f79dd950a8b6df6d57bc984aa185f6"
+ integrity sha512-EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==
dependencies:
- fs-monkey "^1.0.3"
+ fs-monkey "^1.0.4"
memory-fs@^0.4.1:
version "0.4.1"
@@ -8395,6 +8628,13 @@ minimalistic-crypto-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz#f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"
integrity sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==
+minimatch@9.0.1:
+ version "9.0.1"
+ resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.1.tgz#8a555f541cf976c622daf078bb28f29fb927c253"
+ integrity sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==
+ dependencies:
+ brace-expansion "^2.0.1"
+
minimatch@^3.0.4, minimatch@^3.1.1:
version "3.1.2"
resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -8621,22 +8861,22 @@ no-case@^3.0.4:
lower-case "^2.0.2"
tslib "^2.0.3"
-node-fetch-native@^1.0.2:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.1.0.tgz#a530f5c4cadb49b382dcf81d8f5f19ed0f457fbe"
- integrity sha512-nl5goFCig93JZ9FIV8GHT9xpNqXbxQUzkOmKIMKmncsBH9jhg7qKex8hirpymkBFmNQ114chEEG5lS4wgK2I+Q==
+node-fetch-native@^1.2.0:
+ version "1.4.0"
+ resolved "https://registry.yarnpkg.com/node-fetch-native/-/node-fetch-native-1.4.0.tgz#fbe8ac033cb6aa44bd106b5e4fd2b6277ba70fa1"
+ integrity sha512-F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==
node-fetch@^2.6.1, node-fetch@^2.6.7:
- version "2.6.9"
- resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.9.tgz#7c7f744b5cc6eb5fd404e0c7a9fec630a55657e6"
- integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
+ version "2.7.0"
+ resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d"
+ integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
dependencies:
whatwg-url "^5.0.0"
node-html-parser@^6.1.5:
- version "6.1.5"
- resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-6.1.5.tgz#c819dceb13a10a7642ff92f94f870b4f77968097"
- integrity sha512-fAaM511feX++/Chnhe475a0NHD8M7AxDInsqQpz6x63GRF7xYNdS8Vo5dKsIVPgsOvG7eioRRTZQnWBrhDHBSg==
+ version "6.1.6"
+ resolved "https://registry.yarnpkg.com/node-html-parser/-/node-html-parser-6.1.6.tgz#8369a11d629a92ab2db2344bb650261135ac8e13"
+ integrity sha512-C/MGDQ2NjdjzUq41bW9kW00MPZecAe/oo89vZEFLDfWoQVDk/DdML1yuxVVKLDMFIFax2VTq6Vpfzyn7z5yYgQ==
dependencies:
css-select "^5.1.0"
he "1.2.0"
@@ -8687,10 +8927,10 @@ node-preload@^0.2.1:
dependencies:
process-on-spawn "^1.0.0"
-node-releases@^2.0.8:
- version "2.0.10"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.10.tgz#c311ebae3b6a148c89b1813fd7c4d3c024ef537f"
- integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
+node-releases@^2.0.13:
+ version "2.0.13"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.13.tgz#d5ed1627c23e3461e819b02e57b75e4899b1c81d"
+ integrity sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==
node-res@^5.0.1:
version "5.0.1"
@@ -8790,30 +9030,30 @@ nuxt-i18n@^6.15.4:
vue-i18n "^8.25.0"
nuxt@^2.15.8:
- version "2.16.3"
- resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.16.3.tgz#d0338ab9145bc60aa3d927f03d20e439b9adddf4"
- integrity sha512-KfqOwtsgo2vew+mHNTQZOf23SlUYYnppH65Rj7whmbXJ+J28Rdvx8ccTj0Mir13TVpjUMtxYBq9VWAL6cFZyOA==
+ version "2.17.1"
+ resolved "https://registry.yarnpkg.com/nuxt/-/nuxt-2.17.1.tgz#132a8812df48bf2df2fa9c890e63268600d06ce3"
+ integrity sha512-II27v3nRmqsNMT6tNRIodlRPCuIO8RF6NrfsLh7MX0UVI7//HlEG54ivWzxWB2rfqBTDSRxrETPH7NGE+m1H7A==
dependencies:
- "@nuxt/babel-preset-app" "2.16.3"
- "@nuxt/builder" "2.16.3"
- "@nuxt/cli" "2.16.3"
+ "@nuxt/babel-preset-app" "2.17.1"
+ "@nuxt/builder" "2.17.1"
+ "@nuxt/cli" "2.17.1"
"@nuxt/components" "^2.2.1"
- "@nuxt/config" "2.16.3"
- "@nuxt/core" "2.16.3"
- "@nuxt/generator" "2.16.3"
+ "@nuxt/config" "2.17.1"
+ "@nuxt/core" "2.17.1"
+ "@nuxt/generator" "2.17.1"
"@nuxt/loading-screen" "^2.0.4"
"@nuxt/opencollective" "^0.3.3"
- "@nuxt/server" "2.16.3"
+ "@nuxt/server" "2.17.1"
"@nuxt/telemetry" "^1.4.1"
- "@nuxt/utils" "2.16.3"
- "@nuxt/vue-app" "2.16.3"
- "@nuxt/vue-renderer" "2.16.3"
- "@nuxt/webpack" "2.16.3"
+ "@nuxt/utils" "2.17.1"
+ "@nuxt/vue-app" "2.17.1"
+ "@nuxt/vue-renderer" "2.17.1"
+ "@nuxt/webpack" "2.17.1"
nwsapi@^2.2.0:
- version "2.2.4"
- resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.4.tgz#fd59d5e904e8e1f03c25a7d5a15cfa16c714a1e5"
- integrity sha512-NHj4rzRo0tQdijE9ZqAx6kYDcoRwYwSYzCA8MY3JzfxlrvEU0jhnhJT9BhqhJs7I/dKcrDm6TyulaRqZPIhN5g==
+ version "2.2.7"
+ resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.7.tgz#738e0707d3128cb750dddcfe90e4610482df0f30"
+ integrity sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==
nyc@^15.1.0:
version "15.1.0"
@@ -8903,14 +9143,14 @@ object.assign@^4.1.4:
object-keys "^1.1.1"
object.getownpropertydescriptors@^2.0.3:
- version "2.1.6"
- resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.6.tgz#5e5c384dd209fa4efffead39e3a0512770ccc312"
- integrity sha512-lq+61g26E/BgHv0ZTFgRvi7NMEPuAxLkFU7rukXjc/AlwH4Am5xXVnIXy3un1bg/JPbXHrixRkK1itUzzPiIjQ==
+ version "2.1.7"
+ resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.7.tgz#7a466a356cd7da4ba8b9e94ff6d35c3eeab5d56a"
+ integrity sha512-PrJz0C2xJ58FNn11XV2lr4Jt5Gzl94qpy9Lu0JlfEj14z88sqbSBJCBEzdlNUCzY2gburhbrwOZ5BHCmuNUy0g==
dependencies:
- array.prototype.reduce "^1.0.5"
+ array.prototype.reduce "^1.0.6"
call-bind "^1.0.2"
define-properties "^1.2.0"
- es-abstract "^1.21.2"
+ es-abstract "^1.22.1"
safe-array-concat "^1.0.0"
object.pick@^1.3.0:
@@ -8921,13 +9161,13 @@ object.pick@^1.3.0:
isobject "^3.0.1"
object.values@^1.1.1:
- version "1.1.6"
- resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.6.tgz#4abbaa71eba47d63589d402856f908243eea9b1d"
- integrity sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==
+ version "1.1.7"
+ resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.7.tgz#617ed13272e7e1071b43973aa1655d9291b8442a"
+ integrity sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==
dependencies:
call-bind "^1.0.2"
- define-properties "^1.1.4"
- es-abstract "^1.20.4"
+ define-properties "^1.2.0"
+ es-abstract "^1.22.1"
on-finished@2.4.1, on-finished@^2.3.0:
version "2.4.1"
@@ -8976,29 +9216,17 @@ optimize-css-assets-webpack-plugin@^6.0.1:
last-call-webpack-plugin "^3.0.0"
postcss "^8.2.1"
-optionator@^0.8.1:
- version "0.8.3"
- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
- integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
- 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"
-
optionator@^0.9.1:
- version "0.9.1"
- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
- integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+ version "0.9.3"
+ resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.3.tgz#007397d44ed1872fdc6ed31360190f81814e2c64"
+ integrity sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==
dependencies:
+ "@aashutoshrathi/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@^5.2.0:
version "5.4.1"
@@ -9371,9 +9599,9 @@ pify@^5.0.0:
integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA==
pirates@^4.0.4, pirates@^4.0.5:
- version "4.0.5"
- resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
- integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
+ version "4.0.6"
+ resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.6.tgz#3018ae32ecfcff6c29ba2267cbf21166ac1f36b9"
+ integrity sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==
pkg-conf@^3.1.0:
version "3.1.0"
@@ -9404,18 +9632,6 @@ pkg-up@^3.1.0:
dependencies:
find-up "^3.0.0"
-playwright-core@1.33.0:
- version "1.33.0"
- resolved "https://registry.yarnpkg.com/playwright-core/-/playwright-core-1.33.0.tgz#269efe29a927cd6d144d05f3c2d2f72bd72447a1"
- integrity sha512-aizyPE1Cj62vAECdph1iaMILpT0WUDCq3E6rW6I+dleSbBoGbktvJtzS6VHkZ4DKNEOG9qJpiom/ZxO+S15LAw==
-
-playwright@^1.14.0:
- version "1.33.0"
- resolved "https://registry.yarnpkg.com/playwright/-/playwright-1.33.0.tgz#88df1cffe97718ab8a02303e12c9133681ec7fab"
- integrity sha512-+zzU3V2TslRX2ETBRgQKsKytYBkJeLZ2xzUj4JohnZnxQnivoUvOvNbRBYWSYykQTO0Y4zb8NwZTYFUO+EpPBQ==
- dependencies:
- playwright-core "1.33.0"
-
plur@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/plur/-/plur-4.0.0.tgz#729aedb08f452645fe8c58ef115bf16b0a73ef84"
@@ -9455,6 +9671,14 @@ postcss-calc@^8.2.3:
postcss-selector-parser "^6.0.9"
postcss-value-parser "^4.2.0"
+postcss-calc@^9.0.0:
+ version "9.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-9.0.1.tgz#a744fd592438a93d6de0f1434c572670361eb6c6"
+ integrity sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==
+ dependencies:
+ postcss-selector-parser "^6.0.11"
+ postcss-value-parser "^4.2.0"
+
postcss-clamp@^4.1.0:
version "4.1.0"
resolved "https://registry.yarnpkg.com/postcss-clamp/-/postcss-clamp-4.1.0.tgz#7263e95abadd8c2ba1bd911b0b5a5c9c93e02363"
@@ -9462,11 +9686,12 @@ postcss-clamp@^4.1.0:
dependencies:
postcss-value-parser "^4.2.0"
-postcss-color-functional-notation@^5.0.2:
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-5.0.2.tgz#6d03c928aa3a13487703af86c301bdcd501e7430"
- integrity sha512-M6ygxWOyd6eWf3sd1Lv8xi4SeF4iBPfJvkfMU4ITh8ExJc1qhbvh/U8Cv/uOvBgUVOMDdScvCdlg8+hREQzs7w==
+postcss-color-functional-notation@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-6.0.0.tgz#dcc1b8b6273099c597a790dc484d89e2573f5f17"
+ integrity sha512-kaWTgnhRKFtfMF8H0+NQBFxgr5CGg05WGe07Mc1ld6XHwwRWlqSbHOW0zwf+BtkBQpsdVUu7+gl9dtdvhWMedw==
dependencies:
+ "@csstools/postcss-progressive-custom-properties" "^3.0.0"
postcss-value-parser "^4.2.0"
postcss-color-hex-alpha@^9.0.2:
@@ -9476,10 +9701,10 @@ postcss-color-hex-alpha@^9.0.2:
dependencies:
postcss-value-parser "^4.2.0"
-postcss-color-rebeccapurple@^8.0.2:
- version "8.0.2"
- resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-8.0.2.tgz#c0f2dcf1ef4dd393314920aa181cca8c390a2648"
- integrity sha512-xWf/JmAxVoB5bltHpXk+uGRoGFwu4WDAR7210el+iyvTdqiKpDhtcT8N3edXMoVJY0WHFMrKMUieql/wRNiXkw==
+postcss-color-rebeccapurple@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-9.0.0.tgz#317bf718962c70b779efacf3dc040c56f05d03ce"
+ integrity sha512-RmUFL+foS05AKglkEoqfx+KFdKRVmqUAxlHNz4jLqIi7046drIPyerdl4B6j/RA2BSP8FI8gJcHmLRrwJOMnHw==
dependencies:
postcss-value-parser "^4.2.0"
@@ -9493,6 +9718,16 @@ postcss-colormin@^5.3.1:
colord "^2.9.1"
postcss-value-parser "^4.2.0"
+postcss-colormin@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.0.0.tgz#d4250652e952e1c0aca70c66942da93d3cdeaafe"
+ integrity sha512-EuO+bAUmutWoZYgHn2T1dG1pPqHU6L4TjzPlu4t1wZGXQ/fxV16xg2EJmYi0z+6r+MGV1yvpx1BHkUaRrPa2bw==
+ dependencies:
+ browserslist "^4.21.4"
+ caniuse-api "^3.0.0"
+ colord "^2.9.1"
+ postcss-value-parser "^4.2.0"
+
postcss-convert-values@^5.1.3:
version "5.1.3"
resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz#04998bb9ba6b65aa31035d669a6af342c5f9d393"
@@ -9501,99 +9736,127 @@ postcss-convert-values@^5.1.3:
browserslist "^4.21.4"
postcss-value-parser "^4.2.0"
-postcss-custom-media@^9.1.3:
- version "9.1.3"
- resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-9.1.3.tgz#68bb2ae377bb07c19f03f252930cc380af894dce"
- integrity sha512-W1C4Fu6KAZ7sKYQCuGMr8gyaE4BtjTQGPLVS4m0WCaWM6l7PgVbvmDeb4ClBc5R/7kdwESYf0hdxGtEPhi9CLA==
+postcss-convert-values@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.0.0.tgz#ec94a954957e5c3f78f0e8f65dfcda95280b8996"
+ integrity sha512-U5D8QhVwqT++ecmy8rnTb+RL9n/B806UVaS3m60lqle4YDFcpbS3ae5bTQIh3wOGUSDHSEtMYLs/38dNG7EYFw==
dependencies:
- "@csstools/cascade-layer-name-parser" "^1.0.2"
- "@csstools/css-parser-algorithms" "^2.1.1"
- "@csstools/css-tokenizer" "^2.1.1"
- "@csstools/media-query-list-parser" "^2.0.4"
+ browserslist "^4.21.4"
+ postcss-value-parser "^4.2.0"
-postcss-custom-properties@^13.1.5:
- version "13.1.5"
- resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-13.1.5.tgz#75567e3b4a664f820bcc3ba8b6ae3c8d27db05d1"
- integrity sha512-98DXk81zTGqMVkGANysMHbGIg3voH383DYo3/+c+Abzay3nao+vM/f4Jgzsakk9S7BDsEw5DiW7sFy5G4W2wLA==
+postcss-custom-media@^10.0.0:
+ version "10.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-10.0.0.tgz#299781f67d043de7d3eaa13923c26c586d9cd57a"
+ integrity sha512-NxDn7C6GJ7X8TsWOa8MbCdq9rLERRLcPfQSp856k1jzMreL8X9M6iWk35JjPRIb9IfRnVohmxAylDRx7n4Rv4g==
dependencies:
- "@csstools/cascade-layer-name-parser" "^1.0.2"
- "@csstools/css-parser-algorithms" "^2.1.1"
+ "@csstools/cascade-layer-name-parser" "^1.0.3"
+ "@csstools/css-parser-algorithms" "^2.3.0"
"@csstools/css-tokenizer" "^2.1.1"
+ "@csstools/media-query-list-parser" "^2.1.2"
+
+postcss-custom-properties@^13.3.0:
+ version "13.3.0"
+ resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-13.3.0.tgz#53361280a9ec57c2ac448c0877ba25c4978241ee"
+ integrity sha512-q4VgtIKSy5+KcUvQ0WxTjDy9DZjQ5VCXAZ9+tT9+aPMbA0z6s2t1nMw0QHszru1ib5ElkXl9JUpYYU37VVUs7g==
+ dependencies:
+ "@csstools/cascade-layer-name-parser" "^1.0.4"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
postcss-value-parser "^4.2.0"
-postcss-custom-selectors@^7.1.3:
- version "7.1.3"
- resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-7.1.3.tgz#047e2bc4726fe8e448c23047c99785fcdbe1ef87"
- integrity sha512-GTVscax6O/8s7agFF0HsOoIyjrnAbLjgCUle8tn+0oDGJuVx7p56U7ClSRoC49poxFuMfu2B4Q8GnxSCOeuFKw==
+postcss-custom-selectors@^7.1.4:
+ version "7.1.4"
+ resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-7.1.4.tgz#5980972353119af0d9725bdcccad46be8cfc9011"
+ integrity sha512-TU2xyUUBTlpiLnwyE2ZYMUIYB41MKMkBZ8X8ntkqRDQ8sdBLhFFsPgNcOliBd5+/zcK51C9hRnSE7hKUJMxQSw==
dependencies:
- "@csstools/cascade-layer-name-parser" "^1.0.2"
- "@csstools/css-parser-algorithms" "^2.1.1"
+ "@csstools/cascade-layer-name-parser" "^1.0.3"
+ "@csstools/css-parser-algorithms" "^2.3.0"
"@csstools/css-tokenizer" "^2.1.1"
- postcss-selector-parser "^6.0.4"
+ postcss-selector-parser "^6.0.13"
-postcss-dir-pseudo-class@^7.0.2:
- version "7.0.2"
- resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-7.0.2.tgz#71618b7eb4abe067845d11b3c8f322760c9b3e88"
- integrity sha512-cMnslilYxBf9k3qejnovrUONZx1rXeUZJw06fgIUBzABJe3D2LiLL5WAER7Imt3nrkaIgG05XZBztueLEf5P8w==
+postcss-dir-pseudo-class@^8.0.0:
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-8.0.0.tgz#9e4e37d170f672520d3f38fd8376db0ca04d4e9c"
+ integrity sha512-Oy5BBi0dWPwij/IA+yDYj+/OBMQ9EPqAzTHeSNUYrUWdll/PRJmcbiUj0MNcsBi681I1gcSTLvMERPaXzdbvJg==
dependencies:
- postcss-selector-parser "^6.0.10"
+ postcss-selector-parser "^6.0.13"
postcss-discard-comments@^5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz#8df5e81d2925af2780075840c1526f0660e53696"
integrity sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==
+postcss-discard-comments@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-6.0.0.tgz#9ca335e8b68919f301b24ba47dde226a42e535fe"
+ integrity sha512-p2skSGqzPMZkEQvJsgnkBhCn8gI7NzRH2683EEjrIkoMiwRELx68yoUJ3q3DGSGuQ8Ug9Gsn+OuDr46yfO+eFw==
+
postcss-discard-duplicates@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848"
integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==
+postcss-discard-duplicates@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.0.tgz#c26177a6c33070922e67e9a92c0fd23d443d1355"
+ integrity sha512-bU1SXIizMLtDW4oSsi5C/xHKbhLlhek/0/yCnoMQany9k3nPBq+Ctsv/9oMmyqbR96HYHxZcHyK2HR5P/mqoGA==
+
postcss-discard-empty@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz#e57762343ff7f503fe53fca553d18d7f0c369c6c"
integrity sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==
+postcss-discard-empty@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.0.tgz#06c1c4fce09e22d2a99e667c8550eb8a3a1b9aee"
+ integrity sha512-b+h1S1VT6dNhpcg+LpyiUrdnEZfICF0my7HAKgJixJLW7BnNmpRH34+uw/etf5AhOlIhIAuXApSzzDzMI9K/gQ==
+
postcss-discard-overridden@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
-postcss-double-position-gradients@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-4.0.2.tgz#855a23201f26be447210504e9b668429cbf4640c"
- integrity sha512-GXL1RmFREDK4Q9aYvI2RhVrA6a6qqSMQQ5ke8gSH1xgV6exsqbcJpIumC7AOgooH6/WIG3/K/T8xxAiVHy/tJg==
+postcss-discard-overridden@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.0.tgz#49c5262db14e975e349692d9024442de7cd8e234"
+ integrity sha512-4VELwssYXDFigPYAZ8vL4yX4mUepF/oCBeeIT4OXsJPYOtvJumyz9WflmJWTfDwCUcpDR+z0zvCWBXgTx35SVw==
+
+postcss-double-position-gradients@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-5.0.0.tgz#cdc11e1210c3fbd3f7bc242a5ee83e5b9d7db8fa"
+ integrity sha512-wR8npIkrIVUTicUpCWSSo1f/g7gAEIH70FMqCugY4m4j6TX4E0T2Q5rhfO0gqv00biBZdLyb+HkW8x6as+iJNQ==
dependencies:
- "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.0"
postcss-value-parser "^4.2.0"
-postcss-focus-visible@^8.0.2:
- version "8.0.2"
- resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-8.0.2.tgz#a7ac26ffe3e9c2bd17d7200d75e2d79ee8110891"
- integrity sha512-f/Vd+EC/GaKElknU59esVcRYr/Y3t1ZAQyL4u2xSOgkDy4bMCmG7VP5cGvj3+BTLNE9ETfEuz2nnt4qkZwTTeA==
+postcss-focus-visible@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-9.0.0.tgz#a81227428d6f1e524099c6581f7c7132f987e382"
+ integrity sha512-zA4TbVaIaT8npZBEROhZmlc+GBKE8AELPHXE7i4TmIUEQhw/P/mSJfY9t6tBzpQ1rABeGtEOHYrW4SboQeONMQ==
dependencies:
- postcss-selector-parser "^6.0.10"
+ postcss-selector-parser "^6.0.13"
-postcss-focus-within@^7.0.2:
- version "7.0.2"
- resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-7.0.2.tgz#5d2c866030e66ed22b204c9506de640943310b1c"
- integrity sha512-AHAJ89UQBcqBvFgQJE9XasGuwMNkKsGj4D/f9Uk60jFmEBHpAL14DrnSk3Rj+SwZTr/WUG+mh+Rvf8fid/346w==
+postcss-focus-within@^8.0.0:
+ version "8.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-8.0.0.tgz#8304380dd2dadc1c2dcfa52816ff86be7736fc16"
+ integrity sha512-E7+J9nuQzZaA37D/MUZMX1K817RZGDab8qw6pFwzAkDd/QtlWJ9/WTKmzewNiuxzeq6WWY7ATiRePVoDKp+DnA==
dependencies:
- postcss-selector-parser "^6.0.10"
+ postcss-selector-parser "^6.0.13"
postcss-font-variant@^5.0.0:
version "5.0.0"
resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66"
integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==
-postcss-gap-properties@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-4.0.1.tgz#0347d6a84a46bfbe88bedc542cc4b354e04a8338"
- integrity sha512-V5OuQGw4lBumPlwHWk/PRfMKjaq/LTGR4WDTemIMCaMevArVfCCA9wBJiL1VjDAd+rzuCIlkRoRvDsSiAaZ4Fg==
+postcss-gap-properties@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-5.0.0.tgz#3bd77f3d51facb1da404b4edd72b8203929385a5"
+ integrity sha512-YjsEEL6890P7MCv6fch6Am1yq0EhQCJMXyT4LBohiu87+4/WqR7y5W3RIv53WdA901hhytgRvjlrAhibhW4qsA==
-postcss-image-set-function@^5.0.2:
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-5.0.2.tgz#088e0f535f43e74d6ea8033ff7b0482e2735ea6e"
- integrity sha512-Sszjwo0ubETX0Fi5MvpYzsONwrsjeabjMoc5YqHvURFItXgIu3HdCjcVuVKGMPGzKRhgaknmdM5uVWInWPJmeg==
+postcss-image-set-function@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-6.0.0.tgz#a5aba4a805ae903ab8200b584242149c48c481fb"
+ integrity sha512-bg58QnJexFpPBU4IGPAugAPKV0FuFtX5rHYNSKVaV91TpHN7iwyEzz1bkIPCiSU5+BUN00e+3fV5KFrwIgRocw==
dependencies:
postcss-value-parser "^4.2.0"
@@ -9618,15 +9881,15 @@ postcss-initial@^4.0.1:
resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42"
integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==
-postcss-lab-function@^5.2.1:
- version "5.2.1"
- resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-5.2.1.tgz#a1f324fa5c098bddf36de221abcc32070c77b5db"
- integrity sha512-u71Adr4nWi+4EmSZq5EV/fg9d1dYO6W26RNtT9LISEyjhH1q23vJIUkSqRwHgD6v7xxsxLOY5cSdVyaNE6rqzw==
+postcss-lab-function@^6.0.2:
+ version "6.0.2"
+ resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-6.0.2.tgz#f2288a09e2f02d3470772206a2db2887d57f42f5"
+ integrity sha512-OfjeI/1rQWtj38Quy3+D9+mpOReOX3vOXfQNCfsmFIl6xK1AAJ1ta1uGjAswYwsN8uJ9Y52K8U53Jk8QJWfJLg==
dependencies:
- "@csstools/css-color-parser" "^1.1.2"
- "@csstools/css-parser-algorithms" "^2.1.1"
- "@csstools/css-tokenizer" "^2.1.1"
- "@csstools/postcss-progressive-custom-properties" "^2.0.0"
+ "@csstools/css-color-parser" "^1.3.0"
+ "@csstools/css-parser-algorithms" "^2.3.1"
+ "@csstools/css-tokenizer" "^2.2.0"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.0"
postcss-loader@^4.3.0:
version "4.3.0"
@@ -9639,10 +9902,10 @@ postcss-loader@^4.3.0:
schema-utils "^3.0.0"
semver "^7.3.4"
-postcss-logical@^6.1.0:
- version "6.1.0"
- resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-6.1.0.tgz#c33ae75d3edaea7eb821e76dc4e6d0ecedc3200d"
- integrity sha512-qb1+LpClhYjxac8SfOcWotnY3unKZesDqIOm+jnGt8rTl7xaIWpE2bPGZHxflOip1E/4ETo79qlJyRL3yrHn1g==
+postcss-logical@^7.0.0:
+ version "7.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-7.0.0.tgz#9a83426e716e3c8f957dda3fd874edbcf22c754e"
+ integrity sha512-zYf3vHkoW82f5UZTEXChTJvH49Yl9X37axTZsJGxrCG2kOUwtaAoz9E7tqYg0lsIoJLybaL8fk/2mOi81zVIUw==
dependencies:
postcss-value-parser "^4.2.0"
@@ -9654,6 +9917,14 @@ postcss-merge-longhand@^5.1.7:
postcss-value-parser "^4.2.0"
stylehacks "^5.1.1"
+postcss-merge-longhand@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.0.tgz#6f627b27db939bce316eaa97e22400267e798d69"
+ integrity sha512-4VSfd1lvGkLTLYcxFuISDtWUfFS4zXe0FpF149AyziftPFQIWxjvFSKhA4MIxMe4XM3yTDgQMbSNgzIVxChbIg==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+ stylehacks "^6.0.0"
+
postcss-merge-rules@^5.1.4:
version "5.1.4"
resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz#2f26fa5cacb75b1402e213789f6766ae5e40313c"
@@ -9664,6 +9935,16 @@ postcss-merge-rules@^5.1.4:
cssnano-utils "^3.1.0"
postcss-selector-parser "^6.0.5"
+postcss-merge-rules@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.0.1.tgz#39f165746404e646c0f5c510222ccde4824a86aa"
+ integrity sha512-a4tlmJIQo9SCjcfiCcCMg/ZCEe0XTkl/xK0XHBs955GWg9xDX3NwP9pwZ78QUOWB8/0XCjZeJn98Dae0zg6AAw==
+ dependencies:
+ browserslist "^4.21.4"
+ caniuse-api "^3.0.0"
+ cssnano-utils "^4.0.0"
+ postcss-selector-parser "^6.0.5"
+
postcss-minify-font-values@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b"
@@ -9671,6 +9952,13 @@ postcss-minify-font-values@^5.1.0:
dependencies:
postcss-value-parser "^4.2.0"
+postcss-minify-font-values@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.0.tgz#68d4a028f9fa5f61701974724b2cc9445d8e6070"
+ integrity sha512-zNRAVtyh5E8ndZEYXA4WS8ZYsAp798HiIQ1V2UF/C/munLp2r1UGHwf1+6JFu7hdEhJFN+W1WJQKBrtjhFgEnA==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
postcss-minify-gradients@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz#f1fe1b4f498134a5068240c2f25d46fcd236ba2c"
@@ -9680,6 +9968,15 @@ postcss-minify-gradients@^5.1.1:
cssnano-utils "^3.1.0"
postcss-value-parser "^4.2.0"
+postcss-minify-gradients@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.0.tgz#22b5c88cc63091dadbad34e31ff958404d51d679"
+ integrity sha512-wO0F6YfVAR+K1xVxF53ueZJza3L+R3E6cp0VwuXJQejnNUH0DjcAFe3JEBeTY1dLwGa0NlDWueCA1VlEfiKgAA==
+ dependencies:
+ colord "^2.9.1"
+ cssnano-utils "^4.0.0"
+ postcss-value-parser "^4.2.0"
+
postcss-minify-params@^5.1.4:
version "5.1.4"
resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz#c06a6c787128b3208b38c9364cfc40c8aa5d7352"
@@ -9689,6 +9986,15 @@ postcss-minify-params@^5.1.4:
cssnano-utils "^3.1.0"
postcss-value-parser "^4.2.0"
+postcss-minify-params@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.0.0.tgz#2b3a85a9e3b990d7a16866f430f5fd1d5961b539"
+ integrity sha512-Fz/wMQDveiS0n5JPcvsMeyNXOIMrwF88n7196puSuQSWSa+/Ofc1gDOSY2xi8+A4PqB5dlYCKk/WfqKqsI+ReQ==
+ dependencies:
+ browserslist "^4.21.4"
+ cssnano-utils "^4.0.0"
+ postcss-value-parser "^4.2.0"
+
postcss-minify-selectors@^5.2.1:
version "5.2.1"
resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz#d4e7e6b46147b8117ea9325a915a801d5fe656c6"
@@ -9696,6 +10002,13 @@ postcss-minify-selectors@^5.2.1:
dependencies:
postcss-selector-parser "^6.0.5"
+postcss-minify-selectors@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-6.0.0.tgz#5046c5e8680a586e5a0cad52cc9aa36d6be5bda2"
+ integrity sha512-ec/q9JNCOC2CRDNnypipGfOhbYPuUkewGwLnbv6omue/PSASbHSU7s6uSQ0tcFRVv731oMIx8k0SP4ZX6be/0g==
+ dependencies:
+ postcss-selector-parser "^6.0.5"
+
postcss-modules-extract-imports@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
@@ -9710,9 +10023,9 @@ postcss-modules-local-by-default@^1.1.1:
postcss "^6.0.1"
postcss-modules-local-by-default@^4.0.0:
- version "4.0.0"
- resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
- integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.3.tgz#b08eb4f083050708998ba2c6061b50c2870ca524"
+ integrity sha512-2/u2zraspoACtrbFRnTijMiQtb4GW4BvatjaG/bCjYQo8kLTdevCUlwuBHx2sCnSyrI3x3qj4ZK1j5LQBgzmwA==
dependencies:
icss-utils "^5.0.0"
postcss-selector-parser "^6.0.2"
@@ -9752,19 +10065,24 @@ postcss-modules-values@^4.0.0:
dependencies:
icss-utils "^5.0.0"
-postcss-nesting@^11.2.1:
- version "11.2.2"
- resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-11.2.2.tgz#ddedfea5a1fdcd8d753298d82297ad15d5640c0f"
- integrity sha512-aOTiUniAB1bcPE6GGiynWRa6PZFPhOTAm5q3q5cem6QeSijIHHkWr6gs65ukCZMXeak8yXeZVbBJET3VM+HlhA==
+postcss-nesting@^12.0.1:
+ version "12.0.1"
+ resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-12.0.1.tgz#abb76d15dfd59a9f7d03b4464f53b60a4d3795c4"
+ integrity sha512-6LCqCWP9pqwXw/njMvNK0hGY44Fxc4B2EsGbn6xDcxbNRzP8GYoxT7yabVVMLrX3quqOJ9hg2jYMsnkedOf8pA==
dependencies:
- "@csstools/selector-specificity" "^2.0.0"
- postcss-selector-parser "^6.0.10"
+ "@csstools/selector-specificity" "^3.0.0"
+ postcss-selector-parser "^6.0.13"
postcss-normalize-charset@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed"
integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==
+postcss-normalize-charset@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-6.0.0.tgz#36cc12457259064969fb96f84df491652a4b0975"
+ integrity sha512-cqundwChbu8yO/gSWkuFDmKrCZ2vJzDAocheT2JTd0sFNA4HMGoKMfbk2B+J0OmO0t5GUkiAkSM5yF2rSLUjgQ==
+
postcss-normalize-display-values@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8"
@@ -9772,6 +10090,13 @@ postcss-normalize-display-values@^5.1.0:
dependencies:
postcss-value-parser "^4.2.0"
+postcss-normalize-display-values@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.0.tgz#8d2961415078644d8c6bbbdaf9a2fdd60f546cd4"
+ integrity sha512-Qyt5kMrvy7dJRO3OjF7zkotGfuYALETZE+4lk66sziWSPzlBEt7FrUshV6VLECkI4EN8Z863O6Nci4NXQGNzYw==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
postcss-normalize-positions@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz#ef97279d894087b59325b45c47f1e863daefbb92"
@@ -9779,6 +10104,13 @@ postcss-normalize-positions@^5.1.1:
dependencies:
postcss-value-parser "^4.2.0"
+postcss-normalize-positions@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-6.0.0.tgz#25b96df99a69f8925f730eaee0be74416865e301"
+ integrity sha512-mPCzhSV8+30FZyWhxi6UoVRYd3ZBJgTRly4hOkaSifo0H+pjDYcii/aVT4YE6QpOil15a5uiv6ftnY3rm0igPg==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
postcss-normalize-repeat-style@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz#e9eb96805204f4766df66fd09ed2e13545420fb2"
@@ -9786,6 +10118,13 @@ postcss-normalize-repeat-style@^5.1.1:
dependencies:
postcss-value-parser "^4.2.0"
+postcss-normalize-repeat-style@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.0.tgz#ddf30ad8762feb5b1eb97f39f251acd7b8353299"
+ integrity sha512-50W5JWEBiOOAez2AKBh4kRFm2uhrT3O1Uwdxz7k24aKtbD83vqmcVG7zoIwo6xI2FZ/HDlbrCopXhLeTpQib1A==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
postcss-normalize-string@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228"
@@ -9793,6 +10132,13 @@ postcss-normalize-string@^5.1.0:
dependencies:
postcss-value-parser "^4.2.0"
+postcss-normalize-string@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-6.0.0.tgz#948282647a51e409d69dde7910f0ac2ff97cb5d8"
+ integrity sha512-KWkIB7TrPOiqb8ZZz6homet2KWKJwIlysF5ICPZrXAylGe2hzX/HSf4NTX2rRPJMAtlRsj/yfkrWGavFuB+c0w==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
postcss-normalize-timing-functions@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb"
@@ -9800,6 +10146,13 @@ postcss-normalize-timing-functions@^5.1.0:
dependencies:
postcss-value-parser "^4.2.0"
+postcss-normalize-timing-functions@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.0.tgz#5f13e650b8c43351989fc5de694525cc2539841c"
+ integrity sha512-tpIXWciXBp5CiFs8sem90IWlw76FV4oi6QEWfQwyeREVwUy39VSeSqjAT7X0Qw650yAimYW5gkl2Gd871N5SQg==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
postcss-normalize-unicode@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz#f67297fca3fea7f17e0d2caa40769afc487aa030"
@@ -9808,6 +10161,14 @@ postcss-normalize-unicode@^5.1.1:
browserslist "^4.21.4"
postcss-value-parser "^4.2.0"
+postcss-normalize-unicode@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.0.tgz#741b3310f874616bdcf07764f5503695d3604730"
+ integrity sha512-ui5crYkb5ubEUDugDc786L/Me+DXp2dLg3fVJbqyAl0VPkAeALyAijF2zOsnZyaS1HyfPuMH0DwyY18VMFVNkg==
+ dependencies:
+ browserslist "^4.21.4"
+ postcss-value-parser "^4.2.0"
+
postcss-normalize-url@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc"
@@ -9816,6 +10177,13 @@ postcss-normalize-url@^5.1.0:
normalize-url "^6.0.1"
postcss-value-parser "^4.2.0"
+postcss-normalize-url@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-6.0.0.tgz#d0a31e962a16401fb7deb7754b397a323fb650b4"
+ integrity sha512-98mvh2QzIPbb02YDIrYvAg4OUzGH7s1ZgHlD3fIdTHLgPLRpv1ZTKJDnSAKr4Rt21ZQFzwhGMXxpXlfrUBKFHw==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
postcss-normalize-whitespace@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz#08a1a0d1ffa17a7cc6efe1e6c9da969cc4493cfa"
@@ -9823,6 +10191,13 @@ postcss-normalize-whitespace@^5.1.1:
dependencies:
postcss-value-parser "^4.2.0"
+postcss-normalize-whitespace@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.0.tgz#accb961caa42e25ca4179b60855b79b1f7129d4d"
+ integrity sha512-7cfE1AyLiK0+ZBG6FmLziJzqQCpTQY+8XjMhMAz8WSBSCsCNNUKujgIgjCAmDT3cJ+3zjTXFkoD15ZPsckArVw==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
postcss-opacity-percentage@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-2.0.0.tgz#c0a56060cd4586e3f954dbde1efffc2deed53002"
@@ -9836,10 +10211,18 @@ postcss-ordered-values@^5.1.3:
cssnano-utils "^3.1.0"
postcss-value-parser "^4.2.0"
-postcss-overflow-shorthand@^4.0.1:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-4.0.1.tgz#cb61ca24d8c4e1dbf14d85181b017cfa6953aa34"
- integrity sha512-HQZ0qi/9iSYHW4w3ogNqVNr2J49DHJAl7r8O2p0Meip38jsdnRPgiDW7r/LlLrrMBMe3KHkvNtAV2UmRVxzLIg==
+postcss-ordered-values@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-6.0.0.tgz#374704cdff25560d44061d17ba3c6308837a3218"
+ integrity sha512-K36XzUDpvfG/nWkjs6d1hRBydeIxGpKS2+n+ywlKPzx1nMYDYpoGbcjhj5AwVYJK1qV2/SDoDEnHzlPD6s3nMg==
+ dependencies:
+ cssnano-utils "^4.0.0"
+ postcss-value-parser "^4.2.0"
+
+postcss-overflow-shorthand@^5.0.0:
+ version "5.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-5.0.0.tgz#1ed6d6c532cdf52b5dabec06662dc63f9207855c"
+ integrity sha512-2rlxDyeSics/hC2FuMdPnWiP9WUPZ5x7FTuArXLFVpaSQ2woPSfZS4RD59HuEokbZhs/wPUQJ1E3MT6zVv94MQ==
dependencies:
postcss-value-parser "^4.2.0"
@@ -9848,80 +10231,82 @@ postcss-page-break@^3.0.4:
resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f"
integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==
-postcss-place@^8.0.1:
- version "8.0.1"
- resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-8.0.1.tgz#408d7a27e99192df51c95fe62a3a34def62aa66a"
- integrity sha512-Ow2LedN8sL4pq8ubukO77phSVt4QyCm35ZGCYXKvRFayAwcpgB0sjNJglDoTuRdUL32q/ZC1VkPBo0AOEr4Uiw==
+postcss-place@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-9.0.0.tgz#7e47851bf40d16ce06f6013453b706100ca6c102"
+ integrity sha512-qLEPD9VPH5opDVemwmRaujODF9nExn24VOC3ghgVLEvfYN7VZLwJHes0q/C9YR5hI2UC3VgBE8Wkdp1TxCXhtg==
dependencies:
postcss-value-parser "^4.2.0"
-postcss-preset-env@^8.0.1:
- version "8.3.2"
- resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-8.3.2.tgz#9ec368e0f0df9c693d52b69d525d366fe4b1833a"
- integrity sha512-VSAOsfxTXzO/gX5QljC8x8hN3ABbD9iqqLgqHqohBdNI5FhJptwpl96kpu+kYvvzK7BWwaHYou0IeYrp+NqmcQ==
- dependencies:
- "@csstools/postcss-cascade-layers" "^3.0.1"
- "@csstools/postcss-color-function" "^2.2.1"
- "@csstools/postcss-color-mix-function" "^1.0.1"
- "@csstools/postcss-font-format-keywords" "^2.0.2"
- "@csstools/postcss-gradients-interpolation-method" "^3.0.4"
- "@csstools/postcss-hwb-function" "^2.2.1"
- "@csstools/postcss-ic-unit" "^2.0.2"
- "@csstools/postcss-is-pseudo-class" "^3.2.0"
- "@csstools/postcss-logical-float-and-clear" "^1.0.1"
- "@csstools/postcss-logical-resize" "^1.0.1"
- "@csstools/postcss-logical-viewport-units" "^1.0.3"
- "@csstools/postcss-media-minmax" "^1.0.2"
- "@csstools/postcss-media-queries-aspect-ratio-number-values" "^1.0.2"
- "@csstools/postcss-nested-calc" "^2.0.2"
- "@csstools/postcss-normalize-display-values" "^2.0.1"
- "@csstools/postcss-oklab-function" "^2.2.1"
- "@csstools/postcss-progressive-custom-properties" "^2.1.0"
- "@csstools/postcss-scope-pseudo-class" "^2.0.2"
- "@csstools/postcss-stepped-value-functions" "^2.1.1"
- "@csstools/postcss-text-decoration-shorthand" "^2.2.3"
- "@csstools/postcss-trigonometric-functions" "^2.1.1"
- "@csstools/postcss-unset-value" "^2.0.1"
- autoprefixer "^10.4.14"
- browserslist "^4.21.5"
- css-blank-pseudo "^5.0.2"
- css-has-pseudo "^5.0.2"
- css-prefers-color-scheme "^8.0.2"
- cssdb "^7.5.3"
+postcss-preset-env@^9.0.0:
+ version "9.1.2"
+ resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-9.1.2.tgz#42ee5e4041da81ddc0ad85f75747b41128dfebcf"
+ integrity sha512-+v7BbUNLgUD1j+dBQw3YRExLnIhroBradExkhDLpkLwZowzhgUQgSYW4PJul2SlST2qyistlEIPaHTJK9tZlEw==
+ dependencies:
+ "@csstools/postcss-cascade-layers" "^4.0.0"
+ "@csstools/postcss-color-function" "^3.0.2"
+ "@csstools/postcss-color-mix-function" "^2.0.2"
+ "@csstools/postcss-exponential-functions" "^1.0.0"
+ "@csstools/postcss-font-format-keywords" "^3.0.0"
+ "@csstools/postcss-gradients-interpolation-method" "^4.0.2"
+ "@csstools/postcss-hwb-function" "^3.0.2"
+ "@csstools/postcss-ic-unit" "^3.0.0"
+ "@csstools/postcss-is-pseudo-class" "^4.0.0"
+ "@csstools/postcss-logical-float-and-clear" "^2.0.0"
+ "@csstools/postcss-logical-resize" "^2.0.0"
+ "@csstools/postcss-logical-viewport-units" "^2.0.1"
+ "@csstools/postcss-media-minmax" "^1.0.7"
+ "@csstools/postcss-media-queries-aspect-ratio-number-values" "^2.0.2"
+ "@csstools/postcss-nested-calc" "^3.0.0"
+ "@csstools/postcss-normalize-display-values" "^3.0.0"
+ "@csstools/postcss-oklab-function" "^3.0.2"
+ "@csstools/postcss-progressive-custom-properties" "^3.0.0"
+ "@csstools/postcss-relative-color-syntax" "^2.0.2"
+ "@csstools/postcss-scope-pseudo-class" "^3.0.0"
+ "@csstools/postcss-stepped-value-functions" "^3.0.1"
+ "@csstools/postcss-text-decoration-shorthand" "^3.0.1"
+ "@csstools/postcss-trigonometric-functions" "^3.0.1"
+ "@csstools/postcss-unset-value" "^3.0.0"
+ autoprefixer "^10.4.15"
+ browserslist "^4.21.10"
+ css-blank-pseudo "^6.0.0"
+ css-has-pseudo "^6.0.0"
+ css-prefers-color-scheme "^9.0.0"
+ cssdb "^7.7.1"
postcss-attribute-case-insensitive "^6.0.2"
postcss-clamp "^4.1.0"
- postcss-color-functional-notation "^5.0.2"
+ postcss-color-functional-notation "^6.0.0"
postcss-color-hex-alpha "^9.0.2"
- postcss-color-rebeccapurple "^8.0.2"
- postcss-custom-media "^9.1.3"
- postcss-custom-properties "^13.1.5"
- postcss-custom-selectors "^7.1.3"
- postcss-dir-pseudo-class "^7.0.2"
- postcss-double-position-gradients "^4.0.2"
- postcss-focus-visible "^8.0.2"
- postcss-focus-within "^7.0.2"
+ postcss-color-rebeccapurple "^9.0.0"
+ postcss-custom-media "^10.0.0"
+ postcss-custom-properties "^13.3.0"
+ postcss-custom-selectors "^7.1.4"
+ postcss-dir-pseudo-class "^8.0.0"
+ postcss-double-position-gradients "^5.0.0"
+ postcss-focus-visible "^9.0.0"
+ postcss-focus-within "^8.0.0"
postcss-font-variant "^5.0.0"
- postcss-gap-properties "^4.0.1"
- postcss-image-set-function "^5.0.2"
+ postcss-gap-properties "^5.0.0"
+ postcss-image-set-function "^6.0.0"
postcss-initial "^4.0.1"
- postcss-lab-function "^5.2.1"
- postcss-logical "^6.1.0"
- postcss-nesting "^11.2.1"
+ postcss-lab-function "^6.0.2"
+ postcss-logical "^7.0.0"
+ postcss-nesting "^12.0.1"
postcss-opacity-percentage "^2.0.0"
- postcss-overflow-shorthand "^4.0.1"
+ postcss-overflow-shorthand "^5.0.0"
postcss-page-break "^3.0.4"
- postcss-place "^8.0.1"
- postcss-pseudo-class-any-link "^8.0.2"
+ postcss-place "^9.0.0"
+ postcss-pseudo-class-any-link "^9.0.0"
postcss-replace-overflow-wrap "^4.0.0"
postcss-selector-not "^7.0.1"
postcss-value-parser "^4.2.0"
-postcss-pseudo-class-any-link@^8.0.2:
- version "8.0.2"
- resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-8.0.2.tgz#f5738503f2045de0c4dc216eca99bd835f74e42e"
- integrity sha512-FYTIuRE07jZ2CW8POvctRgArQJ43yxhr5vLmImdKUvjFCkR09kh8pIdlCwdx/jbFm7MiW4QP58L4oOUv3grQYA==
+postcss-pseudo-class-any-link@^9.0.0:
+ version "9.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-9.0.0.tgz#5fb5b700e0ecdc845a94eb433b8ccff756cbf660"
+ integrity sha512-QNCYIL98VKFKY6HGDEJpF6+K/sg9bxcUYnOmNHJxZS5wsFDFaVoPeG68WAuhsqwbIBSo/b9fjEnTwY2mTSD+uA==
dependencies:
- postcss-selector-parser "^6.0.10"
+ postcss-selector-parser "^6.0.13"
postcss-reduce-initial@^5.1.2:
version "5.1.2"
@@ -9931,6 +10316,14 @@ postcss-reduce-initial@^5.1.2:
browserslist "^4.21.4"
caniuse-api "^3.0.0"
+postcss-reduce-initial@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.0.tgz#7d16e83e60e27e2fa42f56ec0b426f1da332eca7"
+ integrity sha512-s2UOnidpVuXu6JiiI5U+fV2jamAw5YNA9Fdi/GRK0zLDLCfXmSGqQtzpUPtfN66RtCbb9fFHoyZdQaxOB3WxVA==
+ dependencies:
+ browserslist "^4.21.4"
+ caniuse-api "^3.0.0"
+
postcss-reduce-transforms@^5.1.0:
version "5.1.0"
resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9"
@@ -9938,6 +10331,13 @@ postcss-reduce-transforms@^5.1.0:
dependencies:
postcss-value-parser "^4.2.0"
+postcss-reduce-transforms@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.0.tgz#28ff2601a6d9b96a2f039b3501526e1f4d584a46"
+ integrity sha512-FQ9f6xM1homnuy1wLe9lP1wujzxnwt1EwiigtWwuyf8FsqqXUDUp2Ulxf9A5yjlUOTdCJO6lonYjg1mgqIIi2w==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+
postcss-replace-overflow-wrap@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319"
@@ -9959,10 +10359,10 @@ postcss-selector-parser@^5.0.0:
indexes-of "^1.0.1"
uniq "^1.0.1"
-postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
- version "6.0.12"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.12.tgz#2efae5ffab3c8bfb2b7fbf0c426e3bca616c4abb"
- integrity sha512-NdxGCAZdRrwVI1sy59+Wzrh+pMMHxapGnpfenDVlMEXoOcvt4pGE0JLK9YY2F5dLxcFYA/YbVQKhcGU+FtSYQg==
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.13, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
+ version "6.0.13"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
+ integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
dependencies:
cssesc "^3.0.0"
util-deprecate "^1.0.2"
@@ -9975,6 +10375,14 @@ postcss-svgo@^5.1.0:
postcss-value-parser "^4.2.0"
svgo "^2.7.0"
+postcss-svgo@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-6.0.0.tgz#7b18742d38d4505a0455bbe70d52b49f00eaf69d"
+ integrity sha512-r9zvj/wGAoAIodn84dR/kFqwhINp5YsJkLoujybWG59grR/IHx+uQ2Zo+IcOwM0jskfYX3R0mo+1Kip1VSNcvw==
+ dependencies:
+ postcss-value-parser "^4.2.0"
+ svgo "^3.0.2"
+
postcss-unique-selectors@^5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz#a9f273d1eacd09e9aa6088f4b0507b18b1b541b6"
@@ -9982,6 +10390,13 @@ postcss-unique-selectors@^5.1.1:
dependencies:
postcss-selector-parser "^6.0.5"
+postcss-unique-selectors@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-6.0.0.tgz#c94e9b0f7bffb1203894e42294b5a1b3fb34fbe1"
+ integrity sha512-EPQzpZNxOxP7777t73RQpZE5e9TrnCrkvp7AH7a0l89JmZiPnS82y216JowHXwpBCQitfyxrof9TK3rYbi7/Yw==
+ dependencies:
+ postcss-selector-parser "^6.0.5"
+
postcss-url@^10.1.3:
version "10.1.3"
resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-10.1.3.tgz#54120cc910309e2475ec05c2cfa8f8a2deafdf1e"
@@ -10024,10 +10439,10 @@ postcss@^7.0.14, postcss@^7.0.36:
picocolors "^0.2.1"
source-map "^0.6.1"
-postcss@^8.2.1, postcss@^8.2.15, postcss@^8.4.14, postcss@^8.4.21:
- version "8.4.23"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.23.tgz#df0aee9ac7c5e53e1075c24a3613496f9e6552ab"
- integrity sha512-bQ3qMcpF6A/YjR55xtoTr0jGOlnPOKAIMdOWiv0EIT6HVPEaJiJB4NLljSbiHoC2RX7DN5Uvjtpbg1NPdwv1oA==
+postcss@^8.2.1, postcss@^8.2.15, postcss@^8.4.14, postcss@^8.4.26:
+ version "8.4.29"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.29.tgz#33bc121cf3b3688d4ddef50be869b2a54185a1dd"
+ integrity sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==
dependencies:
nanoid "^3.3.6"
picocolors "^1.0.0"
@@ -10038,11 +10453,6 @@ prelude-ls@^1.2.1:
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
-prelude-ls@~1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
- integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
-
prepend-http@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
@@ -10225,12 +10635,7 @@ pumpify@^1.3.3:
inherits "^2.0.3"
pump "^2.0.0"
-punycode@1.3.2:
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
- integrity sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==
-
-punycode@^1.2.4:
+punycode@^1.2.4, punycode@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
integrity sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==
@@ -10254,10 +10659,10 @@ qs@6.11.0:
dependencies:
side-channel "^1.0.4"
-qs@^6.11.1:
- version "6.11.1"
- resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.1.tgz#6c29dff97f0c0060765911ba65cbc9764186109f"
- integrity sha512-0wsrzgTz/kAVIeuxSjnpGC56rzYtr6JT/2BwEvMaPhFIoYa1aGO8LbzuU1R0uUYQkLpWBTOj0l/CLAJB64J6nQ==
+qs@^6.11.0, qs@^6.11.1:
+ version "6.11.2"
+ resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.2.tgz#64bea51f12c1f5da1bc01496f48ffcff7c69d7d9"
+ integrity sha512-tDNIz22aBzCDxLtVH++VnTfzxlfeK5CbqohpSqpJgj1Wg/cQbStNAz3NuqCs5vV+pjBsK4x4pN9HlVh7rcYRiA==
dependencies:
side-channel "^1.0.4"
@@ -10274,11 +10679,6 @@ querystring-es3@^0.2.0:
resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
integrity sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==
-querystring@0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
- integrity sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==
-
querystringify@^2.1.1:
version "2.2.0"
resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
@@ -10324,13 +10724,13 @@ raw-body@2.5.1:
iconv-lite "0.4.24"
unpipe "1.0.0"
-rc9@^2.0.1:
- version "2.1.0"
- resolved "https://registry.yarnpkg.com/rc9/-/rc9-2.1.0.tgz#57d3a01e55907393ef9bd0cc29f2bd66a6cd0972"
- integrity sha512-ROO9bv8PPqngWKoiUZU3JDQ4sugpdRs9DfwHnzDSxK25XtQn6BEHL6EOd/OtKuDT2qodrtNR+0WkPT6l0jxH5Q==
+rc9@^2.0.1, rc9@^2.1.1:
+ version "2.1.1"
+ resolved "https://registry.yarnpkg.com/rc9/-/rc9-2.1.1.tgz#6614c32db7731b44cd48641ce68f373c3ee212a9"
+ integrity sha512-lNeOl38Ws0eNxpO3+wD1I9rkHGQyj1NU1jlzv4go2CtEnEQEUfqnIvZG7W+bC/aXdJ27n5x/yUjb6RoT9tko+Q==
dependencies:
defu "^6.1.2"
- destr "^1.2.2"
+ destr "^2.0.0"
flat "^5.0.2"
rc@1.2.8, rc@^1.2.8:
@@ -10463,10 +10863,15 @@ regenerator-runtime@^0.13.11:
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz#f6dca3e7ceec20590d07ada785636a90cdca17f9"
integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
-regenerator-transform@^0.15.1:
- version "0.15.1"
- resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.1.tgz#f6c4e99fc1b4591f780db2586328e4d9a9d8dc56"
- integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
+regenerator-runtime@^0.14.0:
+ version "0.14.0"
+ resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz#5e19d68eb12d486f797e15a3c6a918f7cec5eb45"
+ integrity sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==
+
+regenerator-transform@^0.15.2:
+ version "0.15.2"
+ resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.2.tgz#5bbae58b522098ebdf09bca2f83838929001c7a4"
+ integrity sha512-hfMp2BoF0qOk3uc5V20ALGDS2ddjQaLrdl7xrGXvAIow7qeWRM2VA2HuCHkUKk9slq3VwEwLNK3DFBqDfPGYtg==
dependencies:
"@babel/runtime" "^7.8.4"
@@ -10483,7 +10888,7 @@ regexp-tree@^0.1.21, regexp-tree@~0.1.1:
resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.27.tgz#2198f0ef54518ffa743fe74d983b56ffd631b6cd"
integrity sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==
-regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.3:
+regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz#fe7ce25e7e4cca8db37b6634c8a2c7009199b9cb"
integrity sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==
@@ -10660,12 +11065,12 @@ resolve.exports@^1.1.0:
resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.1.tgz#05cfd5b3edf641571fd46fa608b610dda9ead999"
integrity sha512-/NtpHNDN7jWhAaQ9BvBUYZ6YTXsRBgfqWFWP7BZBaoMJO/I3G5OFzvTuWNlZC3aPjins1F+TNrLKsGbH4rfsRQ==
-resolve@^1.1.7, 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.20.0, resolve@^1.22.0, resolve@^1.22.1, resolve@^1.9.0:
- version "1.22.2"
- resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.2.tgz#0ed0943d4e301867955766c9f3e1ae6d01c6845f"
- integrity sha512-Sb+mjNHOULsBv818T40qSPeRiuWLyaGMa5ewydRLFimneixmVy2zdivRl+AF6jaYPC8ERxGDmFSiqui6SfPd+g==
+resolve@^1.1.7, 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.20.0, resolve@^1.22.0, resolve@^1.22.4, resolve@^1.9.0:
+ version "1.22.4"
+ resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34"
+ integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==
dependencies:
- is-core-module "^2.11.0"
+ is-core-module "^2.13.0"
path-parse "^1.0.7"
supports-preserve-symlinks-flag "^1.0.0"
@@ -10846,18 +11251,18 @@ schema-utils@^2.0.0, schema-utils@^2.6.5, schema-utils@^2.7.0:
ajv-keywords "^3.5.2"
schema-utils@^3.0.0:
- version "3.1.2"
- resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.2.tgz#36c10abca6f7577aeae136c804b0c741edeadc99"
- integrity sha512-pvjEHOgWc9OWA/f/DE3ohBWTD6EleVLf7iFUkoSwAxttdBhB9QUebQgxER2kWueOvRJXPHNnyrvvh9eZINB8Eg==
+ version "3.3.0"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+ integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
dependencies:
"@types/json-schema" "^7.0.8"
ajv "^6.12.5"
ajv-keywords "^3.5.2"
schema-utils@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.1.tgz#eb2d042df8b01f4b5c276a2dfd41ba0faab72e8d"
- integrity sha512-lELhBAAly9NowEsX0yZBlw9ahZG+sK/1RJ21EpzdYHKEs13Vku3LJ+MIPhh4sMs0oCCeufZQEQbMekiA4vuVIQ==
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.2.0.tgz#70d7c93e153a273a805801882ebd3bff20d89c8b"
+ integrity sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==
dependencies:
"@types/json-schema" "^7.0.9"
ajv "^8.9.0"
@@ -10877,19 +11282,19 @@ semver-diff@^3.1.1:
semver "^6.3.0"
"semver@2 || 3 || 4 || 5", semver@^5.5.1, semver@^5.6.0:
- version "5.7.1"
- resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
- integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+ version "5.7.2"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+ integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
-semver@^6.0.0, semver@^6.1.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0:
- version "6.3.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
- integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^6.0.0, semver@^6.1.0, semver@^6.2.0, semver@^6.3.0, semver@^6.3.1:
+ version "6.3.1"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+ integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
-semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8:
- version "7.5.0"
- resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
- integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
+semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.5.3, semver@^7.5.4:
+ version "7.5.4"
+ resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
+ integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"
@@ -11028,24 +11433,24 @@ side-channel@^1.0.4:
get-intrinsic "^1.0.2"
object-inspect "^1.9.0"
-sigmund@^1.0.1:
- version "1.0.1"
- resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
- integrity sha512-fCvEXfh6NWpm+YSuY2bpXb/VIihqWA6hLsgboC+0nl71Q7N7o2eaCW8mJa/NLvQhs6jpd3VZV4UiUQlV6+lc8g==
-
-signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
+signal-exit@^3.0.2, signal-exit@^3.0.3:
version "3.0.7"
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
-sirv@^1.0.7:
- version "1.0.19"
- resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
- integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
+signal-exit@^4.0.2:
+ version "4.1.0"
+ resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04"
+ integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==
+
+sirv@^2.0.3:
+ version "2.0.3"
+ resolved "https://registry.yarnpkg.com/sirv/-/sirv-2.0.3.tgz#ca5868b87205a74bef62a469ed0296abceccd446"
+ integrity sha512-O9jm9BsID1P+0HOi81VpXPoDxYP374pkOLzACAoyUQ/3OUVndNpsz6wMnY2z+yOxzbllCKZrM+9QrWsv4THnyA==
dependencies:
"@polka/url" "^1.0.0-next.20"
mrmime "^1.0.0"
- totalist "^1.0.0"
+ totalist "^3.0.0"
sisteransi@^1.0.5:
version "1.0.5"
@@ -11124,7 +11529,7 @@ 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@^1.0.2:
+source-map-js@^1.0.1, source-map-js@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
@@ -11284,10 +11689,10 @@ statuses@~1.5.0:
resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
-std-env@^3.0.1, std-env@^3.3.1, std-env@^3.3.2:
- version "3.3.3"
- resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.3.3.tgz#a54f06eb245fdcfef53d56f3c0251f1d5c3d01fe"
- integrity sha512-Rz6yejtVyWnVjC1RFvNmYL10kgjC49EOghxWn0RFqlCHGFpQx+Xe7yW3I4ceK1SGrWIGMjD5Kbue8W/udkbMJg==
+std-env@^3.0.1, std-env@^3.3.1, std-env@^3.3.3:
+ version "3.4.3"
+ resolved "https://registry.yarnpkg.com/std-env/-/std-env-3.4.3.tgz#326f11db518db751c83fd58574f449b7c3060910"
+ integrity sha512-f9aPhy8fYBuMN+sNfakZV18U39PbalgjXG3lLB9WkaYTxijru61wb57V9wxxNthXM5Sd88ETBWi29qLAsHO52Q==
stream-browserify@^2.0.1:
version "2.0.2"
@@ -11463,6 +11868,14 @@ stylehacks@^5.1.1:
browserslist "^4.21.4"
postcss-selector-parser "^6.0.4"
+stylehacks@^6.0.0:
+ version "6.0.0"
+ resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.0.0.tgz#9fdd7c217660dae0f62e14d51c89f6c01b3cb738"
+ integrity sha512-+UT589qhHPwz6mTlCLSt/vMNTJx8dopeJlZAlBMJPWA3ORqu6wmQY7FBXf+qD+FsqoBJODyqNxOUP3jdntFRdw==
+ dependencies:
+ browserslist "^4.21.4"
+ postcss-selector-parser "^6.0.4"
+
supertap@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/supertap/-/supertap-2.0.0.tgz#8b587d6e14b8e885fa5183a9c45abf429feb9f7f"
@@ -11538,6 +11951,18 @@ svgo@^2.7.0:
picocolors "^1.0.0"
stable "^0.1.8"
+svgo@^3.0.2:
+ version "3.0.2"
+ resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.0.2.tgz#5e99eeea42c68ee0dc46aa16da093838c262fe0a"
+ integrity sha512-Z706C1U2pb1+JGP48fbazf3KxHrWOsLme6Rv7imFBn5EnuanDW1GPaA/P1/dvObE670JDePC3mnj0k0B7P0jjQ==
+ dependencies:
+ "@trysound/sax" "0.2.0"
+ commander "^7.2.0"
+ css-select "^5.1.0"
+ css-tree "^2.2.1"
+ csso "^5.0.5"
+ picocolors "^1.0.0"
+
symbol-tree@^3.2.4:
version "3.2.4"
resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
@@ -11560,9 +11985,9 @@ tapable@^1.0.0, tapable@^1.0.0-beta.5, tapable@^1.1.3:
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
tar@^6.0.2:
- version "6.1.14"
- resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.14.tgz#e87926bec1cfe7c9e783a77a79f3e81c1cfa3b66"
- integrity sha512-piERznXu0U7/pW7cdSn7hjqySIVTYT6F76icmFk7ptU7dDYlXTm5r9A6K04R2vU3olYgoKeo1Cg3eeu5nhftAw==
+ version "6.1.15"
+ resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69"
+ integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A==
dependencies:
chownr "^2.0.0"
fs-minipass "^2.0.0"
@@ -11629,12 +12054,12 @@ terser@^4.1.2, terser@^4.6.3:
source-map-support "~0.5.12"
terser@^5.3.4:
- version "5.17.1"
- resolved "https://registry.yarnpkg.com/terser/-/terser-5.17.1.tgz#948f10830454761e2eeedc6debe45c532c83fd69"
- integrity sha512-hVl35zClmpisy6oaoKALOpS0rDYLxRFLHhRuDlEGTKey9qHjS1w9GMORjuwIMt70Wan4lwsLYyWDVnWgF+KUEw==
+ version "5.19.3"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.3.tgz#359baeba615aef13db4b8c4d77a2aa0d8814aa9e"
+ integrity sha512-pQzJ9UJzM0IgmT4FAtYI6+VqFf0lj/to58AV0Xfgg0Up37RyPG7Al+1cepC6/BVuAxR9oNb41/DL4DEoHJvTdg==
dependencies:
- "@jridgewell/source-map" "^0.3.2"
- acorn "^8.5.0"
+ "@jridgewell/source-map" "^0.3.3"
+ acorn "^8.8.2"
commander "^2.20.0"
source-map-support "~0.5.20"
@@ -11767,15 +12192,15 @@ toidentifier@1.0.1:
resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
-totalist@^1.0.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
- integrity sha512-gduQwd1rOdDMGxFG1gEvhV88Oirdo2p+KjoYFU7k2g+i7n6AFFbDQ5kMPUsW0pNbfQsB/cwXvT1i4Bue0s9g5g==
+totalist@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/totalist/-/totalist-3.0.1.tgz#ba3a3d600c915b1a97872348f79c127475f6acf8"
+ integrity sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==
tough-cookie@^4.0.0:
- version "4.1.2"
- resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.2.tgz#e53e84b85f24e0b65dd526f46628db6c85f6b874"
- integrity sha512-G9fqXWoYFZgTc2z8Q5zaHy/vJMjm+WV0AkAeHxVCQiEB1b+dGvWzFW6QV07cY5jQ5gRkeid2qIkzkxUnmoQZUQ==
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+ integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
dependencies:
psl "^1.1.33"
punycode "^2.1.1"
@@ -11820,9 +12245,9 @@ tslib@^1.8.1, tslib@^1.9.0:
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
tslib@^2.0.3, tslib@^2.3.1:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
- integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
+ version "2.6.2"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+ integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
tsutils@^3.17.1:
version "3.21.0"
@@ -11837,9 +12262,9 @@ tty-browserify@0.0.0:
integrity sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==
tus-js-client@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/tus-js-client/-/tus-js-client-3.1.0.tgz#20af57d06c23823fbe108ccb3a3dcb7503968cb4"
- integrity sha512-Hfpc8ho4C9Lhs/OflPUA/nHUHZJUrKD5upoPBq7dYJJ9DQhWocsjJU2RZYfN16Y5n19j9dFDszwCvVZ5sfcogw==
+ version "3.1.1"
+ resolved "https://registry.yarnpkg.com/tus-js-client/-/tus-js-client-3.1.1.tgz#87cb72e528d274d0a8ff62e9c18165f1e901ce9e"
+ integrity sha512-SZzWP62jEFLmROSRZx+uoGLKqsYWMGK/m+PiNehPVWbCm7/S9zRIMaDxiaOcKdMnFno4luaqP5E+Y1iXXPjP0A==
dependencies:
buffer-from "^1.1.2"
combine-errors "^3.0.3"
@@ -11856,13 +12281,6 @@ type-check@^0.4.0, type-check@~0.4.0:
dependencies:
prelude-ls "^1.2.1"
-type-check@~0.3.2:
- version "0.3.2"
- resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
- integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
- dependencies:
- prelude-ls "~1.1.2"
-
type-detect@4.0.8:
version "4.0.8"
resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-4.0.8.tgz#7646fb5f18871cfbb7749e69bd39a6388eb7450c"
@@ -11906,6 +12324,36 @@ type-is@^1.6.4, type-is@~1.6.18:
media-typer "0.3.0"
mime-types "~2.1.24"
+typed-array-buffer@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz#18de3e7ed7974b0a729d3feecb94338d1472cd60"
+ integrity sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==
+ dependencies:
+ call-bind "^1.0.2"
+ get-intrinsic "^1.2.1"
+ is-typed-array "^1.1.10"
+
+typed-array-byte-length@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz#d787a24a995711611fb2b87a4052799517b230d0"
+ integrity sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==
+ dependencies:
+ call-bind "^1.0.2"
+ for-each "^0.3.3"
+ has-proto "^1.0.1"
+ is-typed-array "^1.1.10"
+
+typed-array-byte-offset@^1.0.0:
+ version "1.0.0"
+ resolved "https://registry.yarnpkg.com/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz#cbbe89b51fdef9cd6aaf07ad4707340abbc4ea0b"
+ integrity sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==
+ dependencies:
+ available-typed-arrays "^1.0.5"
+ call-bind "^1.0.2"
+ for-each "^0.3.3"
+ has-proto "^1.0.1"
+ is-typed-array "^1.1.10"
+
typed-array-length@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/typed-array-length/-/typed-array-length-1.0.4.tgz#89d83785e5c4098bec72e08b319651f0eac9c1bb"
@@ -11932,7 +12380,7 @@ typescript@^4.3.2:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
-ua-parser-js@^1.0.34:
+ua-parser-js@^1.0.35:
version "1.0.35"
resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.35.tgz#c4ef44343bc3db0a3cbefdf21822f1b1fc1ab011"
integrity sha512-fKnGuqmTBnIE+/KXSzCn4db8RTigUzw1AN0DmdU6hJovUTbYJKyqj+8Mt1c4VfRDnOVJnENmfYkIPZ946UrSAA==
@@ -11942,10 +12390,10 @@ ufo@^0.7.7:
resolved "https://registry.yarnpkg.com/ufo/-/ufo-0.7.11.tgz#17defad497981290383c5d26357773431fdbadcb"
integrity sha512-IT3q0lPvtkqQ8toHQN/BkOi4VIqoqheqM1FnkNWT9y0G8B3xJhwnoKBu5OHx8zHDOvveQzfKuFowJ0VSARiIDg==
-ufo@^1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.1.2.tgz#d0d9e0fa09dece0c31ffd57bd363f030a35cfe76"
- integrity sha512-TrY6DsjTQQgyS3E3dBaOXf0TpPD8u9FVrVYmKVegJuFw51n/YB9XPt+U6ydzFG5ZIN7+DIjPbNmXoBj9esYhgQ==
+ufo@^1.1.2:
+ version "1.3.0"
+ resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.0.tgz#c92f8ac209daff607c57bbd75029e190930a0019"
+ integrity sha512-bRn3CsoojyNStCZe0BG0Mt4Nr/4KF+rhFlnNXybgqt5pXHNFRlqinSoQaTrGyzE4X8aHplSb+TorH+COin9Yxw==
uglify-js@^3.5.1:
version "3.17.4"
@@ -12064,7 +12512,7 @@ upath@^2.0.1:
resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b"
integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==
-update-browserslist-db@^1.0.10:
+update-browserslist-db@^1.0.11:
version "1.0.11"
resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz#9a2a641ad2907ae7b3616506f4b977851db5b940"
integrity sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==
@@ -12134,12 +12582,12 @@ url-parse@^1.5.3, url-parse@^1.5.7:
requires-port "^1.0.0"
url@^0.11.0:
- version "0.11.0"
- resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
- integrity sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==
+ version "0.11.1"
+ resolved "https://registry.yarnpkg.com/url/-/url-0.11.1.tgz#26f90f615427eca1b9f4d6a28288c147e2302a32"
+ integrity sha512-rWS3H04/+mzzJkv0eZ7vEDGiQbgquI1fGfOad6zKvgYQi1SzMmhl7c/DdRGxhaWrVH6z0qWITo8rpnxK/RfEhA==
dependencies:
- punycode "1.3.2"
- querystring "0.2.0"
+ punycode "^1.4.1"
+ qs "^6.11.0"
use@^3.1.0:
version "3.1.1"
@@ -12189,9 +12637,9 @@ uuid@^8.3.2:
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
v8-compile-cache@^2.0.3:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
- integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128"
+ integrity sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==
v8-to-istanbul@^8.1.0:
version "8.1.1"
@@ -12266,9 +12714,9 @@ vue-jwt-decode@^0.1.0:
vue "^2.3.3"
vue-loader@^15.10.1, vue-loader@^15.9.7:
- version "15.10.1"
- resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.10.1.tgz#c451c4cd05a911aae7b5dbbbc09fb913fb3cca18"
- integrity sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==
+ version "15.10.2"
+ resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.10.2.tgz#6dccfda8661caa7f5415806a5e386fd3258d8112"
+ integrity sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==
dependencies:
"@vue/component-compiler-utils" "^3.1.0"
hash-sum "^1.0.2"
@@ -12360,9 +12808,9 @@ vuetify-loader@^1.7.3:
loader-utils "^2.0.0"
vuetify@^2.6, vuetify@^2.6.9:
- version "2.6.15"
- resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.6.15.tgz#058c976f4e6e834076d80ae0c09bd61baa836d26"
- integrity sha512-2a6sBSHzivXgi9pZMyHuzTgMyInCkj/BrVwTnoCa1Y/Dnfwj7lkWzgKQDScbGVK0q4vJ+YHoBBrLOmnhz1R0YA==
+ version "2.7.1"
+ resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-2.7.1.tgz#49fc4d460ecfb51ed40d5befff779ceabf4f5a03"
+ integrity sha512-DVFmRsDtYrITw9yuGLwpFWngFYzEgk0KwloDCIV3+vhZw+NBFJOSzdbttbYmOwtqvQlhDxUyIRQolrRbSFAKlg==
vuex-persist@^3.1.3:
version "3.1.3"
@@ -12446,23 +12894,30 @@ webidl-conversions@^6.1.0:
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
-webpack-bundle-analyzer@^4.8.0:
- version "4.8.0"
- resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.8.0.tgz#951b8aaf491f665d2ae325d8b84da229157b1d04"
- integrity sha512-ZzoSBePshOKhr+hd8u6oCkZVwpVaXgpw23ScGLFpR6SjYI7+7iIWYarjN6OEYOfRt8o7ZyZZQk0DuMizJ+LEIg==
+webpack-bundle-analyzer@^4.9.0:
+ version "4.9.1"
+ resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.9.1.tgz#d00bbf3f17500c10985084f22f1a2bf45cb2f09d"
+ integrity sha512-jnd6EoYrf9yMxCyYDPj8eutJvtjQNp8PHmni/e/ulydHBWhT5J3menXt3HEkScsu9YqMAcG4CfFjs3rj5pVU1w==
dependencies:
"@discoveryjs/json-ext" "0.5.7"
acorn "^8.0.4"
acorn-walk "^8.0.0"
- chalk "^4.1.0"
commander "^7.2.0"
+ escape-string-regexp "^4.0.0"
gzip-size "^6.0.0"
- lodash "^4.17.20"
+ is-plain-object "^5.0.0"
+ lodash.debounce "^4.0.8"
+ lodash.escape "^4.0.1"
+ lodash.flatten "^4.4.0"
+ lodash.invokemap "^4.6.0"
+ lodash.pullall "^4.2.0"
+ lodash.uniqby "^4.7.0"
opener "^1.5.2"
- sirv "^1.0.7"
+ picocolors "^1.0.0"
+ sirv "^2.0.3"
ws "^7.3.1"
-webpack-dev-middleware@^5.3.3:
+webpack-dev-middleware@^5.0.0:
version "5.3.3"
resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz#efae67c2793908e7311f1d9b06f2a08dcc97e51f"
integrity sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==
@@ -12473,10 +12928,10 @@ webpack-dev-middleware@^5.3.3:
range-parser "^1.2.1"
schema-utils "^4.0.0"
-webpack-hot-middleware@^2.25.3:
- version "2.25.3"
- resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.3.tgz#be343ce2848022cfd854dd82820cd730998c6794"
- integrity sha512-IK/0WAHs7MTu1tzLTjio73LjS3Ov+VvBKQmE8WPlJutgG5zT6Urgq/BbAdRrHTRpyzK0dvAvFh1Qg98akxgZpA==
+webpack-hot-middleware@^2.25.4:
+ version "2.25.4"
+ resolved "https://registry.yarnpkg.com/webpack-hot-middleware/-/webpack-hot-middleware-2.25.4.tgz#d8bc9e9cb664fc3105c8e83d2b9ed436bee4e193"
+ integrity sha512-IRmTspuHM06aZh98OhBJtqLpeWFM8FXJS5UYpKYxCJzyFoyWj1w6VGFfomZU7OPA55dMLrQK0pRT1eQ3PACr4w==
dependencies:
ansi-html-community "0.0.8"
html-entities "^2.1.0"
@@ -12584,17 +13039,16 @@ which-module@^2.0.0:
resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.1.tgz#776b1fe35d90aebe99e8ac15eb24093389a4a409"
integrity sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==
-which-typed-array@^1.1.9:
- version "1.1.9"
- resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.9.tgz#307cf898025848cf995e795e8423c7f337efbde6"
- integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+which-typed-array@^1.1.10, which-typed-array@^1.1.11:
+ version "1.1.11"
+ resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.11.tgz#99d691f23c72aab6768680805a271b69761ed61a"
+ integrity sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==
dependencies:
available-typed-arrays "^1.0.5"
call-bind "^1.0.2"
for-each "^0.3.3"
gopd "^1.0.1"
has-tostringtag "^1.0.0"
- is-typed-array "^1.1.10"
which@^2.0.1:
version "2.0.2"
@@ -12610,11 +13064,6 @@ widest-line@^3.1.0:
dependencies:
string-width "^4.0.0"
-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==
-
worker-farm@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 6f85ad5ef428398878d9ed33a45ac4b0d0df2e16..7f54196d6105ee2835788149600649975510c2fd 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -41,8 +41,9 @@ services:
- ./setup-schema_local.sql:/docker-entrypoint-initdb.d/setup-schema_local.sql
ports:
- "3306:3306"
- env_file:
- - .env
+ environment:
+ MARIADB_DATABASE: "${METADATA_DB:-fda}"
+ MARIADB_ROOT_PASSWORD: "${METADATA_PASSWORD:-dbrepo}"
healthcheck:
test: mysqladmin ping --user="$METADATA_USERNAME" --password="$METADATA_PASSWORD" --silent
interval: 10s
@@ -55,18 +56,16 @@ services:
restart: "no"
container_name: dbrepo-data-db
hostname: data-db
- image: mariadb:10.5
+ image: bitnami/mariadb:10.5
networks:
core:
volumes:
- data-db-data:/bitnami/mariadb
- - "${SHARED_FILESYSTEM}:/tmp"
+ - "${SHARED_FILESYSTEM:-/tmp}:/tmp"
ports:
- "3307:3306"
- env_file:
- - .env
environment:
- - MARIADB_ROOT_PASSWORD=$USER_DB_PASSWORD
+ MARIADB_ROOT_PASSWORD: "${USER_DB_PASSWORD:-dbrepo}"
healthcheck:
test: mysqladmin ping --user="$USER_DB_USERNAME" --password="$USER_DB_PASSWORD" --silent
interval: 10s
@@ -86,11 +85,9 @@ services:
- auth-db-data:/bitnami/mariadb
ports:
- "3308:3306"
- env_file:
- - .env
environment:
- - MARIADB_ROOT_PASSWORD=$AUTH_PASSWORD
- - MARIADB_DATABASE=$AUTH_DB
+ MARIADB_DATABASE: "${AUTH_DB:-keycloak}"
+ MARIADB_ROOT_PASSWORD: "${AUTH_PASSWORD:-dbrepo}"
healthcheck:
test: mysqladmin ping --user="$AUTH_USERNAME" --password="$AUTH_PASSWORD" --silent
interval: 10s
@@ -108,11 +105,9 @@ services:
- "--base-path=/api/upload/files/"
networks:
core:
- env_file:
- - .env
volumes:
- upload-service-data:/data
- - "${SHARED_FILESYSTEM}:/srv/tusd-data/data"
+ - "${SHARED_FILESYSTEM:-/tmp}:/srv/tusd-data/data"
logging:
driver: json-file
@@ -126,12 +121,16 @@ services:
ports:
- "8443:8443"
- "8080:8080"
- env_file:
- - .env
+ environment:
+ AUTH_DB: "${AUTH_DB:-keycloak}"
+ KC_DB_USERNAME: "${AUTH_USERNAME:-root}"
+ KC_DB_PASSWORD: "${AUTH_PASSWORD:-dbrepo}"
+ KEYCLOAK_ADMIN: "${KEYCLOAK_ADMIN:-fda}"
+ KEYCLOAK_ADMIN_PASSWORD: "${KEYCLOAK_ADMIN_PASSWORD:-fda}"
volumes:
- authentication-service-data:/opt/keycloak/data/
depends_on:
- dbrepo-metadata-db:
+ dbrepo-auth-db:
condition: service_healthy
logging:
driver: json-file
@@ -143,12 +142,40 @@ services:
image: dbrepo/metadata-service:latest
networks:
core:
- env_file:
- - .env
volumes:
- - "${SHARED_FILESYSTEM}:/tmp"
+ - "${SHARED_FILESYSTEM:-/tmp}:/tmp"
ports:
- "9099:9099"
+ environment:
+ ADMIN_MAIL: "${ADMIN_MAIL:-noreply@localhost}"
+ BASE_URL: "${BASE_URL:-http://localhost}"
+ GRANT_PRIVILEGES: "${GRANT_PRIVILEGES:-SELECT, CREATE, CREATE VIEW, CREATE ROUTINE, CREATE TEMPORARY TABLES, LOCK TABLES, INDEX, TRIGGER, INSERT, UPDATE, DELETE}"
+ BROKER_CONSUMERS: "${BROKER_CONSUMERS:-2}"
+ BROKER_ENDPOINT: "${BROKER_ENDPOINT:-http://broker-service:15672}"
+ BROKER_USERNAME: "${BROKER_USERNAME:-fda}"
+ BROKER_PASSWORD: "${BROKER_PASSWORD:-fda}"
+ DELETED_RECORD: "${DELETED_RECORD:-persistent}"
+ EARLIEST_DATESTAMP: "${EARLIEST_DATESTAMP:-2022-09-17T18:23:00Z}"
+ GRANULARITY: "${GRANULARITY:-YYYY-MM-DDThh:mm:ssZ}"
+ JWT_ISSUER: "${JWT_ISSUER:-http://localhost/realms/dbrepo}"
+ JWT_PUBKEY: "${JWT_PUBKEY:-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqqnHQ2BWWW9vDNLRCcxD++xZg/16oqMo/c1l+lcFEjjAIJjJp/HqrPYU/U9GvquGE6PbVFtTzW1KcKawOW+FJNOA3CGo8Q1TFEfz43B8rZpKsFbJKvQGVv1Z4HaKPvLUm7iMm8Hv91cLduuoWx6Q3DPe2vg13GKKEZe7UFghF+0T9u8EKzA/XqQ0OiICmsmYPbwvf9N3bCKsB/Y10EYmZRb8IhCoV9mmO5TxgWgiuNeCTtNCv2ePYqL/U0WvyGFW0reasIK8eg3KrAUj8DpyOgPOVBn3lBGf+3KFSYi+0bwZbJZWqbC/Xlk20Go1YfeJPRIt7ImxD27R/lNjgDO/MwIDAQAB}"
+ LOG_LEVEL: "${LOG_LEVEL:-debug}"
+ METADATA_DB: "${METADATA_DB:-fda}"
+ METADATA_HOST: "${METADATA_HOST:-metadata-db}"
+ METADATA_JDBC_EXTRA_ARGS: "${METADATA_JDBC_EXTRA_ARGS:-}"
+ METADATA_USERNAME: "${METADATA_USERNAME:-root}"
+ METADATA_PASSWORD: "${METADATA_PASSWORD:-dbrepo}"
+ NOT_SUPPORTED_KEYWORDS: "${NOT_SUPPORTED_KEYWORDS:-\\*,AVG,BIT_AND,BIT_OR,BIT_XOR,COUNT,COUNTDISTINCT,GROUP_CONCAT,JSON_ARRAYAGG,JSON_OBJECTAGG,MAX,MIN,STD,STDDEV,STDDEV_POP,STDDEV_SAMP,SUM,VARIANCE,VAR_POP,VAR_SAMP,--}"
+ PID_BASE: "${PID_BASE:-http://localhost/pid/}"
+ REPOSITORY_NAME: "${REPOSITORY_NAME:-Example Repository}"
+ SEARCH_USERNAME: "${SEARCH_USERNAME:-admin}"
+ SEARCH_PASSWORD: "${SEARCH_PASSWORD:-admin}"
+ SHARED_FILESYSTEM: "${SHARED_FILESYSTEM:-/tmp}"
+ USER_NETWORK: "${USER_NETWORK:-userdb}"
+ WEBSITE: "${WEBSITE:-http://localhost}"
+ KEYCLOAK_HOST: "${KEYCLOAK_HOST:-http://authentication-service:8080}"
+ KEYCLOAK_ADMIN: "${KEYCLOAK_ADMIN:-fda}"
+ KEYCLOAK_ADMIN_PASSWORD: "${KEYCLOAK_ADMIN_PASSWORD:-fda}"
healthcheck:
test: wget -qO- localhost:9099/actuator/health/readiness | grep -q "UP" || exit 1
interval: 10s
@@ -173,10 +200,8 @@ services:
core:
ports:
- "5000:5000"
- env_file:
- - .env
volumes:
- - "${SHARED_FILESYSTEM}:/tmp"
+ - "${SHARED_FILESYSTEM:-/tmp}:/tmp"
logging:
driver: json-file
@@ -190,8 +215,6 @@ services:
ports:
- "5672:5672"
- "15672:15672"
- env_file:
- - .env
depends_on:
dbrepo-authentication-service:
condition: service_healthy
@@ -209,8 +232,6 @@ services:
core:
ports:
- 9200:9200
- env_file:
- - .env
healthcheck:
test: curl -s localhost:9200/_cat/indices || exit 1
interval: 10s
@@ -238,8 +259,22 @@ services:
networks:
core:
public:
- env_file:
- - .env
+ environment:
+ BROKER_USERNAME: "${BROKER_USERNAME:-fda}"
+ BROKER_PASSWORD: "${BROKER_PASSWORD:-fda}"
+ BROKER_LOGIN_URL: "${BROKER_LOGIN_URL:-/broker/}"
+ KEYCLOAK_LOGIN_URL: "${KEYCLOAK_LOGIN_URL:-/api/auth/}"
+ SHARED_FILESYSTEM: "${SHARED_FILESYSTEM:-/tmp}"
+ LOGO: "${LOGO:-/logo.png}"
+ SEARCH_USERNAME: "${SEARCH_USERNAME:-admin}"
+ SEARCH_PASSWORD: "${SEARCH_PASSWORD:-admin}"
+ VERSION: "${VERSION:-${TAG}}"
+ TITLE: "${TITLE:-Database Repository}"
+ ICON: "${ICON:-/favicon.ico}"
+ DBREPO_CLIENT_ID: "${DBREPO_CLIENT_ID:-dbrepo-client}"
+ DBREPO_CLIENT_SECRET: "${DBREPO_CLIENT_SECRET:-MUwRc7yfXSJwX8AdRMWaQC3Nep1VjwgG}"
+ UPLOAD_PATH: "${UPLOAD_PATH:-/tmp/}"
+ FORCE_SSL: "${FORCE_SSL:-false}"
depends_on:
dbrepo-upload-service:
condition: service_started
@@ -274,3 +309,34 @@ services:
condition: service_started
logging:
driver: json-file
+
+ dbrepo-search-sync-agent:
+ restart: "no"
+ container_name: dbrepo-search-sync-agent
+ hostname: search-startup-agent
+ image: dbrepo/search-sync-agent:latest
+ networks:
+ core:
+ environment:
+ METADATA_DB: ${METADATA_DB:-fda}
+ METADATA_HOST: ${METADATA_HOST:-metadata-db}
+ METADATA_JDBC_EXTRA_ARGS: ${METADATA_JDBC_EXTRA_ARGS:-}
+ METADATA_PASSWORD: ${METADATA_PASSWORD:-dbrepo}
+ METADATA_USERNAME: ${METADATA_USERNAME:-root}
+ SEARCH_USERNAME: ${SEARCH_USERNAME:-fda}
+ SEARCH_PASSWORD: ${SEARCH_PASSWORD:-fda}
+ LOG_LEVEL: ${LOG_LEVEL:-debug}
+ healthcheck:
+ test: wget -qO- localhost:9050/actuator/health/readiness | grep -q "UP" || exit 1
+ interval: 10s
+ timeout: 5s
+ retries: 12
+ depends_on:
+ dbrepo-metadata-db:
+ condition: service_healthy
+ dbrepo-search-db:
+ condition: service_started
+ dbrepo-authentication-service:
+ condition: service_healthy
+ logging:
+ driver: json-file
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index e9473d11b75cd86f6e97c5b58e07b095fa371108..3bee756840367e429f5a0e9aa9c76efd4f9e4a54 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -288,6 +288,7 @@ services:
BROKER_PASSWORD: "${BROKER_PASSWORD:-fda}"
BROKER_LOGIN_URL: "${BROKER_LOGIN_URL:-/admin/broker/}"
KEYCLOAK_LOGIN_URL: "${KEYCLOAK_LOGIN_URL:-/api/auth/admin/}"
+ OPENSEARCH_LOGIN_URL: "${OPENSEARCH_LOGIN_URL:-/admin/dashboard/}"
SHARED_FILESYSTEM: "${SHARED_FILESYSTEM:-/tmp}"
LOGO: "${LOGO:-/logo.png}"
SEARCH_USERNAME: "${SEARCH_USERNAME:-admin}"
@@ -364,8 +365,8 @@ services:
METADATA_JDBC_EXTRA_ARGS: ${METADATA_JDBC_EXTRA_ARGS:-}
METADATA_PASSWORD: ${METADATA_PASSWORD:-dbrepo}
METADATA_USERNAME: ${METADATA_USERNAME:-root}
- SEARCH_USERNAME: ${SEARCH_USERNAME:-fda}
- SEARCH_PASSWORD: ${SEARCH_PASSWORD:-fda}
+ SEARCH_USERNAME: ${SEARCH_USERNAME:-admin}
+ SEARCH_PASSWORD: ${SEARCH_PASSWORD:-admin}
LOG_LEVEL: ${LOG_LEVEL:-debug}
healthcheck:
test: wget -qO- localhost:9050/actuator/health/readiness | grep -q "UP" || exit 1
diff --git a/install.sh b/install.sh
index 71bc1c56ffb367b118fdb598cca1b341f468a8b5..0e57e31a8dd50cd4789a50fa07e2324ee36434d1 100644
--- a/install.sh
+++ b/install.sh
@@ -1,10 +1,12 @@
#!/bin/bash
-if [ $USER != "root" ]; then
+# dependency
+if [ "$USER" != "root" ]; then
echo "This script needs sudo privileges!"
exit 1
fi
+# dependency
docker info > /dev/null
if [ $? -ne 0 ]; then
echo "Docker is not installed (or accessible in bash) on your system:"
@@ -14,27 +16,31 @@ if [ $? -ne 0 ]; then
exit 2
fi
-echo "Gathering environment ..."
+# environment
+echo "[🚀] Gathering environment ..."
curl -sSL -o .env https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/.env.unix.example
curl -sSL -o docker-compose.yml https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/docker-compose.prod.yml
curl -sSL -o dbrepo.conf https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-gateway-service/dbrepo.conf
curl -sSL -o setup-schema_local.sql https://gitlab.phaidra.org/fair-data-austria-db-repository/fda-services/-/raw/dev/dbrepo-metadata-db/setup-schema_local.sql
-echo "Pulling images ..."
+echo "[📦] Pulling images ..."
docker compose pull
MAX_MAP_COUNT=$(cat /proc/sys/vm/max_map_count)
if [ "$MAX_MAP_COUNT" -lt 262144 ]; then
- echo "Preparing environment ..."
+ echo "[🚀] Preparing environment ..."
echo "vm.max_map_count=262144" >> /etc/sysctl.conf
sysctl -p
fi
-echo "Starting DBRepo ..."
+echo "[✨] Starting DBRepo ..."
docker compose up -d
if [ $? -eq 0 ]; then
- echo "Successfully started. You can now inspect the logs with:"
+ echo "[🎉] Successfully started!"
+ echo ""
+ echo "You can now inspect the logs with:"
+ echo ""
+ echo " docker compose logs -f"
echo ""
- echo "docker compose logs -f"
fi