-
+
@@ -22,7 +22,7 @@
-
+
@@ -80,15 +80,15 @@ The che-plugin of this editor is defined in the plugin registry https://github.c
# Contributing
## Contribute to Che-theia
-Contributing to che-theia section is cover in [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/master/CONTRIBUTING.md)
+Contributing to che-theia section is cover in [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/main/CONTRIBUTING.md)
## Build container images
Building images is required only if you make some changes on `Dockerfile`s inside `dockerfiles` folder.
-If it is about testing che-theia extensions or plugins, please refere to [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/master/CONTRIBUTING.md).
+If it is about testing che-theia extensions or plugins, please refere to [CONTRIBUTING.md](https://github.com/eclipse-che/che-theia/blob/main/CONTRIBUTING.md).
-To build che-theia docker images, please follow [dockerfiles/theia/README.md](https://github.com/eclipse-che/che-theia/blob/master/dockerfiles/theia/README.md) instructions.
+To build che-theia docker images, please follow [dockerfiles/theia/README.md](https://github.com/eclipse-che/che-theia/blob/main/dockerfiles/theia/README.md) instructions.
# License
@@ -101,5 +101,5 @@ The Eclipse Che community is globally reachable through public chat rooms, maili
See https://www.eclipse.org/che/docs/che-7/overview/introduction-to-eclipse-che/#_joining_the_community
## Report issues
-
+
Issues are tracked on the main Eclipse Che Repository: https://github.com/eclipse/che/issues
diff --git a/RELEASE.md b/RELEASE.md
index e7ea89b84..3cc30573f 100644
--- a/RELEASE.md
+++ b/RELEASE.md
@@ -26,5 +26,5 @@ To make another bugfix release of Che-Theia with the upstream Theia patch includ
### Include a diff file
It's also possible to use a diff file to patch the Theia while releasing Che-Theia:
- prepare a `*.patch` file
-- put it into the [`patches`](https://github.com/eclipse-che/che-theia/tree/master/dockerfiles/theia/src/patches) folder and a sub-folder which name corresponds to the [`THEIA_VERSION`](https://github.com/eclipse-che/che-theia/blob/7.27.x/build.include#L15) value, e.g. `master`
+- put it into the [`patches`](https://github.com/eclipse-che/che-theia/tree/main/dockerfiles/theia/src/patches) folder and a sub-folder which name corresponds to the [`THEIA_VERSION`](https://github.com/eclipse-che/che-theia/blob/7.27.x/build.include#L15) value, e.g. `master`
- continue the release process as usual
diff --git a/build.include b/build.include
index f2f7353cb..15cd8c965 100644
--- a/build.include
+++ b/build.include
@@ -14,7 +14,7 @@ IMAGE_TAG="next"
THEIA_GITHUB_REPO="eclipse-theia/theia"
THEIA_VERSION="master"
THEIA_BRANCH="master"
-THEIA_COMMIT_SHA="2eb4319fb459f30ad897e8467878154c6790aaef"
+THEIA_COMMIT_SHA="9648953cd6e8552b7e027558509ba77770bd8b6f"
THEIA_GIT_REFS="refs\\/heads\\/master"
THEIA_DOCKER_IMAGE_VERSION=
diff --git a/che-theia-init-sources.yml b/che-theia-init-sources.yml
index 84dd1922a..703902687 100644
--- a/che-theia-init-sources.yml
+++ b/che-theia-init-sources.yml
@@ -33,4 +33,4 @@ sources:
- plugins/telemetry-plugin
- plugins/github-auth-plugin
- plugins/recommendations-plugin
- checkoutTo: master
+ checkoutTo: main
diff --git a/cico_build_master.sh b/cico_build_master.sh
deleted file mode 100644
index a4548d012..000000000
--- a/cico_build_master.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# See: https://sipb.mit.edu/doc/safe-shell/
-
-echo "Build is moved to GitHub Workflow"
diff --git a/cico_build_nightly.sh b/cico_build_nightly.sh
deleted file mode 100644
index 5018e2fcd..000000000
--- a/cico_build_nightly.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# See: https://sipb.mit.edu/doc/safe-shell/
-
-echo "Not building Eclipse Che-Theia on nightly as it may publish for now images not passing happy path tests"
diff --git a/cico_build_pr.sh b/cico_build_pr.sh
deleted file mode 100644
index a4548d012..000000000
--- a/cico_build_pr.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# See: https://sipb.mit.edu/doc/safe-shell/
-
-echo "Build is moved to GitHub Workflow"
diff --git a/cico_common.sh b/cico_common.sh
deleted file mode 100644
index d5fad7309..000000000
--- a/cico_common.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2019 Red Hat, Inc.
-# This program and the accompanying materials are made
-# available under the terms of the Eclipse Public License 2.0
-# which is available at https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# See: https://sipb.mit.edu/doc/safe-shell/
-
-# Source environment variables of the jenkins slave
-# that might interest this worker.
-function load_jenkins_vars() {
- if [ -e "jenkins-env.json" ]; then
- eval "$(./env-toolkit load -f jenkins-env.json \
- AKAMAI_CHE_AUTH \
- CHE_BOT_GITHUB_TOKEN \
- QUAY_ECLIPSE_CHE_USERNAME \
- QUAY_ECLIPSE_CHE_PASSWORD \
- CHE_NPM_AUTH_TOKEN \
- JENKINS_URL \
- GIT_BRANCH \
- GIT_COMMIT \
- BUILD_NUMBER \
- ghprbSourceBranch \
- ghprbActualCommit \
- BUILD_URL \
- ghprbPullId)"
- #export provided GH token
- export GITHUB_TOKEN=${CHE_BOT_GITHUB_TOKEN}
- export NPM_AUTH_TOKEN=${CHE_NPM_AUTH_TOKEN}
- fi
-}
-
-function install_deps() {
- # We need to disable selinux for now, XXX
- /usr/sbin/setenforce 0 || true
-
- # Get all the deps in
- yum install -y yum-utils device-mapper-persistent-data lvm2
- yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
- curl -sL https://rpm.nodesource.com/setup_12.x | bash -
- yum-config-manager --add-repo https://dl.yarnpkg.com/rpm/yarn.repo
-
- yum install -y epel-release
- yum install -y docker-ce git nodejs yarn gcc-c++ make jq
-
- service docker start
- echo 'CICO: Dependencies installed'
-}
-
-publishImagesOnQuay() {
- REGISTRY="quay.io"
- # For pushing to quay.io 'eclipse' organization we need to use different credentials
- QUAY_USERNAME=${QUAY_ECLIPSE_CHE_USERNAME}
- QUAY_PASSWORD=${QUAY_ECLIPSE_CHE_PASSWORD}
- if [ -n "${QUAY_USERNAME}" ] && [ -n "${QUAY_PASSWORD}" ]; then
- docker login -u "${QUAY_USERNAME}" -p "${QUAY_PASSWORD}" "${REGISTRY}"
- else
- echo "Could not login, missing credentials for pushing to the '${ORGANIZATION}' organization"
- return
- fi
-
- for image in "${PUBLISH_IMAGES_LIST[@]}"
- do
- echo "Publishing ${image}:${IMAGE_TAG}..."
- docker tag "${image}:${IMAGE_TAG}" "${REGISTRY}/${image}:${IMAGE_TAG}"
- echo y | docker push "${REGISTRY}/${image}:${IMAGE_TAG}"
- if [[ -n "${THEIA_DOCKER_IMAGE_VERSION}" ]]; then
- echo "Publishing ${image}:${THEIA_DOCKER_IMAGE_VERSION}..."
- docker tag "${image}:${IMAGE_TAG}" "${REGISTRY}/${image}:${THEIA_DOCKER_IMAGE_VERSION}"
- echo y | docker push "${REGISTRY}/${image}:${THEIA_DOCKER_IMAGE_VERSION}"
- else
- SHORT_SHA=$(git rev-parse --short HEAD)
- echo "Publishing ${image}:${SHORT_SHA}..."
- docker tag "${image}:${IMAGE_TAG}" "${REGISTRY}/${image}:${SHORT_SHA}"
- echo y | docker push "${REGISTRY}/${image}:${SHORT_SHA}"
- fi
- done
-}
diff --git a/devfiles/hosted-che-dogfooding.devfile.yaml b/devfiles/hosted-che-dogfooding.devfile.yaml
index e1aa42fcf..a63746947 100644
--- a/devfiles/hosted-che-dogfooding.devfile.yaml
+++ b/devfiles/hosted-che-dogfooding.devfile.yaml
@@ -27,7 +27,7 @@ projects:
source:
location: 'https://github.com/eclipse-che/che-theia.git'
type: git
- branch: master
+ branch: main
components:
- id: eclipse/che-theia/latest
diff --git a/dockerfiles/theia-dev/Dockerfile b/dockerfiles/theia-dev/Dockerfile
index 7961aa50c..67a9ea3c4 100644
--- a/dockerfiles/theia-dev/Dockerfile
+++ b/dockerfiles/theia-dev/Dockerfile
@@ -46,7 +46,7 @@ RUN npm config set prefix "${HOME}/.npm-global" && \
echo "--global-folder \"${HOME}/.yarn-global\"" > ${HOME}/.yarnrc && \
yarn config set network-timeout 600000 -g && \
# add eclipse che-theia generator
- yarn ${YARN_FLAGS} global add yo generator-code vsce @theia/generator-plugin@0.0.1-1562578105 file:${HOME}/eclipse-che-theia-generator && \
+ yarn ${YARN_FLAGS} global add yo generator-code vsce @theia/generator-plugin@0.0.1-1622834185 file:${HOME}/eclipse-che-theia-generator && \
rm -rf ${HOME}/eclipse-che-theia-generator && \
# Generate .passwd.template \
cat /etc/passwd | \
diff --git a/dockerfiles/theia-dev/docker/alpine/install-dependencies.dockerfile b/dockerfiles/theia-dev/docker/alpine/install-dependencies.dockerfile
index db8fb2c0e..1b6e1a76d 100644
--- a/dockerfiles/theia-dev/docker/alpine/install-dependencies.dockerfile
+++ b/dockerfiles/theia-dev/docker/alpine/install-dependencies.dockerfile
@@ -16,4 +16,6 @@ RUN apk add --update --no-cache \
# synchronization tool
rsync \
# patch (required in che-theia to apply patches)
- patch
+ patch \
+ # requirements to run theia with yarn start
+ libsecret
diff --git a/dockerfiles/theia-dev/docker/ubi8/builder-image-from.dockerfile b/dockerfiles/theia-dev/docker/ubi8/builder-image-from.dockerfile
index c470d6fa3..5b02373b8 100644
--- a/dockerfiles/theia-dev/docker/ubi8/builder-image-from.dockerfile
+++ b/dockerfiles/theia-dev/docker/ubi8/builder-image-from.dockerfile
@@ -1,2 +1,2 @@
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-12
-FROM registry.access.redhat.com/ubi8/nodejs-12:1-87
+FROM registry.access.redhat.com/ubi8/nodejs-12:1-90
diff --git a/dockerfiles/theia-dev/docker/ubi8/install-dependencies.dockerfile b/dockerfiles/theia-dev/docker/ubi8/install-dependencies.dockerfile
index cf8a56031..049c14694 100644
--- a/dockerfiles/theia-dev/docker/ubi8/install-dependencies.dockerfile
+++ b/dockerfiles/theia-dev/docker/ubi8/install-dependencies.dockerfile
@@ -1,3 +1,3 @@
USER root
-RUN yum install -y curl make cmake gcc gcc-c++ python2 git git-core-doc openssh less bash tar gzip rsync patch \
+RUN yum install -y curl make cmake gcc gcc-c++ python2 git git-core-doc openssh less bash tar gzip rsync patch libsecret \
&& yum -y clean all && rm -rf /var/cache/yum
diff --git a/dockerfiles/theia-endpoint-runtime-binary/docker/ubi8/runtime-from.dockerfile b/dockerfiles/theia-endpoint-runtime-binary/docker/ubi8/runtime-from.dockerfile
index 8936f010d..72db71461 100644
--- a/dockerfiles/theia-endpoint-runtime-binary/docker/ubi8/runtime-from.dockerfile
+++ b/dockerfiles/theia-endpoint-runtime-binary/docker/ubi8/runtime-from.dockerfile
@@ -1,2 +1,2 @@
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
-FROM registry.access.redhat.com/ubi8-minimal:8.4-200 as runtime
+FROM registry.access.redhat.com/ubi8-minimal:8.4-205 as runtime
diff --git a/dockerfiles/theia-vsix-installer/docker/ubi8/from.dockerfile b/dockerfiles/theia-vsix-installer/docker/ubi8/from.dockerfile
index 8936f010d..72db71461 100644
--- a/dockerfiles/theia-vsix-installer/docker/ubi8/from.dockerfile
+++ b/dockerfiles/theia-vsix-installer/docker/ubi8/from.dockerfile
@@ -1,2 +1,2 @@
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8-minimal
-FROM registry.access.redhat.com/ubi8-minimal:8.4-200 as runtime
+FROM registry.access.redhat.com/ubi8-minimal:8.4-205 as runtime
diff --git a/dockerfiles/theia/Dockerfile b/dockerfiles/theia/Dockerfile
index e6ef76c03..f005648e6 100644
--- a/dockerfiles/theia/Dockerfile
+++ b/dockerfiles/theia/Dockerfile
@@ -163,7 +163,7 @@ COPY --from=build-result /che-theia-build/plugins /default-theia-plugins
&& cat /etc/passwd | sed s#root:x.*#root:x:\${USER_ID}:\${GROUP_ID}::\${HOME}:/bin/bash#g > ${HOME}/passwd.template \
&& cat /etc/group | sed s#root:x:0:#root:x:0:0,\${USER_ID}:#g > ${HOME}/group.template \
# Add yeoman, theia plugin & VS Code generator and typescript (to have tsc/typescript working)
- && yarn global add ${YARN_FLAGS} yo @theia/generator-plugin@0.0.1-1562578105 generator-code typescript@3.5.3 \
+ && yarn global add ${YARN_FLAGS} yo @theia/generator-plugin@0.0.1-1622834185 generator-code typescript@3.5.3 \
&& mkdir -p ${HOME}/.config/insight-nodejs/ \
&& chmod -R 777 ${HOME}/.config/ \
# Disable the statistics for yeoman
diff --git a/dockerfiles/theia/README.md b/dockerfiles/theia/README.md
index e97b5d112..d4af06031 100644
--- a/dockerfiles/theia/README.md
+++ b/dockerfiles/theia/README.md
@@ -69,11 +69,10 @@ CI generates several tags of [docker images](https://quay.io/repository/eclipse/
- `eclipse/che-theia:next`
- theia branch: [master](https://github.com/theia-ide/theia/)
- - che-theia branch: [master](https://github.com/eclipse-che/che-theia)
- - CI [build job](https://ci.centos.org/view/Devtools/job/devtools-che-theia-che-build-master/)
- - CI [nightly build job](https://ci.centos.org/view/Devtools/job/devtools-che-theia-che-nightly/)
+ - che-theia branch: [main](https://github.com/eclipse-che/che-theia)
+ - CI [next build job](https://github.com/eclipse-che/che-theia/actions/workflows/build-publish-next.yml)
-- `eclipse/che-theia:latest` the latest stable Che-Theia 7.x release, updates on each release by CI [release job](https://ci.centos.org/view/Devtools/job/devtools-che-theia-che-release/)
+- `eclipse/che-theia:latest` the latest stable Che-Theia 7.x release, updates on each release by CI [release job](https://github.com/eclipse-che/che-theia/actions/workflows/release.yml)
## Theia version
diff --git a/dockerfiles/theia/docker/alpine/runtime-install-dependencies.dockerfile b/dockerfiles/theia/docker/alpine/runtime-install-dependencies.dockerfile
index 1436cb956..e1079d0d4 100644
--- a/dockerfiles/theia/docker/alpine/runtime-install-dependencies.dockerfile
+++ b/dockerfiles/theia/docker/alpine/runtime-install-dependencies.dockerfile
@@ -7,4 +7,5 @@
# Install less for handling git diff properly
# Install sshpass for handling passwords for SSH keys
# Install lsblk as Theia requires it
-RUN apk add --update --no-cache sudo git bzip2 which bash curl openssh openssh-keygen less sshpass lsblk
+# Install libsecret as Theia requires it
+RUN apk add --update --no-cache sudo git bzip2 which bash curl openssh openssh-keygen less sshpass lsblk libsecret
diff --git a/dockerfiles/theia/docker/ubi8/build-result-from.dockerfile b/dockerfiles/theia/docker/ubi8/build-result-from.dockerfile
index 79339de9f..e10fc7423 100644
--- a/dockerfiles/theia/docker/ubi8/build-result-from.dockerfile
+++ b/dockerfiles/theia/docker/ubi8/build-result-from.dockerfile
@@ -1,3 +1,3 @@
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-12
-FROM registry.access.redhat.com/ubi8/nodejs-12:1-87 as build-result
+FROM registry.access.redhat.com/ubi8/nodejs-12:1-90 as build-result
USER root
diff --git a/dockerfiles/theia/docker/ubi8/runtime-from.dockerfile b/dockerfiles/theia/docker/ubi8/runtime-from.dockerfile
index ebd1f098f..d26c0d45a 100644
--- a/dockerfiles/theia/docker/ubi8/runtime-from.dockerfile
+++ b/dockerfiles/theia/docker/ubi8/runtime-from.dockerfile
@@ -1,2 +1,2 @@
# https://access.redhat.com/containers/?tab=tags#/registry.access.redhat.com/ubi8/nodejs-12
-FROM registry.access.redhat.com/ubi8/nodejs-12:1-87 as runtime
+FROM registry.access.redhat.com/ubi8/nodejs-12:1-90 as runtime
diff --git a/dockerfiles/theia/docker/ubi8/runtime-install-dependencies.dockerfile b/dockerfiles/theia/docker/ubi8/runtime-install-dependencies.dockerfile
index c321eee72..44a0460c4 100644
--- a/dockerfiles/theia/docker/ubi8/runtime-install-dependencies.dockerfile
+++ b/dockerfiles/theia/docker/ubi8/runtime-install-dependencies.dockerfile
@@ -11,7 +11,8 @@ ARG SSHPASS_VERSION="1.06"
# Install ssh for cloning ssh-repositories
# Install less for handling git diff properly
# Install sshpass for handling passwords for SSH keys
-RUN yum install -y sudo git bzip2 which bash curl openssh less && \
+# Install libsecret as Theia requires it
+RUN yum install -y sudo git bzip2 which bash curl openssh less libsecret && \
curl -ssl https://netcologne.dl.sourceforge.net/project/sshpass/sshpass/"${SSHPASS_VERSION}"/sshpass-"${SSHPASS_VERSION}".tar.gz -o sshpass.tar.gz && \
tar -xvf sshpass.tar.gz && cd sshpass-"${SSHPASS_VERSION}" && ./configure && make install && cd .. && rm -rf sshpass-"${SSHPASS_VERSION}" && \
yum -y clean all && rm -rf /var/cache/yum
diff --git a/extensions/eclipse-che-theia-plugin-ext/package.json b/extensions/eclipse-che-theia-plugin-ext/package.json
index 838a17e0b..6720c576c 100644
--- a/extensions/eclipse-che-theia-plugin-ext/package.json
+++ b/extensions/eclipse-che-theia-plugin-ext/package.json
@@ -19,16 +19,17 @@
"@theia/task": "next",
"@theia/mini-browser": "next",
"@theia/plugin-ext": "next",
+ "@theia/application-package": "next",
"axios": "0.21.1",
"tunnel": "0.0.6",
"vscode-uri": "2.1.1",
"js-yaml": "3.13.1",
"drivelist": "9.0.2",
"@eclipse-che/theia-remote-api": "^0.0.1",
- "@eclipse-che/workspace-telemetry-client": "latest"
+ "@eclipse-che/workspace-telemetry-client": "latest",
+ "mime": "2.5.2"
},
"devDependencies": {
- "@types/tunnel": "0.0.1",
"clean-webpack-plugin": "^0.1.19",
"webpack": "^4.20.2",
"webpack-cli": "^3.1.1",
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/browser/che-api-provider.ts b/extensions/eclipse-che-theia-plugin-ext/src/browser/che-api-provider.ts
index 0c348a175..cc02dc867 100644
--- a/extensions/eclipse-che-theia-plugin-ext/src/browser/che-api-provider.ts
+++ b/extensions/eclipse-che-theia-plugin-ext/src/browser/che-api-provider.ts
@@ -13,6 +13,7 @@ import { injectable, interfaces } from 'inversify';
import { CheDevfileMainImpl } from './che-devfile-main';
import { CheEndpointMainImpl } from './che-endpoint-main';
import { CheGithubMainImpl } from './che-github-main';
+import { CheHttpMainImpl } from './che-http-main';
import { CheK8SMainImpl } from './che-k8s-main';
import { CheLanguagesTestAPIImpl } from './che-languages-test-api';
import { CheOauthMainImpl } from './che-oauth-main';
@@ -49,5 +50,6 @@ export class CheApiProvider implements MainPluginApiProvider {
rpc.set(PLUGIN_RPC_CONTEXT.CHE_SIDERCAR_CONTENT_READER_MAIN, new CheSideCarContentReaderMainImpl(container, rpc));
rpc.set(PLUGIN_RPC_CONTEXT.CHE_LANGUAGES_TEST_API_MAIN, new CheLanguagesTestAPIImpl(container));
rpc.set(PLUGIN_RPC_CONTEXT.CHE_SIDECAR_FILE_SYSTEM_MAIN, new CheSideCarFileSystemMainImpl(container, rpc));
+ rpc.set(PLUGIN_RPC_CONTEXT.CHE_HTTP_MAIN, new CheHttpMainImpl(container));
}
}
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/browser/che-http-main.ts b/extensions/eclipse-che-theia-plugin-ext/src/browser/che-http-main.ts
new file mode 100644
index 000000000..73096b8ba
--- /dev/null
+++ b/extensions/eclipse-che-theia-plugin-ext/src/browser/che-http-main.ts
@@ -0,0 +1,25 @@
+/**********************************************************************
+ * Copyright (c) 2021 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+import { CheHttpMain } from '../common/che-protocol';
+import { HttpService } from '@eclipse-che/theia-remote-api/lib/common/http-service';
+import { interfaces } from 'inversify';
+
+export class CheHttpMainImpl implements CheHttpMain {
+ private readonly cheHttpService: HttpService;
+
+ constructor(container: interfaces.Container) {
+ this.cheHttpService = container.get(HttpService);
+ }
+
+ async $get(url: string): Promise
{
+ return this.cheHttpService.get(url);
+ }
+}
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/browser/che-sidecar-file-system-main.ts b/extensions/eclipse-che-theia-plugin-ext/src/browser/che-sidecar-file-system-main.ts
index 4e13050ef..890dcce1a 100644
--- a/extensions/eclipse-che-theia-plugin-ext/src/browser/che-sidecar-file-system-main.ts
+++ b/extensions/eclipse-che-theia-plugin-ext/src/browser/che-sidecar-file-system-main.ts
@@ -30,7 +30,8 @@ import URI from '@theia/core/lib/common/uri';
import { interfaces } from 'inversify';
export abstract class AbstractSideCarFileSystemProvider
- implements FileSystemProviderWithFileReadWriteCapability, FileSystemProviderWithFileFolderCopyCapability {
+ implements FileSystemProviderWithFileReadWriteCapability, FileSystemProviderWithFileFolderCopyCapability
+{
private readonly _onDidChange = new Emitter();
readonly onDidChangeFile: Event = this._onDidChange.event;
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/browser/plugin/che-plugin-manager.ts b/extensions/eclipse-che-theia-plugin-ext/src/browser/plugin/che-plugin-manager.ts
index 4f8aac7f7..81634b264 100644
--- a/extensions/eclipse-che-theia-plugin-ext/src/browser/plugin/che-plugin-manager.ts
+++ b/extensions/eclipse-che-theia-plugin-ext/src/browser/plugin/che-plugin-manager.ts
@@ -23,6 +23,7 @@ import { inject, injectable, postConstruct } from 'inversify';
import { ChePluginFrontentService } from './che-plugin-frontend-service';
import { ChePluginPreferences } from './che-plugin-preferences';
import { ChePluginServiceClientImpl } from './che-plugin-service-client';
+import { DevfileService } from '@eclipse-che/theia-remote-api/lib/common/devfile-service';
import { EnvVariablesServer } from '@theia/core/lib/common/env-variables';
import { PluginFilter } from '../../common/plugin/plugin-filter';
import { PluginServer } from '@theia/plugin-ext/lib/common/plugin-protocol';
@@ -79,6 +80,9 @@ export class ChePluginManager {
@inject(OpenerService)
protected readonly openerService: OpenerService;
+ @inject(DevfileService)
+ protected readonly devfileService: DevfileService;
+
@postConstruct()
async onStart() {
await this.initDefaults();
@@ -222,6 +226,20 @@ export class ChePluginManager {
registries[registry.name] = registry;
}
+ /**
+ * Scan devfile plugins for custom registry, add the registry to cache if detected.
+ */
+ const devfile = await this.devfileService.get();
+ if (devfile.components) {
+ devfile.components
+ .filter(component => component.plugin && component.plugin.id && component.plugin.registryUrl)
+ .forEach(component => {
+ const registryUrl = component.plugin?.registryUrl!;
+ const name = component.plugin?.id!;
+ registries[name] = { name, uri: registryUrl, publicUri: registryUrl };
+ });
+ }
+
await this.chePluginService.updateCache(registries);
}
@@ -450,10 +468,9 @@ export class ChePluginManager {
try {
// remove the plugin from workspace configuration
- await this.chePluginService.removePlugin(metadata.key);
- this.messageService.info(
- `Plugin '${metadata.publisher}/${metadata.name}/${metadata.version}' has been successfully removed`
- );
+ const key = `${metadata.publisher}/${metadata.name}/${metadata.version}`;
+ await this.chePluginService.removePlugin(key);
+ this.messageService.info(`Plugin '${key}' has been successfully removed`);
// remove the plugin from the list of workspace plugins
this.installedPlugins = this.installedPlugins.filter(p => p !== metadata.key);
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/browser/task-config-service.ts b/extensions/eclipse-che-theia-plugin-ext/src/browser/task-config-service.ts
index 36712eeef..faef836fd 100644
--- a/extensions/eclipse-che-theia-plugin-ext/src/browser/task-config-service.ts
+++ b/extensions/eclipse-che-theia-plugin-ext/src/browser/task-config-service.ts
@@ -39,8 +39,9 @@ export class TaskConfigurationsService extends TaskService {
this.getOpenerOptions(resolvedTask)
);
+ let taskInfo: TaskInfo | undefined;
try {
- const taskInfo = await this.taskServer.run(resolvedTask, this.getContext(), option);
+ taskInfo = await this.taskServer.run(resolvedTask, this.getContext(), option);
terminal.start(taskInfo.terminalId);
this.lastTask = { source, taskLabel, scope: resolvedTask._scope };
@@ -62,14 +63,14 @@ export class TaskConfigurationsService extends TaskService {
console.error(errorMessage, error);
this.messageService.error(errorMessage);
+ if (taskInfo && !this.isRemoteTask(taskInfo.config) && typeof taskInfo.terminalId === 'number') {
+ this.shellTerminalServer.onAttachAttempted(taskInfo.terminalId);
+ }
return undefined;
}
}
- async attach(terminalId: number, taskId: number): Promise {
- const runningTasks = await this.getRunningTasks();
-
- const taskInfo = runningTasks.find((t: TaskInfo) => t.taskId === taskId);
+ async attach(terminalId: number, taskInfo: TaskInfo): Promise {
if (taskInfo) {
const kind = this.isRemoteTask(taskInfo.config) ? REMOTE_TASK_KIND : TASK_KIND;
const terminalWidget = this.terminalService.all.find(
@@ -87,7 +88,7 @@ export class TaskConfigurationsService extends TaskService {
this.getOpenerOptions(taskConfig)
);
- widget.start(terminalId);
+ return widget.start(terminalId);
}
protected getFactoryOptions(config?: TaskConfiguration): TerminalWidgetFactoryOptions {
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/browser/type-converters.ts b/extensions/eclipse-che-theia-plugin-ext/src/browser/type-converters.ts
index 0da728769..974060582 100644
--- a/extensions/eclipse-che-theia-plugin-ext/src/browser/type-converters.ts
+++ b/extensions/eclipse-che-theia-plugin-ext/src/browser/type-converters.ts
@@ -62,16 +62,20 @@ export function toCompletionItem(completionDTO: model.CompletionDto): theia.Comp
range = undefined;
} else if (itemRange.hasOwnProperty('insert') && itemRange.hasOwnProperty('replace')) {
const inserting = Converter.toRange(
- ((itemRange as unknown) as {
- insert: model.Range;
- replace: model.Range;
- }).insert
+ (
+ itemRange as unknown as {
+ insert: model.Range;
+ replace: model.Range;
+ }
+ ).insert
);
const replacing = Converter.toRange(
- ((itemRange as unknown) as {
- insert: model.Range;
- replace: model.Range;
- }).replace
+ (
+ itemRange as unknown as {
+ insert: model.Range;
+ replace: model.Range;
+ }
+ ).replace
);
range = {
inserting: inserting,
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/common/che-protocol.ts b/extensions/eclipse-che-theia-plugin-ext/src/common/che-protocol.ts
index 0e1b6b0a8..a488134bd 100644
--- a/extensions/eclipse-che-theia-plugin-ext/src/common/che-protocol.ts
+++ b/extensions/eclipse-che-theia-plugin-ext/src/common/che-protocol.ts
@@ -93,6 +93,14 @@ export interface CheK8SMain {
$sendRawQuery(requestURL: string, opts: any): Promise;
}
+export interface CheHttp {
+ get(url: string): Promise;
+}
+
+export interface CheHttpMain {
+ $get(url: string): Promise;
+}
+
export interface CheGithub {
uploadPublicSshKey(publicKey: string): Promise;
getToken(): Promise;
@@ -461,6 +469,9 @@ export const PLUGIN_RPC_CONTEXT = {
CHE_K8S: createProxyIdentifier('CheK8S'),
CHE_K8S_MAIN: createProxyIdentifier('CheK8SMain'),
+ CHE_HTTP: createProxyIdentifier('CheHttp'),
+ CHE_HTTP_MAIN: createProxyIdentifier('CheHttpMain'),
+
CHE_USER: createProxyIdentifier('CheUser'),
CHE_USER_MAIN: createProxyIdentifier('CheUserMain'),
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/node/che-plugin-api-provider.ts b/extensions/eclipse-che-theia-plugin-ext/src/node/che-plugin-api-provider.ts
index 437b05f70..31b492df3 100644
--- a/extensions/eclipse-che-theia-plugin-ext/src/node/che-plugin-api-provider.ts
+++ b/extensions/eclipse-che-theia-plugin-ext/src/node/che-plugin-api-provider.ts
@@ -8,8 +8,6 @@
* SPDX-License-Identifier: EPL-2.0
***********************************************************************/
-import * as path from 'path';
-
import { ExtPluginApi, ExtPluginApiProvider } from '@theia/plugin-ext/lib/common/plugin-ext-api-contribution';
import { injectable } from 'inversify';
@@ -23,7 +21,7 @@ export class ChePluginApiProvider implements ExtPluginApiProvider {
initFunction: 'initializeApi',
initVariable: 'che_api_provider',
},
- backendInitPath: path.join('@eclipse-che/theia-plugin-ext/lib/plugin/node/che-api-node-provider.js'),
+ backendInitPath: require.resolve('@eclipse-che/theia-plugin-ext/lib/plugin/node/che-api-node-provider'),
};
}
}
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/node/che-plugin-service.ts b/extensions/eclipse-che-theia-plugin-ext/src/node/che-plugin-service.ts
index e10d55b04..458b87d6e 100644
--- a/extensions/eclipse-che-theia-plugin-ext/src/node/che-plugin-service.ts
+++ b/extensions/eclipse-che-theia-plugin-ext/src/node/che-plugin-service.ts
@@ -8,10 +8,6 @@
* SPDX-License-Identifier: EPL-2.0
***********************************************************************/
-import * as https from 'https';
-import * as tunnel from 'tunnel';
-import * as url from 'url';
-
import {
ChePluginMetadata,
ChePluginRegistries,
@@ -21,10 +17,9 @@ import {
} from '../common/che-plugin-protocol';
import { DevfileComponent, DevfileService } from '@eclipse-che/theia-remote-api/lib/common/devfile-service';
import { WorkspaceService, WorkspaceSettings } from '@eclipse-che/theia-remote-api/lib/common/workspace-service';
-import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
import { injectable, interfaces } from 'inversify';
-import { CertificateService } from '@eclipse-che/theia-remote-api/lib/common/certificate-service';
+import { HttpService } from '@eclipse-che/theia-remote-api/lib/common/http-service';
import { PluginFilter } from '../common/plugin/plugin-filter';
import URI from '@theia/core/lib/common/uri';
@@ -64,7 +59,7 @@ const PLUGIN_REGISTRY_INTERNAL_URL = 'cheWorkspacePluginRegistryInternalUrl';
export class ChePluginServiceImpl implements ChePluginService {
private workspaceService: WorkspaceService;
private devfileService: DevfileService;
- private certificateService: CertificateService;
+ private httpService: HttpService;
private defaultRegistry: ChePluginRegistry;
@@ -75,7 +70,7 @@ export class ChePluginServiceImpl implements ChePluginService {
constructor(container: interfaces.Container) {
this.workspaceService = container.get(WorkspaceService);
this.devfileService = container.get(DevfileService);
- this.certificateService = container.get(CertificateService);
+ this.httpService = container.get(HttpService);
}
setClient(client: ChePluginServiceClient): void {
@@ -123,99 +118,6 @@ export class ChePluginServiceImpl implements ChePluginService {
}
}
- /**
- * If the URI points to default plugin registry, axios will use local authority certificates.
- */
- private async getAxiosInstance(uri: string): Promise {
- const certificateAuthority = await this.certificateService.getCertificateAuthority();
-
- const proxyUrl = process.env.http_proxy;
- const baseUrl = process.env.CHE_API;
- if (proxyUrl && proxyUrl !== '' && baseUrl) {
- const parsedBaseUrl = url.parse(baseUrl);
- if (parsedBaseUrl.hostname && this.shouldProxy(parsedBaseUrl.hostname)) {
- const axiosRequestConfig: AxiosRequestConfig | undefined = {
- proxy: false,
- };
- const parsedProxyUrl = url.parse(proxyUrl);
- const mainProxyOptions = this.getMainProxyOptions(parsedProxyUrl);
- const httpsProxyOptions = this.getHttpsProxyOptions(
- mainProxyOptions,
- parsedBaseUrl.hostname,
- certificateAuthority
- );
- const httpOverHttpAgent = tunnel.httpOverHttp({ proxy: mainProxyOptions });
- const httpOverHttpsAgent = tunnel.httpOverHttps({ proxy: httpsProxyOptions });
- const httpsOverHttpAgent = tunnel.httpsOverHttp({
- proxy: mainProxyOptions,
- ca: certificateAuthority ? certificateAuthority : undefined,
- });
- const httpsOverHttpsAgent = tunnel.httpsOverHttps({
- proxy: httpsProxyOptions,
- ca: certificateAuthority ? certificateAuthority : undefined,
- });
- const urlIsHttps = (parsedBaseUrl.protocol || 'http:').startsWith('https:');
- const proxyIsHttps = (parsedProxyUrl.protocol || 'http:').startsWith('https:');
- if (urlIsHttps) {
- axiosRequestConfig.httpsAgent = proxyIsHttps ? httpsOverHttpsAgent : httpsOverHttpAgent;
- } else {
- axiosRequestConfig.httpAgent = proxyIsHttps ? httpOverHttpsAgent : httpOverHttpAgent;
- }
- return axios.create(axiosRequestConfig);
- }
- }
-
- if (uri.startsWith(this.defaultRegistry.uri) && certificateAuthority) {
- return axios.create({
- httpsAgent: new https.Agent({
- ca: certificateAuthority,
- }),
- });
- }
-
- return axios;
- }
-
- private getHttpsProxyOptions(
- mainProxyOptions: tunnel.ProxyOptions,
- servername: string | undefined,
- certificateAuthority: Buffer[] | undefined
- ): tunnel.HttpsProxyOptions {
- return {
- host: mainProxyOptions.host,
- port: mainProxyOptions.port,
- proxyAuth: mainProxyOptions.proxyAuth,
- servername,
- ca: certificateAuthority ? certificateAuthority : undefined,
- };
- }
-
- private getMainProxyOptions(parsedProxyUrl: url.UrlWithStringQuery): tunnel.ProxyOptions {
- const port = Number(parsedProxyUrl.port);
- return {
- host: parsedProxyUrl.hostname!,
- port: parsedProxyUrl.port !== '' && !isNaN(port) ? port : 3128,
- proxyAuth: parsedProxyUrl.auth && parsedProxyUrl.auth !== '' ? parsedProxyUrl.auth : undefined,
- };
- }
-
- private shouldProxy(hostname: string): boolean {
- const noProxyEnv = process.env.no_proxy || process.env.NO_PROXY;
- const noProxy: string[] = noProxyEnv ? noProxyEnv.split(',').map(s => s.trim()) : [];
- return !noProxy.some(rule => {
- if (!rule) {
- return false;
- }
- if (rule === '*') {
- return true;
- }
- if (rule[0] === '.' && hostname.substr(hostname.length - rule.length) === rule) {
- return true;
- }
- return hostname === rule;
- });
- }
-
/**
* Removes plugins with type 'Che Editor'
*/
@@ -277,7 +179,7 @@ export class ChePluginServiceImpl implements ChePluginService {
for (let pIndex = 0; pIndex < registryPlugins.length; pIndex++) {
const metadataInternal: ChePluginMetadataInternal = registryPlugins[pIndex];
- const pluginYamlURI = this.getPluginYampURI(registry, metadataInternal);
+ const pluginYamlURI = this.getPluginYamlURI(registry, metadataInternal);
try {
const pluginMetadata = await this.loadPluginMetadata(pluginYamlURI, longKeyFormat, registry.publicUri);
@@ -323,9 +225,9 @@ export class ChePluginServiceImpl implements ChePluginService {
* @return list of available plugins
*/
private async loadPluginList(registry: ChePluginRegistry): Promise {
- const registryURI = registry.uri + '/plugins';
- const axiosInstance = await this.getAxiosInstance(registryURI);
- return (await axiosInstance.get(registryURI)).data;
+ const registryURI = registry.uri + '/plugins/';
+ const registryContent = (await this.httpService.get(registryURI)) || '{}';
+ return JSON.parse(registryContent) as ChePluginMetadataInternal[];
}
/**
@@ -335,7 +237,7 @@ export class ChePluginServiceImpl implements ChePluginService {
* @param plugin plugin metadata
* @return uri to plugin yaml file
*/
- private getPluginYampURI(registry: ChePluginRegistry, plugin: ChePluginMetadataInternal): string {
+ private getPluginYamlURI(registry: ChePluginRegistry, plugin: ChePluginMetadataInternal): string {
if (plugin.links && plugin.links.self) {
const self: string = plugin.links.self;
if (self.startsWith('/')) {
@@ -377,9 +279,8 @@ export class ChePluginServiceImpl implements ChePluginService {
private async loadPluginYaml(yamlURI: string): Promise {
let err;
try {
- const axiosInstance = await this.getAxiosInstance(yamlURI);
- const data = (await axiosInstance.get(yamlURI)).data;
- return yaml.safeLoad(data);
+ const pluginYamlContent = await this.httpService.get(yamlURI);
+ return yaml.safeLoad(pluginYamlContent);
} catch (error) {
console.error(error);
err = error;
@@ -390,9 +291,8 @@ export class ChePluginServiceImpl implements ChePluginService {
yamlURI += '/';
}
yamlURI += 'meta.yaml';
- const axiosInstance = await this.getAxiosInstance(yamlURI);
- const data = (await axiosInstance.get(yamlURI)).data;
- return yaml.safeLoad(data);
+ const pluginYamlContent = await this.httpService.get(yamlURI);
+ return yaml.safeLoad(pluginYamlContent);
} catch (error) {
console.error(error);
return Promise.reject('Unable to load plugin metadata. ' + err.message);
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/plugin/che-api.ts b/extensions/eclipse-che-theia-plugin-ext/src/plugin/che-api.ts
index 66d8d7bb7..1eb2598e4 100644
--- a/extensions/eclipse-che-theia-plugin-ext/src/plugin/che-api.ts
+++ b/extensions/eclipse-che-theia-plugin-ext/src/plugin/che-api.ts
@@ -16,6 +16,7 @@ import { CheTaskImpl, TaskStatus, TaskTerminallKind } from './che-task-impl';
import { CheDevfileImpl } from './che-devfile';
import { CheEndpointImpl } from './che-endpoint';
import { CheGithubImpl } from './che-github';
+import { CheHttpImpl } from './che-http';
import { CheK8SImpl } from './che-k8s';
import { CheOauthImpl } from './che-oauth';
import { CheOpenshiftImpl } from './che-openshift';
@@ -51,6 +52,7 @@ export function createAPIFactory(rpc: RPCProtocol): CheApiFactory {
const cheOauthImpl = rpc.set(PLUGIN_RPC_CONTEXT.CHE_OAUTH, new CheOauthImpl(rpc));
const cheK8SImpl = rpc.set(PLUGIN_RPC_CONTEXT.CHE_K8S, new CheK8SImpl(rpc));
const cheUserImpl = rpc.set(PLUGIN_RPC_CONTEXT.CHE_USER, new CheUserImpl(rpc));
+ const cheHttpImpl = rpc.set(PLUGIN_RPC_CONTEXT.CHE_HTTP, new CheHttpImpl(rpc));
rpc.set(PLUGIN_RPC_CONTEXT.CHE_SIDERCAR_CONTENT_READER, new CheSideCarContentReaderImpl(rpc));
rpc.set(PLUGIN_RPC_CONTEXT.CHE_SIDECAR_FILE_SYSTEM, new CheSideCarFileSystemImpl(rpc));
@@ -435,6 +437,12 @@ export function createAPIFactory(rpc: RPCProtocol): CheApiFactory {
},
};
+ const http: typeof che.http = {
+ async get(url: string): Promise {
+ return cheHttpImpl.get(url);
+ },
+ };
+
return {
workspace,
devfile,
@@ -452,6 +460,7 @@ export function createAPIFactory(rpc: RPCProtocol): CheApiFactory {
TaskTerminallKind,
languages,
k8s,
+ http,
};
};
}
diff --git a/extensions/eclipse-che-theia-plugin-ext/src/plugin/che-http.ts b/extensions/eclipse-che-theia-plugin-ext/src/plugin/che-http.ts
new file mode 100644
index 000000000..a2560e677
--- /dev/null
+++ b/extensions/eclipse-che-theia-plugin-ext/src/plugin/che-http.ts
@@ -0,0 +1,25 @@
+/**********************************************************************
+ * Copyright (c) 2021 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+import { CheHttp, CheHttpMain, PLUGIN_RPC_CONTEXT } from '../common/che-protocol';
+
+import { RPCProtocol } from '@theia/plugin-ext/lib/common/rpc-protocol';
+
+export class CheHttpImpl implements CheHttp {
+ private readonly cheHttpMain: CheHttpMain;
+
+ constructor(rpc: RPCProtocol) {
+ this.cheHttpMain = rpc.getProxy(PLUGIN_RPC_CONTEXT.CHE_HTTP_MAIN);
+ }
+
+ async get(url: string): Promise {
+ return this.cheHttpMain.$get(url);
+ }
+}
diff --git a/extensions/eclipse-che-theia-plugin-remote/tests/node/che-content-aware-utils.spec.ts b/extensions/eclipse-che-theia-plugin-remote/tests/node/che-content-aware-utils.spec.ts
index e1751fb14..05648fc8c 100644
--- a/extensions/eclipse-che-theia-plugin-remote/tests/node/che-content-aware-utils.spec.ts
+++ b/extensions/eclipse-che-theia-plugin-remote/tests/node/che-content-aware-utils.spec.ts
@@ -13,6 +13,8 @@ import { overrideUri } from '../../src/node/che-content-aware-utils';
describe('Test overrideUri', () => {
test('Should return the same uri if machine name is not defined', () => {
+ process.env.CHE_MACHINE_NAME = '';
+
const uri = URI.from({
scheme: 'file',
path: '/path',
diff --git a/extensions/eclipse-che-theia-plugin/src/che-proposed.d.ts b/extensions/eclipse-che-theia-plugin/src/che-proposed.d.ts
index b930c6bd3..69e63ab1e 100644
--- a/extensions/eclipse-che-theia-plugin/src/che-proposed.d.ts
+++ b/extensions/eclipse-che-theia-plugin/src/che-proposed.d.ts
@@ -634,6 +634,7 @@ declare module '@eclipse-che/plugin' {
*/
export namespace k8s {
/** Sends a raw query to the cluster. */
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export function sendRawQuery(requestURL: string, opts: any): Promise;
}
@@ -643,4 +644,15 @@ declare module '@eclipse-che/plugin' {
data: string;
error: string;
}
+
+ /**
+ * Namespace to get http resources with proper certificate authority, proxy setting, etc..
+ */
+ export namespace http {
+ // Get request
+ // returns undefined if the requested url resource is not there
+ export function get(url: string): Promise;
+
+ }
+
}
diff --git a/extensions/eclipse-che-theia-preferences-provider-extension/tests/fake-frontend-config.ts b/extensions/eclipse-che-theia-preferences-provider-extension/tests/fake-frontend-config.ts
index 9958517cc..cc676f2cd 100644
--- a/extensions/eclipse-che-theia-preferences-provider-extension/tests/fake-frontend-config.ts
+++ b/extensions/eclipse-che-theia-preferences-provider-extension/tests/fake-frontend-config.ts
@@ -13,7 +13,7 @@ import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/front
/**
* Fake app contrib
*/
-const frontendAppConfig: FrontendApplicationConfig = {
+const frontendAppConfig: FrontendApplicationConfig.Partial = {
defaultTheme: 'dark',
defaultIconTheme: 'dark',
applicationName: 'tests',
diff --git a/extensions/eclipse-che-theia-preferences-provider-extension/tests/prefs-provider-extension.spec.ts b/extensions/eclipse-che-theia-preferences-provider-extension/tests/prefs-provider-extension.spec.ts
index 8b3700c9f..c8f512dca 100644
--- a/extensions/eclipse-che-theia-preferences-provider-extension/tests/prefs-provider-extension.spec.ts
+++ b/extensions/eclipse-che-theia-preferences-provider-extension/tests/prefs-provider-extension.spec.ts
@@ -41,10 +41,10 @@ beforeEach(() => {
has: mockHasProperty,
set: mockSetProperty,
} as PreferenceServiceImpl;
- const workspaceService = ({
+ const workspaceService = {
roots: jest.fn().mockResolvedValue({}),
workspace: jest.fn().mockReturnValue({ uri: 'workspace-uri' }),
- } as unknown) as WorkspaceService;
+ } as unknown as WorkspaceService;
container.bind(PreferencesProvider).toSelf().inSingletonScope();
container.bind(WorkspaceService).toConstantValue(workspaceService);
diff --git a/extensions/eclipse-che-theia-remote-api/src/browser/che-remote-api-frontend-module.ts b/extensions/eclipse-che-theia-remote-api/src/browser/che-remote-api-frontend-module.ts
index 38f1ba432..a32b21706 100644
--- a/extensions/eclipse-che-theia-remote-api/src/browser/che-remote-api-frontend-module.ts
+++ b/extensions/eclipse-che-theia-remote-api/src/browser/che-remote-api-frontend-module.ts
@@ -13,6 +13,7 @@ import { CheK8SService, cheK8SServicePath } from '../common/k8s-service';
import { DevfileService, cheDevfileServicePath } from '../common/devfile-service';
import { EndpointService, cheEndpointServicePath } from '../common/endpoint-service';
import { FactoryService, cheFactoryServicePath } from '../common/factory-service';
+import { HttpService, cheHttpServicePath } from '../common/http-service';
import { OAuthService, cheOAuthServicePath } from '../common/oauth-service';
import { SshKeyService, cheSshKeyServicePath } from '../common/ssh-key-service';
import { TelemetryService, cheTelemetryServicePath } from '../common/telemetry-service';
@@ -94,4 +95,11 @@ export default new ContainerModule(bind => {
return provider.createProxy(cheEndpointServicePath);
})
.inSingletonScope();
+
+ bind(HttpService)
+ .toDynamicValue(ctx => {
+ const provider = ctx.container.get(WebSocketConnectionProvider);
+ return provider.createProxy(cheHttpServicePath);
+ })
+ .inSingletonScope();
});
diff --git a/tools/old/github/github-module.ts b/extensions/eclipse-che-theia-remote-api/src/common/http-service.ts
similarity index 61%
rename from tools/old/github/github-module.ts
rename to extensions/eclipse-che-theia-remote-api/src/common/http-service.ts
index b5b439f1f..687993bad 100644
--- a/tools/old/github/github-module.ts
+++ b/extensions/eclipse-che-theia-remote-api/src/common/http-service.ts
@@ -7,12 +7,11 @@
*
* SPDX-License-Identifier: EPL-2.0
***********************************************************************/
-import { ContainerModule, interfaces } from 'inversify';
-import { GithubResolver } from './github-resolver';
+export const cheHttpServicePath = '/services/http-service';
-const githubModule = new ContainerModule((bind: interfaces.Bind) => {
- bind(GithubResolver).toSelf().inSingletonScope();
-});
+export const HttpService = Symbol('HttpService');
-export { githubModule };
+export interface HttpService {
+ get(url: string): Promise;
+}
diff --git a/extensions/eclipse-che-theia-remote-impl-che-server/package.json b/extensions/eclipse-che-theia-remote-impl-che-server/package.json
index 510e9fef8..37b390556 100644
--- a/extensions/eclipse-che-theia-remote-impl-che-server/package.json
+++ b/extensions/eclipse-che-theia-remote-impl-che-server/package.json
@@ -12,6 +12,7 @@
"src"
],
"dependencies": {
+ "axios": "0.21.1",
"@eclipse-che/api": "latest",
"@kubernetes/client-node": "^0.12.1",
"@eclipse-che/theia-remote-api": "^0.0.1",
diff --git a/extensions/eclipse-che-theia-remote-impl-che-server/src/node/che-remote-impl-che-server-backend-module.ts b/extensions/eclipse-che-theia-remote-impl-che-server/src/node/che-remote-impl-che-server-backend-module.ts
index 20927c4d8..505d95a8b 100644
--- a/extensions/eclipse-che-theia-remote-impl-che-server/src/node/che-remote-impl-che-server-backend-module.ts
+++ b/extensions/eclipse-che-theia-remote-impl-che-server/src/node/che-remote-impl-che-server-backend-module.ts
@@ -17,6 +17,7 @@ import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
import { DevfileService, cheDevfileServicePath } from '@eclipse-che/theia-remote-api/lib/common/devfile-service';
import { EndpointService, cheEndpointServicePath } from '@eclipse-che/theia-remote-api/lib/common/endpoint-service';
import { FactoryService, cheFactoryServicePath } from '@eclipse-che/theia-remote-api/lib/common/factory-service';
+import { HttpService, cheHttpServicePath } from '@eclipse-che/theia-remote-api/lib/common/http-service';
import { OAuthService, cheOAuthServicePath } from '@eclipse-che/theia-remote-api/lib/common/oauth-service';
import { SshKeyService, cheSshKeyServicePath } from '@eclipse-che/theia-remote-api/lib/common/ssh-key-service';
import { TelemetryService, cheTelemetryServicePath } from '@eclipse-che/theia-remote-api/lib/common/telemetry-service';
@@ -28,6 +29,7 @@ import { CheServerCertificateServiceImpl } from './che-server-certificate-servic
import { CheServerDevfileServiceImpl } from './che-server-devfile-service-impl';
import { CheServerEndpointServiceImpl } from './che-server-endpoint-service-impl';
import { CheServerFactoryServiceImpl } from './che-server-factory-service-impl';
+import { CheServerHttpServiceImpl } from './che-server-http-service-impl';
import { CheServerOAuthServiceImpl } from './che-server-oauth-service-impl';
import { CheServerRemoteApiImpl } from './che-server-remote-api-impl';
import { CheServerSshKeyServiceImpl } from './che-server-ssh-key-service-impl';
@@ -56,6 +58,7 @@ export default new ContainerModule(bind => {
bind(CheServerDevfileServiceImpl).toSelf().inSingletonScope();
bind(CheServerEndpointServiceImpl).toSelf().inSingletonScope();
bind(CheK8SServiceImpl).toSelf().inSingletonScope();
+ bind(CheServerHttpServiceImpl).toSelf().inSingletonScope();
bind(CertificateService).to(CheServerCertificateServiceImpl).inSingletonScope();
bind(FactoryService).to(CheServerFactoryServiceImpl).inSingletonScope();
@@ -67,6 +70,7 @@ export default new ContainerModule(bind => {
bind(CheK8SService).to(CheK8SServiceImpl).inSingletonScope();
bind(DevfileService).to(CheServerDevfileServiceImpl).inSingletonScope();
bind(EndpointService).to(CheServerEndpointServiceImpl).inSingletonScope();
+ bind(HttpService).to(CheServerHttpServiceImpl).inSingletonScope();
bind(ConnectionHandler)
.toDynamicValue(
@@ -115,4 +119,8 @@ export default new ContainerModule(bind => {
ctx => new JsonRpcConnectionHandler(cheEndpointServicePath, () => ctx.container.get(EndpointService))
)
.inSingletonScope();
+
+ bind(ConnectionHandler)
+ .toDynamicValue(ctx => new JsonRpcConnectionHandler(cheHttpServicePath, () => ctx.container.get(HttpService)))
+ .inSingletonScope();
});
diff --git a/extensions/eclipse-che-theia-remote-impl-che-server/src/node/che-server-http-service-impl.ts b/extensions/eclipse-che-theia-remote-impl-che-server/src/node/che-server-http-service-impl.ts
new file mode 100644
index 000000000..bc9bc02f0
--- /dev/null
+++ b/extensions/eclipse-che-theia-remote-impl-che-server/src/node/che-server-http-service-impl.ts
@@ -0,0 +1,136 @@
+/**********************************************************************
+ * Copyright (c) 2021 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+import * as https from 'https';
+import * as tunnel from 'tunnel';
+import * as url from 'url';
+
+import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
+import { inject, injectable } from 'inversify';
+
+import { CertificateService } from '@eclipse-che/theia-remote-api/lib/common/certificate-service';
+import { HttpService } from '@eclipse-che/theia-remote-api/lib/common/http-service';
+
+@injectable()
+export class CheServerHttpServiceImpl implements HttpService {
+ @inject(CertificateService)
+ private certificateService: CertificateService;
+
+ async get(uri: string): Promise {
+ const axiosInstance = await this.getAxiosInstance(uri);
+ try {
+ const response = await axiosInstance.get(uri, {
+ transformResponse: [data => data],
+ responseType: 'text',
+ });
+ return response.data;
+ } catch (error) {
+ // not found then we return undefined
+ if (error.response && error.response.status === 404) {
+ return undefined;
+ }
+ throw error;
+ }
+ }
+
+ /**
+ * Use proxy and/or certificates.
+ */
+ private async getAxiosInstance(uri: string): Promise {
+ const certificateAuthority = await this.certificateService.getCertificateAuthority();
+
+ const proxyUrl = process.env.http_proxy;
+ const baseUrl = process.env.CHE_API;
+ console.log('proxyUrl && proxyUrl !== && baseUrl', proxyUrl && proxyUrl !== '' && baseUrl);
+ if (proxyUrl && proxyUrl !== '' && baseUrl) {
+ const parsedBaseUrl = url.parse(baseUrl);
+ if (parsedBaseUrl.hostname && this.shouldProxy(parsedBaseUrl.hostname)) {
+ const axiosRequestConfig: AxiosRequestConfig | undefined = {
+ proxy: false,
+ };
+ const parsedProxyUrl = url.parse(proxyUrl);
+ const mainProxyOptions = this.getMainProxyOptions(parsedProxyUrl);
+ const httpsProxyOptions = this.getHttpsProxyOptions(
+ mainProxyOptions,
+ parsedBaseUrl.hostname,
+ certificateAuthority
+ );
+ const httpOverHttpAgent = tunnel.httpOverHttp({ proxy: mainProxyOptions });
+ const httpOverHttpsAgent = tunnel.httpOverHttps({ proxy: httpsProxyOptions });
+ const httpsOverHttpAgent = tunnel.httpsOverHttp({
+ proxy: mainProxyOptions,
+ ca: certificateAuthority ? certificateAuthority : undefined,
+ });
+ const httpsOverHttpsAgent = tunnel.httpsOverHttps({
+ proxy: httpsProxyOptions,
+ ca: certificateAuthority ? certificateAuthority : undefined,
+ });
+ const urlIsHttps = (parsedBaseUrl.protocol || 'http:').startsWith('https:');
+ const proxyIsHttps = (parsedProxyUrl.protocol || 'http:').startsWith('https:');
+ if (urlIsHttps) {
+ axiosRequestConfig.httpsAgent = proxyIsHttps ? httpsOverHttpsAgent : httpsOverHttpAgent;
+ } else {
+ axiosRequestConfig.httpAgent = proxyIsHttps ? httpOverHttpsAgent : httpOverHttpAgent;
+ }
+ return axios.create(axiosRequestConfig);
+ }
+ }
+
+ if (uri.startsWith('https') && certificateAuthority) {
+ return axios.create({
+ httpsAgent: new https.Agent({
+ ca: certificateAuthority,
+ }),
+ });
+ }
+
+ return axios;
+ }
+
+ private getHttpsProxyOptions(
+ mainProxyOptions: tunnel.ProxyOptions,
+ servername: string | undefined,
+ certificateAuthority: Buffer[] | undefined
+ ): tunnel.HttpsProxyOptions {
+ return {
+ host: mainProxyOptions.host,
+ port: mainProxyOptions.port,
+ proxyAuth: mainProxyOptions.proxyAuth,
+ servername,
+ ca: certificateAuthority ? certificateAuthority : undefined,
+ };
+ }
+
+ private getMainProxyOptions(parsedProxyUrl: url.UrlWithStringQuery): tunnel.ProxyOptions {
+ const port = Number(parsedProxyUrl.port);
+ return {
+ host: parsedProxyUrl.hostname!,
+ port: parsedProxyUrl.port !== '' && !isNaN(port) ? port : 3128,
+ proxyAuth: parsedProxyUrl.auth && parsedProxyUrl.auth !== '' ? parsedProxyUrl.auth : undefined,
+ };
+ }
+
+ private shouldProxy(hostname: string): boolean {
+ const noProxyEnv = process.env.no_proxy || process.env.NO_PROXY;
+ const noProxy: string[] = noProxyEnv ? noProxyEnv.split(',').map(s => s.trim()) : [];
+ return !noProxy.some(rule => {
+ if (!rule) {
+ return false;
+ }
+ if (rule === '*') {
+ return true;
+ }
+ if (rule[0] === '.' && hostname.substr(hostname.length - rule.length) === rule) {
+ return true;
+ }
+ return hostname === rule;
+ });
+ }
+}
diff --git a/plugins/recommendations-plugin/__mocks__/axios.ts b/extensions/eclipse-che-theia-remote-impl-k8s/__mocks__/axios.ts
similarity index 83%
rename from plugins/recommendations-plugin/__mocks__/axios.ts
rename to extensions/eclipse-che-theia-remote-impl-k8s/__mocks__/axios.ts
index 9a9017c41..2ddd7dbf8 100644
--- a/plugins/recommendations-plugin/__mocks__/axios.ts
+++ b/extensions/eclipse-che-theia-remote-impl-k8s/__mocks__/axios.ts
@@ -23,12 +23,13 @@ function __setError(url: string, error: any): void {
myErrors.set(url, error);
}
-function get(url: string): any {
+async function get(url: string): Promise {
if (myErrors.has(url)) {
- throw myErrors.get(url);
+ const storedError = myErrors.get(url);
+ throw storedError;
}
- return Promise.resolve({ data: myContent.get(url) });
+ return { data: myContent.get(url) };
}
function __clearMock(): void {
myContent.clear();
@@ -40,3 +41,7 @@ axios.__setContent = __setContent;
axios.__setError = __setError;
axios.__clearMock = __clearMock;
module.exports = axios;
+
+
+axios.create = jest.fn();
+axios.create.mockResolvedValue(axios);
diff --git a/extensions/eclipse-che-theia-remote-impl-k8s/package.json b/extensions/eclipse-che-theia-remote-impl-k8s/package.json
index 27a6a1d8a..46c2a142a 100644
--- a/extensions/eclipse-che-theia-remote-impl-k8s/package.json
+++ b/extensions/eclipse-che-theia-remote-impl-k8s/package.json
@@ -11,7 +11,11 @@
"lib",
"src"
],
+ "devDependencies": {
+ "@types/tunnel": "0.0.1"
+ },
"dependencies": {
+ "tunnel": "0.0.6",
"@kubernetes/client-node": "^0.12.1",
"@eclipse-che/theia-remote-api": "^0.0.1"
},
diff --git a/extensions/eclipse-che-theia-remote-impl-k8s/src/node/k8s-backend-module.ts b/extensions/eclipse-che-theia-remote-impl-k8s/src/node/k8s-backend-module.ts
index a463f2b4b..a1c043776 100644
--- a/extensions/eclipse-che-theia-remote-impl-k8s/src/node/k8s-backend-module.ts
+++ b/extensions/eclipse-che-theia-remote-impl-k8s/src/node/k8s-backend-module.ts
@@ -17,6 +17,7 @@ import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core';
import { DevfileService, cheDevfileServicePath } from '@eclipse-che/theia-remote-api/lib/common/devfile-service';
import { EndpointService, cheEndpointServicePath } from '@eclipse-che/theia-remote-api/lib/common/endpoint-service';
import { FactoryService, cheFactoryServicePath } from '@eclipse-che/theia-remote-api/lib/common/factory-service';
+import { HttpService, cheHttpServicePath } from '@eclipse-che/theia-remote-api/lib/common/http-service';
import { OAuthService, cheOAuthServicePath } from '@eclipse-che/theia-remote-api/lib/common/oauth-service';
import { SshKeyService, cheSshKeyServicePath } from '@eclipse-che/theia-remote-api/lib/common/ssh-key-service';
import { TelemetryService, cheTelemetryServicePath } from '@eclipse-che/theia-remote-api/lib/common/telemetry-service';
@@ -24,6 +25,7 @@ import { UserService, cheUserServicePath } from '@eclipse-che/theia-remote-api/l
import { WorkspaceService, cheWorkspaceServicePath } from '@eclipse-che/theia-remote-api/lib/common/workspace-service';
import { ContainerModule } from 'inversify';
+import { K8SHttpServiceImpl } from './k8s-http-service-impl';
import { K8SServiceImpl } from './k8s-service-impl';
import { K8sCertificateServiceImpl } from './k8s-certificate-service-impl';
import { K8sDevWorkspaceEnvVariables } from './k8s-devworkspace-env-variables';
@@ -53,6 +55,7 @@ export default new ContainerModule(bind => {
bind(K8SServiceImpl).toSelf().inSingletonScope();
bind(K8sDevfileServiceImpl).toSelf().inSingletonScope();
bind(K8sEndpointServiceImpl).toSelf().inSingletonScope();
+ bind(K8SHttpServiceImpl).toSelf().inSingletonScope();
bind(K8sDevWorkspaceEnvVariables).toSelf().inSingletonScope();
bind(CertificateService).to(K8sCertificateServiceImpl).inSingletonScope();
@@ -65,6 +68,7 @@ export default new ContainerModule(bind => {
bind(CheK8SService).to(K8SServiceImpl).inSingletonScope();
bind(DevfileService).to(K8sDevfileServiceImpl).inSingletonScope();
bind(EndpointService).to(K8sEndpointServiceImpl).inSingletonScope();
+ bind(HttpService).to(K8SHttpServiceImpl).inSingletonScope();
bind(ConnectionHandler)
.toDynamicValue(
@@ -113,4 +117,8 @@ export default new ContainerModule(bind => {
ctx => new JsonRpcConnectionHandler(cheEndpointServicePath, () => ctx.container.get(EndpointService))
)
.inSingletonScope();
+
+ bind(ConnectionHandler)
+ .toDynamicValue(ctx => new JsonRpcConnectionHandler(cheHttpServicePath, () => ctx.container.get(HttpService)))
+ .inSingletonScope();
});
diff --git a/extensions/eclipse-che-theia-remote-impl-k8s/src/node/k8s-http-service-impl.ts b/extensions/eclipse-che-theia-remote-impl-k8s/src/node/k8s-http-service-impl.ts
new file mode 100644
index 000000000..11b19e30d
--- /dev/null
+++ b/extensions/eclipse-che-theia-remote-impl-k8s/src/node/k8s-http-service-impl.ts
@@ -0,0 +1,130 @@
+/**********************************************************************
+ * Copyright (c) 2021 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+import * as https from 'https';
+import * as tunnel from 'tunnel';
+import * as url from 'url';
+
+import axios, { AxiosInstance, AxiosRequestConfig } from 'axios';
+import { inject, injectable } from 'inversify';
+
+import { CertificateService } from '@eclipse-che/theia-remote-api/lib/common/certificate-service';
+import { HttpService } from '@eclipse-che/theia-remote-api/lib/common/http-service';
+
+@injectable()
+export class K8SHttpServiceImpl implements HttpService {
+ @inject(CertificateService)
+ private certificateService: CertificateService;
+
+ async get(uri: string): Promise {
+ const axiosInstance = await this.getAxiosInstance(uri);
+ try {
+ const response = await axiosInstance.get(uri, {
+ transformResponse: [data => data],
+ responseType: 'text',
+ });
+ return response.data;
+ } catch (error) {
+ // not found then we return undefined
+ if (error.response && error.response.status === 404) {
+ return undefined;
+ }
+ throw error;
+ }
+ }
+
+ /**
+ * Use proxy and/or certificates.
+ */
+ private async getAxiosInstance(uri: string): Promise {
+ const certificateAuthority = await this.certificateService.getCertificateAuthority();
+
+ const proxyUrl = process.env.http_proxy;
+ if (proxyUrl && proxyUrl !== '') {
+ const parsedUrl = url.parse(uri);
+ if (parsedUrl.hostname && this.shouldProxy(parsedUrl.hostname)) {
+ const axiosRequestConfig: AxiosRequestConfig | undefined = {
+ proxy: false,
+ };
+ const parsedProxyUrl = url.parse(proxyUrl);
+ const mainProxyOptions = this.getMainProxyOptions(parsedProxyUrl);
+ const httpsProxyOptions = this.getHttpsProxyOptions(mainProxyOptions, parsedUrl.hostname, certificateAuthority);
+ const httpOverHttpAgent = tunnel.httpOverHttp({ proxy: mainProxyOptions });
+ const httpOverHttpsAgent = tunnel.httpOverHttps({ proxy: httpsProxyOptions });
+ const httpsOverHttpAgent = tunnel.httpsOverHttp({
+ proxy: mainProxyOptions,
+ ca: certificateAuthority ? certificateAuthority : undefined,
+ });
+ const httpsOverHttpsAgent = tunnel.httpsOverHttps({
+ proxy: httpsProxyOptions,
+ ca: certificateAuthority ? certificateAuthority : undefined,
+ });
+ const urlIsHttps = (parsedUrl.protocol || 'http:').startsWith('https:');
+ const proxyIsHttps = (parsedProxyUrl.protocol || 'http:').startsWith('https:');
+ if (urlIsHttps) {
+ axiosRequestConfig.httpsAgent = proxyIsHttps ? httpsOverHttpsAgent : httpsOverHttpAgent;
+ } else {
+ axiosRequestConfig.httpAgent = proxyIsHttps ? httpOverHttpsAgent : httpOverHttpAgent;
+ }
+ return axios.create(axiosRequestConfig);
+ }
+ }
+
+ if (uri.startsWith('https') && certificateAuthority) {
+ return axios.create({
+ httpsAgent: new https.Agent({
+ ca: certificateAuthority,
+ }),
+ });
+ }
+
+ return axios;
+ }
+
+ private getHttpsProxyOptions(
+ mainProxyOptions: tunnel.ProxyOptions,
+ servername: string | undefined,
+ certificateAuthority: Buffer[] | undefined
+ ): tunnel.HttpsProxyOptions {
+ return {
+ host: mainProxyOptions.host,
+ port: mainProxyOptions.port,
+ proxyAuth: mainProxyOptions.proxyAuth,
+ servername,
+ ca: certificateAuthority ? certificateAuthority : undefined,
+ };
+ }
+
+ private getMainProxyOptions(parsedProxyUrl: url.UrlWithStringQuery): tunnel.ProxyOptions {
+ const port = Number(parsedProxyUrl.port);
+ return {
+ host: parsedProxyUrl.hostname!,
+ port: parsedProxyUrl.port !== '' && !isNaN(port) ? port : 3128,
+ proxyAuth: parsedProxyUrl.auth && parsedProxyUrl.auth !== '' ? parsedProxyUrl.auth : undefined,
+ };
+ }
+
+ private shouldProxy(hostname: string): boolean {
+ const noProxyEnv = process.env.no_proxy || process.env.NO_PROXY;
+ const noProxy: string[] = noProxyEnv ? noProxyEnv.split(',').map(s => s.trim()) : [];
+ return !noProxy.some(rule => {
+ if (!rule) {
+ return false;
+ }
+ if (rule === '*') {
+ return true;
+ }
+ if (rule[0] === '.' && hostname.substr(hostname.length - rule.length) === rule) {
+ return true;
+ }
+ return hostname === rule;
+ });
+ }
+}
diff --git a/extensions/eclipse-che-theia-remote-impl-k8s/tests/node/k8s-http-service-impl.spec.ts b/extensions/eclipse-che-theia-remote-impl-k8s/tests/node/k8s-http-service-impl.spec.ts
new file mode 100644
index 000000000..6f2b74364
--- /dev/null
+++ b/extensions/eclipse-che-theia-remote-impl-k8s/tests/node/k8s-http-service-impl.spec.ts
@@ -0,0 +1,134 @@
+/**********************************************************************
+ * Copyright (c) 2021 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import 'reflect-metadata';
+
+import { CertificateService } from '@eclipse-che/theia-remote-api/lib/common/certificate-service';
+import { Container } from 'inversify';
+import { HttpService } from '@eclipse-che/theia-remote-api/lib/common/http-service';
+import { K8SHttpServiceImpl } from '../../src/node/k8s-http-service-impl';
+import axios from 'axios';
+
+describe('Test K8sHttpServiceImpl', () => {
+ let container: Container;
+
+ let k8SHttpServiceImpl: HttpService;
+ jest.mock('axios');
+
+ const k8sCertificateServiceGetCertificateAuthorityMethod = jest.fn();
+ const k8sCertificateServiceMock = {
+ getCertificateAuthority: k8sCertificateServiceGetCertificateAuthorityMethod,
+ } as any;
+
+ const existingEnv = process.env;
+ let currentEnv: any;
+ beforeEach(async () => {
+ (axios as any).__clearMock();
+ (axios.create as jest.Mock).mockClear();
+ currentEnv = {};
+ process.env = currentEnv;
+ k8sCertificateServiceGetCertificateAuthorityMethod.mockReset();
+ container = new Container();
+ container.bind(CertificateService).toConstantValue(k8sCertificateServiceMock);
+ container.bind(K8SHttpServiceImpl).toSelf().inSingletonScope();
+ k8SHttpServiceImpl = container.get(K8SHttpServiceImpl);
+ });
+
+ afterEach(async () => {
+ process.env = existingEnv;
+ });
+
+ test('get internal', async () => {
+ const uri = 'http://fake-url';
+ const content = 'fake-content';
+ (axios as any).__setContent(uri, content);
+ const result = await k8SHttpServiceImpl.get(uri);
+ expect(result).toBe(content);
+ });
+
+ test('get https', async () => {
+ const uri = 'https://fake-url';
+ const content = 'fake-content';
+ const ca = 'hello';
+ k8sCertificateServiceGetCertificateAuthorityMethod.mockResolvedValue(ca);
+ const axiosCreateSpy = jest.spyOn(axios, 'create');
+ (axios as any).__setContent(uri, content);
+ const result = await k8SHttpServiceImpl.get(uri);
+
+ expect(axiosCreateSpy).toBeCalled();
+ expect(axiosCreateSpy.mock.calls[0][0]?.httpsAgent).toBeDefined();
+ // can find the CA
+ expect(axiosCreateSpy.mock.calls[0][0]?.httpsAgent?.options?.ca).toBe(ca);
+ expect(result).toBe(content);
+ });
+
+ test('get proxy https', async () => {
+ const uri = 'https://fake-url.com';
+ const content = 'fake-content';
+ const ca = 'hello';
+ currentEnv.http_proxy = 'http://my.proxy';
+ k8sCertificateServiceGetCertificateAuthorityMethod.mockResolvedValue(ca);
+ const axiosCreateSpy = jest.spyOn(axios, 'create');
+ (axios as any).__setContent(uri, content);
+ const result = await k8SHttpServiceImpl.get(uri);
+
+ expect(axiosCreateSpy).toBeCalled();
+ expect(axiosCreateSpy.mock.calls[0][0]?.httpsAgent).toBeDefined();
+ // can find the CA
+ expect(axiosCreateSpy.mock.calls[0][0]?.httpsAgent?.options?.ca).toBe(ca);
+
+ // can find the proxy
+ expect(axiosCreateSpy.mock.calls[0][0]?.httpsAgent?.options?.proxy?.host).toBe('my.proxy');
+ expect(axiosCreateSpy.mock.calls[0][0]?.httpsAgent?.options?.proxy?.port).toBe(0);
+
+ expect(result).toBe(content);
+ });
+
+ test('get proxy http', async () => {
+ const uri = 'http://fake-url.com';
+ const content = 'fake-content';
+ const ca = 'hello';
+ currentEnv.http_proxy = 'http://my.proxy';
+ k8sCertificateServiceGetCertificateAuthorityMethod.mockResolvedValue(ca);
+ const axiosCreateSpy = jest.spyOn(axios, 'create');
+ (axios as any).__setContent(uri, content);
+ const result = await k8SHttpServiceImpl.get(uri);
+
+ expect(axiosCreateSpy).toBeCalled();
+ expect(axiosCreateSpy.mock.calls[0][0]?.httpsAgent).toBeUndefined();
+ expect(axiosCreateSpy.mock.calls[0][0]?.httpAgent).toBeDefined();
+ // no CA
+ expect(axiosCreateSpy.mock.calls[0][0]?.httpAgent?.options?.ca).toBeUndefined();
+
+ // can find the proxy
+ expect(axiosCreateSpy.mock.calls[0][0]?.httpAgent?.options?.proxy?.host).toBe('my.proxy');
+ expect(axiosCreateSpy.mock.calls[0][0]?.httpAgent?.options?.proxy?.port).toBe(0);
+
+ expect(result).toBe(content);
+ });
+
+ test('get 404', async () => {
+ const uri = 'http://fake-url';
+ const error: any = new Error();
+ error.response = { status: 404 };
+ (axios as any).__setError(uri, error);
+ const result = await k8SHttpServiceImpl.get(uri);
+ expect(result).toBeUndefined();
+ });
+
+ test('get 500', async () => {
+ const uri = 'http://fake-url1';
+ const error: any = new Error();
+ error.response = { status: 500 };
+ (axios as any).__setError(uri, error);
+ await expect(k8SHttpServiceImpl.get(uri)).rejects.toThrow(error);
+ });
+});
diff --git a/extensions/eclipse-che-theia-terminal/src/browser/terminal-frontend-module.ts b/extensions/eclipse-che-theia-terminal/src/browser/terminal-frontend-module.ts
index 814429138..07a9f34f1 100644
--- a/extensions/eclipse-che-theia-terminal/src/browser/terminal-frontend-module.ts
+++ b/extensions/eclipse-che-theia-terminal/src/browser/terminal-frontend-module.ts
@@ -126,22 +126,23 @@ export default new ContainerModule(
}
);
- bind('TerminalProxyCreatorProvider').toProvider(context => () =>
- new Promise((resolve, reject) => {
- const provider = context.container.get('TerminalApiEndPointProvider');
- provider()
- .then(url => {
- if (url) {
- context.container.bind('term-api-end-point').toConstantValue(url);
- return resolve(context.container.get(TerminalProxyCreator));
- }
- return reject('Unabel to find che-machine-exec server.');
- })
- .catch(err => {
- console.log('Failed to get terminal proxy. Cause: ', err);
- return reject(err);
- });
- })
+ bind('TerminalProxyCreatorProvider').toProvider(
+ context => () =>
+ new Promise((resolve, reject) => {
+ const provider = context.container.get('TerminalApiEndPointProvider');
+ provider()
+ .then(url => {
+ if (url) {
+ context.container.bind('term-api-end-point').toConstantValue(url);
+ return resolve(context.container.get(TerminalProxyCreator));
+ }
+ return reject('Unabel to find che-machine-exec server.');
+ })
+ .catch(err => {
+ console.log('Failed to get terminal proxy. Cause: ', err);
+ return reject(err);
+ });
+ })
);
}
);
diff --git a/extensions/eclipse-che-theia-terminal/src/browser/terminal-widget/remote-terminal-widget.ts b/extensions/eclipse-che-theia-terminal/src/browser/terminal-widget/remote-terminal-widget.ts
index fa129d651..1d6b77b39 100644
--- a/extensions/eclipse-che-theia-terminal/src/browser/terminal-widget/remote-terminal-widget.ts
+++ b/extensions/eclipse-che-theia-terminal/src/browser/terminal-widget/remote-terminal-widget.ts
@@ -47,9 +47,8 @@ export class RemoteTerminalWidget extends TerminalWidgetImpl {
public static OUTPUT_CHANNEL_NAME = 'remote-terminal';
protected termServer: RemoteTerminalServerProxy | undefined;
- protected waitForRemoteConnection:
- | Deferred
- | undefined = new Deferred();
+ protected waitForRemoteConnection: Deferred | undefined =
+ new Deferred();
@inject('TerminalProxyCreatorProvider')
protected readonly termProxyCreatorProvider: TerminalProxyCreatorProvider;
diff --git a/extensions/eclipse-che-theia-workspace/src/browser/che-navigator-widget.tsx b/extensions/eclipse-che-theia-workspace/src/browser/che-navigator-widget.tsx
index 832802dd7..b8e87c363 100644
--- a/extensions/eclipse-che-theia-workspace/src/browser/che-navigator-widget.tsx
+++ b/extensions/eclipse-che-theia-workspace/src/browser/che-navigator-widget.tsx
@@ -10,17 +10,111 @@
import * as React from 'react';
-import { injectable } from 'inversify';
+import { Devfile, DevfileService } from '@eclipse-che/theia-remote-api/lib/common/devfile-service';
import { FileNavigatorWidget } from '@theia/navigator/lib/browser/navigator-widget';
+import { FileService } from '@theia/filesystem/lib/browser/file-service';
+import URI from '@theia/core/lib/common/uri';
+import { WorkspaceInputDialog } from '@theia/workspace/lib/browser/workspace-input-dialog';
+import { WorkspaceService } from '@eclipse-che/theia-remote-api/lib/common/workspace-service';
+import { inject } from '@theia/core/shared/inversify';
+import { injectable } from 'inversify';
@injectable()
export class CheFileNavigatorWidget extends FileNavigatorWidget {
+ @inject(FileService) protected readonly fileService: FileService;
+ @inject(DevfileService) protected readonly devfileService: DevfileService;
+ @inject(WorkspaceService) protected readonly cheWorkspaceService: WorkspaceService;
+
+ protected devfile: Devfile | undefined;
+ protected projectsRootDirectory: string | undefined;
+
protected renderEmptyMultiRootWorkspace(): React.ReactNode {
+ if (this.devfile) {
+ const projects = this.devfile.projects;
+ if (projects && projects.length > 0) {
+ return this.renderNoProjectsPanel();
+ } else {
+ return this.renderWelcomePanel();
+ }
+ } else {
+ this.initialize().then(() => this.restartRendering());
+
+ return this.renderNoProjectsPanel();
+ }
+ }
+
+ protected renderNoProjectsPanel(): React.ReactNode {
return (
No projects in the workspace yet
);
}
+
+ protected renderWelcomePanel(): React.ReactNode {
+ return (
+
+
No projects in the workspace yet.
+
You can clone a repository from a URL.
+
+
+ Clone Repository
+
+
+
You can also add a new folder to the Che workspace.
+
+
+ New Folder
+
+
+
{
+ if (!this.devfile) {
+ this.devfile = await this.devfileService.get();
+ }
+
+ if (!this.projectsRootDirectory) {
+ this.projectsRootDirectory = (await this.cheWorkspaceService.getProjectsRootDirectory()) || '/projects';
+ }
+ }
+
+ private async restartRendering(): Promise {
+ super.render();
+ }
}
diff --git a/extensions/eclipse-che-theia-workspace/src/browser/che-workspace-module.ts b/extensions/eclipse-che-theia-workspace/src/browser/che-workspace-module.ts
index 84cdca7b8..34b642bc0 100644
--- a/extensions/eclipse-che-theia-workspace/src/browser/che-workspace-module.ts
+++ b/extensions/eclipse-che-theia-workspace/src/browser/che-workspace-module.ts
@@ -7,6 +7,9 @@
*
* SPDX-License-Identifier: EPL-2.0
***********************************************************************/
+
+import '../../src/browser/style/index.css';
+
import { CommandContribution, MenuContribution } from '@theia/core/lib/common';
import { Container, ContainerModule, interfaces } from 'inversify';
import { FileTree, FileTreeModel, FileTreeWidget, createFileTreeContainer } from '@theia/filesystem/lib/browser';
diff --git a/extensions/eclipse-che-theia-workspace/src/browser/style/index.css b/extensions/eclipse-che-theia-workspace/src/browser/style/index.css
new file mode 100644
index 000000000..16737e52c
--- /dev/null
+++ b/extensions/eclipse-che-theia-workspace/src/browser/style/index.css
@@ -0,0 +1,21 @@
+/**********************************************************************
+ * Copyright (c) 2021 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+.theia-navigator-container .label {
+ text-align: center;
+ margin-top: 15px;
+}
+
+.p-Widget .open-workspace-button {
+ padding: 4px 12px;
+ width: calc(100% - var(--theia-ui-padding) * 4);
+ margin-left: 0;
+ margin-bottom: 5px;
+}
diff --git a/generator/README.md b/generator/README.md
index d7b25decd..9de30cfe9 100644
--- a/generator/README.md
+++ b/generator/README.md
@@ -53,15 +53,15 @@ Also you can provide custom `yaml` with your extension set, by using `-c` or `--
`che-theia init -c ./path/to/custom/che-theia-init-sources.yaml`
-The sample of `che-theia-init-sources.yaml` can be found [there](https://github.com/eclipse-che/che-theia/blob/master/che-theia-init-sources.yml)
+The sample of `che-theia-init-sources.yaml` can be found [there](https://github.com/eclipse-che/che-theia/blob/main/che-theia-init-sources.yml)
### Dev mode
-Dev mode is the way to use all new extensions from `master` branch:
+Dev mode is the way to use all new extensions from `main` branch:
`che-theia init -d`
-And `che-theia` will use `master` branch for all extensions and plugins, regardless of provided configuration
+And `che-theia` will use `main` branch for all extensions and plugins, regardless of provided configuration
### Development life-cycle
Che-Theia should be built from root directory only (Root directory of Che-Theia is the directory into which Theia was clonned and `che-theia init` was executed there). In case of building from subdirectories it will mess up dependencies, don't do it.
diff --git a/generator/package.json b/generator/package.json
index f95495faa..b5cdb63ac 100644
--- a/generator/package.json
+++ b/generator/package.json
@@ -15,8 +15,8 @@
"js-yaml": "3.13.1",
"read-pkg": "3.0.0",
"yargs": "12.0.5",
- "webpack": "^4.0.0",
- "html-webpack-plugin": "^3.2.0",
+ "webpack": "^5.36.2",
+ "html-webpack-plugin": "^5.3.1",
"axios": "0.21.1",
"tmp": "^0.0.33"
},
@@ -30,6 +30,9 @@
"@types/yargs": "12.0.1",
"json2yaml": "^1.1.0"
},
+ "resolutions": {
+ "temp": "0.8.4"
+ },
"files": [
"dist",
"src"
diff --git a/generator/src/cdn/html-template.ts b/generator/src/cdn/html-template.ts
index e8e651bfc..4c3d57e20 100644
--- a/generator/src/cdn/html-template.ts
+++ b/generator/src/cdn/html-template.ts
@@ -31,8 +31,8 @@ export class CdnHtmlTemplate {
: '';
// eslint-disable-next-line guard-for-in
- for (const key in htmlWebpackPlugin.files.chunks) {
- const url: string = htmlWebpackPlugin.files.chunks[key].entry;
+ for (const index in htmlWebpackPlugin.files.js) {
+ const url: string = htmlWebpackPlugin.files.js[index];
const chunk: decls.CdnChunk = {
chunk: url,
cdn: undefined,
diff --git a/generator/src/cdn/webpack-customizer.ts b/generator/src/cdn/webpack-customizer.ts
index 83a21b422..e52811fae 100644
--- a/generator/src/cdn/webpack-customizer.ts
+++ b/generator/src/cdn/webpack-customizer.ts
@@ -33,7 +33,7 @@ export function customizeWebpackConfig(
}
if (monacoCDN && !monacopkg) {
- throw new Error("Please check that you specified the parameter '--env.monacopkg'");
+ throw new Error("Please check that you specified the parameter '--env monacopkg' for 'theia build' command.");
}
if (theiaCDN || monacoCDN) {
@@ -55,7 +55,7 @@ export function customizeWebpackConfig(
baseConfig.output.filename = '[name].[chunkhash].js';
// Separate the webpack runtime module, theia modules, external vendor modules
- // in 3 distinct chhunks to optimize caching management
+ // in 3 distinct chunks to optimize caching management
baseConfig.optimization = {
runtimeChunk: 'single',
splitChunks: {
@@ -75,7 +75,7 @@ export function customizeWebpackConfig(
enforce: true,
priority: 1,
},
- vendors: {
+ defaultVendors: {
test: /[\/]node_modules[\/](?!@theia[\/])/,
name: 'vendors',
chunks: 'all',
@@ -85,6 +85,13 @@ export function customizeWebpackConfig(
},
};
+ // fix "process is not defined" error
+ baseConfig.plugins.push(
+ new webpack.ProvidePlugin({
+ process: 'process/browser',
+ })
+ );
+
// Use our own HTML template to trigger the CDN-supporting
// logic, with the CDN prefixes passed as env parameters
baseConfig.plugins.push(
@@ -102,11 +109,6 @@ export function customizeWebpackConfig(
})
);
- // Use hashed module IDs to ease caching support
- // and avoid the hash-based chunk names being changed
- // unexpectedly
- baseConfig.plugins.push(new webpack.HashedModuleIdsPlugin());
-
// Insert a custom loader to override file and url loaders,
// in order to insert CDN-related logic
baseConfig.module.rules
diff --git a/generator/src/cdn/webpack.config.ts b/generator/src/cdn/webpack.config.ts
index 1dfa86c83..b7ffe6e6f 100644
--- a/generator/src/cdn/webpack.config.ts
+++ b/generator/src/cdn/webpack.config.ts
@@ -1,5 +1,5 @@
/**********************************************************************
- * Copyright (c) 2018-2020 Red Hat, Inc.
+ * Copyright (c) 2018-2021 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -10,30 +10,11 @@
import { customizeWebpackConfig } from './webpack-customizer';
-const yargs = require('yargs');
-const {
- env: { cdn, monacopkg },
-} = yargs
- .option('env.cdn', {
- description: `The path of a JSON file that contains CDN settings.
- The file syntax is the following:
- {
- theia: 'Base URL of the CDN that will host Theia files',
- monaco: 'Base URL of the CDN that will host Monaco Editor files'
- }`,
- type: 'string',
- default: '',
- })
- .option('env.monacopkg', {
- description: 'The NPM identifier (with version) of Monaco editor core package',
- type: 'string',
- default: '',
- }).argv;
-
// Retrieve the default, generated, Theia Webpack configuration
const baseConfig = require('../webpack.config');
-customizeWebpackConfig(cdn, monacopkg, baseConfig);
-
// Export the customized webpack configuration object
-module.exports = baseConfig;
+module.exports = function (env: { cdn: string; monacopkg: string }) {
+ customizeWebpackConfig(env.cdn, env.monacopkg, baseConfig);
+ return baseConfig;
+};
diff --git a/generator/src/conf/.yarnclean b/generator/src/conf/.yarnclean
index e6762b5a3..02523ba2c 100644
--- a/generator/src/conf/.yarnclean
+++ b/generator/src/conf/.yarnclean
@@ -28,6 +28,7 @@ dugite/git/*
onigasm
oniguruma
@theia/monaco
+react
react-dom
font-awesome
@theia/monaco-editor-core
diff --git a/generator/src/generate-assembly.ts b/generator/src/generate-assembly.ts
new file mode 100644
index 000000000..7a3ddf8ae
--- /dev/null
+++ b/generator/src/generate-assembly.ts
@@ -0,0 +1,111 @@
+/**********************************************************************
+ * Copyright (c) 2018-2021 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+import * as fs from 'fs-extra';
+import * as mustache from 'mustache';
+import * as path from 'path';
+
+import { CommandBuilder } from 'yargs';
+import { Init } from './init';
+import { Logger } from './logger';
+import { getFullPackageName } from './yarn';
+import { rewriteJson } from './json-utils';
+
+export const builder: CommandBuilder = {
+ 'che-theia': {
+ describe: 'Path of the che-theia project source',
+ requiresArg: true,
+ type: 'string',
+ demandOption: false,
+ },
+ 'theia-version': {
+ describe: 'Theia version to set',
+ requiresArg: true,
+ type: 'string',
+ demandOption: false,
+ default: 'next',
+ },
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function handleCommand(args: any) {
+ const cheTheiaDir = args['che-theia '] || process.cwd();
+ const theiaVersion = args['theia-version']!;
+ const monacoVersion = await getFullPackageName(cheTheiaDir, Init.MONACO_CORE_PKG);
+
+ if (!monacoVersion) {
+ throw new Error(`Package not found: ${Init.MONACO_CORE_PKG}`);
+ }
+
+ const assemblyDir = path.resolve(cheTheiaDir, 'assembly');
+ await generateAssembly(assemblyDir, {
+ theiaVersion,
+ monacoVersion,
+ configDirPrefix: '../../',
+ packageRefPrefix: '../extensions/',
+ });
+
+ const extensionsDir = path.resolve(cheTheiaDir, 'extensions');
+ const folderNames = await fs.readdir(extensionsDir);
+ const extensions = new Map();
+ for (const folderName of folderNames) {
+ const pkgJson = require(path.resolve(extensionsDir, folderName, 'package.json'));
+ extensions.set(pkgJson.name, pkgJson.version);
+ }
+
+ const theiaPlugins = await fs.readJson(path.resolve(__dirname, '../src/templates/theiaPlugins.json'));
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ rewriteJson(path.resolve(assemblyDir, 'package.json'), (json: any) => {
+ const deps = json.dependencies || {};
+ extensions.forEach((version: string, name: string) => {
+ deps[name] = version;
+ });
+ json.dependencies = deps;
+ json.scripts['download:plugins'] = 'theia download:plugins';
+ json.scripts.prepare = json.scripts.prepare + ' && yarn download:plugins';
+ json.theiaPluginsDir = '../plugins';
+ json.theiaPlugins = theiaPlugins;
+ });
+}
+
+export interface AssemblyConfiguration {
+ theiaVersion: string;
+ monacoVersion: string;
+ configDirPrefix: string;
+ packageRefPrefix: string;
+}
+
+export async function generateAssembly(examplesAssemblyFolder: string, config: AssemblyConfiguration): Promise {
+ const srcDir = path.resolve(__dirname, '../src');
+ const distDir = path.resolve(__dirname, '../dist');
+ const templateDir = path.join(srcDir, 'templates');
+ const compileTsConfig = path.join(templateDir, 'assembly-compile.tsconfig.mst.json');
+
+ // generate assembly if does not exists
+ await fs.ensureDir(examplesAssemblyFolder);
+
+ const template = path.join(templateDir, 'assembly-package.mst.json');
+ const target = path.join(examplesAssemblyFolder, 'package.json');
+
+ await renderTemplate(template, target, config);
+ await renderTemplate(compileTsConfig, path.join(examplesAssemblyFolder, 'compile.tsconfig.mst.json'), config);
+
+ Logger.info(`copying ${path.join(templateDir, 'cdn')} to ${path.join(examplesAssemblyFolder, 'cdn')}`);
+ await fs.copy(path.join(templateDir, 'cdn'), path.join(examplesAssemblyFolder, 'cdn'));
+ Logger.info('distdir=' + distDir);
+ await fs.copy(path.join(distDir, 'cdn'), path.join(examplesAssemblyFolder, 'cdn'));
+ await fs.copy(path.join(srcDir, 'scripts'), path.join(examplesAssemblyFolder, 'scripts'));
+}
+
+async function renderTemplate(template: string, target: string, config: Object): Promise {
+ const content = await fs.readFile(template);
+ const rendered = mustache.render(content.toString(), config).replace(///g, '/');
+ await fs.writeFile(target, rendered);
+}
diff --git a/generator/src/init-sources.ts b/generator/src/init-sources.ts
index 9eaae9264..b03952d80 100644
--- a/generator/src/init-sources.ts
+++ b/generator/src/init-sources.ts
@@ -32,7 +32,7 @@ export class InitSources {
public static readonly PREFIX_PACKAGES_EXTENSIONS = '@che-';
public static readonly DEFAULT_EXTENSIONS_URI =
- 'https://raw.githubusercontent.com/eclipse-che/che-theia/master/che-theia-init-sources.yml';
+ 'https://raw.githubusercontent.com/eclipse-che/che-theia/main/che-theia-init-sources.yml';
static argBuilder = (theYargs: yargs.Argv) =>
theYargs
.option('config', {
@@ -41,7 +41,7 @@ export class InitSources {
})
.option('dev', {
description:
- 'Initialize current Theia with Che/Theia extensions from "master" branch instead of provided branches',
+ 'Initialize current Theia with Che/Theia extensions from "main" branch instead of provided branches',
alias: 'd',
type: 'boolean',
default: false,
@@ -105,7 +105,7 @@ export class InitSources {
await Promise.all(
extensionsYaml.sources.map(async (extension: ISource) => {
if (isDevMode) {
- extension.checkoutTo = 'master';
+ extension.checkoutTo = 'main';
}
await this.addExtension(extension);
this.extensions.push(extension);
diff --git a/generator/src/init.ts b/generator/src/init.ts
index 83b783d5a..ae96ce2de 100644
--- a/generator/src/init.ts
+++ b/generator/src/init.ts
@@ -9,13 +9,12 @@
***********************************************************************/
import * as fs from 'fs-extra';
-import * as mustache from 'mustache';
import * as path from 'path';
import * as readPkg from 'read-pkg';
import { Command } from './command';
import { ISource } from './init-sources';
-import { Logger } from './logger';
+import { generateAssembly } from './generate-assembly';
/**
* Generates the examples/assembly
@@ -36,44 +35,19 @@ export class Init {
return (await readPkg(path.join(this.rootFolder, 'packages/core/package.json'))).version;
}
- async getPackageWithVersion(name: string): Promise {
- const pkg = JSON.parse(
- await new Command(path.resolve(this.rootFolder)).exec(Init.GET_PACKAGE_WITH_VERSION_CMD + name)
- ).data.trees[0];
- return pkg ? pkg.name : '';
- }
-
- async generate(): Promise {
- const srcDir = path.resolve(__dirname, '../src');
- const distDir = path.resolve(__dirname, '../dist');
- const templateDir = path.join(srcDir, 'templates');
- const compileTsConfig = path.join(templateDir, 'assembly-compile.tsconfig.json');
- const packageJsonContent = await fs.readFile(path.join(templateDir, 'assembly-package.mst'));
-
- // generate assembly if does not exists
- const rendered = await this.generateAssemblyPackage(packageJsonContent.toString());
- await fs.ensureDir(this.examplesAssemblyFolder);
- await fs.writeFile(path.join(this.examplesAssemblyFolder, 'package.json'), rendered);
- await fs.copy(compileTsConfig, path.join(this.examplesAssemblyFolder, 'compile.tsconfig.json'));
- await fs.copy(path.join(templateDir, 'cdn'), path.join(this.examplesAssemblyFolder, 'cdn'));
- Logger.info(distDir);
- await fs.copy(path.join(distDir, 'cdn'), path.join(this.examplesAssemblyFolder, 'cdn'));
- await fs.copy(path.join(srcDir, 'scripts'), path.join(this.examplesAssemblyFolder, 'scripts'));
-
+ async generate() {
+ await generateAssembly(this.examplesAssemblyFolder, {
+ theiaVersion: '^' + (await this.getCurrentVersion()),
+ monacoVersion: await this.getPackageWithVersion(Init.MONACO_CORE_PKG),
+ configDirPrefix: '../../packages/@che-',
+ packageRefPrefix: '../../config/',
+ });
// Generate checkout folder is does not exist
await fs.ensureDir(this.checkoutFolder);
// copy build all plugins scripts
await fs.ensureDir(this.pluginsFolder);
- await fs.copy(path.join(srcDir, 'foreach_yarn'), path.join(this.pluginsFolder, 'foreach_yarn'));
- }
-
- async generateAssemblyPackage(template: string): Promise {
- const tags = {
- version: await this.getCurrentVersion(),
- monacopkg: await this.getPackageWithVersion(Init.MONACO_CORE_PKG),
- };
- return mustache.render(template, tags).replace(///g, '/');
+ await fs.copy(path.resolve(__dirname, '../src/foreach_yarn'), path.join(this.pluginsFolder, 'foreach_yarn'));
}
async updadeBuildConfiguration(extensions: ISource[]): Promise {
@@ -126,21 +100,28 @@ export class Init {
await fs.writeFile(theiaPackagePath, json);
}
- async updatePluginsConfigurtion(): Promise {
+ async updatePluginsConfiguration(): Promise {
const theiaPackagePath = path.join(this.rootFolder, 'package.json');
const theiaPackage = await readPkg(theiaPackagePath);
- theiaPackage['theiaPlugins'] = await this.getPluginsList();
+ theiaPackage['theiaPlugins'] = await Init.getPluginsList();
const json = JSON.stringify(theiaPackage, undefined, 2);
await fs.writeFile(theiaPackagePath, json);
}
// eslint-disable-next-line @typescript-eslint/no-explicit-any
- private async getPluginsList(): Promise {
+ private static async getPluginsList(): Promise {
const srcDir = path.resolve(__dirname, '../src');
const templateDir = path.join(srcDir, 'templates');
const pluginsJsonContent = await fs.readFile(path.join(templateDir, 'theiaPlugins.json'));
return JSON.parse(pluginsJsonContent.toString());
}
+
+ async getPackageWithVersion(name: string): Promise {
+ const pkg = JSON.parse(
+ await new Command(path.resolve(this.rootFolder)).exec(Init.GET_PACKAGE_WITH_VERSION_CMD + name)
+ ).data.trees[0];
+ return pkg ? pkg.name : '';
+ }
}
diff --git a/generator/src/json-utils.ts b/generator/src/json-utils.ts
new file mode 100644
index 000000000..e773ee460
--- /dev/null
+++ b/generator/src/json-utils.ts
@@ -0,0 +1,38 @@
+/**********************************************************************
+ * Copyright (c) 2018-2021 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+/**
+ * Simple code to rewrite parts of JSON files
+ * @author Thomas Mäder
+ */
+
+import * as fs from 'fs-extra';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function rewriteJson(packageJSONPath: string, rewriteFunction: (json: any) => void) {
+ const json = await fs.readJSON(packageJSONPath);
+ rewriteFunction(json);
+
+ await fs.writeJson(packageJSONPath, json, { encoding: 'utf-8', spaces: 2 });
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function replaceInSection(section: any, replaceVersion: (key: string) => string | undefined) {
+ if (section) {
+ for (const dep in section) {
+ if (section.hasOwnProperty(dep)) {
+ const replacement = replaceVersion(dep);
+ if (replacement) {
+ section[dep] = replacement;
+ }
+ }
+ }
+ }
+}
diff --git a/generator/src/link.ts b/generator/src/link.ts
new file mode 100644
index 000000000..2458e280c
--- /dev/null
+++ b/generator/src/link.ts
@@ -0,0 +1,77 @@
+/**********************************************************************
+ * Copyright (c) 2018-2021 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+/**
+ * A command to yarn link theia dependencies into che-theia
+ * @author Thomas Mäder
+ */
+
+import * as fs from 'fs-extra';
+import * as os from 'os';
+import * as path from 'path';
+
+import { Command } from './command';
+import { CommandBuilder } from 'yargs';
+
+export const builder: CommandBuilder = {
+ theia: {
+ describe: 'Path of the theia project source',
+ requiresArg: true,
+ type: 'string',
+ demandOption: false,
+ },
+ 'che-theia': {
+ describe: 'Path of the che-theia project source',
+ requiresArg: true,
+ type: 'string',
+ demandOption: false,
+ },
+};
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function handleCommand(args: any): Promise {
+ const theiaDir = args.theia || path.resolve(process.cwd(), '../theia');
+ const cheTheiaDir = args['che-theia'] || process.cwd();
+
+ const cfg = await new Command(cheTheiaDir).exec('yarn --silent --json --non-interactive config current');
+
+ try {
+ const yarnConfig = JSON.parse(JSON.parse(cfg).data);
+ let linkDir = yarnConfig['linkFolder'] || path.resolve(os.homedir(), '.yarn/link');
+ await fs.ensureDir(linkDir);
+ linkDir = await fs.realpath(linkDir);
+ await link(cheTheiaDir, theiaDir, linkDir);
+ } catch (e) {
+ console.error(e);
+ }
+}
+
+export async function link(cheTheiaProjectPath: string, theiaProjectPath: string, yarnLinkFolder: string) {
+ await linkTheia(yarnLinkFolder, theiaProjectPath);
+ await linkChe(yarnLinkFolder, cheTheiaProjectPath);
+}
+
+async function linkTheia(yarnLinkFolder: string, theiaProjectPath: string) {
+ for (const rootName of ['packages', 'dev-packages', 'examples']) {
+ const rootPath = path.resolve(theiaProjectPath, rootName);
+ const folderNames = await fs.readdir(rootPath);
+ for (const folderName of folderNames) {
+ await new Command(path.resolve(rootPath, folderName)).exec(`yarn link --link-folder=${yarnLinkFolder}`);
+ }
+ }
+}
+
+async function linkChe(yarnLinkFolder: string, cheTheiaProjectPath: string) {
+ const packages = await fs.readdir(path.resolve(yarnLinkFolder, '@theia'));
+ const cmd = new Command(cheTheiaProjectPath);
+ for (const pkg of packages) {
+ await cmd.exec(`yarn link @theia/${pkg}`);
+ }
+}
diff --git a/generator/src/templates/assembly-compile.tsconfig.json b/generator/src/templates/assembly-compile.tsconfig.json
deleted file mode 100644
index 4d46df871..000000000
--- a/generator/src/templates/assembly-compile.tsconfig.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "extends": "../../configs/base.tsconfig",
- "compilerOptions": {
- "composite": true,
- "rootDir": "src",
- "outDir": "lib"
- },
- "include": [
- "src"
- ],
- "references": [
- {
- "path": "../../packages/@che-eclipse-che-theia-plugin-ext/tsconfig.json"
- },
- {
- "path": "../../packages/@che-che-theia-hosted-plugin-manager-extension/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-about/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-activity-tracker/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-dashboard/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-user-preferences/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-git-provisioner/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-plugin-remote/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-preferences-provider-extension/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-terminal/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-logging/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-remote-api/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-messaging/tsconfig.json"
- },
- {
- "path": "../../packages/@che-eclipse-che-theia-mini-browser/tsconfig.json"
- }
- ]
-}
diff --git a/generator/src/templates/assembly-compile.tsconfig.mst.json b/generator/src/templates/assembly-compile.tsconfig.mst.json
new file mode 100644
index 000000000..cf94075e6
--- /dev/null
+++ b/generator/src/templates/assembly-compile.tsconfig.mst.json
@@ -0,0 +1,55 @@
+{
+ "extends": "{{ configDirPrefix}}base.tsconfig",
+ "compilerOptions": {
+ "composite": true,
+ "rootDir": "src",
+ "outDir": "lib"
+ },
+ "include": [
+ "src"
+ ],
+ "references": [
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-plugin-ext/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}che-theia-hosted-plugin-manager-extension/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-about/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-activity-tracker/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-dashboard/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-user-preferences/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-git-provisioner/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-plugin-remote/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-preferences-provider-extension/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-terminal/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-logging/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-remote-api/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-messaging/tsconfig.json"
+ },
+ {
+ "path": "{{ packageRefPrefix}}eclipse-che-theia-mini-browser/tsconfig.json"
+ }
+ ]
+}
diff --git a/generator/src/templates/assembly-package.mst b/generator/src/templates/assembly-package.mst.json
similarity index 54%
rename from generator/src/templates/assembly-package.mst
rename to generator/src/templates/assembly-package.mst.json
index 242135285..f9d30cefc 100644
--- a/generator/src/templates/assembly-package.mst
+++ b/generator/src/templates/assembly-package.mst.json
@@ -1,7 +1,7 @@
{
"private": true,
"name": "@eclipse-che/theia-assembly",
- "version": "{{ version }}",
+ "version": "0.0.1",
"theia": {
"frontend": {
"config": {
@@ -19,33 +19,33 @@
}
},
"dependencies": {
- "@theia/callhierarchy": "^{{ version }}",
- "@theia/console": "^{{ version }}",
- "@theia/core": "^{{ version }}",
- "@theia/debug": "^{{ version }}",
- "@theia/editor": "^{{ version }}",
- "@theia/file-search": "^{{ version }}",
- "@theia/filesystem": "^{{ version }}",
- "@theia/keymaps": "^{{ version }}",
- "@theia/markers": "^{{ version }}",
- "@theia/messages": "^{{ version }}",
- "@theia/metrics": "^{{ version }}",
- "@theia/mini-browser": "^{{ version }}",
- "@theia/monaco": "^{{ version }}",
- "@theia/navigator": "^{{ version }}",
- "@theia/outline-view": "^{{ version }}",
- "@theia/output": "^{{ version }}",
- "@theia/plugin-dev": "^{{ version }}",
- "@theia/plugin-ext": "^{{ version }}",
- "@theia/plugin-ext-vscode": "^{{ version }}",
- "@theia/preferences": "^{{ version }}",
- "@theia/preview": "^{{ version }}",
- "@theia/process": "^{{ version }}",
- "@theia/search-in-workspace": "^{{ version }}",
- "@theia/task": "^{{ version }}",
- "@theia/userstorage": "^{{ version }}",
- "@theia/variable-resolver": "^{{ version }}",
- "@theia/workspace": "^{{ version }}"
+ "@theia/callhierarchy": "{{ theiaVersion }}",
+ "@theia/console": "{{ theiaVersion }}",
+ "@theia/core": "{{ theiaVersion }}",
+ "@theia/debug": "{{ theiaVersion }}",
+ "@theia/editor": "{{ theiaVersion }}",
+ "@theia/file-search": "{{ theiaVersion }}",
+ "@theia/filesystem": "{{ theiaVersion }}",
+ "@theia/keymaps": "{{ theiaVersion }}",
+ "@theia/markers": "{{ theiaVersion }}",
+ "@theia/messages": "{{ theiaVersion }}",
+ "@theia/metrics": "{{ theiaVersion }}",
+ "@theia/mini-browser": "{{ theiaVersion }}",
+ "@theia/monaco": "{{ theiaVersion }}",
+ "@theia/navigator": "{{ theiaVersion }}",
+ "@theia/outline-view": "{{ theiaVersion }}",
+ "@theia/output": "{{ theiaVersion }}",
+ "@theia/plugin-dev": "{{ theiaVersion }}",
+ "@theia/plugin-ext": "{{ theiaVersion }}",
+ "@theia/plugin-ext-vscode": "{{ theiaVersion }}",
+ "@theia/preferences": "{{ theiaVersion }}",
+ "@theia/preview": "{{ theiaVersion }}",
+ "@theia/process": "{{ theiaVersion }}",
+ "@theia/search-in-workspace": "{{ theiaVersion }}",
+ "@theia/task": "{{ theiaVersion }}",
+ "@theia/userstorage": "{{ theiaVersion }}",
+ "@theia/variable-resolver": "{{ theiaVersion }}",
+ "@theia/workspace": "{{ theiaVersion }}"
},
"bin": {
"override-vs-loader": "./scripts/override-vs-loader.js"
@@ -53,7 +53,7 @@
"scripts": {
"prepare": "yarn run clean && yarn build",
"clean": "theia clean && rimraf errorShots",
- "build": "theia build --mode production --config cdn/webpack.config.js --env.cdn=./cdn.json --env.monacopkg={{ monacopkg }} && yarn run override-vs-loader",
+ "build": "theia build --mode production --config cdn/webpack.config.js --env cdn=./cdn.json --env monacopkg={{ monacoVersion }} && yarn run override-vs-loader",
"override-vs-loader": "override-vs-loader",
"watch": "concurrently -n compile,bundle \"theiaext watch --preserveWatchOutput\" \"theia build --watch --mode development\"",
"start": "theia start",
@@ -67,8 +67,8 @@
"coverage": "yarn coverage:compile && yarn test && yarn coverage:remap && yarn coverage:report:lcov && yarn coverage:report:html"
},
"devDependencies": {
- "@theia/cli": "^{{ version }}",
- "html-webpack-plugin": "^3.2.0",
+ "@theia/cli": "{{ theiaVersion }}",
+ "html-webpack-plugin": "^5.3.1",
"async-limiter": "^2.0.0"
}
}
diff --git a/generator/src/templates/theiaPlugins.json b/generator/src/templates/theiaPlugins.json
index e26f5ea90..689206849 100644
--- a/generator/src/templates/theiaPlugins.json
+++ b/generator/src/templates/theiaPlugins.json
@@ -53,7 +53,7 @@
"vscode-builtin-vb": "https://open-vsx.org/api/vscode/vb/1.44.2/file/vscode.vb-1.44.2.vsix",
"vscode-builtin-xml": "https://open-vsx.org/api/vscode/xml/1.44.2/file/vscode.xml-1.44.2.vsix",
"vscode-builtin-yaml": "https://open-vsx.org/api/vscode/yaml/1.44.2/file/vscode.yaml-1.44.2.vsix",
- "vscode-git": "https://open-vsx.org/api/vscode/git/1.49.3/file/vscode.git-1.49.3.vsix",
+ "vscode-git": "https://open-vsx.org/api/vscode/git/1.52.1/file/vscode.git-1.52.1.vsix",
"vscode-github": "https://open-vsx.org/api/vscode/github/1.50.1/file/vscode.github-1.50.1.vsix",
"vscode-references-view": "https://open-vsx.org/api/ms-vscode/references-view/0.0.47/file/ms-vscode.references-view-0.0.47.vsix",
"vscode-builtin-icon-theme-seti": "https://open-vsx.org/api/vscode/vscode-theme-seti/1.44.2/file/vscode.vscode-theme-seti-1.44.2.vsix",
diff --git a/generator/src/update-dependencies.ts b/generator/src/update-dependencies.ts
new file mode 100644
index 000000000..8b6139122
--- /dev/null
+++ b/generator/src/update-dependencies.ts
@@ -0,0 +1,88 @@
+/**********************************************************************
+ * Copyright (c) 2018-2020 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+/**
+ * Simple code to rewrite versions of a dependency in package.json files
+ * @author Thomas Mäder
+ */
+
+import * as glob from 'glob';
+import * as path from 'path';
+
+import { CommandBuilder } from 'yargs';
+import { promisify } from 'util';
+import { rewriteJson } from './json-utils';
+
+export const builder: CommandBuilder = {
+ 'theia-version': {
+ describe: 'The version of Theia to uses in che-theia',
+ requiresArg: true,
+ type: 'string',
+ demandOption: true,
+ },
+ 'che-theia': {
+ describe: 'Path of the che-theia project source',
+ requiresArg: true,
+ type: 'string',
+ demandOption: false,
+ },
+};
+
+const EXCLUSIONS = ['@theia/plugin-packager'];
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export async function handleCommand(args: any) {
+ const cheTheiaDir = args['che-theia '] || process.cwd();
+ const theiaVersion = args['theia-version'];
+
+ const packageJsons = await promisify(glob)(cheTheiaDir + '/extensions/*/package.json');
+ packageJsons.push(...(await promisify(glob)(cheTheiaDir + '/plugins/*/package.json')));
+ packageJsons.push(path.resolve(cheTheiaDir, 'generator/package.json'));
+ packageJsons.push(path.resolve(cheTheiaDir, 'assembly/package.json'));
+ packageJsons.push(path.resolve(cheTheiaDir, 'package.json'));
+
+ for (const packageJson of packageJsons) {
+ await updateDependencies(packageJson, packageName => {
+ if (packageName.startsWith('@theia') && !EXCLUSIONS.includes(packageName)) {
+ return theiaVersion;
+ }
+ });
+ }
+}
+
+async function updateDependencies(
+ packageJSONPath: string,
+ replaceVersion: (packageName: string) => string | undefined
+) {
+ try {
+ await rewriteJson(packageJSONPath, pkgJson => {
+ // we're assuming the package.json is well formed
+ replaceInSection(pkgJson.dependencies, replaceVersion);
+ replaceInSection(pkgJson.devDependencies, replaceVersion);
+ });
+ } catch (e) {
+ console.warn('could not find package json: ' + packageJSONPath);
+ return;
+ }
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function replaceInSection(section: any, replaceVersion: (packageName: string) => string | undefined) {
+ if (section) {
+ for (const dep in section) {
+ if (section.hasOwnProperty(dep)) {
+ const replacement = replaceVersion(dep);
+ if (replacement) {
+ section[dep] = replacement;
+ }
+ }
+ }
+ }
+}
diff --git a/generator/src/yargs.ts b/generator/src/yargs.ts
index 6fdf73154..bca167f1c 100644
--- a/generator/src/yargs.ts
+++ b/generator/src/yargs.ts
@@ -11,6 +11,10 @@
import * as path from 'path';
import * as yargs from 'yargs';
+import { builder as generateArgsBuilder, handleCommand as handleGenerateCommand } from './generate-assembly';
+import { handleCommand as handleLinkCommand, builder as linkArgsBuilder } from './link';
+import { handleCommand as handleUpdateDepsCommand, builder as updateDepsBuilder } from './update-dependencies';
+
import { Cdn } from './cdn';
import { Clean } from './clean';
import { CliError } from './cli-error';
@@ -29,7 +33,7 @@ const commandArgs = yargs
.usage('$0 [args]')
.command({
command: 'init',
- describe: 'Initialize current theia to beahve like a Che/Theia',
+ describe: 'Initialize current theia to behave like a Che/Theia',
builder: InitSources.argBuilder,
handler: async args => {
try {
@@ -40,7 +44,7 @@ const commandArgs = yargs
const init = new Init(process.cwd(), assemblyFolder, cheFolder, pluginsFolder);
const version = await init.getCurrentVersion();
await init.generate();
- await init.updatePluginsConfigurtion();
+ await init.updatePluginsConfiguration();
const initSources = new InitSources(
process.cwd(),
packagesFolder,
@@ -101,6 +105,25 @@ const commandArgs = yargs
}
},
})
+ // commands related to the "linkless" mode of building che-theia
+ .command({
+ command: 'link',
+ describe: 'Yarn link to a given theia source tree',
+ handler: handleLinkCommand,
+ builder: linkArgsBuilder,
+ })
+ .command({
+ command: 'generate',
+ describe: 'Generate the che-theia assembly folder',
+ handler: handleGenerateCommand,
+ builder: generateArgsBuilder,
+ })
+ .command({
+ command: 'update-dependencies',
+ describe: 'Update the theia version in all package.json files',
+ handler: handleUpdateDepsCommand,
+ builder: updateDepsBuilder,
+ })
.help()
.strict()
.demandCommand().argv;
diff --git a/generator/src/yarn.ts b/generator/src/yarn.ts
index 81f7ef05c..d5082113e 100644
--- a/generator/src/yarn.ts
+++ b/generator/src/yarn.ts
@@ -12,6 +12,7 @@ import * as path from 'path';
import { CliError } from './cli-error';
import { Command } from './command';
+import { Init } from './init';
import { Logger } from './logger';
/**
@@ -96,7 +97,22 @@ export class Yarn {
nodePackages.map(e => e.path).filter((value, index, array) => index === array.indexOf(value))
);
}
-
+ /**
+ * Exclude dependencies which defined on excludedPackages
+ *
+ * @protected
+ * @param {string} pkg
+ * @returns
+ * @memberof Yarn
+ */
+ protected isExcluded(pkg: string) {
+ const exist = this.excludedPackages.indexOf(pkg) !== -1;
+ if (exist) {
+ Logger.debug(` --> Excluding the dependency ${pkg}`);
+ return true;
+ }
+ return false;
+ }
/**
* Find from children all the direct dependencies. Also exclude some dependencies by not analyzing them.
* Allow as well to report error in case of a forbidden dependency found
@@ -109,9 +125,9 @@ export class Yarn {
nodeTreeDependencies: Map,
subsetDependencies: string[]
): void {
- children.map(child => {
+ children.forEach(child => {
// only loop on exist
- if (subsetDependencies.indexOf(child) >= 0) {
+ if (subsetDependencies.indexOf(child) >= 0 || this.isExcluded(child)) {
return;
}
subsetDependencies.push(child);
@@ -119,13 +135,7 @@ export class Yarn {
// loop on children in any
let depChildren = nodeTreeDependencies.get(child);
if (depChildren) {
- depChildren = depChildren.filter(depChild => {
- const res = this.excludedPackages.indexOf(depChild) < 0;
- if (!res) {
- Logger.debug(` --> Excluding the dependency ${depChild}`);
- }
- return res;
- });
+ depChildren = depChildren.filter(depChild => !this.isExcluded(depChild));
const matching: string[] = [];
const foundForbiddenPackage = depChildren.some(r => {
@@ -206,3 +216,20 @@ export interface IYarnNode {
name: string;
children: IYarnNode[];
}
+
+/**
+ * Returns the full package name of an installed package or the emtpy string if not installed
+ */
+export async function getFullPackageName(rootFolder: string, name: string): Promise {
+ const pkg = JSON.parse(await new Command(path.resolve(rootFolder)).exec(Init.GET_PACKAGE_WITH_VERSION_CMD + name))
+ .data.trees[0];
+ return pkg ? pkg.name : '';
+}
+
+/**
+ * Returns the version of an installed package or the emtpy string if not installed
+ */
+export async function getPackageVersion(rootFolder: string, name: string) {
+ const nameWithVersion = getFullPackageName(rootFolder, name);
+ return (await nameWithVersion).split('@').pop() || '';
+}
diff --git a/generator/tests/cdn/html-template.spec.ts b/generator/tests/cdn/html-template.spec.ts
index 84a6215ba..696e79c22 100644
--- a/generator/tests/cdn/html-template.spec.ts
+++ b/generator/tests/cdn/html-template.spec.ts
@@ -19,7 +19,7 @@ describe('Test CdnHtmlTemplate', () => {
let cdnPrefix: string | undefined;
let monacoCdnPrefix: string | undefined;
let monacoEditorCorePackage: string | undefined;
- let chunks: any;
+ let chunks: string[];
let assets: any;
beforeEach(() => {
@@ -28,7 +28,7 @@ describe('Test CdnHtmlTemplate', () => {
cdnPrefix = undefined;
monacoCdnPrefix = undefined;
monacoEditorCorePackage = undefined;
- chunks = {};
+ chunks = [];
assets = {};
});
@@ -44,7 +44,7 @@ describe('Test CdnHtmlTemplate', () => {
},
},
files: {
- chunks: chunks,
+ js: chunks,
},
};
@@ -57,14 +57,7 @@ describe('Test CdnHtmlTemplate', () => {
test('test chunks without CDN prefix', async () => {
cachedChunkRegexp = 'cachedChunk.*';
- chunks = {
- chunk1: {
- entry: 'cachedChunk1',
- },
- chunk2: {
- entry: 'chunk2',
- },
- };
+ chunks = ['cachedChunk1', 'chunk2'];
const htmlTemplate = buildTemplate();
@@ -85,14 +78,7 @@ describe('Test CdnHtmlTemplate', () => {
test('test chunks with CDN prefix', async () => {
cachedChunkRegexp = 'cachedChunk.*';
cdnPrefix = 'http://cdnPrefix/';
- chunks = {
- chunk1: {
- entry: 'cachedChunk1',
- },
- chunk2: {
- entry: 'chunk2',
- },
- };
+ chunks = ['cachedChunk1', 'chunk2'];
const htmlTemplate = buildTemplate();
@@ -178,14 +164,7 @@ describe('Test CdnHtmlTemplate', () => {
test('test cdn.json file', async () => {
cachedChunkRegexp = 'cachedChunk.*';
cdnPrefix = 'http://cdnPrefix/';
- chunks = {
- chunk1: {
- entry: 'cachedChunk1',
- },
- chunk2: {
- entry: 'chunk2',
- },
- };
+ chunks = ['cachedChunk1', 'chunk2'];
cachedResourceRegexp = 'cachedResource.*';
cdnPrefix = 'http://cdnPrefix/';
@@ -229,14 +208,7 @@ describe('Test CdnHtmlTemplate', () => {
test('test generateCdnScript', async () => {
cachedChunkRegexp = 'cachedChunk.*';
cdnPrefix = 'http://cdnPrefix/';
- chunks = {
- chunk1: {
- entry: 'cachedChunk1',
- },
- chunk2: {
- entry: 'chunk2',
- },
- };
+ chunks = ['cachedChunk1', 'chunk2'];
cachedResourceRegexp = 'cachedResource.*';
cdnPrefix = 'http://cdnPrefix/';
diff --git a/generator/tests/cdn/webpack-customizer.spec.ts b/generator/tests/cdn/webpack-customizer.spec.ts
index 0f5be381d..adb6d83f9 100644
--- a/generator/tests/cdn/webpack-customizer.spec.ts
+++ b/generator/tests/cdn/webpack-customizer.spec.ts
@@ -77,7 +77,9 @@ describe('Test webpack customizer', () => {
} catch (err) {
error = err;
}
- expect(error).toEqual(new Error("Please check that you specified the parameter '--env.monacopkg'"));
+ expect(error).toEqual(
+ new Error("Please check that you specified the parameter '--env monacopkg' for 'theia build' command.")
+ );
});
test('test basic changes', async () => {
@@ -87,7 +89,7 @@ describe('Test webpack customizer', () => {
expect(baseConfig.entry['cdn-support']).toEqual(path.resolve(__dirname, '../../src/cdn/bootstrap.js'));
expect(baseConfig.output.filename).toBe('[name].[chunkhash].js');
expect(baseConfig.optimization.runtimeChunk).toBe('single');
- expect(baseConfig.optimization.splitChunks.cacheGroups.vendors).toEqual({
+ expect(baseConfig.optimization.splitChunks.cacheGroups.defaultVendors).toEqual({
test: /[\/]node_modules[\/](?!@theia[\/])/,
name: 'vendors',
chunks: 'all',
diff --git a/generator/tests/init-sources/assembly-example/package.json b/generator/tests/init-sources/assembly-example/package.json
index b1633e9aa..e13aacf02 100644
--- a/generator/tests/init-sources/assembly-example/package.json
+++ b/generator/tests/init-sources/assembly-example/package.json
@@ -16,7 +16,7 @@
"@types/mocha": "^2.2.41",
"@types/node": "^12.0.0",
"@types/sinon": "^2.3.5",
- "@types/temp": "^0.8.29",
+ "@types/temp": "^0.9.1",
"@types/webdriverio": "^4.7.0",
"chai": "^4.1.0",
"chai-string": "^1.4.0",
diff --git a/generator/tests/init-sources/init-sources.spec.ts b/generator/tests/init-sources/init-sources.spec.ts
index 5ca9caf29..d38dc1c54 100644
--- a/generator/tests/init-sources/init-sources.spec.ts
+++ b/generator/tests/init-sources/init-sources.spec.ts
@@ -76,6 +76,7 @@ describe('Test Extensions', () => {
function initGit(cwd: string) {
cp.execSync('git init', { cwd });
+ cp.execSync('git checkout -b main', { cwd });
cp.execSync('git config --local user.name "test user"', { cwd });
cp.execSync('git config --local user.email user@example.com', { cwd });
cp.execSync(`git add ${cwd}`, { cwd });
@@ -105,7 +106,7 @@ describe('Test Extensions', () => {
},
{
source: 'file://' + sourceExtension2Tmp,
- checkoutTo: 'master',
+ checkoutTo: 'main',
},
],
};
@@ -234,7 +235,7 @@ describe('Test Extensions', () => {
},
{
source: 'file://' + sourceExtension2Tmp,
- checkoutTo: 'master',
+ checkoutTo: 'main',
},
],
};
@@ -289,7 +290,7 @@ describe('Test Extensions', () => {
},
{
source: 'file://' + sourceExtension2Tmp,
- checkoutTo: 'master',
+ checkoutTo: 'main',
},
],
};
@@ -383,7 +384,7 @@ describe('Test Extensions', () => {
expect(yargsMockup.options['dev']).toEqual({
description:
- 'Initialize current Theia with Che/Theia extensions from "master" branch instead of provided branches',
+ 'Initialize current Theia with Che/Theia extensions from "main" branch instead of provided branches',
alias: 'd',
type: 'boolean',
default: false,
@@ -409,7 +410,7 @@ describe('Test Extensions', () => {
},
{
source: 'file://' + sourceExtension2Tmp,
- checkoutTo: 'master',
+ checkoutTo: 'main',
},
],
};
diff --git a/generator/tests/init/init.spec.ts b/generator/tests/init/init.spec.ts
index 8ab3817b5..bcfcffbb2 100644
--- a/generator/tests/init/init.spec.ts
+++ b/generator/tests/init/init.spec.ts
@@ -72,8 +72,8 @@ describe('Test Init', () => {
expect(packageJson.name).toBe('@eclipse-che/theia-assembly');
expect(packageJson['dependencies']['@theia/core']).toBe('^' + (await init.getCurrentVersion()));
expect(packageJson['scripts']['build']).toBe(
- 'theia build --mode production --config cdn/webpack.config.js --env.cdn=./cdn.json' +
- ' --env.monacopkg=' +
+ 'theia build --mode production --config cdn/webpack.config.js --env cdn=./cdn.json' +
+ ' --env monacopkg=' +
Init.MONACO_CORE_PKG +
'@' +
coreVersion +
diff --git a/generator/tests/link.spec.ts b/generator/tests/link.spec.ts
new file mode 100644
index 000000000..b52a24ac4
--- /dev/null
+++ b/generator/tests/link.spec.ts
@@ -0,0 +1,54 @@
+/**********************************************************************
+ * Copyright (c) 2018-2020 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+import * as fs from 'fs-extra';
+import * as path from 'path';
+import * as tmp from 'tmp';
+
+import { handleCommand } from '../src/link';
+
+jest.setTimeout(30000);
+
+describe('Test link command', () => {
+ let rootFolderTmp: string;
+ let srcFolder: string;
+ let theiaFolder: string;
+
+ beforeEach(async () => {
+ rootFolderTmp = tmp.dirSync({ mode: 0o750, prefix: 'tmpLink', postfix: '' }).name;
+ srcFolder = path.resolve(rootFolderTmp, 'src');
+ fs.ensureDirSync(srcFolder);
+ const theiaSource = path.resolve(__dirname, 'link');
+ theiaFolder = path.resolve(rootFolderTmp, 'link');
+ const linkFolder = path.resolve(rootFolderTmp, 'links');
+ fs.writeFileSync(path.resolve(rootFolderTmp, '.yarnrc'), `--link-folder ${linkFolder}`);
+ fs.copySync(theiaSource, theiaFolder);
+ if (!fs.existsSync(theiaFolder)) {
+ throw new Error('no copy');
+ }
+ await fs.ensureDir(rootFolderTmp);
+ });
+
+ test('test link', async () => {
+ await handleCommand({
+ theia: theiaFolder,
+ 'che-theia': srcFolder,
+ });
+
+ const fooPackage = path.resolve(srcFolder, 'node_modules/@theia/foo/package.json');
+ const barPackage = path.resolve(srcFolder, 'node_modules/@theia/bar/package.json');
+ const zozPackage = path.resolve(srcFolder, 'node_modules/@theia/zoz/package.json');
+
+ expect(fs.existsSync(fooPackage)).toBeTruthy();
+ expect(fs.existsSync(barPackage)).toBeTruthy();
+ expect(fs.existsSync(zozPackage)).toBeTruthy();
+ });
+});
diff --git a/generator/tests/link/dev-packages/foo/package.json b/generator/tests/link/dev-packages/foo/package.json
new file mode 100644
index 000000000..67eea155c
--- /dev/null
+++ b/generator/tests/link/dev-packages/foo/package.json
@@ -0,0 +1,8 @@
+{
+ "name": "@theia/foo",
+ "description": "description",
+ "authors": "author",
+ "version": "1.0.0",
+ "main": "pathToMain",
+ "dependencies": {}
+}
diff --git a/generator/tests/link/examples/zoz/package.json b/generator/tests/link/examples/zoz/package.json
new file mode 100644
index 000000000..f58f7ba1c
--- /dev/null
+++ b/generator/tests/link/examples/zoz/package.json
@@ -0,0 +1,8 @@
+{
+ "name": "@theia/zoz",
+ "description": "description",
+ "authors": "author",
+ "version": "1.0.0",
+ "main": "pathToMain",
+ "dependencies": {}
+}
diff --git a/generator/tests/link/packages/bar/package.json b/generator/tests/link/packages/bar/package.json
new file mode 100644
index 000000000..23fe66bcc
--- /dev/null
+++ b/generator/tests/link/packages/bar/package.json
@@ -0,0 +1,8 @@
+{
+ "name": "@theia/bar",
+ "description": "description",
+ "authors": "author",
+ "version": "1.0.0",
+ "main": "pathToMain",
+ "dependencies": {}
+}
diff --git a/linkless-build.md b/linkless-build.md
new file mode 100644
index 000000000..52c831e10
--- /dev/null
+++ b/linkless-build.md
@@ -0,0 +1,46 @@
+# Contributing to che-theia with no source linking
+This document describes how to develop for che-theia using yarn linking instead of soure links
+
+# Developing against @theia:next
+The simplest way to program che-theia is to develop against latest "next" tag of theia published
+to npmjs.
+
+1. Check out the source code of che-theia
+
+ cd /projects
+ git clone https://github.com/eclipse-che/che-theia
+2. Generate the che-theia assembly folder
+
+ cd che-theia
+ che-theia generate
+
+ This will generate a theia application that will include the necessary theia and che-theia extensions
+
+3. Build the project
+
+ yarn
+ This builds all parts of che-theia. You are now ready to run che-theia. For example, you can execute `yarn run start` inside the `assembly` folder
+
+# Building against Theia source code
+To build against a Theia version built from source, we need to clone the Theia repository and set up yarn linking
+to use that version in che-theia.
+
+1. Clone Theia
+
+ cd /projects
+ git clone https://github.com/eclipse-theia/theia
+ git checkout
+2. Build theia
+
+ cd /projects/theia
+ yarn
+3. Link into che-theia
+
+ cd /projects/che-theia
+ che-theia link
+ This will `yarn link` all necessary modules from the Theia source into the node modules folder inside the
+ che-theia project. At this time, it's a good idea to rebuild the che-theia project:
+4. Rebuild che-theia
+
+ rm yarn.lock
+ yarn
diff --git a/make-release.sh b/make-release.sh
index b623ae24c..aea75d8d1 100755
--- a/make-release.sh
+++ b/make-release.sh
@@ -43,9 +43,9 @@ sed_in_place() {
# derive branch from version
BRANCH=${VERSION%.*}.x
-# if doing a .0 release, use master; if doing a .z release, use $BRANCH
+# if doing a .0 release, use main; if doing a .z release, use $BRANCH
if [[ ${VERSION} == *".0" ]]; then
- BASEBRANCH="master"
+ BASEBRANCH="main"
else
BASEBRANCH="${BRANCH}"
fi
@@ -87,8 +87,8 @@ apply_files_edits () {
fi
# update config for Che-Theia generator
- sed_in_place -e "/checkoutTo:/s/master/${BRANCH}/" che-theia-init-sources.yml
- sed_in_place -e "/checkoutTo:/s/master/${BRANCH}/" che-theia-init-sources.yml
+ sed_in_place -e "/checkoutTo:/s/main/${BRANCH}/" che-theia-init-sources.yml
+ sed_in_place -e "/checkoutTo:/s/main/${BRANCH}/" che-theia-init-sources.yml
# set the variables for building the images
sed_in_place -e "s/IMAGE_TAG=\"..*\"/IMAGE_TAG=\"latest\"/" build.include
diff --git a/package.json b/package.json
index 04304a26b..0e292b444 100644
--- a/package.json
+++ b/package.json
@@ -48,10 +48,11 @@
},
"workspaces": {
"packages": [
- "extensions/*",
- "plugins/*",
"generator",
- "tools/*"
+ "tools/*",
+ "extensions/*",
+ "assembly",
+ "plugins/*"
]
},
"prettier": {
diff --git a/plugins/containers-plugin/src/containers-tree-data-provider.ts b/plugins/containers-plugin/src/containers-tree-data-provider.ts
index 44fe405dd..244de9e5a 100644
--- a/plugins/containers-plugin/src/containers-tree-data-provider.ts
+++ b/plugins/containers-plugin/src/containers-tree-data-provider.ts
@@ -292,7 +292,9 @@ export async function containersTreeTaskLauncherCommandHandler(label: string, co
}
task.definition.target.containerName = containerName;
- theia.tasks.executeTask(task);
+ // temporary executing generic command to fix https://github.com/eclipse/che/issues/19805
+ // theia.tasks.executeTask(task);
+ theia.commands.executeCommand('workbench.action.tasks.runTask', label);
return;
}
}
diff --git a/plugins/ext-plugin/README.md b/plugins/ext-plugin/README.md
index b84a4a49b..08a6b039e 100644
--- a/plugins/ext-plugin/README.md
+++ b/plugins/ext-plugin/README.md
@@ -12,4 +12,4 @@ if (eclipseCheExtPlugin) {
}
```
-Exported code is coming from https://github.com/eclipse-che/che-theia/blob/master/extensions/eclipse-che-theia-plugin/src/che-proposed.d.ts
+Exported code is coming from https://github.com/eclipse-che/che-theia/blob/main/extensions/eclipse-che-theia-plugin/src/che-proposed.d.ts
diff --git a/plugins/ports-plugin/__mocks__/@eclipse-che/plugin.ts b/plugins/ports-plugin/__mocks__/@eclipse-che/plugin.ts
index d70540963..25f33442c 100644
--- a/plugins/ports-plugin/__mocks__/@eclipse-che/plugin.ts
+++ b/plugins/ports-plugin/__mocks__/@eclipse-che/plugin.ts
@@ -14,15 +14,25 @@
*/
const che: any = {};
let currentWorkspace: any = undefined;
+let currentDevfile: any = undefined;
che.setWorkspaceOutput = (result: string) => {
currentWorkspace = JSON.parse(result);
};
+che.setDevfile = (result: any) => {
+ currentDevfile = result;
+};
+
che.workspace = {};
+che.devfile = {};
che.workspace.getCurrentWorkspace = () => {
return currentWorkspace;
};
+che.devfile.get = () => {
+ return currentDevfile;
+};
+
module.exports = che;
diff --git a/plugins/ports-plugin/src/devfile-handler-devworkspace-impl.ts b/plugins/ports-plugin/src/devfile-handler-devworkspace-impl.ts
new file mode 100644
index 000000000..16cb81d29
--- /dev/null
+++ b/plugins/ports-plugin/src/devfile-handler-devworkspace-impl.ts
@@ -0,0 +1,119 @@
+/**********************************************************************
+ * Copyright (c) 2021 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+import * as che from '@eclipse-che/plugin';
+
+import { DevfileHandler } from './devfile-handler';
+import { Endpoint } from './endpoint';
+import { EndpointCategory } from './endpoint-category';
+import { EndpointExposure } from './endpoint-exposure';
+
+/**
+ * Handle endpoints retrieval for DevWorkspaces.
+ * It filters all container endpoints and then check if there are some attributes to know if it's user or plug-ins side
+ * @author Florent Benoit
+ */
+interface DevfileContainerComponentWithComponentAttributes extends che.devfile.DevfileContainerComponent {
+ componentAttributes: { [attributeName: string]: string };
+}
+
+interface DevfileComponentEndpointWithComponentAttributes extends che.devfile.DevfileComponentEndpoint {
+ componentAttributes: { [attributeName: string]: string };
+}
+
+export class DevWorkspaceDevfileHandlerImpl implements DevfileHandler {
+ async getEndpoints(): Promise> {
+ const devfile = await che.devfile.get();
+ const containerComponents: DevfileContainerComponentWithComponentAttributes[] =
+ devfile.components
+ ?.filter(component => component.container)
+ .map(
+ component =>
+ ({
+ ...component.container,
+ componentAttributes: component.attributes,
+ } as DevfileContainerComponentWithComponentAttributes)
+ ) || [];
+
+ const devfileEndpoints: DevfileComponentEndpointWithComponentAttributes[] = containerComponents
+ .map(container =>
+ (container.endpoints || []).map(endpoint => ({
+ ...endpoint,
+ componentAttributes: container.componentAttributes,
+ }))
+ )
+ .reduce((acc, val) => acc.concat(val), []);
+
+ const endpoints = devfileEndpoints.map(exposedEndpoint => {
+ let exposure: EndpointExposure;
+ if (exposedEndpoint.exposure === 'public') {
+ exposure = EndpointExposure.FROM_DEVFILE_PUBLIC;
+ } else if (exposedEndpoint.exposure === 'internal') {
+ exposure = EndpointExposure.FROM_DEVFILE_PRIVATE;
+ } else {
+ exposure = EndpointExposure.FROM_DEVFILE_NONE;
+ }
+
+ // category ? is is part of eclipse che-theia
+ let category;
+ const isPartOfCheTheia =
+ exposedEndpoint.componentAttributes?.['app.kubernetes.io/part-of'] === 'che-theia.eclipse.org';
+ if (isPartOfCheTheia) {
+ category = EndpointCategory.PLUGINS;
+ } else {
+ category = EndpointCategory.USER;
+ }
+ return {
+ name: exposedEndpoint.name,
+ category,
+ exposure,
+ protocol: exposedEndpoint.protocol,
+ url: exposedEndpoint.attributes?.['controller.devfile.io/endpoint-url'],
+ targetPort: exposedEndpoint.targetPort,
+ } as Endpoint;
+ });
+
+ // Add private JWT proxy ports
+ const jwtProxyEnv: string[] = Object.keys(process.env).filter(key =>
+ key.includes('_JWTPROXY_SERVICE_PORT_SERVER_')
+ );
+ jwtProxyEnv.forEach((key, index) => {
+ const value = process.env[key]!.toLocaleLowerCase() || '';
+ const port = parseInt(value);
+ if (!isNaN(port)) {
+ const endpoint: Endpoint = {
+ name: `jwt-proxy-${index + 1}`,
+ exposure: EndpointExposure.FROM_DEVFILE_PRIVATE,
+ url: '',
+ targetPort: port,
+ protocol: 'tcp',
+ type: 'jwt-proxy',
+ category: EndpointCategory.PLUGINS,
+ };
+ endpoints.push(endpoint);
+ }
+ });
+
+ // Theia sidecar remote endpoint
+ [2503, 2504].forEach(port => {
+ endpoints.push({
+ name: 'theia-sidecar-endpoint',
+ exposure: EndpointExposure.FROM_DEVFILE_PRIVATE,
+ url: '',
+ targetPort: port,
+ protocol: 'tcp',
+ type: 'theia-endpoint',
+ category: EndpointCategory.PLUGINS,
+ });
+ });
+
+ return endpoints;
+ }
+}
diff --git a/plugins/ports-plugin/src/ip-converter.ts b/plugins/ports-plugin/src/ip-converter.ts
index a28bd4667..e040447df 100644
--- a/plugins/ports-plugin/src/ip-converter.ts
+++ b/plugins/ports-plugin/src/ip-converter.ts
@@ -31,9 +31,12 @@ export class IpConverter {
}
convert(entry: string): string {
- const networkInterfaceRegexpV4 = /([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])/gm;
- // eslint-disable-next-line max-len
- const networkInterfaceRegexpV6 = /([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])/gm;
+ const networkInterfaceRegexpV4 =
+ /([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])/gm;
+
+ const networkInterfaceRegexpV6 =
+ // eslint-disable-next-line max-len
+ /([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])([0-9a-fA-F][0-9a-fA-F])/gm;
let interfaceListen;
if (entry.length === 8) {
const netMatcher = networkInterfaceRegexpV4.exec(entry);
diff --git a/plugins/ports-plugin/src/ports-plugin.ts b/plugins/ports-plugin/src/ports-plugin.ts
index 3d72fd6f8..fd8ba7d76 100644
--- a/plugins/ports-plugin/src/ports-plugin.ts
+++ b/plugins/ports-plugin/src/ports-plugin.ts
@@ -11,6 +11,7 @@
import * as theia from '@theia/plugin';
import { CheServerDevfileHandlerImpl } from './devfile-handler-che-server-impl';
+import { DevWorkspaceDevfileHandlerImpl } from './devfile-handler-devworkspace-impl';
import { DevfileHandler } from './devfile-handler';
import { Endpoint } from './endpoint';
import { EndpointCategory } from './endpoint-category';
@@ -52,7 +53,11 @@ export class PortsPlugin {
constructor(private context: theia.PluginContext) {
this.devfileEndpoints = [];
this.redirectPorts = [];
- this.devfileHandler = new CheServerDevfileHandlerImpl();
+ if (process.env.DEVWORKSPACE_COMPONENT_NAME) {
+ this.devfileHandler = new DevWorkspaceDevfileHandlerImpl();
+ } else {
+ this.devfileHandler = new CheServerDevfileHandlerImpl();
+ }
this.portForwards = new Map();
this.excludedPorts = [];
this.endpointsTreeDataProvider = new EndpointsTreeDataProvider();
@@ -257,7 +262,6 @@ export class PortsPlugin {
});
// first, grab ports of workspace
- this.devfileHandler = new CheServerDevfileHandlerImpl();
this.devfileEndpoints = await this.devfileHandler.getEndpoints();
this.redirectPorts = this.devfileEndpoints.filter(endpoint =>
diff --git a/plugins/ports-plugin/tests/devfile-handler/devfile-handler-devworkspace-impl.spec.ts b/plugins/ports-plugin/tests/devfile-handler/devfile-handler-devworkspace-impl.spec.ts
new file mode 100644
index 000000000..2697d359c
--- /dev/null
+++ b/plugins/ports-plugin/tests/devfile-handler/devfile-handler-devworkspace-impl.spec.ts
@@ -0,0 +1,99 @@
+/**********************************************************************
+ * Copyright (c) 2019-2020 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
+
+import * as che from '@eclipse-che/plugin';
+import * as fs from 'fs-extra';
+import * as jsYaml from 'js-yaml';
+
+import { DevWorkspaceDevfileHandlerImpl } from '../../src/devfile-handler-devworkspace-impl';
+import { DevfileHandler } from '../../src/devfile-handler';
+import { EndpointCategory } from '../../src/endpoint-category';
+import { EndpointExposure } from '../../src/endpoint-exposure';
+
+describe('Test Workspace Endpoints', () => {
+ let devfileHandler: DevfileHandler;
+
+ const OLD_ENV = process.env;
+
+ beforeEach(() => {
+ devfileHandler = new DevWorkspaceDevfileHandlerImpl();
+ jest.resetModules();
+ process.env = {};
+ });
+
+ afterAll(() => {
+ process.env = OLD_ENV;
+ });
+
+ test('test ports opened', async () => {
+ const output = await fs.readFile(__dirname + '/devworkspace-flattened.yaml', 'utf-8');
+ const devfile = jsYaml.load(output);
+ (che as any).setDevfile(devfile);
+
+ // jwt proxy
+ process.env.SERVERU2DZ64P8_JWTPROXY_SERVICE_PORT_SERVER_4401 = '4401';
+ process.env.SERVERU2DZ64P8_JWTPROXY_SERVICE_PORT_SERVER_4400 = '4400';
+ process.env.SERVERU2DZ64P8_JWTPROXY_SERVICE_PORT_SERVER_4402 = '4402';
+ process.env.SERVERU2DZ64P8_JWTPROXY_SERVICE_PORT_SERVER_EMPTY = '';
+ process.env.SERVERU2DZ64P8_JWTPROXY_SERVICE_PORT_SERVER_INVALID = 'invalid';
+
+ const endpoints = await devfileHandler.getEndpoints();
+
+ expect(endpoints).toBeDefined();
+ expect(Array.isArray(endpoints)).toBe(true);
+ expect(endpoints.length).toBe(15);
+
+ expect(endpoints[0].targetPort).toBe(3100);
+ expect(endpoints[0].url).toBe('https://workspace4bdbaf7a58884128-1.apps.cluster-c1dd.c1dd.sandbox85.opentlc.com/');
+ expect(endpoints[0].name).toBe('theia');
+ expect(endpoints[0].exposure).toBe(EndpointExposure.FROM_DEVFILE_PUBLIC);
+ expect(endpoints[0].category).toBe(EndpointCategory.PLUGINS);
+
+ // check we have JTW proxy endpoints
+ const jwtEndpoints = endpoints.filter(endpoint => endpoint.type === 'jwt-proxy');
+ expect(jwtEndpoints.length).toBe(3);
+ jwtEndpoints.forEach(jwtEndpoint => {
+ expect(jwtEndpoint.category).toBe(EndpointCategory.PLUGINS);
+ expect(jwtEndpoint.exposure).toBe(EndpointExposure.FROM_DEVFILE_PRIVATE);
+ expect(jwtEndpoint.url).toBe('');
+ expect(jwtEndpoint.protocol).toBe('tcp');
+ expect(jwtEndpoint.url).toBe('');
+ });
+ });
+
+ test('test quarkus workspace', async () => {
+ const output = await fs.readFile(__dirname + '/devworkspace-flattened.yaml', 'utf-8');
+ const devfile = jsYaml.load(output);
+ (che as any).setDevfile(devfile);
+
+ const endpoints = await devfileHandler.getEndpoints();
+
+ // check that quarkus debug port is private
+ const result = endpoints.filter(endpoint => endpoint.name === 'debug');
+ expect(result).toBeDefined();
+ expect(Array.isArray(result)).toBe(true);
+ expect(result!.length).toBe(1);
+ const quarkusEndpoint = result[0];
+ expect(quarkusEndpoint.targetPort).toBe(5005);
+ expect(quarkusEndpoint.exposure).toBe(EndpointExposure.FROM_DEVFILE_NONE);
+ expect(quarkusEndpoint.category).toBe(EndpointCategory.USER);
+
+ // check user public endpoints are filtered (when multiple endpoints have the same url/targetport, etc)
+ const userPublicEndpoints = endpoints.filter(
+ endpoint =>
+ endpoint.exposure === EndpointExposure.FROM_DEVFILE_PUBLIC && endpoint.category === EndpointCategory.USER
+ );
+ expect(userPublicEndpoints).toBeDefined();
+ expect(userPublicEndpoints!.length).toBe(1);
+ });
+});
diff --git a/plugins/ports-plugin/tests/devfile-handler/devworkspace-flattened.yaml b/plugins/ports-plugin/tests/devfile-handler/devworkspace-flattened.yaml
new file mode 100644
index 000000000..93a515fa5
--- /dev/null
+++ b/plugins/ports-plugin/tests/devfile-handler/devworkspace-flattened.yaml
@@ -0,0 +1,231 @@
+commands:
+- apply:
+ component: vsix-installer
+ attributes:
+ controller.devfile.io/imported-by: che-theia-vsix-installer-workspace4bdbaf7a58884128
+ id: copy-vsix
+- apply:
+ component: remote-runtime-injector
+ attributes:
+ controller.devfile.io/imported-by: theia-ide-workspace4bdbaf7a58884128
+ id: init-container-command
+- apply:
+ component: project-clone
+ id: clone-projects
+components:
+- attributes:
+ app.kubernetes.io/component: vsix-installer
+ app.kubernetes.io/part-of: che-theia.eclipse.org
+ controller.devfile.io/imported-by: che-theia-vsix-installer-workspace4bdbaf7a58884128
+ container:
+ image: quay.io/eclipse/che-theia-vsix-installer:next
+ sourceMapping: /projects
+ volumeMounts:
+ - name: plugins
+ path: /plugins
+ name: vsix-installer
+- attributes:
+ controller.devfile.io/imported-by: theia-ide-workspace4bdbaf7a58884128
+ app.kubernetes.io/part-of: che-theia.eclipse.org
+ container:
+ cpuLimit: 1500m
+ cpuRequest: 100m
+ endpoints:
+ - attributes:
+ controller.devfile.io/endpoint-url: https://workspace4bdbaf7a58884128-1.apps.cluster-c1dd.c1dd.sandbox85.opentlc.com/
+ cookiesAuthEnabled: true
+ discoverable: false
+ type: main
+ exposure: public
+ name: theia
+ protocol: https
+ targetPort: 3100
+ - attributes:
+ controller.devfile.io/endpoint-url: https://workspace4bdbaf7a58884128-2.apps.cluster-c1dd.c1dd.sandbox85.opentlc.com/
+ cookiesAuthEnabled: true
+ discoverable: false
+ type: webview
+ unique: true
+ exposure: public
+ name: webviews
+ protocol: https
+ targetPort: 3100
+ - attributes:
+ controller.devfile.io/endpoint-url: https://workspace4bdbaf7a58884128-3.apps.cluster-c1dd.c1dd.sandbox85.opentlc.com/
+ cookiesAuthEnabled: true
+ discoverable: false
+ type: mini-browser
+ unique: true
+ exposure: public
+ name: mini-browser
+ protocol: https
+ targetPort: 3100
+ - attributes:
+ controller.devfile.io/endpoint-url: http://workspace4bdbaf7a58884128-4.apps.cluster-c1dd.c1dd.sandbox85.opentlc.com/
+ discoverable: false
+ type: ide-dev
+ exposure: public
+ name: theia-dev
+ protocol: http
+ targetPort: 3130
+ - attributes:
+ controller.devfile.io/endpoint-url: http://workspace4bdbaf7a58884128-5.apps.cluster-c1dd.c1dd.sandbox85.opentlc.com/
+ discoverable: false
+ exposure: public
+ name: theia-redirect-1
+ protocol: http
+ targetPort: 13131
+ - attributes:
+ controller.devfile.io/endpoint-url: http://workspace4bdbaf7a58884128-6.apps.cluster-c1dd.c1dd.sandbox85.opentlc.com/
+ discoverable: false
+ exposure: public
+ name: theia-redirect-2
+ protocol: http
+ targetPort: 13132
+ - attributes:
+ controller.devfile.io/endpoint-url: http://workspace4bdbaf7a58884128-7.apps.cluster-c1dd.c1dd.sandbox85.opentlc.com/
+ discoverable: false
+ exposure: public
+ name: theia-redirect-3
+ protocol: http
+ targetPort: 13133
+ - attributes:
+ controller.devfile.io/endpoint-url: wss://workspace4bdbaf7a58884128-8.apps.cluster-c1dd.c1dd.sandbox85.opentlc.com/
+ cookiesAuthEnabled: true
+ discoverable: false
+ type: collocated-terminal
+ exposure: public
+ name: terminal
+ protocol: wss
+ targetPort: 3333
+ env:
+ - name: THEIA_PLUGINS
+ value: local-dir:///plugins
+ - name: HOSTED_PLUGIN_HOSTNAME
+ value: 0.0.0.0
+ - name: HOSTED_PLUGIN_PORT
+ value: "3130"
+ - name: THEIA_HOST
+ value: 0.0.0.0
+ image: quay.io/crw_pr/che-theia:1129
+ memoryLimit: 512M
+ mountSources: true
+ sourceMapping: /projects
+ volumeMounts:
+ - name: plugins
+ path: /plugins
+ - name: theia-local
+ path: /home/theia/.theia
+ name: theia-ide
+- attributes:
+ controller.devfile.io/imported-by: theia-ide-workspace4bdbaf7a58884128
+ name: plugins
+ volume: {}
+- attributes:
+ controller.devfile.io/imported-by: theia-ide-workspace4bdbaf7a58884128
+ name: theia-local
+ volume: {}
+- attributes:
+ controller.devfile.io/imported-by: theia-ide-workspace4bdbaf7a58884128
+ container:
+ command:
+ - /go/bin/che-machine-exec
+ - --url
+ - 0.0.0.0:3333
+ cpuLimit: 500m
+ cpuRequest: 30m
+ image: quay.io/eclipse/che-machine-exec:next
+ memoryLimit: 128Mi
+ memoryRequest: 32Mi
+ sourceMapping: /projects
+ name: che-machine-exec
+- attributes:
+ controller.devfile.io/imported-by: theia-ide-workspace4bdbaf7a58884128
+ container:
+ cpuLimit: 500m
+ cpuRequest: 30m
+ env:
+ - name: PLUGIN_REMOTE_ENDPOINT_EXECUTABLE
+ value: /remote-endpoint/plugin-remote-endpoint
+ - name: REMOTE_ENDPOINT_VOLUME_NAME
+ value: remote-endpoint
+ image: quay.io/eclipse/che-theia-endpoint-runtime-binary:next
+ memoryLimit: 128Mi
+ memoryRequest: 32Mi
+ sourceMapping: /projects
+ volumeMounts:
+ - name: remote-endpoint
+ path: /remote-endpoint
+ name: remote-runtime-injector
+- attributes:
+ controller.devfile.io/imported-by: theia-ide-workspace4bdbaf7a58884128
+ name: remote-endpoint
+ volume:
+ ephemeral: true
+- attributes:
+ app.kubernetes.io/name: tools
+ che-theia.eclipse.org/vscode-extensions:
+ - https://download.jboss.org/jbosstools/static/jdt.ls/stable/java-0.75.0-60.vsix
+ - https://download.jboss.org/jbosstools/vscode/3rdparty/vscode-java-debug/vscode-java-debug-0.26.0.vsix
+ - https://open-vsx.org/api/vscjava/vscode-java-test/0.28.1/file/vscjava.vscode-java-test-0.28.1.vsix
+ che-theia.eclipse.org/vscode-preferences:
+ java.server.launchMode: Standard
+ container:
+ args:
+ - sh
+ - -c
+ - ${PLUGIN_REMOTE_ENDPOINT_EXECUTABLE}
+ env:
+ - name: PLUGIN_REMOTE_ENDPOINT_EXECUTABLE
+ value: /remote-endpoint/plugin-remote-endpoint
+ - name: THEIA_PLUGINS
+ value: local-dir:///plugins/sidecars/tools
+ image: quay.io/eclipse/che-java11-maven:nightly
+ memoryLimit: 1536M
+ sourceMapping: /projects
+ endpoints:
+ - attributes:
+ controller.devfile.io/endpoint-url: https://workspace4bdbaf7a58884128-1.apps.cluster-c1dd.c1dd.sandbox85.opentlc.com/debug
+ cookiesAuthEnabled: true
+ discoverable: false
+ exposure: none
+ name: debug
+ protocol: tcp
+ targetPort: 5005
+ - attributes:
+ controller.devfile.io/endpoint-url: https://workspace4bdbaf7a58884128-1.apps.cluster-c1dd.c1dd.sandbox85.opentlc.com/8080
+ exposure: public
+ name: 8080-tcp
+ protocol: tcp
+ targetPort: 8080
+ volumeMounts:
+ - name: m2
+ path: /home/user/.m2
+ - name: remote-endpoint
+ path: /remote-endpoint
+ - name: plugins
+ path: /plugins
+ name: tools
+- name: m2
+ volume:
+ size: 1G
+- container:
+ cpuLimit: 50m
+ cpuRequest: 5m
+ image: quay.io/devfile/project-clone:next
+ memoryLimit: 300Mi
+ memoryRequest: 64Mi
+ mountSources: true
+ name: project-clone
+events:
+ preStart:
+ - copy-vsix
+ - init-container-command
+ - clone-projects
+projects:
+- git:
+ checkoutFrom:
+ revision: devfilev2
+ remotes:
+ origin: https://github.com/che-samples/spring-petclinic
+ name: spring-petclinic
diff --git a/plugins/recommendations-plugin/__mocks__/@eclipse-che/plugin.ts b/plugins/recommendations-plugin/__mocks__/@eclipse-che/plugin.ts
index ebe5c1fe6..eb4dfab40 100644
--- a/plugins/recommendations-plugin/__mocks__/@eclipse-che/plugin.ts
+++ b/plugins/recommendations-plugin/__mocks__/@eclipse-che/plugin.ts
@@ -16,5 +16,37 @@
* @author Florent Benoit
*/
const che: any = {};
+
+// map between URL and content
+const httpContent: Map = new Map();
+const httpErrors: Map = new Map();
+
+function setHttpContentMethod(url: string, content: string): void {
+ httpContent.set(url, content);
+}
+
+function setHttpContentErrorMethod(url: string, error: any): void {
+ httpErrors.set(url, error);
+}
+
+function getMethod(url: string): any {
+ if (httpErrors.has(url)) {
+ throw httpErrors.get(url);
+ }
+
+ return Promise.resolve(httpContent.get(url));
+}
+function clearMocksMethod(): void {
+ httpContent.clear();
+ httpErrors.clear();
+}
+
+che.http = {
+ get: getMethod,
+}
che.workspace = {};
+che.__clearHttpMocks = clearMocksMethod
+che.__setHttpContent = setHttpContentMethod
+che.__setHttpContentError = setHttpContentErrorMethod
+che.http.get = jest.spyOn(che.http, 'get');
module.exports = che;
diff --git a/plugins/recommendations-plugin/__mocks__/globby.ts b/plugins/recommendations-plugin/__mocks__/globby.ts
deleted file mode 100644
index 60382612d..000000000
--- a/plugins/recommendations-plugin/__mocks__/globby.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2021 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- ***********************************************************************/
-
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-const globby: any = jest.requireActual('globby');
-
-let customError: any | undefined = undefined;
-let multipleEnd = false;
-
-function __setStreamError(error: string): void {
- customError = error;
-}
-
-function __setStreamEnd(): void {
- multipleEnd = true;
-}
-
-globby.__setStreamError = __setStreamError;
-globby.__setStreamEnd = __setStreamEnd;
-
-const originalStream = globby.stream;
-globby.stream = (pattern: any, options?: any) => {
- const result = originalStream(pattern, options);
- if (customError) {
- result.emit('error', customError);
- }
- if (multipleEnd) {
- result.emit('end');
- }
- return result;
-};
-
-module.exports = globby;
diff --git a/plugins/recommendations-plugin/package.json b/plugins/recommendations-plugin/package.json
index 1e6ed6ce0..647daa52c 100644
--- a/plugins/recommendations-plugin/package.json
+++ b/plugins/recommendations-plugin/package.json
@@ -15,10 +15,7 @@
"dependencies": {
"@eclipse-che/plugin": "0.0.1",
"@theia/plugin": "next",
- "axios": "^0.21.0",
- "globby": "^11.0.1",
"inversify": "^5.0.1",
- "kind-of": "^6.0.3",
"reflect-metadata": "^0.1.13"
},
"devDependencies": {
diff --git a/plugins/recommendations-plugin/src/fetch/featured-fetcher.ts b/plugins/recommendations-plugin/src/fetch/featured-fetcher.ts
index dd446f521..6f77f8a71 100644
--- a/plugins/recommendations-plugin/src/fetch/featured-fetcher.ts
+++ b/plugins/recommendations-plugin/src/fetch/featured-fetcher.ts
@@ -7,11 +7,12 @@
*
* SPDX-License-Identifier: EPL-2.0
***********************************************************************/
+
+import * as che from '@eclipse-che/plugin';
import * as theia from '@theia/plugin';
import { inject, injectable } from 'inversify';
-import AxiosInstance from 'axios';
import { ChePluginRegistry } from '../registry/che-plugin-registry';
import { FeaturedPlugin } from './featured-plugin';
@@ -26,8 +27,11 @@ export class FeaturedFetcher {
let featuredList: FeaturedPlugin[] = [];
// need to fetch
try {
- const response = await AxiosInstance.get(`${pluginRegistryUrl}/che-theia/featured.json`);
- featuredList = response.data.featured;
+ const response = await che.http.get(`${pluginRegistryUrl}/che-theia/featured.json`);
+ if (response === undefined) {
+ return [];
+ }
+ featuredList = JSON.parse(response).featured;
} catch (error) {
featuredList = [];
theia.window.showErrorMessage(`Error while fetching featured recommendation ${error}`);
diff --git a/plugins/recommendations-plugin/src/fetch/plugins-by-language-fetcher.ts b/plugins/recommendations-plugin/src/fetch/plugins-by-language-fetcher.ts
index ba37b6286..03be1921b 100644
--- a/plugins/recommendations-plugin/src/fetch/plugins-by-language-fetcher.ts
+++ b/plugins/recommendations-plugin/src/fetch/plugins-by-language-fetcher.ts
@@ -7,11 +7,12 @@
*
* SPDX-License-Identifier: EPL-2.0
***********************************************************************/
+
+import * as che from '@eclipse-che/plugin';
import * as theia from '@theia/plugin';
import { inject, injectable } from 'inversify';
-import AxiosInstance from 'axios';
import { ChePluginRegistry } from '../registry/che-plugin-registry';
import { LanguagePlugins } from './language-plugins';
@@ -26,14 +27,13 @@ export class PluginsByLanguageFetcher {
const pluginRegistryUrl = await this.chePluginRegistry.getUrl();
// need to fetch
try {
- const response = await AxiosInstance.get(
- `${pluginRegistryUrl}/che-theia/recommendations/language/${languageId}.json`
- );
- languagePlugins = response.data;
- } catch (error) {
- if (error.response.status !== 404) {
- theia.window.showErrorMessage(`Error while fetching featured recommendations ${error}`);
+ const response = await che.http.get(`${pluginRegistryUrl}/che-theia/recommendations/language/${languageId}.json`);
+ if (response === undefined) {
+ return [];
}
+ languagePlugins = JSON.parse(response);
+ } catch (error) {
+ theia.window.showErrorMessage(`Error while fetching featured recommendations ${error}`);
}
return languagePlugins;
}
diff --git a/plugins/recommendations-plugin/src/find/find-file-extensions.ts b/plugins/recommendations-plugin/src/find/find-file-extensions.ts
index 808b71476..984b251b9 100644
--- a/plugins/recommendations-plugin/src/find/find-file-extensions.ts
+++ b/plugins/recommendations-plugin/src/find/find-file-extensions.ts
@@ -7,7 +7,6 @@
*
* SPDX-License-Identifier: EPL-2.0
***********************************************************************/
-import * as globby from 'globby';
import * as theia from '@theia/plugin';
import { injectable } from 'inversify';
@@ -16,48 +15,21 @@ import { injectable } from 'inversify';
export class FindFileExtensions {
public static readonly DEFAULT_SCAN_TIME_PER_WORKSPACE_FOLDER: number = 3000;
- async find(
- workspaceFolders: theia.WorkspaceFolder[],
- timeout: number = FindFileExtensions.DEFAULT_SCAN_TIME_PER_WORKSPACE_FOLDER
- ): Promise {
- // get extensions for each theia workspace
- const extensions: string[][] = await Promise.all(
- workspaceFolders.map(workspaceFolder => this.findInFolder(workspaceFolder.uri.path, timeout))
- );
- return extensions.reduce((acc, e) => acc.concat(e), []);
- }
+ async find(timeout: number = FindFileExtensions.DEFAULT_SCAN_TIME_PER_WORKSPACE_FOLDER): Promise {
+ const cancellationTokenSource = new theia.CancellationTokenSource();
- findInFolder(workspaceFolder: string, timeout: number): Promise {
- // do not let timeout send the event a new time.
- let alreadyStopped = false;
setTimeout(() => {
- if (!alreadyStopped) {
- stream.emit('end');
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- (stream as any).destroy();
- }
+ cancellationTokenSource.cancel();
}, timeout);
+ const uris = await theia.workspace.findFiles('**/*', undefined, undefined, cancellationTokenSource.token);
const fileExtensions: string[] = [];
- const options: globby.GlobbyOptions = {
- gitignore: true,
- cwd: workspaceFolder,
- };
- const stream = globby.stream('**/*', options);
- stream.on('data', entry => {
- const fileExtension = entry.slice(((entry.lastIndexOf('.') - 1) >>> 0) + 1);
+ uris.forEach(uri => {
+ const fileExtension = uri.fsPath.slice(((uri.fsPath.lastIndexOf('.') - 1) >>> 0) + 1);
if (fileExtension.length > 0 && !fileExtensions.includes(fileExtension)) {
fileExtensions.push(fileExtension);
}
});
- stream.on('end', () => {
- alreadyStopped = true;
- });
-
- return new Promise(resolve => {
- stream.on('end', () => {
- resolve(fileExtensions);
- });
- });
+ return fileExtensions;
}
}
diff --git a/plugins/recommendations-plugin/src/plugin/recommendations-plugin.ts b/plugins/recommendations-plugin/src/plugin/recommendations-plugin.ts
index 2b149ad96..e9f2e9c5b 100644
--- a/plugins/recommendations-plugin/src/plugin/recommendations-plugin.ts
+++ b/plugins/recommendations-plugin/src/plugin/recommendations-plugin.ts
@@ -137,7 +137,7 @@ export class RecommendationsPlugin {
);
// Grab file extensions used in all projects being in the workspace folder (that have been cloned) (with a timeout)
- const extensionsInCheWorkspace = await this.findFileExtensions.find(workspaceFolders);
+ const extensionsInCheWorkspace = await this.findFileExtensions.find();
this.outputChannel.appendLine(`extensionsInCheWorkspace=${extensionsInCheWorkspace}`);
// need to wait all required tasks done when starting the plug-in are finished
diff --git a/plugins/recommendations-plugin/src/registry/che-plugin-registry.ts b/plugins/recommendations-plugin/src/registry/che-plugin-registry.ts
index 4acfcfd7b..1c7dfc1be 100644
--- a/plugins/recommendations-plugin/src/registry/che-plugin-registry.ts
+++ b/plugins/recommendations-plugin/src/registry/che-plugin-registry.ts
@@ -1,5 +1,5 @@
/**********************************************************************
- * Copyright (c) 2020 Red Hat, Inc.
+ * Copyright (c) 2021 Red Hat, Inc.
*
* This program and the accompanying materials are made
* available under the terms of the Eclipse Public License 2.0
@@ -7,18 +7,13 @@
*
* SPDX-License-Identifier: EPL-2.0
***********************************************************************/
+
import * as che from '@eclipse-che/plugin';
+import * as theia from '@theia/plugin';
-/**********************************************************************
- * Copyright (c) 2021 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- ***********************************************************************/
-import { injectable } from 'inversify';
+import { injectable, postConstruct } from 'inversify';
+
+import { Deferred } from '../util/deferred';
/**
* Grab the Che Plugin Registry URL
@@ -27,12 +22,35 @@ import { injectable } from 'inversify';
export class ChePluginRegistry {
private pluginRegistryUrl: String;
+ private internalService: boolean;
+
+ private initDone: Deferred;
+
+ constructor() {
+ this.initDone = new Deferred();
+ }
+
+ @postConstruct()
+ async init(): Promise {
+ const settings = await che.workspace.getSettings();
+ const internalUrl = settings['cheWorkspacePluginRegistryInternalUrl'];
+ const externalUrl = settings['cheWorkspacePluginRegistryUrl'];
+
+ // internal service URL is not empty but set to external one if UseInternalClusterSVCNames is not set...
+ this.internalService = !!internalUrl && internalUrl !== externalUrl;
+
+ // if one day internal is not set or empty, default to external
+ this.pluginRegistryUrl = internalUrl || externalUrl;
+ this.initDone.resolve();
+ }
+
async getUrl(): Promise {
- if (!this.pluginRegistryUrl) {
- const settings = await che.workspace.getSettings();
- this.pluginRegistryUrl =
- settings['cheWorkspacePluginRegistryInternalUrl'] || settings['cheWorkspacePluginRegistryUrl'];
- }
+ await this.initDone.promise;
return this.pluginRegistryUrl;
}
+
+ async isInternalService(): Promise {
+ await this.initDone.promise;
+ return this.internalService;
+ }
}
diff --git a/plugins/recommendations-plugin/src/strategy/featured-plugin-strategy.ts b/plugins/recommendations-plugin/src/strategy/featured-plugin-strategy.ts
index b371bf24d..1b2037458 100644
--- a/plugins/recommendations-plugin/src/strategy/featured-plugin-strategy.ts
+++ b/plugins/recommendations-plugin/src/strategy/featured-plugin-strategy.ts
@@ -38,11 +38,13 @@ export class FeaturedPluginStrategy {
this.outputChannel.appendLine(`getFeaturedPlugins.foundLanguageIds=${foundLanguageIds}`);
// Now compare with what we have as plugin-registry recommendations
- const value = foundLanguageIds
+ const plugins = foundLanguageIds
.map(languageId => this.matchingPlugins(languageId, featurePluginStrategyRequest.featuredList))
.reduce((acc, e) => acc.concat(e), []);
- this.outputChannel.appendLine(`getFeaturedPlugins.value=${value}`);
- return value;
+
+ const uniquePlugins = [...new Set(plugins)];
+ this.outputChannel.appendLine(`getFeaturedPlugins.value=${uniquePlugins}`);
+ return uniquePlugins;
}
protected matchingPlugins(languageId: string, featuredList: FeaturedPlugin[]): string[] {
diff --git a/plugins/recommendations-plugin/src/strategy/recommend-plugin-open-file-strategy.ts b/plugins/recommendations-plugin/src/strategy/recommend-plugin-open-file-strategy.ts
index d280d1e95..8116334fb 100644
--- a/plugins/recommendations-plugin/src/strategy/recommend-plugin-open-file-strategy.ts
+++ b/plugins/recommendations-plugin/src/strategy/recommend-plugin-open-file-strategy.ts
@@ -54,9 +54,8 @@ export class RecommendPluginOpenFileStrategy {
return;
}
- const installedPlugins = workspaceAnalysis.vsCodeExtensionsInstalledLanguages.vscodeExtensionByLanguageId.get(
- languageId
- );
+ const installedPlugins =
+ workspaceAnalysis.vsCodeExtensionsInstalledLanguages.vscodeExtensionByLanguageId.get(languageId);
// if we don't have plug-ins installed locally for this languageId, ask remotely
if (!installedPlugins) {
diff --git a/plugins/recommendations-plugin/tests/analyzer/vscode-current-extensions.spec.ts b/plugins/recommendations-plugin/tests/analyzer/vscode-current-extensions.spec.ts
index c44e83761..be3504dbd 100644
--- a/plugins/recommendations-plugin/tests/analyzer/vscode-current-extensions.spec.ts
+++ b/plugins/recommendations-plugin/tests/analyzer/vscode-current-extensions.spec.ts
@@ -24,7 +24,6 @@ describe('Test VSCodeCurrentExtensions', () => {
beforeEach(() => {
container = new Container();
- jest.mock('axios');
container.bind(VSCodeCurrentExtensions).toSelf().inSingletonScope();
});
diff --git a/plugins/recommendations-plugin/tests/fetch/featured-fetcher.spec.ts b/plugins/recommendations-plugin/tests/fetch/featured-fetcher.spec.ts
index a8c909c6a..e07e3e03a 100644
--- a/plugins/recommendations-plugin/tests/fetch/featured-fetcher.spec.ts
+++ b/plugins/recommendations-plugin/tests/fetch/featured-fetcher.spec.ts
@@ -11,6 +11,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import 'reflect-metadata';
+import * as che from '@eclipse-che/plugin';
import * as fs from 'fs-extra';
import * as path from 'path';
import * as theia from '@theia/plugin';
@@ -18,9 +19,7 @@ import * as theia from '@theia/plugin';
import { ChePluginRegistry } from '../../src/registry/che-plugin-registry';
import { Container } from 'inversify';
import { FeaturedFetcher } from '../../src/fetch/featured-fetcher';
-import axios from 'axios';
-// import AxiosInstance from 'axios';
describe('Test FeaturedFetcher', () => {
let container: Container;
@@ -33,32 +32,32 @@ describe('Test FeaturedFetcher', () => {
beforeEach(() => {
container = new Container();
- jest.mock('axios');
+ (che as any).__clearHttpMocks();
container.bind(ChePluginRegistry).toConstantValue(chePluginRegistry);
container.bind(FeaturedFetcher).toSelf().inSingletonScope();
});
test('get featured', async () => {
const json = await fs.readFile(path.join(__dirname, '..', '_data', 'fetch', 'featured.json'), 'utf8');
- (axios as any).__setContent('https://my.registry/v3/che-theia/featured.json', JSON.parse(json));
+ (che as any).__setHttpContent('https://my.registry/v3/che-theia/featured.json', json);
const featuredFetcher = container.get(FeaturedFetcher);
const featuredList = await featuredFetcher.fetch();
expect(featuredList).toBeDefined();
expect(featuredList.length).toBe(3);
- expect((axios as any).get).toBeCalledWith(`${fakeUrl}/che-theia/featured.json`);
+ expect(che.http.get).toBeCalledWith(`${fakeUrl}/che-theia/featured.json`);
});
test('failure', async () => {
- (axios as any).__setError('https://my.registry/v3/che-theia/featured.json', 'invalid json');
+ (che as any).__setHttpContentError('https://my.registry/v3/che-theia/featured.json', 'invalid json');
const featuredFetcher = container.get(FeaturedFetcher);
const featuredList = await featuredFetcher.fetch();
// no content
expect(featuredList).toBeDefined();
expect(featuredList.length).toBe(0);
- expect((axios as any).get).toBeCalledWith(`${fakeUrl}/che-theia/featured.json`);
+ expect(che.http.get).toBeCalledWith(`${fakeUrl}/che-theia/featured.json`);
});
test('unexpected error', async () => {
@@ -67,7 +66,7 @@ describe('Test FeaturedFetcher', () => {
status: 500,
},
};
- (axios as any).__setError('https://my.registry/v3/che-theia/recommendations/language/java.json', error);
+ (che as any).__setHttpContentError('https://my.registry/v3/che-theia/recommendations/language/java.json', error);
const featuredFetcher = container.get(FeaturedFetcher);
const featuredList = await featuredFetcher.fetch();
diff --git a/plugins/recommendations-plugin/tests/fetch/plugins-by-language-fetcher.spec.ts b/plugins/recommendations-plugin/tests/fetch/plugins-by-language-fetcher.spec.ts
index 44515928c..070421500 100644
--- a/plugins/recommendations-plugin/tests/fetch/plugins-by-language-fetcher.spec.ts
+++ b/plugins/recommendations-plugin/tests/fetch/plugins-by-language-fetcher.spec.ts
@@ -11,6 +11,7 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import 'reflect-metadata';
+import * as che from '@eclipse-che/plugin';
import * as fs from 'fs-extra';
import * as path from 'path';
import * as theia from '@theia/plugin';
@@ -18,7 +19,6 @@ import * as theia from '@theia/plugin';
import { ChePluginRegistry } from '../../src/registry/che-plugin-registry';
import { Container } from 'inversify';
import { PluginsByLanguageFetcher } from '../../src/fetch/plugins-by-language-fetcher';
-import axios from 'axios';
describe('Test PluginsByLanguageFetcher', () => {
let container: Container;
@@ -31,16 +31,15 @@ describe('Test PluginsByLanguageFetcher', () => {
beforeEach(() => {
container = new Container();
- jest.mock('axios');
container.bind(ChePluginRegistry).toConstantValue(chePluginRegistry);
- (axios as any).__clearMock();
+ (che as any).__clearHttpMocks();
container.bind(PluginsByLanguageFetcher).toSelf().inSingletonScope();
chePluginRegistryGetUrlMock.mockResolvedValue(fakeUrl);
});
test('check with language being there', async () => {
const json = await fs.readFile(path.join(__dirname, '..', '_data', 'fetch', 'language-go.json'), 'utf8');
- (axios as any).__setContent('https://my.registry/v3/che-theia/recommendations/language/go.json', JSON.parse(json));
+ (che as any).__setHttpContent('https://my.registry/v3/che-theia/recommendations/language/go.json', json);
const pluginsByLanguageFetcher = container.get(PluginsByLanguageFetcher);
const languagesByPlugins = await pluginsByLanguageFetcher.fetch('go');
@@ -52,12 +51,7 @@ describe('Test PluginsByLanguageFetcher', () => {
});
test('check with language not being there', async () => {
- const error = {
- response: {
- status: 404,
- },
- };
- (axios as any).__setError('https://my.registry/v3/che-theia/recommendations/language/foo.json', error);
+ (che as any).__setHttpContent('https://my.registry/v3/che-theia/recommendations/language/foo.json', undefined);
const pluginsByLanguageFetcher = container.get(PluginsByLanguageFetcher);
const languagesByPlugins = await pluginsByLanguageFetcher.fetch('foo');
@@ -72,7 +66,7 @@ describe('Test PluginsByLanguageFetcher', () => {
status: 500,
},
};
- (axios as any).__setError('https://my.registry/v3/che-theia/recommendations/language/java.json', error);
+ (che as any).__setHttpContentError('https://my.registry/v3/che-theia/recommendations/language/java.json', error);
const pluginsByLanguageFetcher = container.get(PluginsByLanguageFetcher);
const languageByPlugins = await pluginsByLanguageFetcher.fetch('java');
diff --git a/plugins/recommendations-plugin/tests/find/find-file-extensions.spec.ts b/plugins/recommendations-plugin/tests/find/find-file-extensions.spec.ts
index c33b0f100..328b49c4e 100644
--- a/plugins/recommendations-plugin/tests/find/find-file-extensions.spec.ts
+++ b/plugins/recommendations-plugin/tests/find/find-file-extensions.spec.ts
@@ -20,48 +20,63 @@ import { FindFileExtensions } from '../../src/find/find-file-extensions';
describe('Test FindFile implementation', () => {
let container: Container;
+ let findFilesSpy: any;
+ let cancelMethod: any;
beforeEach(() => {
jest.restoreAllMocks();
jest.resetAllMocks();
+ theia.workspace.findFiles = jest.fn();
+ findFilesSpy = jest.spyOn(theia.workspace, 'findFiles');
+ cancelMethod = jest.fn();
+
+ const spy = jest.spyOn(theia.workspace, 'findFiles');
+ (theia as any).CancellationTokenSource = jest.fn().mockImplementation(() => ({
+ cancel: cancelMethod,
+ }));
+
container = new Container();
container.bind(FindFileExtensions).toSelf().inSingletonScope();
});
test('find', async () => {
const findFileExtensions = container.get(FindFileExtensions);
- const findPath = path.join(__dirname, '..', '_data', 'find');
- const uri = { path: findPath };
- const workspaceFolder = { uri } as theia.WorkspaceFolder;
- const workspaceFolders: theia.WorkspaceFolder[] = [workspaceFolder];
- const fileExtensions = await findFileExtensions.find(workspaceFolders);
+ findFilesSpy.mockResolvedValue([{ fsPath: '/tmp/foo.php' } as theia.Uri]);
+ const fileExtensions = await findFileExtensions.find();
expect(fileExtensions).toBeDefined();
- expect(fileExtensions.length).toBe(4);
+ expect(fileExtensions.length).toBe(1);
expect(fileExtensions.includes('.php')).toBeTruthy();
- expect(fileExtensions.includes('.java')).toBeTruthy();
- expect(fileExtensions.includes('.py')).toBeTruthy();
- expect(fileExtensions.includes('.json')).toBeTruthy();
});
- test('stop fast', async () => {
+ test('stop after', async () => {
const findFileExtensions = container.get(FindFileExtensions);
- const findPath = path.join(__dirname, '..', '_data', 'find');
- const fileExtensions = await findFileExtensions.findInFolder(findPath, 0);
+
+ findFilesSpy.mockImplementation(async () => {
+ await sleep(1000);
+ return [{ fsPath: '/tmp/foo.php' } as theia.Uri, { fsPath: '/tmp/one.php' } as theia.Uri];
+ });
+ const fileExtensions = await findFileExtensions.find(500);
expect(fileExtensions).toBeDefined();
expect(fileExtensions.length >= 0).toBeTruthy();
+ // cancel called
+ expect(cancelMethod).toBeCalled();
});
- function sleep(ms: number) {
- return new Promise(resolve => setTimeout(resolve, ms));
- }
-
- test('multiple end event', async () => {
- (globby as any).__setStreamEnd();
+ test('stop before', async () => {
const findFileExtensions = container.get(FindFileExtensions);
- const findPath = path.join(__dirname, '..', '_data', 'find');
- const fileExtensions = await findFileExtensions.findInFolder(findPath, 100);
- await sleep(1000);
+
+ findFilesSpy.mockImplementation(async () => [
+ { fsPath: '/tmp/foo.php' } as theia.Uri,
+ { fsPath: '/tmp/one.php' } as theia.Uri,
+ ]);
+ const fileExtensions = await findFileExtensions.find(100);
expect(fileExtensions).toBeDefined();
- expect(fileExtensions.length).toBe(4);
+ expect(fileExtensions.length >= 0).toBeTruthy();
+ // cancel called not called
+ expect(cancelMethod).toBeCalledTimes(0);
});
+
+ function sleep(ms: number) {
+ return new Promise(resolve => setTimeout(resolve, ms));
+ }
});
diff --git a/plugins/recommendations-plugin/tests/registry/che-plugin-registry.spec.ts b/plugins/recommendations-plugin/tests/registry/che-plugin-registry.spec.ts
index fe9c6afd6..bd9a7804a 100644
--- a/plugins/recommendations-plugin/tests/registry/che-plugin-registry.spec.ts
+++ b/plugins/recommendations-plugin/tests/registry/che-plugin-registry.spec.ts
@@ -23,14 +23,14 @@ describe('Test ChePluginRegistry', () => {
beforeEach(() => {
container = new Container();
che.workspace.getSettings = getSettingsMock;
- jest.resetAllMocks();
container.bind(ChePluginRegistry).toSelf().inSingletonScope();
});
test('check internal', async () => {
- const dummyUrl = 'https://foo.registry';
+ const fakeInternalRegistryUrl = 'https://internal.registry';
const fakeSettings = {
- cheWorkspacePluginRegistryInternalUrl: dummyUrl,
+ cheWorkspacePluginRegistryInternalUrl: fakeInternalRegistryUrl,
+ cheWorkspacePluginRegistryUrl: 'https://external.registry',
};
getSettingsMock.mockResolvedValue(fakeSettings);
const chePluginRegistry = container.get(ChePluginRegistry);
@@ -42,16 +42,37 @@ describe('Test ChePluginRegistry', () => {
// API is called only once
expect(getSettingsMock).toBeCalledTimes(1);
+
+ const isInternal = await chePluginRegistry.isInternalService();
+ expect(isInternal).toBeTruthy();
});
- test('check external', async () => {
- const dummyUrl = 'https://foo.registry';
+ test('check external no internal', async () => {
+ const fakeExternallRegistryUrl = 'https://external.registry';
const fakeSettings = {
- cheWorkspacePluginRegistryUrl: dummyUrl,
+ cheWorkspacePluginRegistryUrl: fakeExternallRegistryUrl,
};
getSettingsMock.mockResolvedValue(fakeSettings);
const chePluginRegistry = container.get(ChePluginRegistry);
const registryUrl = await chePluginRegistry.getUrl();
expect(registryUrl).toBe(fakeSettings.cheWorkspacePluginRegistryUrl);
+
+ const isInternal = await chePluginRegistry.isInternalService();
+ expect(isInternal).toBeFalsy();
+ });
+
+ test('check external and internal identical', async () => {
+ const fakeExternallRegistryUrl = 'https://external.registry';
+ const fakeSettings = {
+ cheWorkspacePluginRegistryInternalUrl: fakeExternallRegistryUrl,
+ cheWorkspacePluginRegistryUrl: fakeExternallRegistryUrl,
+ };
+ getSettingsMock.mockResolvedValue(fakeSettings);
+ const chePluginRegistry = container.get(ChePluginRegistry);
+ const registryUrl = await chePluginRegistry.getUrl();
+ expect(registryUrl).toBe(fakeSettings.cheWorkspacePluginRegistryUrl);
+
+ const isInternal = await chePluginRegistry.isInternalService();
+ expect(isInternal).toBeFalsy();
});
});
diff --git a/plugins/recommendations-plugin/tests/strategy/featured-plugin-strategy.spec.ts b/plugins/recommendations-plugin/tests/strategy/featured-plugin-strategy.spec.ts
index 6463ac012..e1446d1bc 100644
--- a/plugins/recommendations-plugin/tests/strategy/featured-plugin-strategy.spec.ts
+++ b/plugins/recommendations-plugin/tests/strategy/featured-plugin-strategy.spec.ts
@@ -128,4 +128,46 @@ describe('Test FeaturedPluginStrategy', () => {
expect(featuredPlugins).toBeDefined();
expect(featuredPlugins.length).toBe(0);
});
+
+ test('basic xml with duplicated plug-ins', async () => {
+ const featuredPluginStrategy = container.get(FeaturedPluginStrategy);
+
+ // xml language is associated to multiple file extensions
+ languagesByFileExtensions.set('.xml', ['xml']);
+ languagesByFileExtensions.set('.jmx', ['xml']);
+ languagesByFileExtensions.set('.svg', ['xml']);
+ vscodeExtensionByLanguageId.set('xml', ['redhat/xml']);
+
+ const featured: FeaturedPlugin = {
+ id: 'redhat/xml',
+ onLanguages: ['xml'],
+ workspaceContains: [],
+ contributes: {
+ languages: [
+ {
+ id: 'xml',
+ aliases: [],
+ extensions: ['.xml'],
+ filenames: [],
+ },
+ ],
+ },
+ };
+ const featuredList = [featured];
+ const extensionsInCheWorkspace = ['.xml', '.unknown', '.jmx', '.svg'];
+ const devfileHasPlugins = true;
+
+ const request: FeaturedPluginStrategyRequest = {
+ featuredList,
+ vsCodeExtensionsInstalledLanguages,
+ devfileHasPlugins,
+ extensionsInCheWorkspace,
+ };
+
+ const featuredPlugins = await featuredPluginStrategy.getFeaturedPlugins(request);
+ expect(featuredPlugins).toBeDefined();
+ // only one instance of the plug-in even if there are multiple matches
+ expect(featuredPlugins.length).toBe(1);
+ expect(featuredPlugins[0]).toBe('redhat/xml');
+ });
});
diff --git a/plugins/recommendations-plugin/tsconfig.json b/plugins/recommendations-plugin/tsconfig.json
index fb22f97b0..42dfd0208 100644
--- a/plugins/recommendations-plugin/tsconfig.json
+++ b/plugins/recommendations-plugin/tsconfig.json
@@ -15,11 +15,11 @@
"strictPropertyInitialization": false,
"skipLibCheck": true,
"skipDefaultLibCheck": true,
- "types": ["reflect-metadata", "jest"],
+ "types": ["node", "reflect-metadata", "jest"],
"experimentalDecorators": true,
"emitDecoratorMetadata": true,
"lib": [
- "es6",
+ "es6"
],
}
,
diff --git a/plugins/resource-monitor-plugin/tests/plugin.spec.ts b/plugins/resource-monitor-plugin/tests/plugin.spec.ts
index 733e1917f..834de87e1 100644
--- a/plugins/resource-monitor-plugin/tests/plugin.spec.ts
+++ b/plugins/resource-monitor-plugin/tests/plugin.spec.ts
@@ -42,6 +42,12 @@ const context: theia.PluginContext = {
prepend: jest.fn(),
replace: jest.fn(),
},
+ secrets: {
+ get: jest.fn(),
+ delete: jest.fn(),
+ store: jest.fn(),
+ onDidChange: jest.fn(),
+ },
extensionPath: '',
extensionUri: uri,
storageUri: uri,
diff --git a/plugins/resource-monitor-plugin/tests/resource-monitor.spec.ts b/plugins/resource-monitor-plugin/tests/resource-monitor.spec.ts
index 92cd6b12f..4b9cc5556 100644
--- a/plugins/resource-monitor-plugin/tests/resource-monitor.spec.ts
+++ b/plugins/resource-monitor-plugin/tests/resource-monitor.spec.ts
@@ -56,6 +56,12 @@ describe('Test Resource Monitor Plugin', () => {
prepend: jest.fn(),
replace: jest.fn(),
},
+ secrets: {
+ get: jest.fn(),
+ delete: jest.fn(),
+ store: jest.fn(),
+ onDidChange: jest.fn(),
+ },
extensionPath: '',
extensionUri: uri,
storageUri: uri,
diff --git a/plugins/ssh-plugin/src/ssh-plugin.ts b/plugins/ssh-plugin/src/ssh-plugin.ts
index 9a5c501ea..9305dabad 100644
--- a/plugins/ssh-plugin/src/ssh-plugin.ts
+++ b/plugins/ssh-plugin/src/ssh-plugin.ts
@@ -26,6 +26,11 @@ import { UploadPrivateKey } from './command/upload-private-key';
import { ViewPublicKey } from './command/view-public-key';
export async function start(): Promise {
+ // disable this plug-in on DevWorkspace as there is no che API / ssh service
+ if (process.env.DEVWORKSPACE_COMPONENT_NAME) {
+ return {} as SSHPlugin;
+ }
+
const container = new InversifyBinding().initBindings();
// start SSH authentication agent
diff --git a/plugins/workspace-plugin/.travis.yml b/plugins/workspace-plugin/.travis.yml
index 0a83f5338..ad00cb4a0 100644
--- a/plugins/workspace-plugin/.travis.yml
+++ b/plugins/workspace-plugin/.travis.yml
@@ -9,7 +9,7 @@ cache:
- node_modules
branches:
only:
- - master
+ - main
before_install:
- curl -o- -L https://yarnpkg.com/install.sh | bash -s --
- export PATH=$HOME/.yarn/bin:$PATH ;
@@ -27,7 +27,7 @@ jobs:
- provider: script
script: npm publish --access public
on:
- branch: master
+ branch: main
skip_cleanup: true
- provider: releases
api-key: $GITHUB_AUTH_TOKEN
@@ -36,4 +36,4 @@ jobs:
file: ./*.theia
skip_cleanup: true
on:
- branch: master
+ branch: main
diff --git a/plugins/workspace-plugin/README.md b/plugins/workspace-plugin/README.md
index c4389ead7..606f49f48 100644
--- a/plugins/workspace-plugin/README.md
+++ b/plugins/workspace-plugin/README.md
@@ -31,16 +31,16 @@ From the factory definition:
},
```
-3. Build the needed "mydockerorg/che-theia:nightly" image with using build script
+3. Build the needed "mydockerorg/che-theia:next" image with using build script
```
$ ./build.sh --organization:mydockerorg
```
-4. Push "mydockerorg/che-theia:nightly" image into your repo or use it locally.
+4. Push "mydockerorg/che-theia:next" image into your repo or use it locally.
5. The following mount should be set in the che.env file: CHE_WORKSPACE_VOLUME=/var/run/docker.sock:/var/run/docker.sock;
Change and restart CHE if it wasn't.
-7. Create a new factory from this factory.json file as a working example. Change "mydockerorg/che-theia:nightly" image to your own from steps 3 and 4.
+7. Create a new factory from this factory.json file as a working example. Change "mydockerorg/che-theia:next" image to your own from steps 3 and 4.
```
{
"v":"4.0",
@@ -115,7 +115,7 @@ Change and restart CHE if it wasn't.
},
"recipe":{
"type":"compose",
- "content":"services:\n machine-exec:\n image: eclipse/che-machine-exec:latest\n theia:\n image: mydockerorg/che-theia:nightly\n mem_limit: 1073741824\n dev-machine:\n image: eclipse/che-dev:nightly\n mem_limit: 2147483648\n depends_on:\n - theia",
+ "content":"services:\n machine-exec:\n image: eclipse/che-machine-exec:latest\n theia:\n image: mydockerorg/che-theia:next\n mem_limit: 1073741824\n dev-machine:\n image: eclipse/che-dev:next\n mem_limit: 2147483648\n depends_on:\n - theia",
"contentType":"application/x-yaml"
}
}
diff --git a/plugins/workspace-plugin/tests/devfile-service.spec.ts b/plugins/workspace-plugin/tests/devfile-service.spec.ts
index 68c912f4e..b0db4ca71 100644
--- a/plugins/workspace-plugin/tests/devfile-service.spec.ts
+++ b/plugins/workspace-plugin/tests/devfile-service.spec.ts
@@ -331,7 +331,7 @@ describe('Devfile Service:', () => {
],
});
- await devfileService.updateProject('/projects/che-theia', 'https://github.com/eclipse-che/che-theia.git', 'master');
+ await devfileService.updateProject('/projects/che-theia', 'https://github.com/eclipse-che/che-theia.git', 'main');
expect(getDevfileMock).toBeCalledTimes(1);
expect(updateDevfileMock).toBeCalledTimes(1);
diff --git a/plugins/workspace-plugin/tests/workspace-projects-manager.spec.ts b/plugins/workspace-plugin/tests/workspace-projects-manager.spec.ts
index 78b884499..3e032e4aa 100644
--- a/plugins/workspace-plugin/tests/workspace-projects-manager.spec.ts
+++ b/plugins/workspace-plugin/tests/workspace-projects-manager.spec.ts
@@ -112,6 +112,12 @@ const context: theia.PluginContext = {
prepend: jest.fn(),
replace: jest.fn(),
},
+ secrets: {
+ get: jest.fn(),
+ delete: jest.fn(),
+ store: jest.fn(),
+ onDidChange: jest.fn(),
+ },
extensionPath: '',
extensionUri: uri,
storageUri: uri,
diff --git a/tools/automation/README.md b/tools/automation/README.md
index ff479f6de..3ed512038 100644
--- a/tools/automation/README.md
+++ b/tools/automation/README.md
@@ -1,6 +1,6 @@
# Automation
-Che-theia makes use of theia built-in extensions, located [here](https://github.com/eclipse-theia/theia/blob/master/package.json). The corresponding che-theia list of extensions is located [here](https://github.com/eclipse-che/che-theia/blob/master/generator/src/templates/theiaPlugins.json).
+Che-theia makes use of theia built-in extensions, located [here](https://github.com/eclipse-theia/theia/blob/master/package.json). The corresponding che-theia list of extensions is located [here](https://github.com/eclipse-che/che-theia/blob/main/generator/src/templates/theiaPlugins.json).
This directory contains various scripts which automate various maintenance steps of the registry.
diff --git a/tools/automation/package.json b/tools/automation/package.json
index b85655135..2972f43f3 100644
--- a/tools/automation/package.json
+++ b/tools/automation/package.json
@@ -23,7 +23,7 @@
"bugs": {
"url": "https://github.com/eclipse/che/issues"
},
- "homepage": "https://github.com/eclipse-che/che-theia/blob/master/tools/automation/README.md",
+ "homepage": "https://github.com/eclipse-che/che-theia/blob/main/tools/automation/README.md",
"dependencies": {
"download": "^8.0.0",
"fs-extra": "^9.0.1",
diff --git a/tools/automation/src/check-extension-updates.ts b/tools/automation/src/check-extension-updates.ts
index f2bedfd4c..767b8b6fb 100755
--- a/tools/automation/src/check-extension-updates.ts
+++ b/tools/automation/src/check-extension-updates.ts
@@ -61,62 +61,60 @@ export class Report {
// grab result in parallel
const entries: Entry[] = await Promise.all(
- Object.entries(cheTheiaExtensions).map(
- async ([name, location]): Promise => {
- const entry: Entry = {
- extensionName: name,
- errors: [],
- };
+ Object.entries(cheTheiaExtensions).map(async ([name, location]): Promise => {
+ const entry: Entry = {
+ extensionName: name,
+ errors: [],
+ };
+
+ const extensionFile = `/tmp/${name}`;
+
+ try {
+ await fs.writeFile(extensionFile, await download(location));
+ } catch (err) {
+ return this.handleError(entry, `Error downloading/writing vsix file ${err}`);
+ }
- const extensionFile = `/tmp/${name}`;
+ try {
+ entry.cheTheiaVersion = (await vsixInfo.getInfo(extensionFile)).version;
+ } catch (err) {
+ return this.handleError(entry, `Error scraping vsix data ${err}`);
+ }
+ // Remove che-theia vsix
+ await fs.remove(extensionFile);
+ // if the built-in exists in both package.json's, download the vsix and check it
+ if (theiaExtensions[name]) {
try {
- await fs.writeFile(extensionFile, await download(location));
+ await fs.writeFile(extensionFile, await download(theiaExtensions[name]));
} catch (err) {
return this.handleError(entry, `Error downloading/writing vsix file ${err}`);
}
+ // get version information from theia vsix
try {
- entry.cheTheiaVersion = (await vsixInfo.getInfo(extensionFile)).version;
+ entry.theiaVersion = (await vsixInfo.getInfo(extensionFile)).version;
} catch (err) {
return this.handleError(entry, `Error scraping vsix data ${err}`);
}
- // Remove che-theia vsix
+ // Remove theia vsix
await fs.remove(extensionFile);
- // if the built-in exists in both package.json's, download the vsix and check it
- if (theiaExtensions[name]) {
- try {
- await fs.writeFile(extensionFile, await download(theiaExtensions[name]));
- } catch (err) {
- return this.handleError(entry, `Error downloading/writing vsix file ${err}`);
- }
-
- // get version information from theia vsix
- try {
- entry.theiaVersion = (await vsixInfo.getInfo(extensionFile)).version;
- } catch (err) {
- return this.handleError(entry, `Error scraping vsix data ${err}`);
- }
- // Remove theia vsix
- await fs.remove(extensionFile);
-
- if (!entry.theiaVersion) {
- entry.needsUpdating = false;
- return this.handleError(entry, 'Failure: there is no theia version');
- } else if (!entry.cheTheiaVersion) {
- entry.needsUpdating = false;
- return this.handleError(entry, 'Failure: there is no che-theia version');
- } else {
- entry.needsUpdating = semver.gt(entry.theiaVersion, entry.cheTheiaVersion);
- }
- entry.needsUpdating = semver.gt(entry.theiaVersion, entry.cheTheiaVersion);
+ if (!entry.theiaVersion) {
+ entry.needsUpdating = false;
+ return this.handleError(entry, 'Failure: there is no theia version');
+ } else if (!entry.cheTheiaVersion) {
+ entry.needsUpdating = false;
+ return this.handleError(entry, 'Failure: there is no che-theia version');
} else {
- return this.handleError(entry, `Failure: there is no theia built-in named *${name}*`);
+ entry.needsUpdating = semver.gt(entry.theiaVersion, entry.cheTheiaVersion);
}
- return entry;
+ entry.needsUpdating = semver.gt(entry.theiaVersion, entry.cheTheiaVersion);
+ } else {
+ return this.handleError(entry, `Failure: there is no theia built-in named *${name}*`);
}
- )
+ return entry;
+ })
);
// sort entries by extension name if present (and not by repository name)
diff --git a/tools/devworkspace-handler/package.json b/tools/devworkspace-handler/package.json
index 7402a3a15..f9ffc78ed 100644
--- a/tools/devworkspace-handler/package.json
+++ b/tools/devworkspace-handler/package.json
@@ -6,6 +6,10 @@
"publishConfig": {
"access": "public"
},
+ "files": [
+ "lib",
+ "src"
+ ],
"scripts": {
"prepare": "yarn run clean && yarn run build",
"clean": "rimraf lib",
@@ -28,7 +32,7 @@
"bugs": {
"url": "https://github.com/eclipse/che/issues"
},
- "homepage": "https://github.com/eclipse/che-theia/blob/master/tools/devworkspace-handler/README.md",
+ "homepage": "https://github.com/eclipse/che-theia/blob/main/tools/devworkspace-handler/README.md",
"dependencies": {
"@devfile/api": "latest",
"axios": "0.21.1",
diff --git a/tools/devworkspace-handler/src/api/devfile-context.ts b/tools/devworkspace-handler/src/api/devfile-context.ts
index 232cb26bf..8ea0b71a2 100644
--- a/tools/devworkspace-handler/src/api/devfile-context.ts
+++ b/tools/devworkspace-handler/src/api/devfile-context.ts
@@ -18,9 +18,6 @@ export enum SidecarPolicy {
* Context used on every call to this service to resolve VSIX components to add with their optional sidecar and the vsix installer
*/
export interface DevfileContext {
- // link to the devfile
- devfileUrl: string;
-
// devfile Content
// eslint-disable-next-line @typescript-eslint/no-explicit-any
devfile: any;
diff --git a/tools/devworkspace-handler/src/generate.ts b/tools/devworkspace-handler/src/generate.ts
index 7159d6dee..9f7ab931d 100644
--- a/tools/devworkspace-handler/src/generate.ts
+++ b/tools/devworkspace-handler/src/generate.ts
@@ -93,7 +93,6 @@ export class Generate {
const devWorkspaceTemplates = [editorDevWorkspaceTemplate];
await this.cheTheiaPluginsDevfileResolver.handle({
- devfileUrl,
devfile: userDevfileContent,
vscodeExtensionsJsonContent,
cheTheiaPluginsContent,
diff --git a/tools/devworkspace-handler/src/github/github-resolver.ts b/tools/devworkspace-handler/src/github/github-resolver.ts
index 13143e6c1..7cec363d9 100644
--- a/tools/devworkspace-handler/src/github/github-resolver.ts
+++ b/tools/devworkspace-handler/src/github/github-resolver.ts
@@ -17,7 +17,8 @@ import { injectable } from 'inversify';
@injectable()
export class GithubResolver {
// eslint-disable-next-line max-len
- static readonly GITHUB_URL_PATTERN = /^(?:http)(?:s)?(?:\:\/\/)github\.com\/(?[^\/]+)\/(?[^\/]+)((\/)|(?:\/(blob|tree)\/(?[^\/]+)(?:\/(?.*))?))?$/;
+ static readonly GITHUB_URL_PATTERN =
+ /^(?:http)(?:s)?(?:\:\/\/)github\.com\/(?[^\/]+)\/(?[^\/]+)((\/)|(?:\/(blob|tree)\/(?[^\/]+)(?:\/(?.*))?))?$/;
resolve(link: string): GithubUrl {
const match = GithubResolver.GITHUB_URL_PATTERN.exec(link);
diff --git a/tools/devworkspace-handler/tests/devfile/che-theia-component-finder.spec.ts b/tools/devworkspace-handler/tests/devfile/che-theia-component-finder.spec.ts
index 5fad36396..a49cc4c88 100644
--- a/tools/devworkspace-handler/tests/devfile/che-theia-component-finder.spec.ts
+++ b/tools/devworkspace-handler/tests/devfile/che-theia-component-finder.spec.ts
@@ -48,7 +48,7 @@ describe('Test CheTheiaComponentFinder', () => {
});
test('in the main devWorkspace', async () => {
- const devfileContext = ({
+ const devfileContext = {
devWorkspaceTemplates: [],
devWorkspace: {
spec: {
@@ -62,16 +62,16 @@ describe('Test CheTheiaComponentFinder', () => {
},
},
},
- } as any) as DevfileContext;
+ } as any as DevfileContext;
const devWorkspaceSpectTemplateComponents = await cheTheiaComponentFinder.find(devfileContext);
expect(devWorkspaceSpectTemplateComponents.name).toBe('theia-ide');
});
test('missing', async () => {
- const devfileContext = ({
+ const devfileContext = {
devWorkspaceTemplates: [],
devWorkspace: {},
- } as any) as DevfileContext;
+ } as any as DevfileContext;
await expect(cheTheiaComponentFinder.find(devfileContext)).rejects.toThrow(
'Not able to find theia-ide component in DevWorkspace and its templates'
);
diff --git a/tools/devworkspace-handler/tests/vsix-installer/vsix-installer-component-updater.spec.ts b/tools/devworkspace-handler/tests/vsix-installer/vsix-installer-component-updater.spec.ts
index 42fa527f3..9134c8519 100644
--- a/tools/devworkspace-handler/tests/vsix-installer/vsix-installer-component-updater.spec.ts
+++ b/tools/devworkspace-handler/tests/vsix-installer/vsix-installer-component-updater.spec.ts
@@ -38,7 +38,7 @@ describe('Test VsixInstallerComponentUpdater', () => {
},
};
const suffix = 'my-suffix';
- const devfileContext = ({ devWorkspace, devWorkspaceTemplates, suffix } as any) as DevfileContext;
+ const devfileContext = { devWorkspace, devWorkspaceTemplates, suffix } as any as DevfileContext;
await vsixInstallerComponentUpdater.add(devfileContext);
// a new template added
expect(devWorkspaceTemplates.length).toBe(1);
diff --git a/tools/old/github/github-resolver.ts b/tools/old/github/github-resolver.ts
deleted file mode 100644
index 13143e6c1..000000000
--- a/tools/old/github/github-resolver.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2021 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- ***********************************************************************/
-
-import { GithubUrl } from './github-url';
-import { injectable } from 'inversify';
-
-/**
- * Providing a github URL it provides a github URL object allowing to interact
- */
-@injectable()
-export class GithubResolver {
- // eslint-disable-next-line max-len
- static readonly GITHUB_URL_PATTERN = /^(?:http)(?:s)?(?:\:\/\/)github\.com\/(?[^\/]+)\/(?[^\/]+)((\/)|(?:\/(blob|tree)\/(?[^\/]+)(?:\/(?.*))?))?$/;
-
- resolve(link: string): GithubUrl {
- const match = GithubResolver.GITHUB_URL_PATTERN.exec(link);
- if (!match) {
- throw new Error(`Invalid github URL: ${link}`);
- }
- const repoUser = this.getGroup(match, 'repoUser');
- const repoName = this.getGroup(match, 'repoName');
- const branchName = this.getGroup(match, 'branchName', 'HEAD');
- const subFolder = this.getGroup(match, 'subFolder');
- return new GithubUrl(repoUser, repoName, branchName, subFolder);
- }
-
- getGroup(match: RegExpExecArray, groupName: string, defaultValue?: string) {
- if (match.groups && match.groups[groupName]) {
- return match.groups[groupName];
- }
- return defaultValue || '';
- }
-}
diff --git a/tools/old/github/github-url.ts b/tools/old/github/github-url.ts
deleted file mode 100644
index e61706f92..000000000
--- a/tools/old/github/github-url.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2021 Red Hat, Inc.
- *
- * This program and the accompanying materials are made
- * available under the terms of the Eclipse Public License 2.0
- * which is available at https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- ***********************************************************************/
-
-/**
- * Provides helper methods on top of github URL to get for example raw content of get relative links
- */
-export class GithubUrl {
- // raw link
- static readonly RAW_LINK = 'https://cdn.jsdelivr.net/gh';
-
- constructor(
- private readonly repoUser: string,
- private readonly repoName: string,
- private readonly branchName: string,
- private readonly subFolder: string
- ) {}
-
- /**
- * Provides the raw link to the given path based on the current repository information
- */
- getContentUrl(path: string): string {
- return `${GithubUrl.RAW_LINK}/${this.repoUser}/${this.repoName}@${this.branchName}/${path}`;
- }
-
- getUrl(): string {
- return `https://github.com/${this.repoUser}/${this.repoName}/tree/${this.branchName}/${this.subFolder}`;
- }
-}
diff --git a/yarn.lock b/yarn.lock
index 02e4cf7d2..10dd2b578 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,32 +9,32 @@
dependencies:
"@babel/highlight" "^7.10.4"
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
- integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
+ integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
dependencies:
- "@babel/highlight" "^7.12.13"
+ "@babel/highlight" "^7.14.5"
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.15", "@babel/compat-data@^7.13.8", "@babel/compat-data@^7.14.0":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.0.tgz#a901128bce2ad02565df95e6ecbf195cf9465919"
- integrity sha512-vu9V3uMM/1o5Hl5OekMUowo3FqXLJSw+s+66nt0fSWVWTtmosdzn45JHOB3cPtZoe6CTBDzvSw0RdOY85Q37+Q==
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.5.tgz#8ef4c18e58e801c5c95d3c1c0f2874a2680fadea"
+ integrity sha512-kixrYn4JwfAVPa0f2yfzc2AWti6WRRyO3XjWW5PJAvtE11qhSayrrcrEnee05KAtNaPC+EwehE8Qt1UedEVB8w==
"@babel/core@^7.1.0", "@babel/core@^7.11.0", "@babel/core@^7.2.2", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.0.tgz#47299ff3ec8d111b493f1a9d04bf88c04e728d88"
- integrity sha512-8YqpRig5NmIHlMLw09zMlPTvUVMILjqCOtVgu+TVNWEBvy9b5I3RRyhqnrV4hjgEK7n8P9OqvkWJAFmEL6Wwfw==
- dependencies:
- "@babel/code-frame" "^7.12.13"
- "@babel/generator" "^7.14.0"
- "@babel/helper-compilation-targets" "^7.13.16"
- "@babel/helper-module-transforms" "^7.14.0"
- "@babel/helpers" "^7.14.0"
- "@babel/parser" "^7.14.0"
- "@babel/template" "^7.12.13"
- "@babel/traverse" "^7.14.0"
- "@babel/types" "^7.14.0"
+ version "7.14.6"
+ resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.6.tgz#e0814ec1a950032ff16c13a2721de39a8416fcab"
+ integrity sha512-gJnOEWSqTk96qG5BoIrl5bVtc23DCycmIePPYnamY9RboYdI4nFy5vAQMSl81O5K/W0sLDWfGysnOECC+KUUCA==
+ dependencies:
+ "@babel/code-frame" "^7.14.5"
+ "@babel/generator" "^7.14.5"
+ "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helpers" "^7.14.6"
+ "@babel/parser" "^7.14.6"
+ "@babel/template" "^7.14.5"
+ "@babel/traverse" "^7.14.5"
+ "@babel/types" "^7.14.5"
convert-source-map "^1.7.0"
debug "^4.1.0"
gensync "^1.0.0-beta.2"
@@ -42,64 +42,64 @@
semver "^6.3.0"
source-map "^0.5.0"
-"@babel/generator@^7.14.0":
- version "7.14.1"
- resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.1.tgz#1f99331babd65700183628da186f36f63d615c93"
- integrity sha512-TMGhsXMXCP/O1WtQmZjpEYDhCYC9vFhayWZPJSZCGkPJgUqX0rF0wwtrYvnzVxIjcF80tkUertXVk5cwqi5cAQ==
+"@babel/generator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.5.tgz#848d7b9f031caca9d0cd0af01b063f226f52d785"
+ integrity sha512-y3rlP+/G25OIX3mYKKIOlQRcqj7YgrvHxOLbVmyLJ9bPmi5ttvUmpydVjcFjZphOktWuA7ovbx91ECloWTfjIA==
dependencies:
- "@babel/types" "^7.14.1"
+ "@babel/types" "^7.14.5"
jsesc "^2.5.1"
source-map "^0.5.0"
-"@babel/helper-annotate-as-pure@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
- integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
+"@babel/helper-annotate-as-pure@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61"
+ integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==
dependencies:
- "@babel/types" "^7.12.13"
+ "@babel/types" "^7.14.5"
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
- integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191"
+ integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==
dependencies:
- "@babel/helper-explode-assignable-expression" "^7.12.13"
- "@babel/types" "^7.12.13"
+ "@babel/helper-explode-assignable-expression" "^7.14.5"
+ "@babel/types" "^7.14.5"
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.13.16", "@babel/helper-compilation-targets@^7.13.8", "@babel/helper-compilation-targets@^7.9.6":
- version "7.13.16"
- resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.16.tgz#6e91dccf15e3f43e5556dffe32d860109887563c"
- integrity sha512-3gmkYIrpqsLlieFwjkGgLaSHmhnvlAYzZLlYVjlW+QwI+1zE17kGxuJGmIqDQdYp56XdmGeD+Bswx0UTyG18xA==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.9.6":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf"
+ integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==
dependencies:
- "@babel/compat-data" "^7.13.15"
- "@babel/helper-validator-option" "^7.12.17"
- browserslist "^4.14.5"
+ "@babel/compat-data" "^7.14.5"
+ "@babel/helper-validator-option" "^7.14.5"
+ browserslist "^4.16.6"
semver "^6.3.0"
-"@babel/helper-create-class-features-plugin@^7.13.0", "@babel/helper-create-class-features-plugin@^7.13.11", "@babel/helper-create-class-features-plugin@^7.14.0":
- version "7.14.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.1.tgz#1fe11b376f3c41650ad9fedc665b0068722ea76c"
- integrity sha512-r8rsUahG4ywm0QpGcCrLaUSOuNAISR3IZCg4Fx05Ozq31aCUrQsTLH6KPxy0N5ULoQ4Sn9qjNdGNtbPWAC6hYg==
+"@babel/helper-create-class-features-plugin@^7.14.5":
+ version "7.14.6"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.6.tgz#f114469b6c06f8b5c59c6c4e74621f5085362542"
+ integrity sha512-Z6gsfGofTxH/+LQXqYEK45kxmcensbzmk/oi8DmaQytlQCgqNZt9XQF8iqlI/SeXWVjaMNxvYvzaYw+kh42mDg==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.12.13"
- "@babel/helper-function-name" "^7.12.13"
- "@babel/helper-member-expression-to-functions" "^7.13.12"
- "@babel/helper-optimise-call-expression" "^7.12.13"
- "@babel/helper-replace-supers" "^7.13.12"
- "@babel/helper-split-export-declaration" "^7.12.13"
+ "@babel/helper-annotate-as-pure" "^7.14.5"
+ "@babel/helper-function-name" "^7.14.5"
+ "@babel/helper-member-expression-to-functions" "^7.14.5"
+ "@babel/helper-optimise-call-expression" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.14.5"
+ "@babel/helper-split-export-declaration" "^7.14.5"
-"@babel/helper-create-regexp-features-plugin@^7.12.13":
- version "7.12.17"
- resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.17.tgz#a2ac87e9e319269ac655b8d4415e94d38d663cb7"
- integrity sha512-p2VGmBu9oefLZ2nQpgnEnG0ZlRPvL8gAGvPUMQwUdaE8k49rOMuZpOwdQoy5qJf6K8jL3bcAMhVUlHAjIgJHUg==
+"@babel/helper-create-regexp-features-plugin@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
+ integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.12.13"
+ "@babel/helper-annotate-as-pure" "^7.14.5"
regexpu-core "^4.7.1"
-"@babel/helper-define-polyfill-provider@^0.2.0":
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.0.tgz#a640051772045fedaaecc6f0c6c69f02bdd34bf1"
- integrity sha512-JT8tHuFjKBo8NnaUbblz7mIu1nnvUDiHVjXXkulZULyidvo/7P6TY7+YqpV37IfF+KUFxmlK04elKtGKXaiVgw==
+"@babel/helper-define-polyfill-provider@^0.2.2":
+ version "0.2.3"
+ resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
+ integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==
dependencies:
"@babel/helper-compilation-targets" "^7.13.0"
"@babel/helper-module-imports" "^7.12.13"
@@ -110,304 +110,304 @@
resolve "^1.14.2"
semver "^6.1.2"
-"@babel/helper-explode-assignable-expression@^7.12.13":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.13.0.tgz#17b5c59ff473d9f956f40ef570cf3a76ca12657f"
- integrity sha512-qS0peLTDP8kOisG1blKbaoBg/o9OSa1qoumMjTK5pM+KDTtpxpsiubnCGP34vK8BXGcb2M9eigwgvoJryrzwWA==
- dependencies:
- "@babel/types" "^7.13.0"
-
-"@babel/helper-function-name@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
- integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
- dependencies:
- "@babel/helper-get-function-arity" "^7.12.13"
- "@babel/template" "^7.12.13"
- "@babel/types" "^7.12.13"
-
-"@babel/helper-get-function-arity@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
- integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
- dependencies:
- "@babel/types" "^7.12.13"
-
-"@babel/helper-hoist-variables@^7.13.0":
- version "7.13.16"
- resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.16.tgz#1b1651249e94b51f8f0d33439843e33e39775b30"
- integrity sha512-1eMtTrXtrwscjcAeO4BVK+vvkxaLJSPFz1w1KLawz6HLNi9bPFGBNwwDyVfiu1Tv/vRRFYfoGaKhmAQPGPn5Wg==
- dependencies:
- "@babel/traverse" "^7.13.15"
- "@babel/types" "^7.13.16"
-
-"@babel/helper-member-expression-to-functions@^7.13.12":
- version "7.13.12"
- resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
- integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
- dependencies:
- "@babel/types" "^7.13.12"
-
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.13.12", "@babel/helper-module-imports@^7.8.3":
- version "7.13.12"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
- integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
- dependencies:
- "@babel/types" "^7.13.12"
-
-"@babel/helper-module-transforms@^7.13.0", "@babel/helper-module-transforms@^7.14.0":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.0.tgz#8fcf78be220156f22633ee204ea81f73f826a8ad"
- integrity sha512-L40t9bxIuGOfpIGA3HNkJhU9qYrf4y5A5LUSw7rGMSn+pcG8dfJ0g6Zval6YJGd2nEjI7oP00fRdnhLKndx6bw==
- dependencies:
- "@babel/helper-module-imports" "^7.13.12"
- "@babel/helper-replace-supers" "^7.13.12"
- "@babel/helper-simple-access" "^7.13.12"
- "@babel/helper-split-export-declaration" "^7.12.13"
- "@babel/helper-validator-identifier" "^7.14.0"
- "@babel/template" "^7.12.13"
- "@babel/traverse" "^7.14.0"
- "@babel/types" "^7.14.0"
-
-"@babel/helper-optimise-call-expression@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
- integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
- dependencies:
- "@babel/types" "^7.12.13"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
- integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
-
-"@babel/helper-remap-async-to-generator@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
- integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
+"@babel/helper-explode-assignable-expression@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645"
+ integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.12.13"
- "@babel/helper-wrap-function" "^7.13.0"
- "@babel/types" "^7.13.0"
-
-"@babel/helper-replace-supers@^7.12.13", "@babel/helper-replace-supers@^7.13.0", "@babel/helper-replace-supers@^7.13.12":
- version "7.13.12"
- resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
- integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-function-name@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
+ integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
dependencies:
- "@babel/helper-member-expression-to-functions" "^7.13.12"
- "@babel/helper-optimise-call-expression" "^7.12.13"
- "@babel/traverse" "^7.13.0"
- "@babel/types" "^7.13.12"
+ "@babel/helper-get-function-arity" "^7.14.5"
+ "@babel/template" "^7.14.5"
+ "@babel/types" "^7.14.5"
-"@babel/helper-simple-access@^7.13.12":
- version "7.13.12"
- resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
- integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
+"@babel/helper-get-function-arity@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
+ integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
dependencies:
- "@babel/types" "^7.13.12"
-
-"@babel/helper-skip-transparent-expression-wrappers@^7.12.1":
- version "7.12.1"
- resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.12.1.tgz#462dc63a7e435ade8468385c63d2b84cce4b3cbf"
- integrity sha512-Mf5AUuhG1/OCChOJ/HcADmvcHM42WJockombn8ATJG3OnyiSxBK/Mm5x78BQWvmtXZKHgbjdGL2kin/HOLlZGA==
- dependencies:
- "@babel/types" "^7.12.1"
-
-"@babel/helper-split-export-declaration@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
- integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
- dependencies:
- "@babel/types" "^7.12.13"
-
-"@babel/helper-validator-identifier@^7.12.11", "@babel/helper-validator-identifier@^7.14.0":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.0.tgz#d26cad8a47c65286b15df1547319a5d0bcf27288"
- integrity sha512-V3ts7zMSu5lfiwWDVWzRDGIN+lnCEUdaXgtVHJgLb1rGaA6jMrtB9EmE7L18foXJIE8Un/A/h6NJfGQp/e1J4A==
-
-"@babel/helper-validator-option@^7.12.17":
- version "7.12.17"
- resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
- integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-hoist-variables@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
+ integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
+ dependencies:
+ "@babel/types" "^7.14.5"
-"@babel/helper-wrap-function@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
- integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
- dependencies:
- "@babel/helper-function-name" "^7.12.13"
- "@babel/template" "^7.12.13"
- "@babel/traverse" "^7.13.0"
- "@babel/types" "^7.13.0"
-
-"@babel/helpers@^7.14.0":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.0.tgz#ea9b6be9478a13d6f961dbb5f36bf75e2f3b8f62"
- integrity sha512-+ufuXprtQ1D1iZTO/K9+EBRn+qPWMJjZSw/S0KlFrxCw4tkrzv9grgpDHkY9MeQTjTY8i2sp7Jep8DfU6tN9Mg==
- dependencies:
- "@babel/template" "^7.12.13"
- "@babel/traverse" "^7.14.0"
- "@babel/types" "^7.14.0"
-
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.0.tgz#3197e375711ef6bf834e67d0daec88e4f46113cf"
- integrity sha512-YSCOwxvTYEIMSGaBQb5kDDsCopDdiUGsqpatp3fOlI4+2HQSkTmEVWnVuySdAC5EWCqSWWTv0ib63RjR7dTBdg==
- dependencies:
- "@babel/helper-validator-identifier" "^7.14.0"
+"@babel/helper-member-expression-to-functions@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.5.tgz#d5c70e4ad13b402c95156c7a53568f504e2fb7b8"
+ integrity sha512-UxUeEYPrqH1Q/k0yRku1JE7dyfyehNwT6SVkMHvYvPDv4+uu627VXBckVj891BO8ruKBkiDoGnZf4qPDD8abDQ==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5", "@babel/helper-module-imports@^7.8.3":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
+ integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-module-transforms@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.5.tgz#7de42f10d789b423eb902ebd24031ca77cb1e10e"
+ integrity sha512-iXpX4KW8LVODuAieD7MzhNjmM6dzYY5tfRqT+R9HDXWl0jPn/djKmA+G9s/2C2T9zggw5tK1QNqZ70USfedOwA==
+ dependencies:
+ "@babel/helper-module-imports" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.14.5"
+ "@babel/helper-simple-access" "^7.14.5"
+ "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/helper-validator-identifier" "^7.14.5"
+ "@babel/template" "^7.14.5"
+ "@babel/traverse" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-optimise-call-expression@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
+ integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
+ integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
+
+"@babel/helper-remap-async-to-generator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6"
+ integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==
+ dependencies:
+ "@babel/helper-annotate-as-pure" "^7.14.5"
+ "@babel/helper-wrap-function" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-replace-supers@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94"
+ integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==
+ dependencies:
+ "@babel/helper-member-expression-to-functions" "^7.14.5"
+ "@babel/helper-optimise-call-expression" "^7.14.5"
+ "@babel/traverse" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-simple-access@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.5.tgz#66ea85cf53ba0b4e588ba77fc813f53abcaa41c4"
+ integrity sha512-nfBN9xvmCt6nrMZjfhkl7i0oTV3yxR4/FztsbOASyTvVcoYd0TRHh7eMLdlEcCqobydC0LAF3LtC92Iwxo0wyw==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4"
+ integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-split-export-declaration@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
+ integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
+ dependencies:
+ "@babel/types" "^7.14.5"
+
+"@babel/helper-validator-identifier@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8"
+ integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg==
+
+"@babel/helper-validator-option@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
+ integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
+
+"@babel/helper-wrap-function@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff"
+ integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==
+ dependencies:
+ "@babel/helper-function-name" "^7.14.5"
+ "@babel/template" "^7.14.5"
+ "@babel/traverse" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/helpers@^7.14.6":
+ version "7.14.6"
+ resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.6.tgz#5b58306b95f1b47e2a0199434fa8658fa6c21635"
+ integrity sha512-yesp1ENQBiLI+iYHSJdoZKUtRpfTlL1grDIX9NRlAVppljLw/4tTyYupIB7uIYmC3stW/imAv8EqaKaS/ibmeA==
+ dependencies:
+ "@babel/template" "^7.14.5"
+ "@babel/traverse" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
+ integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
+ dependencies:
+ "@babel/helper-validator-identifier" "^7.14.5"
chalk "^2.0.0"
js-tokens "^4.0.0"
-"@babel/parser@^7.0.0-beta.54", "@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.14.0":
- version "7.14.1"
- resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.1.tgz#1bd644b5db3f5797c4479d89ec1817fe02b84c47"
- integrity sha512-muUGEKu8E/ftMTPlNp+mc6zL3E9zKWmF5sDHZ5MSsoTP9Wyz64AhEf9kD08xYJ7w6Hdcu8H550ircnPyWSIF0Q==
+"@babel/parser@^7.0.0-beta.54", "@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.6":
+ version "7.14.6"
+ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.6.tgz#d85cc68ca3cac84eae384c06f032921f5227f4b2"
+ integrity sha512-oG0ej7efjEXxb4UgE+klVx+3j4MVo+A2vCzm7OUN4CLo6WhQ+vSOD2yJ8m7B+DghObxtLxt3EfgMWpq+AsWehQ==
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
- version "7.13.12"
- resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
- integrity sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"
+ integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
- "@babel/plugin-proposal-optional-chaining" "^7.13.12"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+ "@babel/plugin-proposal-optional-chaining" "^7.14.5"
-"@babel/plugin-proposal-async-generator-functions@^7.13.15":
- version "7.13.15"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.15.tgz#80e549df273a3b3050431b148c892491df1bcc5b"
- integrity sha512-VapibkWzFeoa6ubXy/NgV5U2U4MVnUlvnx6wo1XhlsaTrLYWE0UFpDQsVrmn22q5CzeloqJ8gEMHSKxuee6ZdA==
+"@babel/plugin-proposal-async-generator-functions@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.5.tgz#4024990e3dd74181f4f426ea657769ff49a2df39"
+ integrity sha512-tbD/CG3l43FIXxmu4a7RBe4zH7MLJ+S/lFowPFO7HetS2hyOZ/0nnnznegDuzFzfkyQYTxqdTH/hKmuBngaDAA==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-remap-async-to-generator" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-remap-async-to-generator" "^7.14.5"
"@babel/plugin-syntax-async-generators" "^7.8.4"
-"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.8.3":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37"
- integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==
+"@babel/plugin-proposal-class-properties@^7.14.5", "@babel/plugin-proposal-class-properties@^7.8.3":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
+ integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.13.0"
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-class-static-block@^7.13.11":
- version "7.13.11"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.13.11.tgz#6fcbba4a962702c17e5371a0c7b39afde186d703"
- integrity sha512-fJTdFI4bfnMjvxJyNuaf8i9mVcZ0UhetaGEUHaHV9KEnibLugJkZAtXikR8KcYj+NYmI4DZMS8yQAyg+hvfSqg==
+"@babel/plugin-proposal-class-static-block@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681"
+ integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/plugin-syntax-class-static-block" "^7.12.13"
+ "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/plugin-syntax-class-static-block" "^7.14.5"
"@babel/plugin-proposal-decorators@^7.8.3":
- version "7.13.15"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.13.15.tgz#e91ccfef2dc24dd5bd5dcc9fc9e2557c684ecfb8"
- integrity sha512-ibAMAqUm97yzi+LPgdr5Nqb9CMkeieGHvwPg1ywSGjZrZHQEGqE01HmOio8kxRpA/+VtOHouIVy2FMpBbtltjA==
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.14.5.tgz#59bc4dfc1d665b5a6749cf798ff42297ed1b2c1d"
+ integrity sha512-LYz5nvQcvYeRVjui1Ykn28i+3aUiXwQ/3MGoEy0InTaz1pJo/lAzmIDXX+BQny/oufgHzJ6vnEEiXQ8KZjEVFg==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.13.11"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/plugin-syntax-decorators" "^7.12.13"
+ "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/plugin-syntax-decorators" "^7.14.5"
-"@babel/plugin-proposal-dynamic-import@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d"
- integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==
+"@babel/plugin-proposal-dynamic-import@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c"
+ integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
-"@babel/plugin-proposal-export-namespace-from@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d"
- integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==
+"@babel/plugin-proposal-export-namespace-from@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76"
+ integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-export-namespace-from" "^7.8.3"
-"@babel/plugin-proposal-json-strings@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b"
- integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==
+"@babel/plugin-proposal-json-strings@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb"
+ integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-json-strings" "^7.8.3"
-"@babel/plugin-proposal-logical-assignment-operators@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"
- integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==
+"@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738"
+ integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"
- integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"
+ integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
-"@babel/plugin-proposal-numeric-separator@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db"
- integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==
+"@babel/plugin-proposal-numeric-separator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18"
+ integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-numeric-separator" "^7.10.4"
-"@babel/plugin-proposal-object-rest-spread@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a"
- integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==
+"@babel/plugin-proposal-object-rest-spread@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.5.tgz#e581d5ccdfa187ea6ed73f56c6a21c1580b90fbf"
+ integrity sha512-VzMyY6PWNPPT3pxc5hi9LloKNr4SSrVCg7Yr6aZpW4Ym07r7KqSU/QXYwjXLVxqwSv0t/XSXkFoKBPUkZ8vb2A==
dependencies:
- "@babel/compat-data" "^7.13.8"
- "@babel/helper-compilation-targets" "^7.13.8"
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/compat-data" "^7.14.5"
+ "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-object-rest-spread" "^7.8.3"
- "@babel/plugin-transform-parameters" "^7.13.0"
+ "@babel/plugin-transform-parameters" "^7.14.5"
-"@babel/plugin-proposal-optional-catch-binding@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"
- integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==
+"@babel/plugin-proposal-optional-catch-binding@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c"
+ integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
-"@babel/plugin-proposal-optional-chaining@^7.13.12":
- version "7.13.12"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866"
- integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==
+"@babel/plugin-proposal-optional-chaining@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
+ integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
-"@babel/plugin-proposal-private-methods@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"
- integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==
+"@babel/plugin-proposal-private-methods@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d"
+ integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==
dependencies:
- "@babel/helper-create-class-features-plugin" "^7.13.0"
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-proposal-private-property-in-object@^7.14.0":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.0.tgz#b1a1f2030586b9d3489cc26179d2eb5883277636"
- integrity sha512-59ANdmEwwRUkLjB7CRtwJxxwtjESw+X2IePItA+RGQh+oy5RmpCh/EvVVvh5XQc3yxsm5gtv0+i9oBZhaDNVTg==
+"@babel/plugin-proposal-private-property-in-object@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636"
+ integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.12.13"
- "@babel/helper-create-class-features-plugin" "^7.14.0"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/plugin-syntax-private-property-in-object" "^7.14.0"
+ "@babel/helper-annotate-as-pure" "^7.14.5"
+ "@babel/helper-create-class-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
-"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
- integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
+"@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8"
+ integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-async-generators@^7.8.4":
version "7.8.4"
@@ -430,19 +430,19 @@
dependencies:
"@babel/helper-plugin-utils" "^7.12.13"
-"@babel/plugin-syntax-class-static-block@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.12.13.tgz#8e3d674b0613e67975ceac2776c97b60cafc5c9c"
- integrity sha512-ZmKQ0ZXR0nYpHZIIuj9zE7oIqCx2hw9TKi+lIo73NNrMPAZGHfS92/VRV0ZmPj6H2ffBgyFHXvJ5NYsNeEaP2A==
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+ integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-syntax-decorators@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.12.13.tgz#fac829bf3c7ef4a1bc916257b403e58c6bdaf648"
- integrity sha512-Rw6aIXGuqDLr6/LoBBYE57nKOzQpz/aDkKlMqEwH+Vp0MXbG6H/TfRjaY343LKxzAKAMXIHsQ8JzaZKuDZ9MwA==
+"@babel/plugin-syntax-decorators@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.14.5.tgz#eafb9c0cbe09c8afeb964ba3a7bbd63945a72f20"
+ integrity sha512-c4sZMRWL4GSvP1EXy0woIP7m4jkVcEuG8R1TOZxPBPtp4FSM/kiPZub9UIs/Jrb5ZAOzvTUSGYrWsrSu1JvoPw==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-dynamic-import@^7.8.3":
version "7.8.3"
@@ -473,11 +473,11 @@
"@babel/helper-plugin-utils" "^7.8.0"
"@babel/plugin-syntax-jsx@^7.0.0", "@babel/plugin-syntax-jsx@^7.2.0", "@babel/plugin-syntax-jsx@^7.8.3":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.12.13.tgz#044fb81ebad6698fe62c478875575bcbb9b70f15"
- integrity sha512-d4HM23Q1K7oq/SLNmG6mRt85l2csmQ0cHRaxRXjKW0YFdEXqlZ5kzFQKH5Uc3rDJECgu+yCRgPkG04Mm98R/1g==
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.14.5.tgz#000e2e25d8673cce49300517a3eda44c263e4201"
+ integrity sha512-ohuFIsOMXJnbOMRfX7/w7LocdR6R7whhuRD4ax8IipLcLPlZGJKkBxgHp++U4N/vKyU16/YDQr2f5seajD3jIw==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-syntax-logical-assignment-operators@^7.10.4", "@babel/plugin-syntax-logical-assignment-operators@^7.8.3":
version "7.10.4"
@@ -521,308 +521,308 @@
dependencies:
"@babel/helper-plugin-utils" "^7.8.0"
-"@babel/plugin-syntax-private-property-in-object@^7.14.0":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.0.tgz#762a4babec61176fec6c88480dec40372b140c0b"
- integrity sha512-bda3xF8wGl5/5btF794utNOL0Jw+9jE5C1sLZcoK7c4uonE/y3iQiyG+KbkF3WBV/paX58VCpjhxLPkdj5Fe4w==
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+ integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-syntax-top-level-await@^7.12.13", "@babel/plugin-syntax-top-level-await@^7.8.3":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
- integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
+"@babel/plugin-syntax-top-level-await@^7.14.5", "@babel/plugin-syntax-top-level-await@^7.8.3":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+ integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-arrow-functions@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
- integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
+"@babel/plugin-transform-arrow-functions@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a"
+ integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-async-to-generator@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
- integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
+"@babel/plugin-transform-async-to-generator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
+ integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
dependencies:
- "@babel/helper-module-imports" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-remap-async-to-generator" "^7.13.0"
+ "@babel/helper-module-imports" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-remap-async-to-generator" "^7.14.5"
-"@babel/plugin-transform-block-scoped-functions@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
- integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
+"@babel/plugin-transform-block-scoped-functions@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4"
+ integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-block-scoping@^7.14.1":
- version "7.14.1"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.1.tgz#ac1b3a8e3d8cbb31efc6b9be2f74eb9823b74ab2"
- integrity sha512-2mQXd0zBrwfp0O1moWIhPpEeTKDvxyHcnma3JATVP1l+CctWBuot6OJG8LQ4DnBj4ZZPSmlb/fm4mu47EOAnVA==
+"@babel/plugin-transform-block-scoping@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939"
+ integrity sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-classes@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b"
- integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==
+"@babel/plugin-transform-classes@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf"
+ integrity sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA==
dependencies:
- "@babel/helper-annotate-as-pure" "^7.12.13"
- "@babel/helper-function-name" "^7.12.13"
- "@babel/helper-optimise-call-expression" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-replace-supers" "^7.13.0"
- "@babel/helper-split-export-declaration" "^7.12.13"
+ "@babel/helper-annotate-as-pure" "^7.14.5"
+ "@babel/helper-function-name" "^7.14.5"
+ "@babel/helper-optimise-call-expression" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.14.5"
+ "@babel/helper-split-export-declaration" "^7.14.5"
globals "^11.1.0"
-"@babel/plugin-transform-computed-properties@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
- integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
+"@babel/plugin-transform-computed-properties@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f"
+ integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-destructuring@^7.13.17":
- version "7.13.17"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.17.tgz#678d96576638c19d5b36b332504d3fd6e06dea27"
- integrity sha512-UAUqiLv+uRLO+xuBKKMEpC+t7YRNVRqBsWWq1yKXbBZBje/t3IXCiSinZhjn/DC3qzBfICeYd2EFGEbHsh5RLA==
+"@babel/plugin-transform-destructuring@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.5.tgz#d32ad19ff1a6da1e861dc62720d80d9776e3bf35"
+ integrity sha512-wU9tYisEbRMxqDezKUqC9GleLycCRoUsai9ddlsq54r8QRLaeEhc+d+9DqCG+kV9W2GgQjTZESPTpn5bAFMDww==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
- integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
+"@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a"
+ integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-duplicate-keys@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
- integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
+"@babel/plugin-transform-duplicate-keys@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954"
+ integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-exponentiation-operator@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
- integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
+"@babel/plugin-transform-exponentiation-operator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493"
+ integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==
dependencies:
- "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-for-of@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
- integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
+"@babel/plugin-transform-for-of@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb"
+ integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-function-name@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
- integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
+"@babel/plugin-transform-function-name@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2"
+ integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==
dependencies:
- "@babel/helper-function-name" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-function-name" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-literals@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
- integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
+"@babel/plugin-transform-literals@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"
+ integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-member-expression-literals@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
- integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
+"@babel/plugin-transform-member-expression-literals@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7"
+ integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-modules-amd@^7.14.0":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.0.tgz#589494b5b290ff76cf7f59c798011f6d77026553"
- integrity sha512-CF4c5LX4LQ03LebQxJ5JZes2OYjzBuk1TdiF7cG7d5dK4lAdw9NZmaxq5K/mouUdNeqwz3TNjnW6v01UqUNgpQ==
+"@babel/plugin-transform-modules-amd@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7"
+ integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==
dependencies:
- "@babel/helper-module-transforms" "^7.14.0"
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-commonjs@^7.14.0":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.0.tgz#52bc199cb581e0992edba0f0f80356467587f161"
- integrity sha512-EX4QePlsTaRZQmw9BsoPeyh5OCtRGIhwfLquhxGp5e32w+dyL8htOcDwamlitmNFK6xBZYlygjdye9dbd9rUlQ==
+"@babel/plugin-transform-modules-commonjs@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97"
+ integrity sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==
dependencies:
- "@babel/helper-module-transforms" "^7.14.0"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-simple-access" "^7.13.12"
+ "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-simple-access" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-systemjs@^7.13.8":
- version "7.13.8"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
- integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
+"@babel/plugin-transform-modules-systemjs@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29"
+ integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==
dependencies:
- "@babel/helper-hoist-variables" "^7.13.0"
- "@babel/helper-module-transforms" "^7.13.0"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-validator-identifier" "^7.12.11"
+ "@babel/helper-hoist-variables" "^7.14.5"
+ "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-validator-identifier" "^7.14.5"
babel-plugin-dynamic-import-node "^2.3.3"
-"@babel/plugin-transform-modules-umd@^7.14.0":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.0.tgz#2f8179d1bbc9263665ce4a65f305526b2ea8ac34"
- integrity sha512-nPZdnWtXXeY7I87UZr9VlsWme3Y0cfFFE41Wbxz4bbaexAjNMInXPFUpRRUJ8NoMm0Cw+zxbqjdPmLhcjfazMw==
+"@babel/plugin-transform-modules-umd@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0"
+ integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==
dependencies:
- "@babel/helper-module-transforms" "^7.14.0"
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-module-transforms" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
- integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.5.tgz#d537e8ee083ee6f6aa4f4eef9d2081d555746e4c"
+ integrity sha512-+Xe5+6MWFo311U8SchgeX5c1+lJM+eZDBZgD+tvXu9VVQPXwwVzeManMMjYX6xw2HczngfOSZjoFYKwdeB/Jvw==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin" "^7.14.5"
-"@babel/plugin-transform-new-target@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
- integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
+"@babel/plugin-transform-new-target@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8"
+ integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-object-super@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
- integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
+"@babel/plugin-transform-object-super@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45"
+ integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
- "@babel/helper-replace-supers" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-replace-supers" "^7.14.5"
-"@babel/plugin-transform-parameters@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"
- integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==
+"@babel/plugin-transform-parameters@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3"
+ integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-property-literals@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
- integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
+"@babel/plugin-transform-property-literals@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"
+ integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-regenerator@^7.13.15":
- version "7.13.15"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.13.15.tgz#e5eb28945bf8b6563e7f818945f966a8d2997f39"
- integrity sha512-Bk9cOLSz8DiurcMETZ8E2YtIVJbFCPGW28DJWUakmyVWtQSm6Wsf0p4B4BfEr/eL2Nkhe/CICiUiMOCi1TPhuQ==
+"@babel/plugin-transform-regenerator@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f"
+ integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==
dependencies:
regenerator-transform "^0.14.2"
-"@babel/plugin-transform-reserved-words@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
- integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
+"@babel/plugin-transform-reserved-words@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304"
+ integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/plugin-transform-runtime@^7.11.0":
- version "7.13.15"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.15.tgz#2eddf585dd066b84102517e10a577f24f76a9cd7"
- integrity sha512-d+ezl76gx6Jal08XngJUkXM4lFXK/5Ikl9Mh4HKDxSfGJXmZ9xG64XT2oivBzfxb/eQ62VfvoMkaCZUKJMVrBA==
- dependencies:
- "@babel/helper-module-imports" "^7.13.12"
- "@babel/helper-plugin-utils" "^7.13.0"
- babel-plugin-polyfill-corejs2 "^0.2.0"
- babel-plugin-polyfill-corejs3 "^0.2.0"
- babel-plugin-polyfill-regenerator "^0.2.0"
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz#30491dad49c6059f8f8fa5ee8896a0089e987523"
+ integrity sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==
+ dependencies:
+ "@babel/helper-module-imports" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ babel-plugin-polyfill-corejs2 "^0.2.2"
+ babel-plugin-polyfill-corejs3 "^0.2.2"
+ babel-plugin-polyfill-regenerator "^0.2.2"
semver "^6.3.0"
-"@babel/plugin-transform-shorthand-properties@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
- integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
+"@babel/plugin-transform-shorthand-properties@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58"
+ integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-spread@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
- integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
+"@babel/plugin-transform-spread@^7.14.5":
+ version "7.14.6"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144"
+ integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
-"@babel/plugin-transform-sticky-regex@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
- integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
+"@babel/plugin-transform-sticky-regex@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9"
+ integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-template-literals@^7.13.0":
- version "7.13.0"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
- integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
+"@babel/plugin-transform-template-literals@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93"
+ integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==
dependencies:
- "@babel/helper-plugin-utils" "^7.13.0"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-typeof-symbol@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
- integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
+"@babel/plugin-transform-typeof-symbol@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4"
+ integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-unicode-escapes@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"
- integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==
+"@babel/plugin-transform-unicode-escapes@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b"
+ integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==
dependencies:
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-plugin-utils" "^7.14.5"
-"@babel/plugin-transform-unicode-regex@^7.12.13":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
- integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
+"@babel/plugin-transform-unicode-regex@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e"
+ integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==
dependencies:
- "@babel/helper-create-regexp-features-plugin" "^7.12.13"
- "@babel/helper-plugin-utils" "^7.12.13"
+ "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
"@babel/preset-env@^7.11.0":
- version "7.14.1"
- resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.1.tgz#b55914e2e68885ea03f69600b2d3537e54574a93"
- integrity sha512-0M4yL1l7V4l+j/UHvxcdvNfLB9pPtIooHTbEhgD/6UGyh8Hy3Bm1Mj0buzjDXATCSz3JFibVdnoJZCrlUCanrQ==
- dependencies:
- "@babel/compat-data" "^7.14.0"
- "@babel/helper-compilation-targets" "^7.13.16"
- "@babel/helper-plugin-utils" "^7.13.0"
- "@babel/helper-validator-option" "^7.12.17"
- "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12"
- "@babel/plugin-proposal-async-generator-functions" "^7.13.15"
- "@babel/plugin-proposal-class-properties" "^7.13.0"
- "@babel/plugin-proposal-class-static-block" "^7.13.11"
- "@babel/plugin-proposal-dynamic-import" "^7.13.8"
- "@babel/plugin-proposal-export-namespace-from" "^7.12.13"
- "@babel/plugin-proposal-json-strings" "^7.13.8"
- "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8"
- "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
- "@babel/plugin-proposal-numeric-separator" "^7.12.13"
- "@babel/plugin-proposal-object-rest-spread" "^7.13.8"
- "@babel/plugin-proposal-optional-catch-binding" "^7.13.8"
- "@babel/plugin-proposal-optional-chaining" "^7.13.12"
- "@babel/plugin-proposal-private-methods" "^7.13.0"
- "@babel/plugin-proposal-private-property-in-object" "^7.14.0"
- "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.5.tgz#c0c84e763661fd0e74292c3d511cb33b0c668997"
+ integrity sha512-ci6TsS0bjrdPpWGnQ+m4f+JSSzDKlckqKIJJt9UZ/+g7Zz9k0N8lYU8IeLg/01o2h8LyNZDMLGgRLDTxpudLsA==
+ dependencies:
+ "@babel/compat-data" "^7.14.5"
+ "@babel/helper-compilation-targets" "^7.14.5"
+ "@babel/helper-plugin-utils" "^7.14.5"
+ "@babel/helper-validator-option" "^7.14.5"
+ "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5"
+ "@babel/plugin-proposal-async-generator-functions" "^7.14.5"
+ "@babel/plugin-proposal-class-properties" "^7.14.5"
+ "@babel/plugin-proposal-class-static-block" "^7.14.5"
+ "@babel/plugin-proposal-dynamic-import" "^7.14.5"
+ "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
+ "@babel/plugin-proposal-json-strings" "^7.14.5"
+ "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
+ "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
+ "@babel/plugin-proposal-numeric-separator" "^7.14.5"
+ "@babel/plugin-proposal-object-rest-spread" "^7.14.5"
+ "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
+ "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+ "@babel/plugin-proposal-private-methods" "^7.14.5"
+ "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
+ "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
"@babel/plugin-syntax-async-generators" "^7.8.4"
"@babel/plugin-syntax-class-properties" "^7.12.13"
- "@babel/plugin-syntax-class-static-block" "^7.12.13"
+ "@babel/plugin-syntax-class-static-block" "^7.14.5"
"@babel/plugin-syntax-dynamic-import" "^7.8.3"
"@babel/plugin-syntax-export-namespace-from" "^7.8.3"
"@babel/plugin-syntax-json-strings" "^7.8.3"
@@ -832,46 +832,46 @@
"@babel/plugin-syntax-object-rest-spread" "^7.8.3"
"@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
"@babel/plugin-syntax-optional-chaining" "^7.8.3"
- "@babel/plugin-syntax-private-property-in-object" "^7.14.0"
- "@babel/plugin-syntax-top-level-await" "^7.12.13"
- "@babel/plugin-transform-arrow-functions" "^7.13.0"
- "@babel/plugin-transform-async-to-generator" "^7.13.0"
- "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
- "@babel/plugin-transform-block-scoping" "^7.14.1"
- "@babel/plugin-transform-classes" "^7.13.0"
- "@babel/plugin-transform-computed-properties" "^7.13.0"
- "@babel/plugin-transform-destructuring" "^7.13.17"
- "@babel/plugin-transform-dotall-regex" "^7.12.13"
- "@babel/plugin-transform-duplicate-keys" "^7.12.13"
- "@babel/plugin-transform-exponentiation-operator" "^7.12.13"
- "@babel/plugin-transform-for-of" "^7.13.0"
- "@babel/plugin-transform-function-name" "^7.12.13"
- "@babel/plugin-transform-literals" "^7.12.13"
- "@babel/plugin-transform-member-expression-literals" "^7.12.13"
- "@babel/plugin-transform-modules-amd" "^7.14.0"
- "@babel/plugin-transform-modules-commonjs" "^7.14.0"
- "@babel/plugin-transform-modules-systemjs" "^7.13.8"
- "@babel/plugin-transform-modules-umd" "^7.14.0"
- "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13"
- "@babel/plugin-transform-new-target" "^7.12.13"
- "@babel/plugin-transform-object-super" "^7.12.13"
- "@babel/plugin-transform-parameters" "^7.13.0"
- "@babel/plugin-transform-property-literals" "^7.12.13"
- "@babel/plugin-transform-regenerator" "^7.13.15"
- "@babel/plugin-transform-reserved-words" "^7.12.13"
- "@babel/plugin-transform-shorthand-properties" "^7.12.13"
- "@babel/plugin-transform-spread" "^7.13.0"
- "@babel/plugin-transform-sticky-regex" "^7.12.13"
- "@babel/plugin-transform-template-literals" "^7.13.0"
- "@babel/plugin-transform-typeof-symbol" "^7.12.13"
- "@babel/plugin-transform-unicode-escapes" "^7.12.13"
- "@babel/plugin-transform-unicode-regex" "^7.12.13"
+ "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+ "@babel/plugin-syntax-top-level-await" "^7.14.5"
+ "@babel/plugin-transform-arrow-functions" "^7.14.5"
+ "@babel/plugin-transform-async-to-generator" "^7.14.5"
+ "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
+ "@babel/plugin-transform-block-scoping" "^7.14.5"
+ "@babel/plugin-transform-classes" "^7.14.5"
+ "@babel/plugin-transform-computed-properties" "^7.14.5"
+ "@babel/plugin-transform-destructuring" "^7.14.5"
+ "@babel/plugin-transform-dotall-regex" "^7.14.5"
+ "@babel/plugin-transform-duplicate-keys" "^7.14.5"
+ "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
+ "@babel/plugin-transform-for-of" "^7.14.5"
+ "@babel/plugin-transform-function-name" "^7.14.5"
+ "@babel/plugin-transform-literals" "^7.14.5"
+ "@babel/plugin-transform-member-expression-literals" "^7.14.5"
+ "@babel/plugin-transform-modules-amd" "^7.14.5"
+ "@babel/plugin-transform-modules-commonjs" "^7.14.5"
+ "@babel/plugin-transform-modules-systemjs" "^7.14.5"
+ "@babel/plugin-transform-modules-umd" "^7.14.5"
+ "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.5"
+ "@babel/plugin-transform-new-target" "^7.14.5"
+ "@babel/plugin-transform-object-super" "^7.14.5"
+ "@babel/plugin-transform-parameters" "^7.14.5"
+ "@babel/plugin-transform-property-literals" "^7.14.5"
+ "@babel/plugin-transform-regenerator" "^7.14.5"
+ "@babel/plugin-transform-reserved-words" "^7.14.5"
+ "@babel/plugin-transform-shorthand-properties" "^7.14.5"
+ "@babel/plugin-transform-spread" "^7.14.5"
+ "@babel/plugin-transform-sticky-regex" "^7.14.5"
+ "@babel/plugin-transform-template-literals" "^7.14.5"
+ "@babel/plugin-transform-typeof-symbol" "^7.14.5"
+ "@babel/plugin-transform-unicode-escapes" "^7.14.5"
+ "@babel/plugin-transform-unicode-regex" "^7.14.5"
"@babel/preset-modules" "^0.1.4"
- "@babel/types" "^7.14.1"
- babel-plugin-polyfill-corejs2 "^0.2.0"
- babel-plugin-polyfill-corejs3 "^0.2.0"
- babel-plugin-polyfill-regenerator "^0.2.0"
- core-js-compat "^3.9.0"
+ "@babel/types" "^7.14.5"
+ babel-plugin-polyfill-corejs2 "^0.2.2"
+ babel-plugin-polyfill-corejs3 "^0.2.2"
+ babel-plugin-polyfill-regenerator "^0.2.2"
+ core-js-compat "^3.14.0"
semver "^6.3.0"
"@babel/preset-modules@^0.1.4":
@@ -886,41 +886,42 @@
esutils "^2.0.2"
"@babel/runtime@^7.10.0", "@babel/runtime@^7.11.0", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.0.tgz#46794bc20b612c5f75e62dd071e24dfd95f1cbe6"
- integrity sha512-JELkvo/DlpNdJ7dlyw/eY7E0suy5i5GQH+Vlxaq1nsNJ+H7f4Vtv3jMeCEgRhZZQFXTjldYfQgv2qmM6M1v5wA==
+ version "7.14.6"
+ resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.6.tgz#535203bc0892efc7dec60bdc27b2ecf6e409062d"
+ integrity sha512-/PCB2uJ7oM44tz8YhC4Z/6PeOKXp4K588f+5M3clr1M4zbqztlo0XEfJ2LEzj/FgwfgGcIdl8n7YYjTCI0BYwg==
dependencies:
regenerator-runtime "^0.13.4"
-"@babel/template@^7.0.0", "@babel/template@^7.12.13", "@babel/template@^7.3.3":
- version "7.12.13"
- resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
- integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
- dependencies:
- "@babel/code-frame" "^7.12.13"
- "@babel/parser" "^7.12.13"
- "@babel/types" "^7.12.13"
-
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.0.0-beta.54", "@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.13.15", "@babel/traverse@^7.14.0":
- version "7.14.0"
- resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.0.tgz#cea0dc8ae7e2b1dec65f512f39f3483e8cc95aef"
- integrity sha512-dZ/a371EE5XNhTHomvtuLTUyx6UEoJmYX+DT5zBCQN3McHemsuIaKKYqsc/fs26BEkHs/lBZy0J571LP5z9kQA==
- dependencies:
- "@babel/code-frame" "^7.12.13"
- "@babel/generator" "^7.14.0"
- "@babel/helper-function-name" "^7.12.13"
- "@babel/helper-split-export-declaration" "^7.12.13"
- "@babel/parser" "^7.14.0"
- "@babel/types" "^7.14.0"
+"@babel/template@^7.0.0", "@babel/template@^7.14.5", "@babel/template@^7.3.3":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
+ integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
+ dependencies:
+ "@babel/code-frame" "^7.14.5"
+ "@babel/parser" "^7.14.5"
+ "@babel/types" "^7.14.5"
+
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.0.0-beta.54", "@babel/traverse@^7.1.0", "@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.5.tgz#c111b0f58afab4fea3d3385a406f692748c59870"
+ integrity sha512-G3BiS15vevepdmFqmUc9X+64y0viZYygubAMO8SvBmKARuF6CPSZtH4Ng9vi/lrWlZFGe3FWdXNy835akH8Glg==
+ dependencies:
+ "@babel/code-frame" "^7.14.5"
+ "@babel/generator" "^7.14.5"
+ "@babel/helper-function-name" "^7.14.5"
+ "@babel/helper-hoist-variables" "^7.14.5"
+ "@babel/helper-split-export-declaration" "^7.14.5"
+ "@babel/parser" "^7.14.5"
+ "@babel/types" "^7.14.5"
debug "^4.1.0"
globals "^11.1.0"
-"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.54", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.13.0", "@babel/types@^7.13.12", "@babel/types@^7.13.16", "@babel/types@^7.14.0", "@babel/types@^7.14.1", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
- version "7.14.1"
- resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.1.tgz#095bd12f1c08ab63eff6e8f7745fa7c9cc15a9db"
- integrity sha512-S13Qe85fzLs3gYRUnrpyeIrBJIMYv33qSTg1qoBwiG6nPKwUWAD9odSzWhEedpwOIzSEI6gbdQIWEMiCI42iBA==
+"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.54", "@babel/types@^7.14.5", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+ version "7.14.5"
+ resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.5.tgz#3bb997ba829a2104cedb20689c4a5b8121d383ff"
+ integrity sha512-M/NzBpEL95I5Hh4dwhin5JlE7EzO5PHMAuzjxss3tiOBD46KfQvVedN/3jEPZvdRvtsK2222XfdHogNIttFgcg==
dependencies:
- "@babel/helper-validator-identifier" "^7.14.0"
+ "@babel/helper-validator-identifier" "^7.14.5"
to-fast-properties "^2.0.0"
"@bcoe/v8-coverage@^0.2.3":
@@ -937,32 +938,32 @@
minimist "^1.2.0"
"@devfile/api@latest":
- version "0.0.1-1620398714"
- resolved "https://registry.yarnpkg.com/@devfile/api/-/api-0.0.1-1620398714.tgz#1eb97e463e7a12baa0cdf3dc774be45c7035a8ce"
- integrity sha512-VFUGWgJlwMAJ44f476TNGg6We5DwkjoHRfOyG0ncZ1sSuUfoTIFtnM95Od7R49sX1n5AQWMsExDR3NH+SKoGhQ==
+ version "0.0.1-1623792866"
+ resolved "https://registry.yarnpkg.com/@devfile/api/-/api-0.0.1-1623792866.tgz#b0e6e8d8680477c12f2204ceaa64988c0cb9f565"
+ integrity sha512-RFOAD62jWdQBtFZ8HwYI2UsXnKIljMSXElXcWegj5mPqXMCO05akQCrz6KWpv7SwP7YivV5+m+J6Gd+sgi7GRw==
dependencies:
- "@types/bluebird" "*"
+ "@types/bluebird" "3.5.21"
"@types/request" "*"
bluebird "^3.5.0"
request "^2.81.0"
rewire "^3.0.2"
"@eclipse-che/api@^7.0.0-beta-4.0", "@eclipse-che/api@^7.3.2", "@eclipse-che/api@latest":
- version "7.30.0"
- resolved "https://registry.yarnpkg.com/@eclipse-che/api/-/api-7.30.0.tgz#c6fcdd48dad814e0c48063815ca6b2dbb23d6d63"
- integrity sha512-gTNKintzNXxxb2ImVoG+/T9Fv59ID9UZqxdV/O5W+DP/j4gECGwM4NRMUf49PWmKtHD03DAu5wmtQskh2VJ05A==
+ version "7.31.2"
+ resolved "https://registry.yarnpkg.com/@eclipse-che/api/-/api-7.31.2.tgz#35012470662f970fd9ec5da9147f73244e213a39"
+ integrity sha512-UTbisWfucpxllnypZ8lCt39/pKATudOIrGztHxD56cuUyGTEdciJPEPaMiAFyVcu7E6cpgQTC+WmsM6SHebZnQ==
"@eclipse-che/plugin@latest":
- version "0.0.1-1620395393"
- resolved "https://registry.yarnpkg.com/@eclipse-che/plugin/-/plugin-0.0.1-1620395393.tgz#cd3dfd9c5b56dfa641a8567d1558b801ac6a2965"
- integrity sha512-iocvgd2kq4MP6ngCK++v9KiVXZb+7LOqPBVRDh8JAeiLCtcjqvw4isMB43i1xrbcC9AU0hUyf0C4dhltzsC8Tg==
+ version "0.0.1-1623781519"
+ resolved "https://registry.yarnpkg.com/@eclipse-che/plugin/-/plugin-0.0.1-1623781519.tgz#72b579c23a5cc4281bea2153c599ae8a10d0ea34"
+ integrity sha512-+j9T2mZazktQ27lqM1fbPxxGF5YlXICpNkZDQRS8lJGPZGwNd5lvy3U7ZKHwBkJiDmL2HYxBtdu7KjXFQ9ofVw==
dependencies:
"@eclipse-che/api" latest
"@eclipse-che/workspace-client@latest":
- version "0.0.1-1618916247"
- resolved "https://registry.yarnpkg.com/@eclipse-che/workspace-client/-/workspace-client-0.0.1-1618916247.tgz#61b88009a0718b110a8c06b2b534b025ad5e63ba"
- integrity sha512-V2kzjOtj784pHRu74qAvxmMMvM7X/CgTrT/F9DFN1v3ELeBJ0PXPzm68IN3I2hc7WzZrjViUW5J1wPg1gu13zQ==
+ version "0.0.1-1622804813"
+ resolved "https://registry.yarnpkg.com/@eclipse-che/workspace-client/-/workspace-client-0.0.1-1622804813.tgz#0f845b65649d5e28a8d803c18e7b712580f71dad"
+ integrity sha512-ZK2VINIWCEwvGRr28TTqQGWT5/c5TcemiKcikj4KWikmdvcsr3lgqf7DdqPN/8avE580UajZJleVhtN4/pSzig==
dependencies:
"@eclipse-che/api" "^7.0.0-beta-4.0"
axios "^0.21.1"
@@ -979,15 +980,15 @@
axios "0.21.1"
moxios "git://github.com/stoplightio/moxios#v1.3.0"
-"@eslint/eslintrc@^0.4.0":
- version "0.4.0"
- resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.0.tgz#99cc0a0584d72f1df38b900fb062ba995f395547"
- integrity sha512-2ZPCc+uNbjV5ERJr+aKSPRwZgKd2z11x0EgLvb1PURmUrn9QNRXFqje0Ldq454PfAVyaJYyrDvvIKSFP4NnBog==
+"@eslint/eslintrc@^0.4.2":
+ version "0.4.2"
+ resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"
+ integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg==
dependencies:
ajv "^6.12.4"
debug "^4.1.1"
espree "^7.3.0"
- globals "^12.1.0"
+ globals "^13.9.0"
ignore "^4.0.6"
import-fresh "^3.2.1"
js-yaml "^3.13.1"
@@ -1912,18 +1913,18 @@
call-me-maybe "^1.0.1"
glob-to-regexp "^0.3.0"
-"@nodelib/fs.scandir@2.1.4":
- version "2.1.4"
- resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz#d4b3549a5db5de2683e0c1071ab4f140904bbf69"
- integrity sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==
+"@nodelib/fs.scandir@2.1.5":
+ version "2.1.5"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+ integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
dependencies:
- "@nodelib/fs.stat" "2.0.4"
+ "@nodelib/fs.stat" "2.0.5"
run-parallel "^1.1.9"
-"@nodelib/fs.stat@2.0.4", "@nodelib/fs.stat@^2.0.2":
- version "2.0.4"
- resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz#a3f2dd61bab43b8db8fa108a121cfffe4c676655"
- integrity sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==
+"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+ version "2.0.5"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+ integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
"@nodelib/fs.stat@^1.1.2":
version "1.1.3"
@@ -1931,11 +1932,11 @@
integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
"@nodelib/fs.walk@^1.2.3":
- version "1.2.6"
- resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
- integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+ version "1.2.7"
+ resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.7.tgz#94c23db18ee4653e129abd26fb06f870ac9e1ee2"
+ integrity sha512-BTIhocbPBSrRmHxOAJFtR18oLhxTtAFDAvL8hY1S3iU8k+E60W/YFs4jrixGzQjMpF4qPXxIQHcjVD9dz1C2QA==
dependencies:
- "@nodelib/fs.scandir" "2.1.4"
+ "@nodelib/fs.scandir" "2.1.5"
fastq "^1.6.0"
"@npmcli/ci-detect@^1.0.0":
@@ -2003,41 +2004,41 @@
dependencies:
"@octokit/types" "^6.0.3"
-"@octokit/core@^3.2.3":
- version "3.4.0"
- resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.4.0.tgz#b48aa27d755b339fe7550548b340dcc2b513b742"
- integrity sha512-6/vlKPP8NF17cgYXqucdshWqmMZGXkuvtcrWCgU5NOI0Pl2GjlmZyWgBMrU8zJ3v2MJlM6++CiB45VKYmhiWWg==
+"@octokit/core@^3.5.0":
+ version "3.5.1"
+ resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz#8601ceeb1ec0e1b1b8217b960a413ed8e947809b"
+ integrity sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw==
dependencies:
"@octokit/auth-token" "^2.4.4"
"@octokit/graphql" "^4.5.8"
- "@octokit/request" "^5.4.12"
+ "@octokit/request" "^5.6.0"
"@octokit/request-error" "^2.0.5"
"@octokit/types" "^6.0.3"
before-after-hook "^2.2.0"
universal-user-agent "^6.0.0"
"@octokit/endpoint@^6.0.1":
- version "6.0.11"
- resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.11.tgz#082adc2aebca6dcefa1fb383f5efb3ed081949d1"
- integrity sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==
+ version "6.0.12"
+ resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz#3b4d47a4b0e79b1027fb8d75d4221928b2d05658"
+ integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==
dependencies:
"@octokit/types" "^6.0.3"
is-plain-object "^5.0.0"
universal-user-agent "^6.0.0"
"@octokit/graphql@^4.5.8":
- version "4.6.1"
- resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.6.1.tgz#f975486a46c94b7dbe58a0ca751935edc7e32cc9"
- integrity sha512-2lYlvf4YTDgZCTXTW4+OX+9WTLFtEUc6hGm4qM1nlZjzxj+arizM4aHWzBVBCxY9glh7GIs0WEuiSgbVzv8cmA==
+ version "4.6.4"
+ resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.6.4.tgz#0c3f5bed440822182e972317122acb65d311a5ed"
+ integrity sha512-SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg==
dependencies:
- "@octokit/request" "^5.3.0"
+ "@octokit/request" "^5.6.0"
"@octokit/types" "^6.0.3"
universal-user-agent "^6.0.0"
-"@octokit/openapi-types@^7.0.0":
- version "7.0.0"
- resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-7.0.0.tgz#0f6992db9854af15eca77d71ab0ec7fad2f20411"
- integrity sha512-gV/8DJhAL/04zjTI95a7FhQwS6jlEE0W/7xeYAzuArD0KVAVWDLP2f3vi98hs3HLTczxXdRK/mF0tRoQPpolEw==
+"@octokit/openapi-types@^7.3.2":
+ version "7.3.2"
+ resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-7.3.2.tgz#065ce49b338043ec7f741316ce06afd4d459d944"
+ integrity sha512-oJhK/yhl9Gt430OrZOzAl2wJqR0No9445vmZ9Ey8GjUZUpwuu/vmEFP0TDhDXdpGDoxD6/EIFHJEcY8nHXpDTA==
"@octokit/plugin-enterprise-rest@^6.0.1":
version "6.0.1"
@@ -2045,62 +2046,62 @@
integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw==
"@octokit/plugin-paginate-rest@^2.6.2":
- version "2.13.3"
- resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.3.tgz#f0f1792230805108762d87906fb02d573b9e070a"
- integrity sha512-46lptzM9lTeSmIBt/sVP/FLSTPGx6DCzAdSX3PfeJ3mTf4h9sGC26WpaQzMEq/Z44cOcmx8VsOhO+uEgE3cjYg==
+ version "2.13.5"
+ resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.13.5.tgz#e459f9b5dccbe0a53f039a355d5b80c0a2b0dc57"
+ integrity sha512-3WSAKBLa1RaR/7GG+LQR/tAZ9fp9H9waE9aPXallidyci9oZsfgsLn5M836d3LuDC6Fcym+2idRTBpssHZePVg==
dependencies:
- "@octokit/types" "^6.11.0"
+ "@octokit/types" "^6.13.0"
"@octokit/plugin-request-log@^1.0.2":
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.3.tgz#70a62be213e1edc04bb8897ee48c311482f9700d"
- integrity sha512-4RFU4li238jMJAzLgAwkBAw+4Loile5haQMQr+uhFq27BmyJXcXSKvoQKqh0agsZEiUlW6iSv3FAgvmGkur7OQ==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
+ integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
-"@octokit/plugin-rest-endpoint-methods@5.0.1":
- version "5.0.1"
- resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.0.1.tgz#631b8d4edc6798b03489911252a25f2a4e58c594"
- integrity sha512-vvWbPtPqLyIzJ7A4IPdTl+8IeuKAwMJ4LjvmqWOOdfSuqWQYZXq2CEd0hsnkidff2YfKlguzujHs/reBdAx8Sg==
+"@octokit/plugin-rest-endpoint-methods@5.3.1":
+ version "5.3.1"
+ resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.3.1.tgz#deddce769b4ec3179170709ab42e4e9e6195aaa9"
+ integrity sha512-3B2iguGmkh6bQQaVOtCsS0gixrz8Lg0v4JuXPqBcFqLKuJtxAUf3K88RxMEf/naDOI73spD+goJ/o7Ie7Cvdjg==
dependencies:
- "@octokit/types" "^6.13.1"
+ "@octokit/types" "^6.16.2"
deprecation "^2.3.1"
-"@octokit/request-error@^2.0.0", "@octokit/request-error@^2.0.5":
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.0.5.tgz#72cc91edc870281ad583a42619256b380c600143"
- integrity sha512-T/2wcCFyM7SkXzNoyVNWjyVlUwBvW3igM3Btr/eKYiPmucXTtkxt2RBsf6gn3LTzaLSLTQtNmvg+dGsOxQrjZg==
+"@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
+ integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
dependencies:
"@octokit/types" "^6.0.3"
deprecation "^2.0.0"
once "^1.4.0"
-"@octokit/request@^5.3.0", "@octokit/request@^5.4.12":
- version "5.4.15"
- resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.15.tgz#829da413dc7dd3aa5e2cdbb1c7d0ebe1f146a128"
- integrity sha512-6UnZfZzLwNhdLRreOtTkT9n57ZwulCve8q3IT/Z477vThu6snfdkBuhxnChpOKNGxcQ71ow561Qoa6uqLdPtag==
+"@octokit/request@^5.6.0":
+ version "5.6.0"
+ resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.0.tgz#6084861b6e4fa21dc40c8e2a739ec5eff597e672"
+ integrity sha512-4cPp/N+NqmaGQwbh3vUsYqokQIzt7VjsgTYVXiwpUP2pxd5YiZB2XuTedbb0SPtv9XS7nzAKjAuQxmY8/aZkiA==
dependencies:
"@octokit/endpoint" "^6.0.1"
- "@octokit/request-error" "^2.0.0"
- "@octokit/types" "^6.7.1"
+ "@octokit/request-error" "^2.1.0"
+ "@octokit/types" "^6.16.1"
is-plain-object "^5.0.0"
node-fetch "^2.6.1"
universal-user-agent "^6.0.0"
"@octokit/rest@^18.1.0":
- version "18.5.3"
- resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.5.3.tgz#6a2e6006a87ebbc34079c419258dd29ec9ff659d"
- integrity sha512-KPAsUCr1DOdLVbZJgGNuE/QVLWEaVBpFQwDAz/2Cnya6uW2wJ/P5RVGk0itx7yyN1aGa8uXm2pri4umEqG1JBA==
+ version "18.6.0"
+ resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.6.0.tgz#9a8457374c78c2773d3ab3f50aaffc62f3ed4f76"
+ integrity sha512-MdHuXHDJM7e5sUBe3K9tt7th0cs4csKU5Bb52LRi2oHAeIMrMZ4XqaTrEv660HoUPoM1iDlnj27Ab/Nh3MtwlA==
dependencies:
- "@octokit/core" "^3.2.3"
+ "@octokit/core" "^3.5.0"
"@octokit/plugin-paginate-rest" "^2.6.2"
"@octokit/plugin-request-log" "^1.0.2"
- "@octokit/plugin-rest-endpoint-methods" "5.0.1"
+ "@octokit/plugin-rest-endpoint-methods" "5.3.1"
-"@octokit/types@^6.0.3", "@octokit/types@^6.11.0", "@octokit/types@^6.13.1", "@octokit/types@^6.7.1":
- version "6.14.2"
- resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.14.2.tgz#64c9457f38fb8522bdbba3c8cc814590a2d61bf5"
- integrity sha512-wiQtW9ZSy4OvgQ09iQOdyXYNN60GqjCL/UdMsepDr1Gr0QzpW6irIKbH3REuAHXAhxkEk9/F2a3Gcs1P6kW5jA==
+"@octokit/types@^6.0.3", "@octokit/types@^6.13.0", "@octokit/types@^6.16.1", "@octokit/types@^6.16.2":
+ version "6.16.4"
+ resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.16.4.tgz#d24f5e1bacd2fe96d61854b5bda0e88cf8288dfe"
+ integrity sha512-UxhWCdSzloULfUyamfOg4dJxV9B+XjgrIZscI0VCbp4eNrjmorGEw+4qdwcpTsu6DIrm9tQsFQS2pK5QkqQ04A==
dependencies:
- "@octokit/openapi-types" "^7.0.0"
+ "@octokit/openapi-types" "^7.3.2"
"@panva/asn1.js@^1.0.0":
version "1.0.0"
@@ -2273,10 +2274,10 @@
dependencies:
defer-to-connect "^2.0.0"
-"@theia/application-package@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.14.0-next.c86b82d8.tgz#abbf6bf2e6e5bc8ba3abb0cf146a2a12deb7840d"
- integrity sha512-P8u8TfNGM7YJ8MWxq7TY7ato0sYfLY5EBOl7uYylFhWr5v1xWNBNapI9qQ6L4ZCKlMMNVP0jHkWchY+R0F8M/w==
+"@theia/application-package@1.15.0-next.af9b883d", "@theia/application-package@next":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.15.0-next.af9b883d.tgz#d7d0cb94cc0b25ff62421157703b474ecde9242b"
+ integrity sha512-WXSk5nlbRYQeEjwlpcU1Ag7cY4stdBTW7VDGeV6aGpezndtmGwKGfbPJdVV8GtPHsMQl2RCFsLU9juNGSWAYcA==
dependencies:
"@types/fs-extra" "^4.0.2"
"@types/request" "^2.0.3"
@@ -2290,42 +2291,40 @@
semver "^5.4.1"
write-json-file "^2.2.0"
-"@theia/bulk-edit@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/bulk-edit/-/bulk-edit-1.14.0-next.c86b82d8.tgz#19be95d068a424699f8faff6e22c5afe0308215e"
- integrity sha512-u50v7rBiZ3DRvDMvPMwpB+rasagoxazqCrM2CKm8N+p28GshZ0vHQc4X/Oz7V4eez45qkr2vcU6jPVMg2QO6og==
- dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/monaco" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
-
-"@theia/callhierarchy@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/callhierarchy/-/callhierarchy-1.14.0-next.c86b82d8.tgz#db5454e0f89fbc259798185e96df857bf2f0c310"
- integrity sha512-BnrU61DxzLerwExGYuNokJDW53wNra7BAM6C5IHEhXk+hKZCo6xU9syRxh5t8bkVBOSu/1ushYg/Qt1nN5viiw==
- dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/monaco" "1.14.0-next.c86b82d8"
+"@theia/bulk-edit@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/bulk-edit/-/bulk-edit-1.15.0-next.af9b883d.tgz#3b13717195d23b181f5d570aebe938dc4d88544b"
+ integrity sha512-4HDoWi5JwTqNSORCt8polj0XLyShQo27GkgQlSlzGawKLqR1H6inog/SH5uyK6ApcAlLEGmehdKdLhLH9eEPVw==
+ dependencies:
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/monaco" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
+
+"@theia/callhierarchy@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/callhierarchy/-/callhierarchy-1.15.0-next.af9b883d.tgz#81a5eff921ece172ee2b1702d257d46840547a3a"
+ integrity sha512-7gqYyRhOY8+h4eTzQw7PkbMpUiR860IaKuxx0FjHaLZPb7IF/6dUtU9Wlainbe6dDjVak2tvGYlqHlLUVGis9A==
+ dependencies:
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/monaco" "1.15.0-next.af9b883d"
ts-md5 "^1.2.2"
-"@theia/console@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/console/-/console-1.14.0-next.c86b82d8.tgz#1a76a7adaaddf7fed48e229c8d32ccec37947063"
- integrity sha512-38R8zBAbwT7fL8pgh7Occ7jgs+ql8i8kE6x22dGzLu8UqyOqqFIQZiwwmbJKcQNu0lJjIubtSG5LFiIcP9akzA==
+"@theia/console@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/console/-/console-1.15.0-next.af9b883d.tgz#ac9c17a95cf259f90aa36c0122c0e6433378d53e"
+ integrity sha512-OJI4GbUhiej8l6rkAztBq+Cmip4ar8Vd1K+kjQ3cGwkzFGpfL2lQi3o85ZA7+QRX17+szgbUgCvoQrf8MoUPiQ==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/monaco" "1.14.0-next.c86b82d8"
- "@types/dompurify" "^2.0.2"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/monaco" "1.15.0-next.af9b883d"
anser "^2.0.1"
- dompurify "^2.0.11"
-"@theia/core@1.14.0-next.c86b82d8", "@theia/core@next":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.14.0-next.c86b82d8.tgz#4e01f13757bffa4cb284d36c2361ee9022cafcd0"
- integrity sha512-UCJHXcTZbDI5lJi04hi7zk1oEx2UStxw8mtoYJG1H9mR5NwaR4ie9695mUyAIM9JhQplR6cnkwuuQ5QyE1DhvQ==
+"@theia/core@1.15.0-next.af9b883d", "@theia/core@next":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.15.0-next.af9b883d.tgz#5af834c147fc64583ed68604da6e78a993bfdf8f"
+ integrity sha512-577FSJa1ZIgDCZasKu9I3b3rKMrUCxmVshFhqHw+l3Xg2GJ7rEtpvaslcz5dJxvfiSznlq8n8DSGh6WVBxpgnA==
dependencies:
"@babel/runtime" "^7.10.0"
"@phosphor/algorithm" "1"
@@ -2339,9 +2338,10 @@
"@phosphor/virtualdom" "1"
"@phosphor/widgets" "1"
"@primer/octicons-react" "^9.0.0"
- "@theia/application-package" "1.14.0-next.c86b82d8"
+ "@theia/application-package" "1.15.0-next.af9b883d"
"@types/body-parser" "^1.16.4"
"@types/cookie" "^0.3.3"
+ "@types/dompurify" "^2.2.2"
"@types/express" "^4.16.0"
"@types/fs-extra" "^4.0.2"
"@types/lodash.debounce" "4.0.3"
@@ -2356,6 +2356,7 @@
ajv "^6.5.3"
body-parser "^1.17.2"
cookie "^0.4.0"
+ dompurify "^2.2.9"
drivelist "^9.0.2"
es6-promise "^4.2.4"
express "^4.16.3"
@@ -2366,6 +2367,7 @@
iconv-lite "^0.6.0"
inversify "^5.0.1"
jschardet "^2.1.1"
+ keytar "7.7.0"
lodash.debounce "^4.0.8"
lodash.throttle "^4.1.1"
nsfw "^2.1.2"
@@ -2386,25 +2388,25 @@
ws "^7.1.2"
yargs "^15.3.1"
-"@theia/debug@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/debug/-/debug-1.14.0-next.c86b82d8.tgz#27d06a7d5bad56c1f6d3bd9566053cc9d8cfb2ca"
- integrity sha512-KduazvDj/2rvag/ElyXQFqJuHpZfVIJ6OOwl0os2UKhOz2NaK2KbEjfR8w82is4O3FBt7GqVFwdeNMSUHDorWg==
- dependencies:
- "@theia/console" "1.14.0-next.c86b82d8"
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/markers" "1.14.0-next.c86b82d8"
- "@theia/monaco" "1.14.0-next.c86b82d8"
- "@theia/output" "1.14.0-next.c86b82d8"
- "@theia/preferences" "1.14.0-next.c86b82d8"
- "@theia/process" "1.14.0-next.c86b82d8"
- "@theia/task" "1.14.0-next.c86b82d8"
- "@theia/terminal" "1.14.0-next.c86b82d8"
- "@theia/userstorage" "1.14.0-next.c86b82d8"
- "@theia/variable-resolver" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
+"@theia/debug@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/debug/-/debug-1.15.0-next.af9b883d.tgz#403827f8d0935106705a47f3d870fbdf962c1d71"
+ integrity sha512-mED7D+QX7v7qF25KUwD/9RVyXG5matMVrFaG0ys3k6KHO5deKNNarW0r4ALr8Qt4R9C7E+vaG00jFrlTWD3Zgg==
+ dependencies:
+ "@theia/console" "1.15.0-next.af9b883d"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/markers" "1.15.0-next.af9b883d"
+ "@theia/monaco" "1.15.0-next.af9b883d"
+ "@theia/output" "1.15.0-next.af9b883d"
+ "@theia/preferences" "1.15.0-next.af9b883d"
+ "@theia/process" "1.15.0-next.af9b883d"
+ "@theia/task" "1.15.0-next.af9b883d"
+ "@theia/terminal" "1.15.0-next.af9b883d"
+ "@theia/userstorage" "1.15.0-next.af9b883d"
+ "@theia/variable-resolver" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
jsonc-parser "^2.2.0"
mkdirp "^0.5.0"
p-debounce "^2.1.0"
@@ -2413,34 +2415,34 @@
unzip-stream "^0.3.0"
vscode-debugprotocol "^1.32.0"
-"@theia/editor@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.14.0-next.c86b82d8.tgz#91a4b8486f9cd38b48532239b90ee7565853b629"
- integrity sha512-g7i4PgwV1+ePQ22pfro3pNYUeERFm9uiPSZMT+wxxUhqQOODVxyBlAKO8tfXn3QOBh0Z2WkLVEvqVdiEhRwRZA==
+"@theia/editor@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.15.0-next.af9b883d.tgz#5d91565d083e426637d82a38147ed31ab09e1e62"
+ integrity sha512-O1wSZ0XECHt1pBgJu4/Y9d8DEKGZez8ILv8LwhQ3kNFKRFIqgbYa7PNqmMpYCE7v1iC1uMu1F7/ur8r2UF1jEw==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/variable-resolver" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/variable-resolver" "1.15.0-next.af9b883d"
"@types/base64-arraybuffer" "0.1.0"
base64-arraybuffer "^0.1.5"
-"@theia/file-search@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.14.0-next.c86b82d8.tgz#20b507305c22cd8636b9a596dea3955d7eb07265"
- integrity sha512-BpdrJRQmgU0QQlIXodDnuyPUxGNKHB7oHkcCRGJX2zao5Ztny9zW4wK2NBlOP8J21K3nSx10edAqD0GpoXZAcA==
+"@theia/file-search@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.15.0-next.af9b883d.tgz#9be6c3c8915db07d8a5a54b7a5126e6c697ecb62"
+ integrity sha512-71w+YJMAgAPcIv7OZhMLNrATDDGXdio2JuJkF5qsg33ETMfVST/y0HEAa1QTmmwb8qYWB6WuOGwdyGdXRB/ktg==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/process" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/process" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
vscode-ripgrep "^1.2.4"
-"@theia/filesystem@1.14.0-next.c86b82d8", "@theia/filesystem@next":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.14.0-next.c86b82d8.tgz#94063b2fa62106f4db264af90b90debaa673d8c2"
- integrity sha512-hiSnJWXM6kAEeeiQqbT2WUTBpkx9uPVcF9AdaIiDFQx5v9ee8jzuXYrLoC2xu3iUcsBfsCqZHk9o7a6rFHPGHA==
+"@theia/filesystem@1.15.0-next.af9b883d", "@theia/filesystem@next":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.15.0-next.af9b883d.tgz#af5daf88ccdb9b18bbc48166bc9e764b0399e88e"
+ integrity sha512-vBUn+Jc+CW7NBfNPzYsBhtqIkgwu42sO0Khq96+izaM6C67V5+z5SZ/3etZ6hc9shCzSI+EBMlpQbaWMqIeR1A==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
"@types/body-parser" "^1.17.0"
"@types/rimraf" "^2.0.2"
"@types/tar-fs" "^1.16.1"
@@ -2454,33 +2456,33 @@
uuid "^8.0.0"
vscode-languageserver-textdocument "^1.0.1"
-"@theia/markers@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.14.0-next.c86b82d8.tgz#b90d422d6b87a53ef53ffad689ab9007913dccb0"
- integrity sha512-uBjeOYopzzzghHubVAmqMe0/GtYdba7GRZIu/byfk71tRVEm4OgS+734zKZoSrJyqTRaYT44/gRLvVXxaXPtOw==
+"@theia/markers@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.15.0-next.af9b883d.tgz#e90527c0bee01ce79ba9a36d1108c95dfb94f699"
+ integrity sha512-B6QFRtQw9V81bPSQNPcGjGhCwCPsaAmrIF55fmCbuvQUKNlwbAkY2bDmN6nCsZ2YlhD2tObVk0A/F/hbUzezWg==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/navigator" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/navigator" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
-"@theia/messages@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.14.0-next.c86b82d8.tgz#dc22816a362b111b69b22baa62f63ffa60d81d4b"
- integrity sha512-z0rQrX+G1WmAh/4ufasEsq6hHSJrlF38kE++mB1FS2A0e57x9wgwya987wbQGMnv9XDE6KAltfCSe01niCqc0Q==
+"@theia/messages@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.15.0-next.af9b883d.tgz#abed49e274bd3fc1134a907293e73939472cbed2"
+ integrity sha512-Drw/uaMZFft33f2kTHXmp0oEt0ulER3tYNPNgrsivJcAfVnzmpnhc28nU+duhYh55n8XL9pc21WE7VD+cQxGNw==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
markdown-it "^8.4.0"
react-perfect-scrollbar "^1.5.3"
ts-md5 "^1.2.2"
"@theia/mini-browser@next":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/mini-browser/-/mini-browser-1.14.0-next.c86b82d8.tgz#d8fa7b0096b74bbb3ecbe9f57a7c85d0dea05067"
- integrity sha512-wAGjk9jOtxpjCTlFSJI2JUcrA1B9Jrpg5b1jF+4mzDP+zucCNHWe0G6cKtK1YE2qHAIEF3a16sZn18sGCbsTAw==
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/mini-browser/-/mini-browser-1.15.0-next.af9b883d.tgz#e41a3b2666f1158a137764f34bba86833730bc2e"
+ integrity sha512-Wd9X/wtX7RQIBU/dN48ZwDXas/eJ3nSJ9JbsbJ/xLeF+qGAtXylekG72wmnj8HgbbV3ZPA0R5Hw+hAXjTvBo9A==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
"@types/mime-types" "^2.1.0"
mime-types "^2.1.18"
pdfobject "^2.0.201604172"
@@ -2492,18 +2494,18 @@
resolved "https://registry.yarnpkg.com/@theia/monaco-editor-core/-/monaco-editor-core-0.20.0.tgz#0f3cdfd6d1278bbcc3df0224471fc967a4d901c5"
integrity sha512-6QDOrZRW3dE0RgyD/hXMlVla49ACNjwIX+u9+i/qY+OqaZ1u/QdgdnHy4QO6g4J0lQCyr7nXgqF1BAc+Xbxx2g==
-"@theia/monaco@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.14.0-next.c86b82d8.tgz#8d90daac835c83c719543eb776895fa8be42c017"
- integrity sha512-4+pi9/q0YQQRxA+Ju1fmQoWyjnDKKO0ZYNsfX+qikOxCjzzEKVsQkw0QyT6sfGoJpy0Y9z0NbC/itIjFSwRoyg==
+"@theia/monaco@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.15.0-next.af9b883d.tgz#31979ad04d058b11f4ba88f0ba0c46508a6ecbfa"
+ integrity sha512-VBNTlVQM6r4IKBRfrsRfbic/jDOlUuzOxzZejVGThkpQU5h9ej49ONgT+daI/40CTFoNTzQdOiRyleZm28xz3w==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/markers" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/markers" "1.15.0-next.af9b883d"
"@theia/monaco-editor-core" "^0.20.0"
- "@theia/outline-view" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
+ "@theia/outline-view" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
deepmerge "2.0.1"
fast-plist "^0.1.2"
idb "^4.0.5"
@@ -2511,14 +2513,14 @@
onigasm "^2.2.0"
vscode-textmate "^4.4.0"
-"@theia/navigator@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.14.0-next.c86b82d8.tgz#11bd7a23cee0f072b8d5314369ee6c0e3b4a2e53"
- integrity sha512-Dghw2dfSWAhkU45MSJizu9jKPSYk3YTZTSyZHMnxeEfrDZzsv4rbxZeIDEAsEDUF/yqkGQQJZbAAqqLtcgeGNQ==
+"@theia/navigator@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.15.0-next.af9b883d.tgz#cc1c65f74f62b5373a22bb54422372639d682310"
+ integrity sha512-TguIjkPoE6peptEbWQ+JprPUy0NyzMi0+8nLDPZ7oCry9BfWwJv7R3U56yN2wU8HTADuuhP4saWpwTDOA/Fq3Q==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
minimatch "^3.0.4"
"@theia/node-pty@0.9.0-theia.6":
@@ -2528,88 +2530,86 @@
dependencies:
nan "^2.14.0"
-"@theia/outline-view@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.14.0-next.c86b82d8.tgz#b6a506dfeb2904d7e236b1e6e54bd38c6db91f8d"
- integrity sha512-4nSVkBvLsTOcd18pT3n/t8l2XlWLbIccgzbf6Q2ForSpOZ9xgfBmm8TSwfpGXdEQF2G183aYQLoGFyvstLEN0g==
+"@theia/outline-view@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.15.0-next.af9b883d.tgz#5402054eb9d060e6d5766ec9353014bbbbcd7d58"
+ integrity sha512-EVInjhxpleHl3s+xQQ/k7uyOXn9EffBY16/xLslj9+dAbC5smlW5jz6d31ozwBtqb2OozuAmiEszu60k9bdBcw==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
-"@theia/output@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/output/-/output-1.14.0-next.c86b82d8.tgz#49df3f248ee1ef98d7d5517923d20a93f6fb0bbc"
- integrity sha512-1/IXWYKQ9L6WXKeqIcegjvdG6qp3Tg76rr0a7VvhHUuE/1aEaQCywkpAG3vV9IgNb3dqBWVWAsu67ZFFewSoNQ==
+"@theia/output@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/output/-/output-1.15.0-next.af9b883d.tgz#f6ee565c128290359e436a7452ec70ed7171a303"
+ integrity sha512-PHojY6r8O78SufZOmw+wNmZ7r04O0CHTqMBo7BHVXqo/sbeKHlmYjiynLyArYpi56gjfdQiQ3BAV3baO5dHltg==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/monaco" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/monaco" "1.15.0-next.af9b883d"
"@types/p-queue" "^2.3.1"
p-queue "^2.4.2"
"@theia/plugin-dev@next":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/plugin-dev/-/plugin-dev-1.14.0-next.c86b82d8.tgz#a3220e7b699d6eb93ca12687bc3fd67e0e2bf435"
- integrity sha512-qH3xeZLnhwpJaPWroyV2Y7zZm3staMVEdf0ewkPqHG36zqWdC9p8g+xaZGwf9e0AX4HgHhkA5nOTN3NxOoyTiw==
- dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/debug" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/output" "1.14.0-next.c86b82d8"
- "@theia/plugin-ext" "1.14.0-next.c86b82d8"
- "@theia/preferences" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/plugin-dev/-/plugin-dev-1.15.0-next.af9b883d.tgz#615112dbef3dfcbd47c87cf8383abbd680dbea85"
+ integrity sha512-g3EegXPpVRSSjdSGEyVSrb5pg1riE3wPhHBZpdY7o7m7KUhUICebtLeHjZrftlcNpBenneEbjArIdkdXlDK41g==
+ dependencies:
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/debug" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/output" "1.15.0-next.af9b883d"
+ "@theia/plugin-ext" "1.15.0-next.af9b883d"
+ "@theia/preferences" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
"@types/request" "^2.0.3"
ps-tree "^1.2.0"
request "^2.82.0"
"@theia/plugin-ext-vscode@next":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/plugin-ext-vscode/-/plugin-ext-vscode-1.14.0-next.c86b82d8.tgz#99d5522af9dbd24d6fee1c0e410473ea460773c8"
- integrity sha512-Wvrr+JAtP+CwiJzN7kpJOgxCLymzzzQyuyI98t2Xhm3gYo4Yu+7C2BZo9Nchz1npj6SFZhckZj6s5TN4CrqxXA==
- dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/monaco" "1.14.0-next.c86b82d8"
- "@theia/navigator" "1.14.0-next.c86b82d8"
- "@theia/plugin" "1.14.0-next.c86b82d8"
- "@theia/plugin-ext" "1.14.0-next.c86b82d8"
- "@theia/terminal" "1.14.0-next.c86b82d8"
- "@theia/userstorage" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/plugin-ext-vscode/-/plugin-ext-vscode-1.15.0-next.af9b883d.tgz#c0a76048467454b1935e147f26a8d9df39907c49"
+ integrity sha512-QFehgcBt4HdrVAifcnv9QGDbnLTsBRrIxUEOvMobI+bv2cRDSEqNRWjVbtvIJ6YUMDJnqPh3KUtjCQPyZBFU4Q==
+ dependencies:
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/monaco" "1.15.0-next.af9b883d"
+ "@theia/navigator" "1.15.0-next.af9b883d"
+ "@theia/plugin" "1.15.0-next.af9b883d"
+ "@theia/plugin-ext" "1.15.0-next.af9b883d"
+ "@theia/terminal" "1.15.0-next.af9b883d"
+ "@theia/userstorage" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
"@types/request" "^2.0.3"
filenamify "^4.1.0"
request "^2.82.0"
-"@theia/plugin-ext@1.14.0-next.c86b82d8", "@theia/plugin-ext@next":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/plugin-ext/-/plugin-ext-1.14.0-next.c86b82d8.tgz#f83c48fbec2accbab6c74892f4df4edf8d48a2fa"
- integrity sha512-a90yq6MBQet0/SLEYSWlTd2V/2tirmVo0Xdq3X6NJWexqIovCqoUP26w6xLpVGovmhhP+nJxhTXRLGVitoHkow==
- dependencies:
- "@theia/bulk-edit" "1.14.0-next.c86b82d8"
- "@theia/callhierarchy" "1.14.0-next.c86b82d8"
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/debug" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/file-search" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/markers" "1.14.0-next.c86b82d8"
- "@theia/messages" "1.14.0-next.c86b82d8"
- "@theia/monaco" "1.14.0-next.c86b82d8"
- "@theia/navigator" "1.14.0-next.c86b82d8"
- "@theia/output" "1.14.0-next.c86b82d8"
- "@theia/plugin" "1.14.0-next.c86b82d8"
- "@theia/preferences" "1.14.0-next.c86b82d8"
- "@theia/scm" "1.14.0-next.c86b82d8"
- "@theia/search-in-workspace" "1.14.0-next.c86b82d8"
- "@theia/task" "1.14.0-next.c86b82d8"
- "@theia/terminal" "1.14.0-next.c86b82d8"
- "@theia/timeline" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
- "@types/dompurify" "^2.0.2"
+"@theia/plugin-ext@1.15.0-next.af9b883d", "@theia/plugin-ext@next":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/plugin-ext/-/plugin-ext-1.15.0-next.af9b883d.tgz#aee42faebe1015e8071d377a12cf77fdf7257147"
+ integrity sha512-kigRcpvpAZtVMtfMSejlWvwDyt0B+KGDF4A7gkPnqZhrBCWlomDa3jfl171ursUDCH6KJSSBk5qemxD9snpMyQ==
+ dependencies:
+ "@theia/bulk-edit" "1.15.0-next.af9b883d"
+ "@theia/callhierarchy" "1.15.0-next.af9b883d"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/debug" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/file-search" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/markers" "1.15.0-next.af9b883d"
+ "@theia/messages" "1.15.0-next.af9b883d"
+ "@theia/monaco" "1.15.0-next.af9b883d"
+ "@theia/navigator" "1.15.0-next.af9b883d"
+ "@theia/output" "1.15.0-next.af9b883d"
+ "@theia/plugin" "1.15.0-next.af9b883d"
+ "@theia/preferences" "1.15.0-next.af9b883d"
+ "@theia/scm" "1.15.0-next.af9b883d"
+ "@theia/search-in-workspace" "1.15.0-next.af9b883d"
+ "@theia/task" "1.15.0-next.af9b883d"
+ "@theia/terminal" "1.15.0-next.af9b883d"
+ "@theia/timeline" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
"@types/mime" "^2.0.1"
decompress "^4.2.1"
- dompurify "^2.0.11"
escape-html "^1.0.3"
filenamify "^4.1.0"
jsonc-parser "^2.2.0"
@@ -2636,127 +2636,127 @@
read-pkg "4.0.1"
yargs "12.0.1"
-"@theia/plugin@1.14.0-next.c86b82d8", "@theia/plugin@next":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/plugin/-/plugin-1.14.0-next.c86b82d8.tgz#fa358c18eede86770dcccb7dc94f9125b8cf65d6"
- integrity sha512-r5dHC1wFAEhU3UeCaRT6LGJR6CktwHI7Ai7Hr5Vf9AWgJrZO/w9I7gWIwV9738az+wmsMM49iQE8/pp9v5ljwg==
-
-"@theia/preferences@1.14.0-next.c86b82d8", "@theia/preferences@next":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.14.0-next.c86b82d8.tgz#ab1afb7786e856984925e084942e9d7319052c9f"
- integrity sha512-JhjP+T1lr7wp95pS877Maa2l6UjWMciGwgSNu111W7mybxfQqK8XcbxBVhSPG2AEt70yW+RqNUvg7nG4pMTqJA==
- dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/monaco" "1.14.0-next.c86b82d8"
- "@theia/userstorage" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
+"@theia/plugin@1.15.0-next.af9b883d", "@theia/plugin@next":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/plugin/-/plugin-1.15.0-next.af9b883d.tgz#c699282e72f926b1711067a95879236a32f90de2"
+ integrity sha512-tvRQ7gkjcQHQtFTRUKIaEFV+4u7k2Zw7LYqX27WRMqM3XQmpumXZGWQ1ui+/zbhkJWMW5uFyZ2V0pZgnzhV64w==
+
+"@theia/preferences@1.15.0-next.af9b883d", "@theia/preferences@next":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.15.0-next.af9b883d.tgz#6c6e6407715e4e857e7d42b244365f6707181b3e"
+ integrity sha512-OMdrciNM+ITcFtdLZ8J4djQMGV7VfC6eRIrq5eea3PVeBzooijH8xcIiIxh7cDKUmrZtm3o9BaN+/dGYNWoNWQ==
+ dependencies:
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/monaco" "1.15.0-next.af9b883d"
+ "@theia/userstorage" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
jsonc-parser "^2.2.0"
-"@theia/process@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.14.0-next.c86b82d8.tgz#d053665289f6655ccc971aaf6c0e65ae40d88312"
- integrity sha512-NBzfYJxLCQFH4bAhHvn+lon9aOGwO8iFXp4UryzjCzgNrYJwUjOm7/xv8MQTC7Jj5HhfIG79SvYdC5zwoQfEkA==
+"@theia/process@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.15.0-next.af9b883d.tgz#06b262e1cbcbda84e125790a656a0cfbd4538e58"
+ integrity sha512-ChZ0g0uUZm18nPY4gSR+EKZx/L15j04dGKhkY/u7wMaoE0+yuGGxSQajVO75psvP78nUQojGqILIyEoyplzpPA==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
"@theia/node-pty" "0.9.0-theia.6"
string-argv "^0.1.1"
-"@theia/scm@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.14.0-next.c86b82d8.tgz#b86bd9b22a0837e1268795cc0c93f54aed353b48"
- integrity sha512-7bycixY9sOtCgn/jWxfKRKv99xTBpgOJfyU1Zkz4NTIjwBonWkW9kiEJliv3Byqdk90Ws7co9DVNKCvq65iutg==
+"@theia/scm@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.15.0-next.af9b883d.tgz#77b2a8528725de2da9c13269dad8c7f5645186f3"
+ integrity sha512-rptrWkR3zE7l8k78LjD+yyAjpNwK7Kho9JWuC29MsdMAQEpKguSQawgBrZ8LgPZ/FEZVhUZk1sVGEJK/wMrpmA==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/navigator" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/navigator" "1.15.0-next.af9b883d"
"@types/diff" "^3.2.2"
diff "^3.4.0"
p-debounce "^2.1.0"
react-autosize-textarea "^7.0.0"
ts-md5 "^1.2.2"
-"@theia/search-in-workspace@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-1.14.0-next.c86b82d8.tgz#faef4ac7ff982f234afaab8efdbd04ea608f2cdf"
- integrity sha512-SR9QadJNlg/RzFrKwRk0ZI1QP8G7zG2OWO2mRfFC9u3P1m2d9PHal3Wqp0CyR1T8QBszoOOOadiQc9ebVIp1xw==
- dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/navigator" "1.14.0-next.c86b82d8"
- "@theia/process" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
+"@theia/search-in-workspace@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-1.15.0-next.af9b883d.tgz#bf3759dc44468bbc19b89c94b9f487cea57bd75b"
+ integrity sha512-mJZORyHthazRQH7ao8GHiSo+vKasNR5oI6ejWA0QUDVZW0tSDr3x2roK/whDqSrtIYctEAdyGbXkJ4db459oWg==
+ dependencies:
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/navigator" "1.15.0-next.af9b883d"
+ "@theia/process" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
minimatch "^3.0.4"
vscode-ripgrep "^1.2.4"
-"@theia/task@1.14.0-next.c86b82d8", "@theia/task@next":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/task/-/task-1.14.0-next.c86b82d8.tgz#307e9a045c369bcc6043e77ca93777266b6759a7"
- integrity sha512-n8ZLxrBJE7NrsvFmhiupP6pzrFEt8NHWTxEhxMIIUXiukdZPn18ZFXT0isBvPXlfJWMWL3B23s15jgPusS3rxg==
- dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/markers" "1.14.0-next.c86b82d8"
- "@theia/monaco" "1.14.0-next.c86b82d8"
- "@theia/preferences" "1.14.0-next.c86b82d8"
- "@theia/process" "1.14.0-next.c86b82d8"
- "@theia/terminal" "1.14.0-next.c86b82d8"
- "@theia/userstorage" "1.14.0-next.c86b82d8"
- "@theia/variable-resolver" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
+"@theia/task@1.15.0-next.af9b883d", "@theia/task@next":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/task/-/task-1.15.0-next.af9b883d.tgz#e1391da765633c2f0e4a8ab155043239e506b526"
+ integrity sha512-KaGI+7ny6jLsMf/NeA4NxOJW0O8In2meRpJqdw7buENA9HVeE3DArV7X8kGNn52wFkb7T/oFeyhVEykTqpef+w==
+ dependencies:
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/markers" "1.15.0-next.af9b883d"
+ "@theia/monaco" "1.15.0-next.af9b883d"
+ "@theia/preferences" "1.15.0-next.af9b883d"
+ "@theia/process" "1.15.0-next.af9b883d"
+ "@theia/terminal" "1.15.0-next.af9b883d"
+ "@theia/userstorage" "1.15.0-next.af9b883d"
+ "@theia/variable-resolver" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
ajv "^6.5.3"
jsonc-parser "^2.2.0"
p-debounce "^2.1.0"
-"@theia/terminal@1.14.0-next.c86b82d8", "@theia/terminal@next":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.14.0-next.c86b82d8.tgz#b9e3d0380ca0935ae30d26a9e8307a7462ba63ad"
- integrity sha512-WGltFG/SzGdKDH/hoFUplfr62I8+9RqjJzEex/fJWdfCJTAFh0BOU4iNB5SnRScetTXT8c62nGotVs/nZ7PqWA==
+"@theia/terminal@1.15.0-next.af9b883d", "@theia/terminal@next":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.15.0-next.af9b883d.tgz#8358cdd0c79a64f5a1491b87b8b161401475b06b"
+ integrity sha512-CeWYvgVL2WiX4mJ8w1xB2JhD0bLBOi8G61/5ULD7xQ3m8FlQcm0CvqGJL3V+n2RCY25ypi6+fyGMWIaZoxodRQ==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/editor" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/process" "1.14.0-next.c86b82d8"
- "@theia/workspace" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/editor" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/process" "1.15.0-next.af9b883d"
+ "@theia/workspace" "1.15.0-next.af9b883d"
xterm "~4.11.0"
xterm-addon-fit "~0.5.0"
xterm-addon-search "~0.8.0"
-"@theia/timeline@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/timeline/-/timeline-1.14.0-next.c86b82d8.tgz#59ffce18465c6c0bb47c14a30f40523f17da0f84"
- integrity sha512-ToGDEppVilr+p9Z6sTO19JVv20bGyuoZ9aJY5Q5n25CAA7BE9dPLBvA8ysieEWeo6PFHCG+Yq3HiQ+V0hb4IAQ==
+"@theia/timeline@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/timeline/-/timeline-1.15.0-next.af9b883d.tgz#4f552fb7fb9a2cd6ca2b24d4ba1674355aeed2c4"
+ integrity sha512-IkRaJ+cNJzBxKvrnl6CQLI9LzR3Wlk5CMmlnDOTr65zGQ076Tz7Ce72XXRfOJuHvj3BZ3ycMespe3rpShwulnQ==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/navigator" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/navigator" "1.15.0-next.af9b883d"
-"@theia/userstorage@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.14.0-next.c86b82d8.tgz#8915e2d4c390805d64d999cd0648ba1991944bc6"
- integrity sha512-uFjr8ZTeGSL2W0AovDBU3EfV3u/z4tncvBmwEjI67/5RFo7qj9pKiNQ/K568/e3b+M+jpnNGCIrtaoeZFrPW7A==
+"@theia/userstorage@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.15.0-next.af9b883d.tgz#df33c61dfb64919f65978e120186ebc3e370c689"
+ integrity sha512-o3Qswmk56s5WebcoGZDX3lRTvSyUxbbCh6JCXCxxvru1G5DaUys4Gi7weIFwbRwk/koB/8tRGdKXmiiESnOHtw==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
-"@theia/variable-resolver@1.14.0-next.c86b82d8":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.14.0-next.c86b82d8.tgz#ab34c0c840b89fcaec4c6fb66610d7d4c67f612e"
- integrity sha512-lwzY6d0/SbmNIHEp652+11hWTucGQbgJ9Ks53WyykVUYN2wNjpe3oTXl3DSwl/4FuHsFNZNrA1XvdpdS/8lmDA==
+"@theia/variable-resolver@1.15.0-next.af9b883d":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.15.0-next.af9b883d.tgz#cb7109fcc635b155df67f0ca19f9504e2d9cf5ea"
+ integrity sha512-szhAhb2FPzr0b8tjhoSxotsuKlnECfNS5SUQZJG6a1TLHJelNYBkU1/0lyqWooEc9ePFwNSmFBGhV23blBLMsA==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
-"@theia/workspace@1.14.0-next.c86b82d8", "@theia/workspace@next":
- version "1.14.0-next.c86b82d8"
- resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.14.0-next.c86b82d8.tgz#adea5318c1eaf75984d504ddcc9f0e1eb51a700b"
- integrity sha512-ydy4wnYJwEwGqBE/IWgUw8KqqztGg7ALrhi+wV2rxfY1xx3oZmaF2fd2E5iYjx9CKIsyzaSlc9J3HvPJ6x0xbA==
+"@theia/workspace@1.15.0-next.af9b883d", "@theia/workspace@next":
+ version "1.15.0-next.af9b883d"
+ resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.15.0-next.af9b883d.tgz#704e7222c068b4dc68d7c2bcb44310d85035f55f"
+ integrity sha512-1dSDIUuOOFASpMbVqJ/3P68hsB1nuLKKTKeeZMm2TkqXNf9+VQG+ePBw651aAqMjZc2HEbhVcyxogeIB3RYH1Q==
dependencies:
- "@theia/core" "1.14.0-next.c86b82d8"
- "@theia/filesystem" "1.14.0-next.c86b82d8"
- "@theia/variable-resolver" "1.14.0-next.c86b82d8"
+ "@theia/core" "1.15.0-next.af9b883d"
+ "@theia/filesystem" "1.15.0-next.af9b883d"
+ "@theia/variable-resolver" "1.15.0-next.af9b883d"
ajv "^6.5.3"
jsonc-parser "^2.2.0"
moment "2.24.0"
@@ -2767,11 +2767,6 @@
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
-"@types/anymatch@*":
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
- integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
-
"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
version "7.1.14"
resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402"
@@ -2810,10 +2805,10 @@
resolved "https://registry.yarnpkg.com/@types/base64-arraybuffer/-/base64-arraybuffer-0.1.0.tgz#739eea0a974d13ae831f96d97d882ceb0b187543"
integrity sha512-oyV0CGER7tX6OlfnLfGze0XbsA7tfRuTtsQ2JbP8K5KBUzc24yoYRD+0XjMRQgOejvZWeIbtkNaHlE8akzj4aQ==
-"@types/bluebird@*":
- version "3.5.34"
- resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.34.tgz#0e9f1f4f5dfab98a421fb973b5f5690d22411893"
- integrity sha512-QMc57Pf067Rr78l6f4FftvuIXPYxu0VYFRKrZk1Clv+LWy7gN2fTBiAiv68askFHEHZcTLPFd01kNlpKOiSPgQ==
+"@types/bluebird@3.5.21":
+ version "3.5.21"
+ resolved "https://registry.yarnpkg.com/@types/bluebird/-/bluebird-3.5.21.tgz#567615589cc913e84a28ecf9edb031732bdf2634"
+ integrity sha512-6UNEwyw+6SGMC/WMI0ld0PS4st7Qq51qgguFrFizOSpGvZiqe9iswztFSdZvwJBEhLOy2JaxNE6VC7yMAlbfyQ==
"@types/body-parser@*", "@types/body-parser@^1.16.4", "@types/body-parser@^1.17.0":
version "1.19.0"
@@ -2860,7 +2855,7 @@
resolved "https://registry.yarnpkg.com/@types/diff/-/diff-3.5.3.tgz#7c6c3721ba454d838790100faf7957116ee7deab"
integrity sha512-YrLagYnL+tfrgM7bQ5yW34pi5cg9pmh5Gbq2Lmuuh+zh0ZjmK2fU3896PtlpJT3IDG2rdkoG30biHJepgIsMnw==
-"@types/dompurify@^2.0.2":
+"@types/dompurify@^2.2.2":
version "2.2.2"
resolved "https://registry.yarnpkg.com/@types/dompurify/-/dompurify-2.2.2.tgz#2c6692580eb7c653785ca3b2c1348847ea8b995d"
integrity sha512-8nNWfAa8/oZjH3OLY5Wsxu9ueo0NwVUotIi353g0P2+N5BuTLJyAVOnF4xBUY0NyFUGJHY05o1pO2bqLto+lmA==
@@ -2872,24 +2867,50 @@
resolved "https://registry.yarnpkg.com/@types/escape-html/-/escape-html-0.0.20.tgz#cae698714dd61ebee5ab3f2aeb9a34ba1011735a"
integrity sha512-6dhZJLbA7aOwkYB2GDGdIqJ20wmHnkDzaxV9PJXe7O02I2dSFTERzRB6JrX6cWKaS+VqhhY7cQUMCbO5kloFUw==
+"@types/eslint-scope@^3.7.0":
+ version "3.7.0"
+ resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86"
+ integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==
+ dependencies:
+ "@types/eslint" "*"
+ "@types/estree" "*"
+
+"@types/eslint@*":
+ version "7.2.13"
+ resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.13.tgz#e0ca7219ba5ded402062ad6f926d491ebb29dd53"
+ integrity sha512-LKmQCWAlnVHvvXq4oasNUMTJJb2GwSyTY8+1C7OH5ILR8mPLaljv1jxL1bXW3xB3jFbQxTKxJAvI8PyjB09aBg==
+ dependencies:
+ "@types/estree" "*"
+ "@types/json-schema" "*"
+
+"@types/estree@*":
+ version "0.0.48"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.48.tgz#18dc8091b285df90db2f25aa7d906cfc394b7f74"
+ integrity sha512-LfZwXoGUDo0C3me81HXgkBg5CTQYb6xzEl+fNmbO4JdRiSKQ8A0GD1OBBvKAIsbCUgoyAty7m99GqqMQe784ew==
+
+"@types/estree@^0.0.47":
+ version "0.0.47"
+ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.47.tgz#d7a51db20f0650efec24cd04994f523d93172ed4"
+ integrity sha512-c5ciR06jK8u9BstrmJyO97m+klJrrhCf9u3rLu3DEAJBirxRqSCvDQoYKmxuYwQI5SZChAWu+tq9oVlGRuzPAg==
+
"@types/events@*":
version "3.0.0"
resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
"@types/express-serve-static-core@^4.17.18":
- version "4.17.19"
- resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.19.tgz#00acfc1632e729acac4f1530e9e16f6dd1508a1d"
- integrity sha512-DJOSHzX7pCiSElWaGR8kCprwibCB/3yW6vcT8VG3P0SJjnv19gnWG/AZMfM60Xj/YJIp/YCaDHyvzsFVeniARA==
+ version "4.17.21"
+ resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.21.tgz#a427278e106bca77b83ad85221eae709a3414d42"
+ integrity sha512-gwCiEZqW6f7EoR8TTEfalyEhb1zA5jQJnRngr97+3pzMaO1RKoI1w2bw07TK72renMUVWcWS5mLI6rk1NqN0nA==
dependencies:
"@types/node" "*"
"@types/qs" "*"
"@types/range-parser" "*"
"@types/express@^4.16.0":
- version "4.17.11"
- resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
- integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
+ version "4.17.12"
+ resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.12.tgz#4bc1bf3cd0cfe6d3f6f2853648b40db7d54de350"
+ integrity sha512-pTYas6FrP15B1Oa0bkN5tQMNqOcVXa9j4FTFtO8DWI9kppKib+6NJtfTOOLcwxuuYvcX2+dVG6et1SxW/Kc17Q==
dependencies:
"@types/body-parser" "*"
"@types/express-serve-static-core" "^4.17.18"
@@ -2932,6 +2953,11 @@
dependencies:
"@types/node" "*"
+"@types/html-minifier-terser@^5.0.0":
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/@types/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#3c9ee980f1a10d6021ae6632ca3e79ca2ec4fb50"
+ integrity sha512-giAlZwstKbmvMk1OO7WXSj4OZ0keXAcl2TQq4LWHiiPH2ByaH7WeUzng+Qej8UPxxv+8lRTuouo0iaNDBuzIBA==
+
"@types/http-cache-semantics@*":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a"
@@ -2955,9 +2981,9 @@
"@types/istanbul-lib-coverage" "*"
"@types/istanbul-reports@^3.0.0":
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
- integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz#9153fe98bba2bd565a63add9436d6f0d7f8468ff"
+ integrity sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==
dependencies:
"@types/istanbul-lib-report" "*"
@@ -2987,7 +3013,7 @@
resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.12.6.tgz#7f10c926aa41e189a2755c4c7fcf8e4573bd7ac1"
integrity sha512-cK4XqrLvP17X6c0C8n4iTbT59EixqyXL3Fk8/Rsk4dF3oX4dg70gYUXrXVUUHpnsGMPNlTQMqf+TVmNPX6FmSQ==
-"@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5":
+"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6", "@types/json-schema@^7.0.7":
version "7.0.7"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
@@ -3019,9 +3045,9 @@
"@types/lodash" "*"
"@types/lodash@*":
- version "4.14.168"
- resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008"
- integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==
+ version "4.14.170"
+ resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.170.tgz#0d67711d4bf7f4ca5147e9091b847479b87925d6"
+ integrity sha512-bpcvu/MKHHeYX+qeEN8GE7DIravODWdACVA1ctevD8CN24RhPZIKMn9ntfAsrvLfSX3cR5RrBKAbYm9bGs0A+Q==
"@types/mime-types@^2.1.0":
version "2.1.0"
@@ -3061,9 +3087,9 @@
integrity sha512-RTVWV485OOf4+nO2+feurk0chzHkSjkjALiejpHltyuMf/13fGymbbNNFrSKdSSUg1TIwzszXdWsVirxgqYiFA==
"@types/node@*", "@types/node@^10.12.0", "@types/node@^12.0.0":
- version "12.20.12"
- resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.12.tgz#fd9c1c2cfab536a2383ed1ef70f94adea743a226"
- integrity sha512-KQZ1al2hKOONAs2MFv+yTQP1LkDWMrRJ9YCVRalXltOfXsBmH5IownLxQaiq0lnAHwAViLnh2aTYqrPcRGEbgg==
+ version "12.20.15"
+ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.15.tgz#10ee6a6a3f971966fddfa3f6e89ef7a73ec622df"
+ integrity sha512-F6S4Chv4JicJmyrwlDkxUdGNSplsQdGwp1A0AJloEVDirWdZOAiRHhovDlsFkKUrquUXhz1imJhXHsf59auyAg==
"@types/normalize-package-data@*", "@types/normalize-package-data@^2.4.0":
version "2.4.0"
@@ -3081,9 +3107,9 @@
integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
"@types/prettier@^2.0.0":
- version "2.2.3"
- resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.2.3.tgz#ef65165aea2924c9359205bf748865b8881753c0"
- integrity sha512-PijRCG/K3s3w1We6ynUKdxEc5AcuuH3NBmMDP8uvKVp6X43UY7NQlTzczakXP3DJR0F4dfNQIGjU2cUeRYs2AA==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.3.0.tgz#2e8332cc7363f887d32ec5496b207d26ba8052bb"
+ integrity sha512-hkc1DATxFLQo4VxPDpMH1gCkPpBbpOoJ/4nhuXw4n63/0R6bCpQECj4+K226UJ4JO/eJQz+1mC2I7JsWanAdQw==
"@types/prop-types@*":
version "15.7.3"
@@ -3106,9 +3132,9 @@
integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
"@types/react-dom@^16.8.0":
- version "16.9.12"
- resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.12.tgz#55cd6b17e73922edb9545e5355a0016c1734e6f4"
- integrity sha512-i7NPZZpPte3jtVOoW+eLB7G/jsX5OM6GqQnH+lC0nq0rqwlK0x8WcMEvYDgFWqWhWMlTltTimzdMax6wYfZssA==
+ version "16.9.13"
+ resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.13.tgz#5898f0ee68fe200685e6b61d3d7d8828692814d0"
+ integrity sha512-34Hr3XnmUSJbUVDxIw/e7dhQn2BJZhJmlAaPyPwfTQyuVS9mV/CeyghFcXyvkJXxI7notQJz8mF8FeCVvloJrA==
dependencies:
"@types/react" "^16"
@@ -3121,18 +3147,18 @@
"@types/react" "*"
"@types/react@*":
- version "17.0.5"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.5.tgz#3d887570c4489011f75a3fc8f965bf87d09a1bea"
- integrity sha512-bj4biDB9ZJmGAYTWSKJly6bMr4BLUiBrx9ujiJEoP9XIDY9CTaPGxE5QWN/1WjpPLzYF7/jRNnV2nNxNe970sw==
+ version "17.0.11"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.11.tgz#67fcd0ddbf5a0b083a0f94e926c7d63f3b836451"
+ integrity sha512-yFRQbD+whVonItSk7ZzP/L+gPTJVBkL/7shLEF+i9GC/1cV3JmUxEQz6+9ylhUpWSDuqo1N9qEvqS6vTj4USUA==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
csstype "^3.0.2"
"@types/react@^16", "@types/react@^16.8.0":
- version "16.14.6"
- resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.6.tgz#d933a2a6bc1bfe320a5eea480e8f45ba8126d6ee"
- integrity sha512-Ol/aFKune+P0FSFKIgf+XbhGzYGyz0p7g5befSt4rmbzfGLaZR0q7jPew9k7d3bvrcuaL8dPy9Oz3XGZmf9n+w==
+ version "16.14.8"
+ resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.8.tgz#4aee3ab004cb98451917c9b7ada3c7d7e52db3fe"
+ integrity sha512-QN0/Qhmx+l4moe7WJuTxNiTsjBwlBGHqKGvInSQCBdo7Qio0VtOqwsC0Wq7q3PbJlB0cR4Y4CVo1OOe6BOsOmA==
dependencies:
"@types/prop-types" "*"
"@types/scheduler" "*"
@@ -3200,9 +3226,9 @@
integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ==
"@types/semver@^7.3.1":
- version "7.3.5"
- resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.5.tgz#74deebbbcb1e86634dbf10a5b5e8798626f5a597"
- integrity sha512-iotVxtCCsPLRAvxMFFgxL8HD2l4mAZ2Oin7/VJ2ooWO0VOK4EGOGmZWZn1uCq7RofR3I/1IOSjCHlFT71eVK0Q==
+ version "7.3.6"
+ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.6.tgz#e9831776f4512a7ba6da53e71c26e5fb67882d63"
+ integrity sha512-0caWDWmpCp0uifxFh+FaqK3CuZ2SkRR/ZRxAV5+zNdC3QVUi6wyOJnefhPvtNt8NQWXB5OA93BUvZsXpWat2Xw==
"@types/serve-static@*":
version "1.13.9"
@@ -3306,15 +3332,15 @@
source-map "^0.7.3"
"@types/webpack@^4.0.0":
- version "4.41.28"
- resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.28.tgz#0069a2159b7ad4d83d0b5801942c17d54133897b"
- integrity sha512-Nn84RAiJjKRfPFFCVR8LC4ueTtTdfWAMZ03THIzZWRJB+rX24BD3LqPSFnbMscWauEsT4segAsylPDIaZyZyLQ==
+ version "4.41.29"
+ resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.29.tgz#2e66c1de8223c440366469415c50a47d97625773"
+ integrity sha512-6pLaORaVNZxiB3FSHbyBiWM7QdazAWda1zvAq4SbZObZqHSDbWLi62iFdblVea6SK9eyBIVp5yHhKt/yNQdR7Q==
dependencies:
- "@types/anymatch" "*"
"@types/node" "*"
"@types/tapable" "^1"
"@types/uglify-js" "*"
"@types/webpack-sources" "*"
+ anymatch "^3.0.0"
source-map "^0.6.0"
"@types/write-json-file@^2.2.1":
@@ -3355,30 +3381,30 @@
"@types/yargs-parser" "*"
"@typescript-eslint/eslint-plugin@^4.8.1":
- version "4.22.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.22.1.tgz#6bcdbaa4548553ab861b4e5f34936ead1349a543"
- integrity sha512-kVTAghWDDhsvQ602tHBc6WmQkdaYbkcTwZu+7l24jtJiYvm9l+/y/b2BZANEezxPDiX5MK2ZecE+9BFi/YJryw==
+ version "4.27.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.27.0.tgz#0b7fc974e8bc9b2b5eb98ed51427b0be529b4ad0"
+ integrity sha512-DsLqxeUfLVNp3AO7PC3JyaddmEHTtI9qTSAs+RB6ja27QvIM0TA8Cizn1qcS6vOu+WDLFJzkwkgweiyFhssDdQ==
dependencies:
- "@typescript-eslint/experimental-utils" "4.22.1"
- "@typescript-eslint/scope-manager" "4.22.1"
- debug "^4.1.1"
+ "@typescript-eslint/experimental-utils" "4.27.0"
+ "@typescript-eslint/scope-manager" "4.27.0"
+ debug "^4.3.1"
functional-red-black-tree "^1.0.1"
- lodash "^4.17.15"
- regexpp "^3.0.0"
- semver "^7.3.2"
- tsutils "^3.17.1"
+ lodash "^4.17.21"
+ regexpp "^3.1.0"
+ semver "^7.3.5"
+ tsutils "^3.21.0"
-"@typescript-eslint/experimental-utils@4.22.1":
- version "4.22.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.22.1.tgz#3938a5c89b27dc9a39b5de63a62ab1623ab27497"
- integrity sha512-svYlHecSMCQGDO2qN1v477ax/IDQwWhc7PRBiwAdAMJE7GXk5stF4Z9R/8wbRkuX/5e9dHqbIWxjeOjckK3wLQ==
+"@typescript-eslint/experimental-utils@4.27.0":
+ version "4.27.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.27.0.tgz#78192a616472d199f084eab8f10f962c0757cd1c"
+ integrity sha512-n5NlbnmzT2MXlyT+Y0Jf0gsmAQzCnQSWXKy4RGSXVStjDvS5we9IWbh7qRVKdGcxT0WYlgcCYUK/HRg7xFhvjQ==
dependencies:
- "@types/json-schema" "^7.0.3"
- "@typescript-eslint/scope-manager" "4.22.1"
- "@typescript-eslint/types" "4.22.1"
- "@typescript-eslint/typescript-estree" "4.22.1"
- eslint-scope "^5.0.0"
- eslint-utils "^2.0.0"
+ "@types/json-schema" "^7.0.7"
+ "@typescript-eslint/scope-manager" "4.27.0"
+ "@typescript-eslint/types" "4.27.0"
+ "@typescript-eslint/typescript-estree" "4.27.0"
+ eslint-scope "^5.1.1"
+ eslint-utils "^3.0.0"
"@typescript-eslint/experimental-utils@^2.19.2 || ^3.0.0":
version "3.10.1"
@@ -3402,32 +3428,32 @@
eslint-utils "^2.0.0"
"@typescript-eslint/parser@^4.8.1":
- version "4.22.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.22.1.tgz#a95bda0fd01d994a15fc3e99dc984294f25c19cc"
- integrity sha512-l+sUJFInWhuMxA6rtirzjooh8cM/AATAe3amvIkqKFeMzkn85V+eLzb1RyuXkHak4dLfYzOmF6DXPyflJvjQnw==
+ version "4.27.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.27.0.tgz#85447e573364bce4c46c7f64abaa4985aadf5a94"
+ integrity sha512-XpbxL+M+gClmJcJ5kHnUpBGmlGdgNvy6cehgR6ufyxkEJMGP25tZKCaKyC0W/JVpuhU3VU1RBn7SYUPKSMqQvQ==
dependencies:
- "@typescript-eslint/scope-manager" "4.22.1"
- "@typescript-eslint/types" "4.22.1"
- "@typescript-eslint/typescript-estree" "4.22.1"
- debug "^4.1.1"
+ "@typescript-eslint/scope-manager" "4.27.0"
+ "@typescript-eslint/types" "4.27.0"
+ "@typescript-eslint/typescript-estree" "4.27.0"
+ debug "^4.3.1"
-"@typescript-eslint/scope-manager@4.22.1":
- version "4.22.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.22.1.tgz#5bb357f94f9cd8b94e6be43dd637eb73b8f355b4"
- integrity sha512-d5bAiPBiessSmNi8Amq/RuLslvcumxLmyhf1/Xa9IuaoFJ0YtshlJKxhlbY7l2JdEk3wS0EnmnfeJWSvADOe0g==
+"@typescript-eslint/scope-manager@4.27.0":
+ version "4.27.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.27.0.tgz#b0b1de2b35aaf7f532e89c8e81d0fa298cae327d"
+ integrity sha512-DY73jK6SEH6UDdzc6maF19AHQJBFVRf6fgAXHPXCGEmpqD4vYgPEzqpFz1lf/daSbOcMpPPj9tyXXDPW2XReAw==
dependencies:
- "@typescript-eslint/types" "4.22.1"
- "@typescript-eslint/visitor-keys" "4.22.1"
+ "@typescript-eslint/types" "4.27.0"
+ "@typescript-eslint/visitor-keys" "4.27.0"
"@typescript-eslint/types@3.10.1":
version "3.10.1"
resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727"
integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==
-"@typescript-eslint/types@4.22.1":
- version "4.22.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.22.1.tgz#bf99c6cec0b4a23d53a61894816927f2adad856a"
- integrity sha512-2HTkbkdAeI3OOcWbqA8hWf/7z9c6gkmnWNGz0dKSLYLWywUlkOAQ2XcjhlKLj5xBFDf8FgAOF5aQbnLRvgNbCw==
+"@typescript-eslint/types@4.27.0":
+ version "4.27.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.27.0.tgz#712b408519ed699baff69086bc59cd2fc13df8d8"
+ integrity sha512-I4ps3SCPFCKclRcvnsVA/7sWzh7naaM/b4pBO2hVxnM3wrU51Lveybdw5WoIktU/V4KfXrTt94V9b065b/0+wA==
"@typescript-eslint/typescript-estree@2.34.0":
version "2.34.0"
@@ -3456,18 +3482,18 @@
semver "^7.3.2"
tsutils "^3.17.1"
-"@typescript-eslint/typescript-estree@4.22.1":
- version "4.22.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.22.1.tgz#dca379eead8cdfd4edc04805e83af6d148c164f9"
- integrity sha512-p3We0pAPacT+onSGM+sPR+M9CblVqdA9F1JEdIqRVlxK5Qth4ochXQgIyb9daBomyQKAXbygxp1aXQRV0GC79A==
+"@typescript-eslint/typescript-estree@4.27.0":
+ version "4.27.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.27.0.tgz#189a7b9f1d0717d5cccdcc17247692dedf7a09da"
+ integrity sha512-KH03GUsUj41sRLLEy2JHstnezgpS5VNhrJouRdmh6yNdQ+yl8w5LrSwBkExM+jWwCJa7Ct2c8yl8NdtNRyQO6g==
dependencies:
- "@typescript-eslint/types" "4.22.1"
- "@typescript-eslint/visitor-keys" "4.22.1"
- debug "^4.1.1"
- globby "^11.0.1"
+ "@typescript-eslint/types" "4.27.0"
+ "@typescript-eslint/visitor-keys" "4.27.0"
+ debug "^4.3.1"
+ globby "^11.0.3"
is-glob "^4.0.1"
- semver "^7.3.2"
- tsutils "^3.17.1"
+ semver "^7.3.5"
+ tsutils "^3.21.0"
"@typescript-eslint/visitor-keys@3.10.1":
version "3.10.1"
@@ -3476,12 +3502,12 @@
dependencies:
eslint-visitor-keys "^1.1.0"
-"@typescript-eslint/visitor-keys@4.22.1":
- version "4.22.1"
- resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.22.1.tgz#6045ae25a11662c671f90b3a403d682dfca0b7a6"
- integrity sha512-WPkOrIRm+WCLZxXQHCi+WG8T2MMTUFR70rWjdWYddLT7cEfb2P4a3O/J2U1FBVsSFTocXLCoXWY6MZGejeStvQ==
+"@typescript-eslint/visitor-keys@4.27.0":
+ version "4.27.0"
+ resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.27.0.tgz#f56138b993ec822793e7ebcfac6ffdce0a60cb81"
+ integrity sha512-es0GRYNZp0ieckZ938cEANfEhsfHrzuLrePukLKtY3/KPXcq1Xd555Mno9/GOgXhKzn0QfkDLVgqWO3dGY80bg==
dependencies:
- "@typescript-eslint/types" "4.22.1"
+ "@typescript-eslint/types" "4.27.0"
eslint-visitor-keys "^2.0.0"
"@vue/babel-helper-vue-jsx-merge-props@^1.2.1":
@@ -3522,9 +3548,9 @@
svg-tags "^1.0.0"
"@vue/babel-preset-app@^4.1.2":
- version "4.5.12"
- resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.5.12.tgz#c3a23cf33f6e5ea30536f13c0f9b1fc7e028b1c1"
- integrity sha512-8q67ORQ9O0Ms0nlqsXTVhaBefRBaLrzPxOewAZhdcO7onHwcO5/wRdWtHhZgfpCZlhY7NogkU16z3WnorSSkEA==
+ version "4.5.13"
+ resolved "https://registry.yarnpkg.com/@vue/babel-preset-app/-/babel-preset-app-4.5.13.tgz#cb475321e4c73f7f110dac29a48c2a9cb80afeb6"
+ integrity sha512-pM7CR3yXB6L8Gfn6EmX7FLNE3+V/15I3o33GkSNsWvgsMp6HVGXKkXgojrcfUUauyL1LZOdvTmu4enU2RePGHw==
dependencies:
"@babel/core" "^7.11.0"
"@babel/helper-compilation-targets" "^7.9.6"
@@ -3607,15 +3633,15 @@
camelcase "^5.0.0"
"@vue/component-compiler-utils@^3.1.0":
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.2.0.tgz#8f85182ceed28e9b3c75313de669f83166d11e5d"
- integrity sha512-lejBLa7xAMsfiZfNp7Kv51zOzifnb29FwdnMLa96z26kXErPFioSf9BMcePVIQ6/Gc6/mC0UrPpxAWIHyae0vw==
+ version "3.2.2"
+ resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-3.2.2.tgz#2f7ed5feed82ff7f0284acc11d525ee7eff22460"
+ integrity sha512-rAYMLmgMuqJFWAOb3Awjqqv5X3Q3hVr4jH/kgrFJpiU0j3a90tnNBplqbj+snzrgZhC9W128z+dtgMifOiMfJg==
dependencies:
consolidate "^0.15.1"
hash-sum "^1.0.2"
lru-cache "^4.1.2"
merge-source-map "^1.1.0"
- postcss "^7.0.14"
+ postcss "^7.0.36"
postcss-selector-parser "^6.0.2"
source-map "~0.6.1"
vue-template-es2015-compiler "^1.9.0"
@@ -3751,6 +3777,14 @@
vuepress-plugin-container "^2.0.2"
vuepress-plugin-smooth-scroll "^0.0.3"
+"@webassemblyjs/ast@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f"
+ integrity sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==
+ dependencies:
+ "@webassemblyjs/helper-numbers" "1.11.0"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
+
"@webassemblyjs/ast@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964"
@@ -3760,16 +3794,31 @@
"@webassemblyjs/helper-wasm-bytecode" "1.9.0"
"@webassemblyjs/wast-parser" "1.9.0"
+"@webassemblyjs/floating-point-hex-parser@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz#34d62052f453cd43101d72eab4966a022587947c"
+ integrity sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==
+
"@webassemblyjs/floating-point-hex-parser@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz#3c3d3b271bddfc84deb00f71344438311d52ffb4"
integrity sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==
+"@webassemblyjs/helper-api-error@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz#aaea8fb3b923f4aaa9b512ff541b013ffb68d2d4"
+ integrity sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==
+
"@webassemblyjs/helper-api-error@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz#203f676e333b96c9da2eeab3ccef33c45928b6a2"
integrity sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==
+"@webassemblyjs/helper-buffer@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz#d026c25d175e388a7dbda9694e91e743cbe9b642"
+ integrity sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==
+
"@webassemblyjs/helper-buffer@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz#a1442d269c5feb23fcbc9ef759dac3547f29de00"
@@ -3794,11 +3843,35 @@
dependencies:
"@webassemblyjs/ast" "1.9.0"
+"@webassemblyjs/helper-numbers@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz#7ab04172d54e312cc6ea4286d7d9fa27c88cd4f9"
+ integrity sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==
+ dependencies:
+ "@webassemblyjs/floating-point-hex-parser" "1.11.0"
+ "@webassemblyjs/helper-api-error" "1.11.0"
+ "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/helper-wasm-bytecode@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz#85fdcda4129902fe86f81abf7e7236953ec5a4e1"
+ integrity sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==
+
"@webassemblyjs/helper-wasm-bytecode@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz#4fed8beac9b8c14f8c58b70d124d549dd1fe5790"
integrity sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==
+"@webassemblyjs/helper-wasm-section@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz#9ce2cc89300262509c801b4af113d1ca25c1a75b"
+ integrity sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.0"
+ "@webassemblyjs/helper-buffer" "1.11.0"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
+ "@webassemblyjs/wasm-gen" "1.11.0"
+
"@webassemblyjs/helper-wasm-section@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz#5a4138d5a6292ba18b04c5ae49717e4167965346"
@@ -3809,6 +3882,13 @@
"@webassemblyjs/helper-wasm-bytecode" "1.9.0"
"@webassemblyjs/wasm-gen" "1.9.0"
+"@webassemblyjs/ieee754@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz#46975d583f9828f5d094ac210e219441c4e6f5cf"
+ integrity sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==
+ dependencies:
+ "@xtuc/ieee754" "^1.2.0"
+
"@webassemblyjs/ieee754@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz#15c7a0fbaae83fb26143bbacf6d6df1702ad39e4"
@@ -3816,6 +3896,13 @@
dependencies:
"@xtuc/ieee754" "^1.2.0"
+"@webassemblyjs/leb128@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.0.tgz#f7353de1df38aa201cba9fb88b43f41f75ff403b"
+ integrity sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==
+ dependencies:
+ "@xtuc/long" "4.2.2"
+
"@webassemblyjs/leb128@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.9.0.tgz#f19ca0b76a6dc55623a09cffa769e838fa1e1c95"
@@ -3823,11 +3910,30 @@
dependencies:
"@xtuc/long" "4.2.2"
+"@webassemblyjs/utf8@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.0.tgz#86e48f959cf49e0e5091f069a709b862f5a2cadf"
+ integrity sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==
+
"@webassemblyjs/utf8@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.9.0.tgz#04d33b636f78e6a6813227e82402f7637b6229ab"
integrity sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==
+"@webassemblyjs/wasm-edit@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz#ee4a5c9f677046a210542ae63897094c2027cb78"
+ integrity sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.0"
+ "@webassemblyjs/helper-buffer" "1.11.0"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
+ "@webassemblyjs/helper-wasm-section" "1.11.0"
+ "@webassemblyjs/wasm-gen" "1.11.0"
+ "@webassemblyjs/wasm-opt" "1.11.0"
+ "@webassemblyjs/wasm-parser" "1.11.0"
+ "@webassemblyjs/wast-printer" "1.11.0"
+
"@webassemblyjs/wasm-edit@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz#3fe6d79d3f0f922183aa86002c42dd256cfee9cf"
@@ -3842,6 +3948,17 @@
"@webassemblyjs/wasm-parser" "1.9.0"
"@webassemblyjs/wast-printer" "1.9.0"
+"@webassemblyjs/wasm-gen@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz#3cdb35e70082d42a35166988dda64f24ceb97abe"
+ integrity sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.0"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
+ "@webassemblyjs/ieee754" "1.11.0"
+ "@webassemblyjs/leb128" "1.11.0"
+ "@webassemblyjs/utf8" "1.11.0"
+
"@webassemblyjs/wasm-gen@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz#50bc70ec68ded8e2763b01a1418bf43491a7a49c"
@@ -3853,6 +3970,16 @@
"@webassemblyjs/leb128" "1.9.0"
"@webassemblyjs/utf8" "1.9.0"
+"@webassemblyjs/wasm-opt@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz#1638ae188137f4bb031f568a413cd24d32f92978"
+ integrity sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.0"
+ "@webassemblyjs/helper-buffer" "1.11.0"
+ "@webassemblyjs/wasm-gen" "1.11.0"
+ "@webassemblyjs/wasm-parser" "1.11.0"
+
"@webassemblyjs/wasm-opt@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz#2211181e5b31326443cc8112eb9f0b9028721a61"
@@ -3863,6 +3990,18 @@
"@webassemblyjs/wasm-gen" "1.9.0"
"@webassemblyjs/wasm-parser" "1.9.0"
+"@webassemblyjs/wasm-parser@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz#3e680b8830d5b13d1ec86cc42f38f3d4a7700754"
+ integrity sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.0"
+ "@webassemblyjs/helper-api-error" "1.11.0"
+ "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
+ "@webassemblyjs/ieee754" "1.11.0"
+ "@webassemblyjs/leb128" "1.11.0"
+ "@webassemblyjs/utf8" "1.11.0"
+
"@webassemblyjs/wasm-parser@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz#9d48e44826df4a6598294aa6c87469d642fff65e"
@@ -3887,6 +4026,14 @@
"@webassemblyjs/helper-fsm" "1.9.0"
"@xtuc/long" "4.2.2"
+"@webassemblyjs/wast-printer@1.11.0":
+ version "1.11.0"
+ resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz#680d1f6a5365d6d401974a8e949e05474e1fab7e"
+ integrity sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==
+ dependencies:
+ "@webassemblyjs/ast" "1.11.0"
+ "@xtuc/long" "4.2.2"
+
"@webassemblyjs/wast-printer@1.9.0":
version "1.9.0"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz#4935d54c85fef637b00ce9f52377451d00d47899"
@@ -3960,10 +4107,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.1.0:
- version "8.2.4"
- resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.2.4.tgz#caba24b08185c3b56e3168e97d15ed17f4d31fd0"
- integrity sha512-Ibt84YwBDDA890eDiDCEqcbwvHlBvzzDkU2cGBBDDI1QWT12jTiXIOn2CIw5KK4i6N5Z2HUxwYjzriDyqaqqZg==
+acorn@^8.2.1, acorn@^8.2.4:
+ version "8.4.0"
+ resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.0.tgz#af53266e698d7cffa416714b503066a82221be60"
+ integrity sha512-ULr0LDaEqQrMFGyQ3bhJkLsbtrQ8QibAseGZeaSUiT/6zb9IvIkomWHJIvgvwad+hinRAgsI51JcWk2yvwyL+w==
add-stream@^1.0.0:
version "1.0.0"
@@ -4014,7 +4161,7 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
-ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.5.3, ajv@^6.9.1:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.5.3, ajv@^6.9.1:
version "6.12.6"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -4025,9 +4172,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.5.3, ajv@
uri-js "^4.2.2"
ajv@^8.0.1:
- version "8.2.0"
- resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.2.0.tgz#c89d3380a784ce81b2085f48811c4c101df4c602"
- integrity sha512-WSNGFuyWd//XO8n/m/EaOlNLtO0yL8EXT/74LqT4khdhpZjP7lkj/kT5uwRmGitKEVp/Oj7ZUHeGfPtgHhQ5CA==
+ version "8.6.0"
+ resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz#60cc45d9c46a477d80d92c48076d972c342e5720"
+ integrity sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ==
dependencies:
fast-deep-equal "^3.1.1"
json-schema-traverse "^1.0.0"
@@ -4146,7 +4293,7 @@ anymatch@^2.0.0:
micromatch "^3.1.4"
normalize-path "^2.1.1"
-anymatch@^3.0.3, anymatch@~3.1.1:
+anymatch@^3.0.0, anymatch@^3.0.3, anymatch@~3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
@@ -4424,9 +4571,9 @@ autoprefixer@^9.5.1:
postcss-value-parser "^4.1.0"
autosize@^4.0.2:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/autosize/-/autosize-4.0.2.tgz#073cfd07c8bf45da4b9fd153437f5bafbba1e4c9"
- integrity sha512-jnSyH2d+qdfPGpWlcuhGiHmqBJ6g3X+8T+iRwFrHPLVcdoGJE/x6Qicm6aDHfTsbgZKxyV8UU/YB2p4cjKDRRA==
+ version "4.0.4"
+ resolved "https://registry.yarnpkg.com/autosize/-/autosize-4.0.4.tgz#924f13853a466b633b9309330833936d8bccce03"
+ integrity sha512-5yxLQ22O0fCRGoxGfeLSNt3J8LB1v+umtpMnPW6XjkTWXKoN0AmXAIhelJcDtFT/Y/wYWmfE+oqU10Q0b8FhaQ==
aws-sign2@~0.7.0:
version "0.7.0"
@@ -4438,7 +4585,7 @@ aws4@^1.8.0:
resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
-axios@0.21.1, axios@^0.21.0, axios@^0.21.1:
+axios@0.21.1, axios@^0.21.1:
version "0.21.1"
resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
integrity sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==
@@ -4560,29 +4707,29 @@ babel-plugin-jest-hoist@^26.6.2:
"@types/babel__core" "^7.0.0"
"@types/babel__traverse" "^7.0.6"
-babel-plugin-polyfill-corejs2@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.0.tgz#686775bf9a5aa757e10520903675e3889caeedc4"
- integrity sha512-9bNwiR0dS881c5SHnzCmmGlMkJLl0OUZvxrxHo9w/iNoRuqaPjqlvBf4HrovXtQs/au5yKkpcdgfT1cC5PAZwg==
+babel-plugin-polyfill-corejs2@^0.2.2:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
+ integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==
dependencies:
"@babel/compat-data" "^7.13.11"
- "@babel/helper-define-polyfill-provider" "^0.2.0"
+ "@babel/helper-define-polyfill-provider" "^0.2.2"
semver "^6.1.1"
-babel-plugin-polyfill-corejs3@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.0.tgz#f4b4bb7b19329827df36ff56f6e6d367026cb7a2"
- integrity sha512-zZyi7p3BCUyzNxLx8KV61zTINkkV65zVkDAFNZmrTCRVhjo1jAS+YLvDJ9Jgd/w2tsAviCwFHReYfxO3Iql8Yg==
+babel-plugin-polyfill-corejs3@^0.2.2:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.2.tgz#7424a1682ee44baec817327710b1b094e5f8f7f5"
+ integrity sha512-l1Cf8PKk12eEk5QP/NQ6TH8A1pee6wWDJ96WjxrMXFLHLOBFzYM4moG80HFgduVhTqAFez4alnZKEhP/bYHg0A==
dependencies:
- "@babel/helper-define-polyfill-provider" "^0.2.0"
+ "@babel/helper-define-polyfill-provider" "^0.2.2"
core-js-compat "^3.9.1"
-babel-plugin-polyfill-regenerator@^0.2.0:
- version "0.2.0"
- resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.0.tgz#853f5f5716f4691d98c84f8069c7636ea8da7ab8"
- integrity sha512-J7vKbCuD2Xi/eEHxquHN14bXAW9CXtecwuLrOIDJtcZzTaPzV1VdEfoUf9AzcRBMolKUQKM9/GVojeh0hFiqMg==
+babel-plugin-polyfill-regenerator@^0.2.2:
+ version "0.2.2"
+ resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
+ integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==
dependencies:
- "@babel/helper-define-polyfill-provider" "^0.2.0"
+ "@babel/helper-define-polyfill-provider" "^0.2.2"
babel-plugin-transform-es2015-block-scoping@^6.26.0:
version "6.26.0"
@@ -4738,9 +4885,9 @@ bcrypt-pbkdf@^1.0.0:
tweetnacl "^0.14.3"
before-after-hook@^2.2.0:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.1.tgz#73540563558687586b52ed217dad6a802ab1549c"
- integrity sha512-/6FKxSTWoJdbsLDF8tdIjaRiFXiE6UHsEHE3OPI/cwPURCVi1ukP0gmLn7XWEiFk5TcwQjjY5PWsU+j+tgXgmw==
+ version "2.2.2"
+ resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
+ integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
big.js@^3.1.3:
version "3.2.0"
@@ -5109,10 +5256,10 @@ cacache@^12.0.2, cacache@^12.0.3:
unique-filename "^1.1.1"
y18n "^4.0.0"
-cacache@^15.0.5:
- version "15.0.6"
- resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099"
- integrity sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==
+cacache@^15.0.5, cacache@^15.2.0:
+ version "15.2.0"
+ resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389"
+ integrity sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==
dependencies:
"@npmcli/move-file" "^1.0.1"
chownr "^2.0.0"
@@ -5191,16 +5338,16 @@ cacheable-request@^6.0.0:
responselike "^1.0.2"
cacheable-request@^7.0.1:
- version "7.0.1"
- resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.1.tgz#062031c2856232782ed694a257fa35da93942a58"
- integrity sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==
+ version "7.0.2"
+ resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
+ integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
dependencies:
clone-response "^1.0.2"
get-stream "^5.1.0"
http-cache-semantics "^4.0.0"
keyv "^4.0.0"
lowercase-keys "^2.0.0"
- normalize-url "^4.1.0"
+ normalize-url "^6.0.1"
responselike "^2.0.0"
call-bind@^1.0.0, call-bind@^1.0.2:
@@ -5248,6 +5395,14 @@ camel-case@3.0.x:
no-case "^2.2.0"
upper-case "^1.1.1"
+camel-case@^4.1.1:
+ version "4.1.2"
+ resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
+ integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
+ dependencies:
+ pascal-case "^3.1.2"
+ tslib "^2.0.3"
+
camelcase-keys@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
@@ -5296,9 +5451,9 @@ caniuse-api@^3.0.0:
lodash.uniq "^4.5.0"
caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
- version "1.0.30001223"
- resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001223.tgz#39b49ff0bfb3ee3587000d2f66c47addc6e14443"
- integrity sha512-k/RYs6zc/fjbxTjaWZemeSmOjO0JJV+KguOBA3NwPup8uzxM1cMhR2BD9XmO86GuqaqTCO8CgkgH9Rz//vdDiA==
+ version "1.0.30001237"
+ resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001237.tgz#4b7783661515b8e7151fc6376cfd97f0e427b9e5"
+ integrity sha512-pDHgRndit6p1NR2GhzMbQ6CkRrp4VKuSsqbcLeOQppYPKOYkKT/6ZvZDvKJUqcmtyWIAHuZq3SVS2vc1egCZzw==
capture-exit@^2.0.0:
version "2.0.0"
@@ -5404,19 +5559,19 @@ chokidar@^2.0.3, chokidar@^2.1.8:
fsevents "^1.2.7"
chokidar@^3.4.1:
- version "3.5.1"
- resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.1.tgz#ee9ce7bbebd2b79f49f304799d5468e31e14e68a"
- integrity sha512-9+s+Od+W0VJJzawDma/gvBNQqkTiqYTWLuZoyAsivsI4AaWTCzHG06/TMjsf1cYe9Cb97UCEhjz7HvnPk2p/tw==
+ version "3.5.2"
+ resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
+ integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
dependencies:
- anymatch "~3.1.1"
+ anymatch "~3.1.2"
braces "~3.0.2"
- glob-parent "~5.1.0"
+ glob-parent "~5.1.2"
is-binary-path "~2.1.0"
is-glob "~4.0.1"
normalize-path "~3.0.0"
- readdirp "~3.5.0"
+ readdirp "~3.6.0"
optionalDependencies:
- fsevents "~2.3.1"
+ fsevents "~2.3.2"
chownr@^1.0.1, chownr@^1.1.1:
version "1.1.4"
@@ -5439,9 +5594,9 @@ ci-info@^2.0.0:
integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
ci-info@^3.0.0:
- version "3.1.1"
- resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.1.1.tgz#9a32fcefdf7bcdb6f0a7e1c0f8098ec57897b80a"
- integrity sha512-kdRWLBIJwdsYJWYJFtAFFYxybguqeF91qpZaggjG5Nf8QKdizFG2hjqvaTXbxFIcYbSaD74KpAXv6BSm17DHEQ==
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.2.0.tgz#2876cb948a498797b5236f0095bc057d0dca38b6"
+ integrity sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==
cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
version "1.0.4"
@@ -5471,7 +5626,7 @@ class-utils@^0.3.5:
isobject "^3.0.0"
static-extend "^0.1.1"
-clean-css@4.2.x:
+clean-css@4.2.x, clean-css@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
@@ -5682,7 +5837,7 @@ columnify@^1.5.4:
strip-ansi "^3.0.0"
wcwidth "^1.0.0"
-combined-stream@^1.0.6, combined-stream@~1.0.6:
+combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
version "1.0.8"
resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
@@ -5704,6 +5859,11 @@ commander@^2.20.0, commander@^2.8.1:
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+commander@^4.1.1:
+ version "4.1.1"
+ resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
+ integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
+
commander@~2.19.0:
version "2.19.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
@@ -5818,9 +5978,9 @@ concurrently@^5.3.0:
yargs "^13.3.0"
config-chain@^1.1.12:
- version "1.1.12"
- resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
- integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
+ version "1.1.13"
+ resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4"
+ integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==
dependencies:
ini "^1.3.4"
proto-list "~1.2.1"
@@ -6028,10 +6188,10 @@ copy-webpack-plugin@^5.0.2:
serialize-javascript "^4.0.0"
webpack-log "^2.0.0"
-core-js-compat@^3.6.5, core-js-compat@^3.9.0, core-js-compat@^3.9.1:
- version "3.12.0"
- resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.12.0.tgz#a031e51fe411085e33cb629bfee2acaa53bc309a"
- integrity sha512-vvaN8EOvYBEjrr+MN3vCKrMNc/xdYZI+Rt/uPMROi4T5Hj8Fz6TiPQm2mrB9aZoQVW1lCFHYmMrv99aUct9mkg==
+core-js-compat@^3.14.0, core-js-compat@^3.6.5, core-js-compat@^3.9.1:
+ version "3.14.0"
+ resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.14.0.tgz#b574dabf29184681d5b16357bd33d104df3d29a5"
+ integrity sha512-R4NS2eupxtiJU+VwgkF9WTpnSfZW4pogwKHd8bclWU2sp93Pr5S1uYJI84cMOubJRou7bcfL0vmwtLslWN5p3A==
dependencies:
browserslist "^4.16.6"
semver "7.0.0"
@@ -6042,9 +6202,9 @@ core-js@^2.4.0, core-js@^2.5.0:
integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
core-js@^3.6.4, core-js@^3.6.5:
- version "3.12.0"
- resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.12.0.tgz#62bac86f7d7f087d40dba3e90a211c2c3c8559ea"
- integrity sha512-SaMnchL//WwU2Ot1hhkPflE8gzo7uq1FGvUJ8GKmi3TOU7rGTHIU+eir1WGf6qOtTyxdfdcp10yPdGZ59sQ3hw==
+ version "3.14.0"
+ resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz#62322b98c71cc2018b027971a69419e2425c2a6c"
+ integrity sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA==
core-util-is@1.0.2, core-util-is@~1.0.0:
version "1.0.2"
@@ -6235,7 +6395,7 @@ css-select-base-adapter@^0.1.1:
resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==
-css-select@^2.0.0, css-select@^2.0.2:
+css-select@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef"
integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==
@@ -6245,6 +6405,17 @@ css-select@^2.0.0, css-select@^2.0.2:
domutils "^1.7.0"
nth-check "^1.0.2"
+css-select@^4.1.3:
+ version "4.1.3"
+ resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067"
+ integrity sha512-gT3wBNd9Nj49rAbmtFHj1cljIAOLYSX1nZ8CB7TBO3INYckygm5B7LISU/szY//YmdiSLbJvDLOx9VnMVpMBxA==
+ dependencies:
+ boolbase "^1.0.0"
+ css-what "^5.0.0"
+ domhandler "^4.2.0"
+ domutils "^2.6.0"
+ nth-check "^2.0.0"
+
css-tree@1.0.0-alpha.37:
version "1.0.0-alpha.37"
resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
@@ -6266,6 +6437,11 @@ css-what@^3.2.1:
resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
+css-what@^5.0.0:
+ version "5.0.1"
+ resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad"
+ integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==
+
css@^2.0.0:
version "2.2.4"
resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
@@ -6417,9 +6593,9 @@ date-fns@^1.23.0:
integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
date-fns@^2.0.1:
- version "2.21.2"
- resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.21.2.tgz#9db92305cf00626e9122e56c72195b17725594aa"
- integrity sha512-FMkG7pIPx64mGIpS2LOb3Wp3O606H/hatoiz7G0oiYWai1izdM4tF1dd7QABv2NogkIDI4wxsfLLFQSuVvDHgA==
+ version "2.22.1"
+ resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.22.1.tgz#1e5af959831ebb1d82992bf67b765052d8f0efc4"
+ integrity sha512-yUFPQjrxEmIsMqlHhAhmxkuH769baF21Kk+nZwZGyrMoyLA+LugaQtC0+Tqf9CBUUULWwUJt6Q5ySI3LJDDCGg==
dateformat@^3.0.0:
version "3.0.3"
@@ -6453,7 +6629,7 @@ debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1:
dependencies:
ms "2.1.2"
-debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
+debug@^3.1.0, debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
version "3.2.7"
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -6746,9 +6922,9 @@ detect-indent@^5.0.0:
integrity sha1-OHHMCmoALow+Wzz38zYmRnXwa50=
detect-indent@^6.0.0:
- version "6.0.0"
- resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
- integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
+ integrity sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==
detect-libc@^1.0.3:
version "1.0.3"
@@ -6766,9 +6942,9 @@ detect-newline@^3.0.0:
integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
detect-node@^2.0.4:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.5.tgz#9d270aa7eaa5af0b72c4c9d9b814e7f4ce738b79"
- integrity sha512-qi86tE6hRcFHy8jI1m2VG+LaPUR1LhqDa5G8tVjuUXmOrpuAgqsA1pN0+ldgr3aKUH+QLI9hCY/OcRYisERejw==
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
+ integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
dezalgo@^1.0.0:
version "1.0.3"
@@ -6822,9 +6998,9 @@ dns-equal@^1.0.0:
integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
dns-packet@^1.3.1:
- version "1.3.1"
- resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
- integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+ version "1.3.4"
+ resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
+ integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
dependencies:
ip "^1.1.0"
safe-buffer "^5.0.1"
@@ -6864,7 +7040,7 @@ doctrine@^3.0.0:
dependencies:
esutils "^2.0.2"
-dom-converter@^0.2:
+dom-converter@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.2.0.tgz#6721a9daee2e293682955b6afe416771627bb768"
integrity sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==
@@ -6887,6 +7063,15 @@ dom-serializer@0:
domelementtype "^2.0.1"
entities "^2.0.0"
+dom-serializer@^1.0.1:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
+ integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
+ dependencies:
+ domelementtype "^2.0.1"
+ domhandler "^4.2.0"
+ entities "^2.0.0"
+
dom-walk@^0.1.0:
version "0.1.2"
resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.2.tgz#0c548bef048f4d1f2a97249002236060daa3fd84"
@@ -6897,12 +7082,12 @@ domain-browser@^1.1.1:
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
integrity sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==
-domelementtype@1, domelementtype@^1.3.1:
+domelementtype@1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-domelementtype@^2.0.1:
+domelementtype@^2.0.1, domelementtype@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
@@ -6914,19 +7099,19 @@ domexception@^2.0.1:
dependencies:
webidl-conversions "^5.0.0"
-domhandler@^2.3.0:
- version "2.4.2"
- resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
- integrity sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==
+domhandler@^4.0.0, domhandler@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
+ integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
dependencies:
- domelementtype "1"
+ domelementtype "^2.2.0"
-dompurify@^2.0.11:
- version "2.2.8"
- resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.8.tgz#ce88e395f6d00b6dc53f80d6b2a6fdf5446873c6"
- integrity sha512-9H0UL59EkDLgY3dUFjLV6IEUaHm5qp3mxSqWw7Yyx4Zhk2Jn2cmLe+CNPP3xy13zl8Bqg+0NehQzkdMoVhGRww==
+dompurify@^2.2.9:
+ version "2.2.9"
+ resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.9.tgz#4b42e244238032d9286a0d2c87b51313581d9624"
+ integrity sha512-+9MqacuigMIZ+1+EwoEltogyWGFTJZWU3258Rupxs+2CGs4H914G9er6pZbsme/bvb5L67o2rade9n21e4RW/w==
-domutils@^1.5.1, domutils@^1.7.0:
+domutils@^1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
@@ -6934,6 +7119,23 @@ domutils@^1.5.1, domutils@^1.7.0:
dom-serializer "0"
domelementtype "1"
+domutils@^2.5.2, domutils@^2.6.0:
+ version "2.7.0"
+ resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442"
+ integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==
+ dependencies:
+ dom-serializer "^1.0.1"
+ domelementtype "^2.2.0"
+ domhandler "^4.2.0"
+
+dot-case@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
+ integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
+ dependencies:
+ no-case "^3.0.4"
+ tslib "^2.0.3"
+
dot-prop@^5.1.0, dot-prop@^5.2.0, dot-prop@^6.0.1:
version "5.3.0"
resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
@@ -7012,9 +7214,9 @@ ee-first@1.1.1:
integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
electron-to-chromium@^1.3.723:
- version "1.3.727"
- resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.727.tgz#857e310ca00f0b75da4e1db6ff0e073cc4a91ddf"
- integrity sha512-Mfz4FIB4FSvEwBpDfdipRIrwd6uo8gUDoRDF4QEYb4h4tSuI3ov594OrjU6on042UlFHouIJpClDODGkPcBSbg==
+ version "1.3.752"
+ resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.752.tgz#0728587f1b9b970ec9ffad932496429aef750d09"
+ integrity sha512-2Tg+7jSl3oPxgsBsWKh5H83QazTkmWG/cnNwJplmyZc7KcN61+I10oUgaXSVk/NwfvN3BdkKDR4FYuRBQQ2v0A==
elliptic@^6.5.3:
version "6.5.4"
@@ -7082,6 +7284,14 @@ enhanced-resolve@^4.1.1, enhanced-resolve@^4.5.0:
memory-fs "^0.5.0"
tapable "^1.0.0"
+enhanced-resolve@^5.8.0:
+ version "5.8.2"
+ resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"
+ integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==
+ dependencies:
+ graceful-fs "^4.2.4"
+ tapable "^2.2.0"
+
enquirer@^2.3.5:
version "2.3.6"
resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
@@ -7089,16 +7299,16 @@ enquirer@^2.3.5:
dependencies:
ansi-colors "^4.1.1"
-entities@^1.1.1, entities@~1.1.1:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
- integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
-
entities@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+entities@~1.1.1:
+ version "1.1.2"
+ resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
+ integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
+
env-paths@^2.2.0:
version "2.2.1"
resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
@@ -7136,10 +7346,10 @@ error-ex@^1.2.0, error-ex@^1.3.1:
dependencies:
is-arrayish "^0.2.1"
-es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
- version "1.18.0"
- resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0.tgz#ab80b359eecb7ede4c298000390bc5ac3ec7b5a4"
- integrity sha512-LJzK7MrQa8TS0ja2w3YNLzUgJCGPdPOV1yVvezjNnS89D+VR08+Szt2mz3YB2Dck/+w5tfIq/RoUAFqJJGM2yw==
+es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
+ version "1.18.3"
+ resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0"
+ integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==
dependencies:
call-bind "^1.0.2"
es-to-primitive "^1.2.1"
@@ -7148,15 +7358,20 @@ es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2:
has "^1.0.3"
has-symbols "^1.0.2"
is-callable "^1.2.3"
- is-negative-zero "^2.0.1"
- is-regex "^1.1.2"
- is-string "^1.0.5"
- object-inspect "^1.9.0"
+ is-negative-zero "^2.0.1"
+ is-regex "^1.1.3"
+ is-string "^1.0.6"
+ object-inspect "^1.10.3"
object-keys "^1.1.1"
object.assign "^4.1.2"
string.prototype.trimend "^1.0.4"
string.prototype.trimstart "^1.0.4"
- unbox-primitive "^1.0.0"
+ unbox-primitive "^1.0.1"
+
+es-module-lexer@^0.4.0:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.1.tgz#dda8c6a14d8f340a24e34331e0fab0cb50438e0e"
+ integrity sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==
es-to-primitive@^1.2.1:
version "1.2.1"
@@ -7197,6 +7412,11 @@ escape-string-regexp@^2.0.0:
resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz#a30304e99daa32e23b2fd20f51babd07cffca344"
integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==
+escape-string-regexp@^4.0.0:
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+ integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
escodegen@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
@@ -7225,11 +7445,11 @@ eslint-import-resolver-node@^0.3.4:
resolve "^1.13.1"
eslint-module-utils@^2.6.0:
- version "2.6.0"
- resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
- integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
+ version "2.6.1"
+ resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.1.tgz#b51be1e473dd0de1c5ea638e22429c2490ea8233"
+ integrity sha512-ZXI9B8cxAJIH4nfkhTwcRTEAnrVfobYqwjWy/QMCZ8rHkZHFjf9yO4BzpiF9kCSfNlMG54eKigISHpX0+AaT4A==
dependencies:
- debug "^2.6.9"
+ debug "^3.2.7"
pkg-dir "^2.0.0"
eslint-plugin-deprecation@^1.1.0:
@@ -7294,6 +7514,14 @@ eslint-plugin-sonarjs@0.5.0:
resolved "https://registry.yarnpkg.com/eslint-plugin-sonarjs/-/eslint-plugin-sonarjs-0.5.0.tgz#ce17b2daba65a874c2862213a9e38e8986ad7d7d"
integrity sha512-XW5MnzlRjhXpIdbULC/qAdJYHWw3rRLws/DyawdlPU/IdVr9AmRK1r2LaCvabwKOAW2XYYSo3kDX58E4MrB7PQ==
+eslint-scope@5.1.1, eslint-scope@^5.0.0, eslint-scope@^5.1.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+ integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+ dependencies:
+ esrecurse "^4.3.0"
+ estraverse "^4.1.1"
+
eslint-scope@^4.0.3:
version "4.0.3"
resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
@@ -7302,14 +7530,6 @@ eslint-scope@^4.0.3:
esrecurse "^4.1.0"
estraverse "^4.1.1"
-eslint-scope@^5.0.0, eslint-scope@^5.1.1:
- version "5.1.1"
- resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
- integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
- dependencies:
- esrecurse "^4.3.0"
- estraverse "^4.1.1"
-
eslint-utils@^1.3.1:
version "1.4.3"
resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
@@ -7324,6 +7544,13 @@ eslint-utils@^2.0.0, eslint-utils@^2.1.0:
dependencies:
eslint-visitor-keys "^1.1.0"
+eslint-utils@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+ integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+ dependencies:
+ eslint-visitor-keys "^2.0.0"
+
eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
version "1.3.0"
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
@@ -7377,27 +7604,29 @@ eslint@^5.0.0:
text-table "^0.2.0"
eslint@^7.14.0:
- version "7.25.0"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.25.0.tgz#1309e4404d94e676e3e831b3a3ad2b050031eb67"
- integrity sha512-TVpSovpvCNpLURIScDRB6g5CYu/ZFq9GfX2hLNIV4dSBKxIWojeDODvYl3t0k0VtMxYeR8OXPCFE5+oHMlGfhw==
+ version "7.28.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.28.0.tgz#435aa17a0b82c13bb2be9d51408b617e49c1e820"
+ integrity sha512-UMfH0VSjP0G4p3EWirscJEQ/cHqnT/iuH6oNZOB94nBjWbMnhGEPxsZm1eyIW0C/9jLI0Fow4W5DXLjEI7mn1g==
dependencies:
"@babel/code-frame" "7.12.11"
- "@eslint/eslintrc" "^0.4.0"
+ "@eslint/eslintrc" "^0.4.2"
ajv "^6.10.0"
chalk "^4.0.0"
cross-spawn "^7.0.2"
debug "^4.0.1"
doctrine "^3.0.0"
enquirer "^2.3.5"
+ escape-string-regexp "^4.0.0"
eslint-scope "^5.1.1"
eslint-utils "^2.1.0"
eslint-visitor-keys "^2.0.0"
espree "^7.3.1"
esquery "^1.4.0"
esutils "^2.0.2"
+ fast-deep-equal "^3.1.3"
file-entry-cache "^6.0.1"
functional-red-black-tree "^1.0.1"
- glob-parent "^5.0.0"
+ glob-parent "^5.1.2"
globals "^13.6.0"
ignore "^4.0.6"
import-fresh "^3.0.0"
@@ -7406,7 +7635,7 @@ eslint@^7.14.0:
js-yaml "^3.13.1"
json-stable-stringify-without-jsonify "^1.0.1"
levn "^0.4.1"
- lodash "^4.17.21"
+ lodash.merge "^4.6.2"
minimatch "^3.0.4"
natural-compare "^1.4.0"
optionator "^0.9.1"
@@ -7415,7 +7644,7 @@ eslint@^7.14.0:
semver "^7.2.1"
strip-ansi "^6.0.0"
strip-json-comments "^3.1.0"
- table "^6.0.4"
+ table "^6.0.9"
text-table "^0.2.0"
v8-compile-cache "^2.0.3"
@@ -7499,7 +7728,7 @@ events@^1.1.0:
resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
-events@^3.0.0:
+events@^3.0.0, events@^3.2.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
@@ -7577,9 +7806,9 @@ execa@^4.0.0:
strip-final-newline "^2.0.0"
execa@^5.0.0:
- version "5.0.0"
- resolved "https://registry.yarnpkg.com/execa/-/execa-5.0.0.tgz#4029b0007998a841fbd1032e5f4de86a3c1e3376"
- integrity sha512-ov6w/2LCiuyO4RLYGdpFGjkcs0wMTgGE8PrkTHikeUy5iJekXyPIKUjifk5CsE0pt7sMCrMZ3YNqoCj6idQOnQ==
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+ integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
dependencies:
cross-spawn "^7.0.3"
get-stream "^6.0.0"
@@ -7737,7 +7966,7 @@ extsprintf@^1.2.0:
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
version "3.1.3"
resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
@@ -7794,9 +8023,9 @@ fastq@^1.6.0:
reusify "^1.0.4"
faye-websocket@^0.11.3:
- version "0.11.3"
- resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.3.tgz#5c0e9a8968e8912c286639fde977a8b209f2508e"
- integrity sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==
+ version "0.11.4"
+ resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+ integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
dependencies:
websocket-driver ">=0.5.1"
@@ -8052,9 +8281,9 @@ flush-write-stream@^1.0.0:
readable-stream "^2.3.6"
follow-redirects@^1.0.0, follow-redirects@^1.10.0:
- version "1.14.0"
- resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe"
- integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg==
+ version "1.14.1"
+ resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
+ integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
font-awesome@^4.7.0:
version "4.7.0"
@@ -8085,6 +8314,15 @@ form-data@^2.5.0:
combined-stream "^1.0.6"
mime-types "^2.1.12"
+form-data@^3.0.0:
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+ integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
+ dependencies:
+ asynckit "^0.4.0"
+ combined-stream "^1.0.8"
+ mime-types "^2.1.12"
+
form-data@~2.3.2:
version "2.3.3"
resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
@@ -8094,10 +8332,10 @@ form-data@~2.3.2:
combined-stream "^1.0.6"
mime-types "^2.1.12"
-forwarded@~0.1.2:
- version "0.1.2"
- resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
- integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+forwarded@0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+ integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
fragment-cache@^0.2.1:
version "0.2.1"
@@ -8212,7 +8450,7 @@ fsevents@^1.2.7:
bindings "^1.5.0"
nan "^2.12.1"
-fsevents@^2.1.2, fsevents@~2.3.1:
+fsevents@^2.1.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==
@@ -8407,7 +8645,7 @@ glob-parent@^3.1.0:
is-glob "^3.1.0"
path-dirname "^1.0.0"
-glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
+glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
version "5.1.2"
resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
@@ -8426,6 +8664,11 @@ glob-to-regexp@^0.3.0:
resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
+glob-to-regexp@^0.4.1:
+ version "0.4.1"
+ resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+ integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
+
glob@7.1.3:
version "7.1.3"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
@@ -8506,17 +8749,10 @@ globals@^11.1.0, globals@^11.7.0:
resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-globals@^12.1.0:
- version "12.4.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
- integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
- dependencies:
- type-fest "^0.8.1"
-
-globals@^13.6.0:
- version "13.8.0"
- resolved "https://registry.yarnpkg.com/globals/-/globals-13.8.0.tgz#3e20f504810ce87a8d72e55aecf8435b50f4c1b3"
- integrity sha512-rHtdA6+PDBIjeEvA91rpqzEvk/k3/i7EeNQiryiWuJH0Hw9cpyJMAt2jtbAwUaRdhD+573X4vWw6IcjKPasi9Q==
+globals@^13.6.0, globals@^13.9.0:
+ version "13.9.0"
+ resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"
+ integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA==
dependencies:
type-fest "^0.20.2"
@@ -8525,7 +8761,7 @@ globals@^9.18.0:
resolved "https://registry.yarnpkg.com/globals/-/globals-9.18.0.tgz#aa3896b3e69b487f17e31ed2143d69a8e30c2d8a"
integrity sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==
-globby@^11.0.1, globby@^11.0.2:
+globby@^11.0.2, globby@^11.0.3:
version "11.0.3"
resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
@@ -8824,7 +9060,7 @@ hash.js@^1.0.0, hash.js@^1.0.3:
inherits "^2.0.3"
minimalistic-assert "^1.0.1"
-he@1.2.x, he@^1.1.0:
+he@1.2.x, he@^1.1.0, he@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -8915,6 +9151,19 @@ html-escaper@^2.0.0:
resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
+html-minifier-terser@^5.0.1:
+ version "5.1.1"
+ resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
+ integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
+ dependencies:
+ camel-case "^4.1.1"
+ clean-css "^4.2.3"
+ commander "^4.1.1"
+ he "^1.2.0"
+ param-case "^3.0.3"
+ relateurl "^0.2.7"
+ terser "^4.6.3"
+
html-minifier@^3.2.3:
version "3.5.21"
resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
@@ -8938,30 +9187,26 @@ html-tags@^3.1.0:
resolved "https://registry.yarnpkg.com/html-tags/-/html-tags-3.1.0.tgz#7b5e6f7e665e9fb41f30007ed9e0d41e97fb2140"
integrity sha512-1qYz89hW3lFDEazhjW0yVAV87lw8lVkrJocr72XmBkMKsoSVJCQx3W8BXsC7hO2qAt8BoVjYjtAcZ9perqGnNg==
-html-webpack-plugin@^3.2.0:
- version "3.2.0"
- resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
- integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s=
+html-webpack-plugin@^5.3.1:
+ version "5.3.1"
+ resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.3.1.tgz#8797327548e3de438e3494e0c6d06f181a7f20d1"
+ integrity sha512-rZsVvPXUYFyME0cuGkyOHfx9hmkFa4pWfxY/mdY38PsBEaVNsRoA+Id+8z6DBDgyv3zaw6XQszdF8HLwfQvcdQ==
dependencies:
- html-minifier "^3.2.3"
- loader-utils "^0.2.16"
- lodash "^4.17.3"
- pretty-error "^2.0.2"
- tapable "^1.0.0"
- toposort "^1.0.0"
- util.promisify "1.0.0"
+ "@types/html-minifier-terser" "^5.0.0"
+ html-minifier-terser "^5.0.1"
+ lodash "^4.17.20"
+ pretty-error "^2.1.1"
+ tapable "^2.0.0"
-htmlparser2@^3.10.1:
- version "3.10.1"
- resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
- integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
+htmlparser2@^6.1.0:
+ version "6.1.0"
+ resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+ integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
dependencies:
- domelementtype "^1.3.1"
- domhandler "^2.3.0"
- domutils "^1.5.1"
- entities "^1.1.1"
- inherits "^2.0.1"
- readable-stream "^3.1.1"
+ domelementtype "^2.0.1"
+ domhandler "^4.0.0"
+ domutils "^2.5.2"
+ entities "^2.0.0"
http-cache-semantics@3.8.1:
version "3.8.1"
@@ -9116,9 +9361,9 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24:
safer-buffer ">= 2.1.2 < 3"
iconv-lite@^0.6.0, iconv-lite@^0.6.2:
- version "0.6.2"
- resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
- integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+ version "0.6.3"
+ resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+ integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
dependencies:
safer-buffer ">= 2.1.2 < 3.0.0"
@@ -9532,11 +9777,11 @@ is-binary-path@~2.1.0:
binary-extensions "^2.0.0"
is-boolean-object@^1.1.0:
- version "1.1.0"
- resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.0.tgz#e2aaad3a3a8fca34c28f6eee135b156ed2587ff0"
- integrity sha512-a7Uprx8UtD+HWdyYwnD1+ExtTgqQtD2k/1yJgtXP6wnMm8byhkoTZRl+95LLThpzNZJ5aEvi46cdH+ayMFRwmA==
+ version "1.1.1"
+ resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
+ integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
dependencies:
- call-bind "^1.0.0"
+ call-bind "^1.0.2"
is-buffer@^1.1.5:
version "1.1.6"
@@ -9575,9 +9820,9 @@ is-color-stop@^1.0.0:
rgba-regex "^1.0.0"
is-core-module@^2.2.0:
- version "2.3.0"
- resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
- integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==
+ version "2.4.0"
+ resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.4.0.tgz#8e9fc8e15027b011418026e98f0e6f4d86305cc1"
+ integrity sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==
dependencies:
has "^1.0.3"
@@ -9596,9 +9841,9 @@ is-data-descriptor@^1.0.0:
kind-of "^6.0.0"
is-date-object@^1.0.1:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.3.tgz#4c0802ae9c8097939ea8001eaae3c502f3dbe72f"
- integrity sha512-tDpEUInNcy2Yw3lNSepK3Wdw1RnXLcIVienz6Ou631Acl15cJyRWK4dgA1vCmOEgIbtOV0W7MHg+AR2Gdg1NXQ==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
+ integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
is-descriptor@^0.1.0:
version "0.1.6"
@@ -9720,9 +9965,9 @@ is-npm@^4.0.0:
integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig==
is-number-object@^1.0.4:
- version "1.0.4"
- resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.4.tgz#36ac95e741cf18b283fc1ddf5e83da798e3ec197"
- integrity sha512-zohwelOAur+5uXtk8O3GPQ1eAcu4ZX3UwxQhUlfFFMNpUd83gXgjbhJh6HmB6LUNV/ieOLQuDwJO3dWJosUeMw==
+ version "1.0.5"
+ resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
+ integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
is-number@^3.0.0:
version "3.0.0"
@@ -9792,18 +10037,18 @@ is-plain-object@^5.0.0:
resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
-is-potential-custom-element-name@^1.0.0:
+is-potential-custom-element-name@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
-is-regex@^1.0.4, is-regex@^1.1.2:
- version "1.1.2"
- resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
- integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
+is-regex@^1.0.4, is-regex@^1.1.3:
+ version "1.1.3"
+ resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
+ integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
dependencies:
call-bind "^1.0.2"
- has-symbols "^1.0.1"
+ has-symbols "^1.0.2"
is-resolvable@^1.0.0:
version "1.1.0"
@@ -9816,9 +10061,9 @@ is-retry-allowed@^1.1.0:
integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==
is-ssh@^1.3.0:
- version "1.3.2"
- resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.2.tgz#a4b82ab63d73976fd8263cceee27f99a88bdae2b"
- integrity sha512-elEw0/0c2UscLrNG+OAorbP539E3rhliKPg+hDMWN9VwrDXfYK+4PBEykDPfxlYYtQvl84TascnQyobfQLHEhQ==
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.3.tgz#7f133285ccd7f2c2c7fc897b771b53d95a2b2c7e"
+ integrity sha512-NKzJmQzJfEEma3w5cJNcUMxoXfDjz0Zj0eyCalHn2E6VOwlzjZo0yuO2fcBSf8zhFuVCL/82/r5gRcoi6aEPVQ==
dependencies:
protocols "^1.1.0"
@@ -9832,17 +10077,17 @@ is-stream@^2.0.0:
resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.0.tgz#bde9c32680d6fae04129d6ac9d921ce7815f78e3"
integrity sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==
-is-string@^1.0.5:
- version "1.0.5"
- resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.5.tgz#40493ed198ef3ff477b8c7f92f644ec82a5cd3a6"
- integrity sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==
+is-string@^1.0.5, is-string@^1.0.6:
+ version "1.0.6"
+ resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
+ integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
is-symbol@^1.0.2, is-symbol@^1.0.3:
- version "1.0.3"
- resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
- integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+ version "1.0.4"
+ resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+ integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
dependencies:
- has-symbols "^1.0.1"
+ has-symbols "^1.0.2"
is-text-path@^1.0.1:
version "1.0.1"
@@ -10348,6 +10593,15 @@ jest-worker@^26.6.2:
merge-stream "^2.0.0"
supports-color "^7.0.0"
+jest-worker@^27.0.2:
+ version "27.0.2"
+ resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.2.tgz#4ebeb56cef48b3e7514552f80d0d80c0129f0b05"
+ integrity sha512-EoBdilOTTyOgmHXtw/cPc+ZrCA0KJMrkXzkrPGNwLmnvvlN1nj7MPrxpT7m+otSv2e1TLaVffzDnE/LB14zJMg==
+ dependencies:
+ "@types/node" "*"
+ merge-stream "^2.0.0"
+ supports-color "^8.0.0"
+
jest@26.6.3, jest@^26.6.3:
version "26.6.3"
resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef"
@@ -10408,12 +10662,12 @@ jschardet@^2.1.1:
integrity sha512-6I6xT7XN/7sBB7q8ObzKbmv5vN+blzLcboDE1BNEsEfmRXJValMxO6OIRT69ylPBRemS3rw6US+CMCar0OBc9g==
jsdom@^16.4.0:
- version "16.5.3"
- resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.5.3.tgz#13a755b3950eb938b4482c407238ddf16f0d2136"
- integrity sha512-Qj1H+PEvUsOtdPJ056ewXM4UJPCi4hhLA8wpiz9F2YvsRBhuFsXxtrIFAgGBDynQA9isAMGE91PfUYbdMPXuTA==
+ version "16.6.0"
+ resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac"
+ integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg==
dependencies:
abab "^2.0.5"
- acorn "^8.1.0"
+ acorn "^8.2.4"
acorn-globals "^6.0.0"
cssom "^0.4.4"
cssstyle "^2.3.0"
@@ -10421,12 +10675,13 @@ jsdom@^16.4.0:
decimal.js "^10.2.1"
domexception "^2.0.1"
escodegen "^2.0.0"
+ form-data "^3.0.0"
html-encoding-sniffer "^2.0.1"
- is-potential-custom-element-name "^1.0.0"
+ http-proxy-agent "^4.0.1"
+ https-proxy-agent "^5.0.0"
+ is-potential-custom-element-name "^1.0.1"
nwsapi "^2.2.0"
parse5 "6.0.1"
- request "^2.88.2"
- request-promise-native "^1.0.9"
saxes "^5.0.1"
symbol-tree "^3.2.4"
tough-cookie "^4.0.0"
@@ -10436,7 +10691,7 @@ jsdom@^16.4.0:
whatwg-encoding "^1.0.5"
whatwg-mimetype "^2.3.0"
whatwg-url "^8.5.0"
- ws "^7.4.4"
+ ws "^7.4.5"
xml-name-validator "^3.0.0"
jsesc@^1.3.0:
@@ -10586,6 +10841,14 @@ jszip@^3.1.5:
readable-stream "~2.3.6"
set-immediate-shim "~1.0.1"
+keytar@7.7.0:
+ version "7.7.0"
+ resolved "https://registry.yarnpkg.com/keytar/-/keytar-7.7.0.tgz#3002b106c01631aa79b1aa9ee0493b94179bbbd2"
+ integrity sha512-YEY9HWqThQc5q5xbXbRwsZTh2PJ36OSYRjSv3NN2xf5s5dpLTjEZnC2YikR29OaVybf9nQ0dJ/80i40RS97t/A==
+ dependencies:
+ node-addon-api "^3.0.0"
+ prebuild-install "^6.0.0"
+
keyv@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
@@ -10723,23 +10986,23 @@ levn@^0.4.1:
type-check "~0.4.0"
libnpmaccess@^4.0.1:
- version "4.0.2"
- resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.2.tgz#781832fb7ccb867b26343a75a85ad9c43e50406e"
- integrity sha512-avXtJibZuGap0/qADDYqb9zdpgzVu/yG5+tl2sTRa7MCkDNv2ZlGwCYI0r6/+tmqXPj0iB9fKexHz426vB326w==
+ version "4.0.3"
+ resolved "https://registry.yarnpkg.com/libnpmaccess/-/libnpmaccess-4.0.3.tgz#dfb0e5b0a53c315a2610d300e46b4ddeb66e7eec"
+ integrity sha512-sPeTSNImksm8O2b6/pf3ikv4N567ERYEpeKRPSmqlNt1dTZbvgpJIzg5vAhXHpw2ISBsELFRelk0jEahj1c6nQ==
dependencies:
aproba "^2.0.0"
minipass "^3.1.1"
npm-package-arg "^8.1.2"
- npm-registry-fetch "^10.0.0"
+ npm-registry-fetch "^11.0.0"
libnpmpublish@^4.0.0:
- version "4.0.1"
- resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.1.tgz#08ca2cbb5d7f6be1ce4f3f9c49b3822682bcf166"
- integrity sha512-hZCrZ8v4G9YH3DxpIyBdob25ijD5v5LNzRbwsej4pPDopjdcLLj1Widl+BUeFa7D0ble1JYL4F3owjLJqiA8yA==
+ version "4.0.2"
+ resolved "https://registry.yarnpkg.com/libnpmpublish/-/libnpmpublish-4.0.2.tgz#be77e8bf5956131bcb45e3caa6b96a842dec0794"
+ integrity sha512-+AD7A2zbVeGRCFI2aO//oUmapCwy7GHqPXFJh3qpToSRNU+tXKJ2YFUgjt04LPPAf2dlEH95s6EhIHM1J7bmOw==
dependencies:
normalize-package-data "^3.0.2"
npm-package-arg "^8.1.2"
- npm-registry-fetch "^10.0.0"
+ npm-registry-fetch "^11.0.0"
semver "^7.1.3"
ssri "^8.0.1"
@@ -10820,6 +11083,11 @@ loader-runner@^2.4.0:
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
+loader-runner@^4.2.0:
+ version "4.2.0"
+ resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
+ integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
+
loader-utils@^0.2.16:
version "0.2.17"
resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
@@ -10892,6 +11160,11 @@ lodash.memoize@4.x, lodash.memoize@^4.1.2:
resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+lodash.merge@^4.6.2:
+ version "4.6.2"
+ resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+ integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
lodash.template@^4.5.0:
version "4.5.0"
resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
@@ -10952,6 +11225,13 @@ lower-case@^1.1.1:
resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
+lower-case@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
+ integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
+ dependencies:
+ tslib "^2.0.3"
+
lowercase-keys@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
@@ -11042,6 +11322,28 @@ make-fetch-happen@^8.0.9:
socks-proxy-agent "^5.0.0"
ssri "^8.0.0"
+make-fetch-happen@^9.0.1:
+ version "9.0.2"
+ resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.0.2.tgz#aa8c0e4a5e3a5f2be86c54d3abed44fe5a32ad5d"
+ integrity sha512-UkAWAuXPXSSlVviTjH2We20mtj1NnZW2Qq/oTY2dyMbRQ5CR3Xed3akCDMnM7j6axrMY80lhgM7loNE132PfAw==
+ dependencies:
+ agentkeepalive "^4.1.3"
+ cacache "^15.2.0"
+ http-cache-semantics "^4.1.0"
+ http-proxy-agent "^4.0.1"
+ https-proxy-agent "^5.0.0"
+ is-lambda "^1.0.1"
+ lru-cache "^6.0.0"
+ minipass "^3.1.3"
+ minipass-collect "^1.0.2"
+ minipass-fetch "^1.3.2"
+ minipass-flush "^1.0.5"
+ minipass-pipeline "^1.2.4"
+ negotiator "^0.6.2"
+ promise-retry "^2.0.1"
+ socks-proxy-agent "^5.0.0"
+ ssri "^8.0.0"
+
makeerror@1.0.x:
version "1.0.11"
resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c"
@@ -11277,24 +11579,24 @@ miller-rabin@^4.0.0:
bn.js "^4.0.0"
brorand "^1.0.1"
-mime-db@1.47.0, "mime-db@>= 1.43.0 < 2", mime-db@^1.28.0:
- version "1.47.0"
- resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.47.0.tgz#8cb313e59965d3c05cfbf898915a267af46a335c"
- integrity sha512-QBmA/G2y+IfeS4oktet3qRZ+P5kPhCKRXxXnQEudYqUaEioAU1/Lq2us3D/t1Jfo4hE9REQPrbB7K5sOczJVIw==
+mime-db@1.48.0, "mime-db@>= 1.43.0 < 2", mime-db@^1.28.0:
+ version "1.48.0"
+ resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
+ integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
-mime-types@^2.1.12, mime-types@^2.1.18, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
- version "2.1.30"
- resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.30.tgz#6e7be8b4c479825f85ed6326695db73f9305d62d"
- integrity sha512-crmjA4bLtR8m9qLpHvgxSChT+XoSlZi8J4n/aIdn3z92e/U47Z0V/yl+Wh9W046GgFVAmoNR/fmdbZYcSSIUeg==
+mime-types@^2.1.12, mime-types@^2.1.18, mime-types@^2.1.27, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+ version "2.1.31"
+ resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
+ integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==
dependencies:
- mime-db "1.47.0"
+ mime-db "1.48.0"
mime@1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
-mime@^2.0.3, mime@^2.4.4:
+mime@2.5.2, mime@^2.0.3, mime@^2.4.4:
version "2.5.2"
resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
@@ -11641,12 +11943,12 @@ natural-compare@^1.4.0:
resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
-negotiator@0.6.2:
+negotiator@0.6.2, negotiator@^0.6.2:
version "0.6.2"
resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
-neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
+neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1, neo-async@^2.6.2:
version "2.6.2"
resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
@@ -11668,23 +11970,36 @@ no-case@^2.2.0:
dependencies:
lower-case "^1.1.1"
-node-abi@^2.7.0:
- version "2.26.0"
- resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.26.0.tgz#355d5d4bc603e856f74197adbf3f5117a396ba40"
- integrity sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ==
+no-case@^3.0.4:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
+ integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
+ dependencies:
+ lower-case "^2.0.2"
+ tslib "^2.0.3"
+
+node-abi@^2.21.0, node-abi@^2.7.0:
+ version "2.30.0"
+ resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.0.tgz#8be53bf3e7945a34eea10e0fc9a5982776cf550b"
+ integrity sha512-g6bZh3YCKQRdwuO/tSZZYJAw622SjsRfJ2X0Iy4sSOHZ34/sPPdVBn8fev2tj7njzLwuqPw9uMtGsGkO5kIQvg==
dependencies:
semver "^5.4.1"
node-addon-api@*:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239"
- integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==
+ version "4.0.0"
+ resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-4.0.0.tgz#ac128f43eff7fac4b5f5ef2f39d6d7c2709efead"
+ integrity sha512-ALmRVBFzfwldBfk3SbKfl6+PVMXiCPKZBEfsJqB/EjXAMAI+MfFrEHR+GMRBuI162DihZ1QjEZ8ieYKuRCJ8Hg==
node-addon-api@^1.7.1:
version "1.7.2"
resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
+node-addon-api@^3.0.0:
+ version "3.2.1"
+ resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+ integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+
node-fetch@^2.6.1:
version "2.6.1"
resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
@@ -11780,9 +12095,9 @@ node-notifier@^8.0.0:
which "^2.0.2"
node-releases@^1.1.71:
- version "1.1.71"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
- integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+ version "1.1.73"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"
+ integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==
noop-logger@^0.1.1:
version "0.1.1"
@@ -11857,15 +12172,20 @@ normalize-url@2.0.1, normalize-url@^2.0.1:
query-string "^5.0.1"
sort-keys "^2.0.0"
-normalize-url@^3.0.0, normalize-url@^3.3.0:
+normalize-url@^3.0.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
normalize-url@^4.1.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
- integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+ version "4.5.1"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
+ integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
+
+normalize-url@^6.0.1:
+ version "6.0.1"
+ resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.0.1.tgz#a4f27f58cf8c7b287b440b8a8201f42d0b00d256"
+ integrity sha512-VU4pzAuh7Kip71XEmO9aNREYAdMHFGTVj/i+CaTImS8x0i1d3jUZkXhqluy/PRgjPLMgsLQulYY3PJ/aSbSjpQ==
npm-bundled@^1.1.1:
version "1.1.2"
@@ -11901,9 +12221,9 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1:
integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.0, npm-package-arg@^8.1.2:
- version "8.1.2"
- resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.2.tgz#b868016ae7de5619e729993fbd8d11dc3c52ab62"
- integrity sha512-6Eem455JsSMJY6Kpd3EyWE+n5hC+g9bSyHr9K9U2zqZb7+02+hObQ2c0+8iDk/mNF+8r1MhY44WypKJAkySIYA==
+ version "8.1.5"
+ resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
+ integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
dependencies:
hosted-git-info "^4.0.1"
semver "^7.3.4"
@@ -11929,13 +12249,12 @@ npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
npm-package-arg "^8.1.2"
semver "^7.3.4"
-npm-registry-fetch@^10.0.0:
- version "10.1.1"
- resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-10.1.1.tgz#97bc7a0fca5e8f76cc5162185b8de8caa8bea639"
- integrity sha512-F6a3l+ffCQ7hvvN16YG5bpm1rPZntCg66PLHDQ1apWJPOCUVHoKnL2w5fqEaTVhp42dmossTyXeR7hTGirfXrg==
+npm-registry-fetch@^11.0.0:
+ version "11.0.0"
+ resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
+ integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
dependencies:
- lru-cache "^6.0.0"
- make-fetch-happen "^8.0.9"
+ make-fetch-happen "^9.0.1"
minipass "^3.1.3"
minipass-fetch "^1.3.0"
minipass-json-stream "^1.0.1"
@@ -12017,6 +12336,13 @@ nth-check@^1.0.2:
dependencies:
boolbase "~1.0.0"
+nth-check@^2.0.0:
+ version "2.0.0"
+ resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
+ integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
+ dependencies:
+ boolbase "^1.0.0"
+
num2fraction@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
@@ -12052,14 +12378,14 @@ object-copy@^0.1.0:
kind-of "^3.0.3"
object-hash@^2.0.1:
- version "2.1.1"
- resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.1.1.tgz#9447d0279b4fcf80cff3259bf66a1dc73afabe09"
- integrity sha512-VOJmgmS+7wvXf8CjbQmimtCnEx3IAoLxI3fp2fbWehxrWBcAQFbk+vcwb6vzR0VZv/eNCJ/27j151ZTwqW/JeQ==
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5"
+ integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
-object-inspect@^1.9.0:
- version "1.10.2"
- resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.2.tgz#b6385a3e2b7cae0b5eafcf90cddf85d128767f30"
- integrity sha512-gz58rdPpadwztRrPjZE9DZLOABUpTGdcANUgOwBFO1C+HZZhePoP83M65WGDmbpwFYJSWqavbl4SgDn4k8RYTA==
+object-inspect@^1.10.3, object-inspect@^1.9.0:
+ version "1.10.3"
+ resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.10.3.tgz#c2aa7d2d09f50c99375704f7a0adf24c5782d369"
+ integrity sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==
object-is@^1.0.1:
version "1.1.5"
@@ -12108,14 +12434,13 @@ object.pick@^1.3.0:
isobject "^3.0.1"
object.values@^1.1.0, object.values@^1.1.1:
- version "1.1.3"
- resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.3.tgz#eaa8b1e17589f02f698db093f7c62ee1699742ee"
- integrity sha512-nkF6PfDB9alkOUxpf1HNm/QlkeW3SReqL5WXeBLpEJJnlPSvRaDQpW3gQTksTN3fgJX4hL42RzKyOin6ff3tyw==
+ version "1.1.4"
+ resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
+ integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
dependencies:
call-bind "^1.0.2"
define-properties "^1.1.3"
- es-abstract "^1.18.0-next.2"
- has "^1.0.3"
+ es-abstract "^1.18.2"
obuf@^1.0.0, obuf@^1.1.2:
version "1.1.2"
@@ -12180,9 +12505,9 @@ opencollective-postinstall@^2.0.2:
integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
openid-client@^4.1.1:
- version "4.7.3"
- resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-4.7.3.tgz#ea4f6f9ff6203dfbbe3d9bb4415d5dce751b0a70"
- integrity sha512-YLwZQLSjo3gdSVxw/G25ddoRp9oCpXkREZXssmenlejZQPsnTq+yQtFUcBmC7u3VVkx+gwqXZF7X0CtAAJrRRg==
+ version "4.7.4"
+ resolved "https://registry.yarnpkg.com/openid-client/-/openid-client-4.7.4.tgz#bd9978456d53d38adb89856b14a8fbd094f7732e"
+ integrity sha512-n+RURXYuR0bBZo9i0pn+CXZSyg5JYQ1nbwEwPQvLE7EcJt/vMZ2iIMjLehl5DvCN53XUoPVZs9KAE5r6d9fxsw==
dependencies:
aggregate-error "^3.1.0"
got "^11.8.0"
@@ -12200,9 +12525,9 @@ opn@^5.5.0:
is-wsl "^1.1.0"
optimize-css-assets-webpack-plugin@^5.0.1:
- version "5.0.4"
- resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.4.tgz#85883c6528aaa02e30bbad9908c92926bb52dc90"
- integrity sha512-wqd6FdI2a5/FdoiCNNkEvLeA//lHHfG24Ln2Xm2qqdIk4aOlsR18jwpyOihqQ8849W3qu2DX8fOYxpvTMj+93A==
+ version "5.0.6"
+ resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-5.0.6.tgz#abad0c6c11a632201794f75ddba3ce13e32ae80e"
+ integrity sha512-JAYw7WrIAIuHWoKeSBB3lJ6ZG9PSDK3JJduv/FMpIY060wvbA8Lqn/TCtxNGICNlg0X5AGshLzIhpYrkltdq+A==
dependencies:
cssnano "^4.1.10"
last-call-webpack-plugin "^3.0.0"
@@ -12345,6 +12670,13 @@ p-limit@^2.0.0, p-limit@^2.2.0, p-limit@^2.2.1:
dependencies:
p-try "^2.0.0"
+p-limit@^3.1.0:
+ version "3.1.0"
+ resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+ integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+ dependencies:
+ yocto-queue "^0.1.0"
+
p-locate@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -12462,9 +12794,9 @@ package-json@^6.3.0:
semver "^6.2.0"
pacote@^11.2.6:
- version "11.3.3"
- resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.3.tgz#d7d6091464f77c09691699df2ded13ab906b3e68"
- integrity sha512-GQxBX+UcVZrrJRYMK2HoG+gPeSUX/rQhnbPkkGrCYa4n2F/bgClFPaMm0nsdnYrxnmUy85uMHoFXZ0jTD0drew==
+ version "11.3.4"
+ resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.4.tgz#c290b790a5cee3082bb8fa223f3f3e2fdf3d0bfc"
+ integrity sha512-RfahPCunM9GI7ryJV/zY0bWQiokZyLqaSNHXtbNSoLb7bwTvBbJBEyCJ01KWs4j1Gj7GmX8crYXQ1sNX6P2VKA==
dependencies:
"@npmcli/git" "^2.0.1"
"@npmcli/installed-package-contents" "^1.0.6"
@@ -12479,7 +12811,7 @@ pacote@^11.2.6:
npm-package-arg "^8.0.1"
npm-packlist "^2.1.4"
npm-pick-manifest "^6.0.0"
- npm-registry-fetch "^10.0.0"
+ npm-registry-fetch "^11.0.0"
promise-retry "^2.0.1"
read-package-json-fast "^2.0.1"
rimraf "^3.0.2"
@@ -12507,6 +12839,14 @@ param-case@2.1.x:
dependencies:
no-case "^2.2.0"
+param-case@^3.0.3:
+ version "3.0.4"
+ resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
+ integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
+ dependencies:
+ dot-case "^3.0.4"
+ tslib "^2.0.3"
+
parent-module@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
@@ -12571,12 +12911,12 @@ parse-path@^4.0.0:
query-string "^6.13.8"
parse-url@^5.0.0:
- version "5.0.2"
- resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.2.tgz#856a3be1fcdf78dc93fc8b3791f169072d898b59"
- integrity sha512-Czj+GIit4cdWtxo3ISZCvLiUjErSo0iI3wJ+q9Oi3QuMYTI6OZu+7cewMWZ+C1YAnKhYTk6/TLuhIgCypLthPA==
+ version "5.0.3"
+ resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.3.tgz#c158560f14cb1560917e0b7fd8b01adc1e9d3cab"
+ integrity sha512-nrLCVMJpqo12X8uUJT4GJPd5AFaTOrGx/QpJy3HNcVtq0AZSstVIsnxS5fqNPuoqMUs3MyfBoOP6Zvu2Arok5A==
dependencies:
is-ssh "^1.3.0"
- normalize-url "^3.3.0"
+ normalize-url "^6.0.1"
parse-path "^4.0.0"
protocols "^1.4.0"
@@ -12590,6 +12930,14 @@ parseurl@~1.3.2, parseurl@~1.3.3:
resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+pascal-case@^3.1.2:
+ version "3.1.2"
+ resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
+ integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
+ dependencies:
+ no-case "^3.0.4"
+ tslib "^2.0.3"
+
pascalcase@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
@@ -12648,9 +12996,9 @@ path-key@^3.0.0, path-key@^3.1.0:
integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
path-parse@^1.0.6:
- version "1.0.6"
- resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
- integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+ version "1.0.7"
+ resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+ integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
path-to-regexp@0.1.7:
version "0.1.7"
@@ -12724,9 +13072,9 @@ performance-now@^2.1.0:
integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3:
- version "2.2.3"
- resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
- integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+ integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
version "2.3.0"
@@ -13097,9 +13445,9 @@ postcss-selector-parser@^3.0.0:
uniq "^1.0.1"
postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
- version "6.0.5"
- resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.5.tgz#042d74e137db83e6f294712096cb413f5aa612c4"
- integrity sha512-aFYPoYmXbZ1V6HZaSvat08M97A8HqO6Pjz+PiNpw/DhuRrC72XWAdp3hL6wusDCN31sSmcZyMGa2hZEuX+Xfhg==
+ version "6.0.6"
+ resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
+ integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
dependencies:
cssesc "^3.0.0"
util-deprecate "^1.0.2"
@@ -13132,10 +13480,10 @@ postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb"
integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ==
-postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
- version "7.0.35"
- resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
- integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
+postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.36, postcss@^7.0.5, postcss@^7.0.6:
+ version "7.0.36"
+ resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
+ integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
dependencies:
chalk "^2.4.2"
source-map "^0.6.1"
@@ -13162,6 +13510,25 @@ prebuild-install@^5.2.4:
tunnel-agent "^0.6.0"
which-pm-runs "^1.0.0"
+prebuild-install@^6.0.0:
+ version "6.1.3"
+ resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.3.tgz#8ea1f9d7386a0b30f7ef20247e36f8b2b82825a2"
+ integrity sha512-iqqSR84tNYQUQHRXalSKdIaM8Ov1QxOVuBNWI7+BzZWv6Ih9k75wOnH1rGQ9WWTaaLkTpxWKIciOF0KyfM74+Q==
+ dependencies:
+ detect-libc "^1.0.3"
+ expand-template "^2.0.3"
+ github-from-package "0.0.0"
+ minimist "^1.2.3"
+ mkdirp-classic "^0.5.3"
+ napi-build-utils "^1.0.1"
+ node-abi "^2.21.0"
+ npmlog "^4.0.1"
+ pump "^3.0.0"
+ rc "^1.2.7"
+ simple-get "^3.0.3"
+ tar-fs "^2.0.0"
+ tunnel-agent "^0.6.0"
+
prelude-ls@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -13200,11 +13567,11 @@ prettier@^1.18.2:
integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
prettier@^2.1.2, prettier@^2.2.0:
- version "2.2.1"
- resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
- integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
+ version "2.3.1"
+ resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.1.tgz#76903c3f8c4449bc9ac597acefa24dc5ad4cbea6"
+ integrity sha512-p+vNbgpLjif/+D+DwAZAbndtRrR0md0MwfmOVN9N+2RgyACMT+7tfaRnT+WDPkqnuVwleyuBIG2XBxKDme3hPA==
-pretty-error@^2.0.2:
+pretty-error@^2.0.2, pretty-error@^2.1.1:
version "2.1.2"
resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.2.tgz#be89f82d81b1c86ec8fdfbc385045882727f93b6"
integrity sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==
@@ -13302,11 +13669,11 @@ protocols@^1.1.0, protocols@^1.4.0:
integrity sha512-IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg==
proxy-addr@~2.0.5:
- version "2.0.6"
- resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
- integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
+ version "2.0.7"
+ resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+ integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
dependencies:
- forwarded "~0.1.2"
+ forwarded "0.2.0"
ipaddr.js "1.9.1"
proxy-from-env@^1.1.0:
@@ -13756,10 +14123,10 @@ readdirp@^2.2.1:
micromatch "^3.1.10"
readable-stream "^2.0.2"
-readdirp@~3.5.0:
- version "3.5.0"
- resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e"
- integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ==
+readdirp@~3.6.0:
+ version "3.6.0"
+ resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+ integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
dependencies:
picomatch "^2.2.1"
@@ -13863,10 +14230,10 @@ regexpp@^2.0.1:
resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
-regexpp@^3.0.0, regexpp@^3.1.0:
- version "3.1.0"
- resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"
- integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==
+regexpp@^3.1.0:
+ version "3.2.0"
+ resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+ integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
regexpu-core@^4.7.1:
version "4.7.1"
@@ -13906,7 +14273,7 @@ regjsparser@^0.6.4:
dependencies:
jsesc "~0.5.0"
-relateurl@0.2.x:
+relateurl@0.2.x, relateurl@^0.2.7:
version "0.2.7"
resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
@@ -13922,15 +14289,15 @@ remove-trailing-separator@^1.0.1:
integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
renderkid@^2.0.4:
- version "2.0.5"
- resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.5.tgz#483b1ac59c6601ab30a7a596a5965cabccfdd0a5"
- integrity sha512-ccqoLg+HLOHq1vdfYNm4TBeaCDIi1FLt3wGojTDSvdewUv65oTmI3cnT2E4hRjl1gzKZIPK+KZrXzlUYKnR+vQ==
+ version "2.0.7"
+ resolved "https://registry.yarnpkg.com/renderkid/-/renderkid-2.0.7.tgz#464f276a6bdcee606f4a15993f9b29fc74ca8609"
+ integrity sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==
dependencies:
- css-select "^2.0.2"
- dom-converter "^0.2"
- htmlparser2 "^3.10.1"
- lodash "^4.17.20"
- strip-ansi "^3.0.0"
+ css-select "^4.1.3"
+ dom-converter "^0.2.0"
+ htmlparser2 "^6.1.0"
+ lodash "^4.17.21"
+ strip-ansi "^3.0.1"
repeat-element@^1.1.2:
version "1.1.4"
@@ -13949,22 +14316,6 @@ repeating@^2.0.0:
dependencies:
is-finite "^1.0.0"
-request-promise-core@1.1.4:
- version "1.1.4"
- resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
- integrity sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==
- dependencies:
- lodash "^4.17.19"
-
-request-promise-native@^1.0.9:
- version "1.0.9"
- resolved "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz#e407120526a5efdc9a39b28a5679bf47b9d9dc28"
- integrity sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==
- dependencies:
- request-promise-core "1.1.4"
- stealthy-require "^1.1.1"
- tough-cookie "^2.3.3"
-
request@^2.81.0, request@^2.82.0, request@^2.87.0, request@^2.88.0, request@^2.88.2:
version "2.88.2"
resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
@@ -14134,9 +14485,9 @@ rewire@^3.0.2:
babel-plugin-transform-es2015-block-scoping "^6.26.0"
rfc4648@^1.3.0:
- version "1.4.0"
- resolved "https://registry.yarnpkg.com/rfc4648/-/rfc4648-1.4.0.tgz#c75b2856ad2e2d588b6ddb985d556f1f7f2a2abd"
- integrity sha512-3qIzGhHlMHA6PoT6+cdPKZ+ZqtxkIvg8DZGKA5z6PQ33/uuhoJ+Ws/D/J9rXW6gXodgH8QYlz2UCl+sdUDmNIg==
+ version "1.5.0"
+ resolved "https://registry.yarnpkg.com/rfc4648/-/rfc4648-1.5.0.tgz#1ba940ec1649685ec4d88788dc57fb8e18855055"
+ integrity sha512-FA6W9lDNeX8WbMY31io1xWg+TpZCbeDKsBo0ocwACZiWnh9TUAyk9CCuBQuOPmYnwwdEQZmraQ2ZK7yJsxErBg==
rgb-regex@^1.0.1:
version "1.0.1"
@@ -14178,11 +14529,11 @@ ripemd160@^2.0.0, ripemd160@^2.0.1:
inherits "^2.0.1"
rollup@^2.44.0:
- version "2.47.0"
- resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.47.0.tgz#9d958aeb2c0f6a383cacc0401dff02b6e252664d"
- integrity sha512-rqBjgq9hQfW0vRmz+0S062ORRNJXvwRpzxhFXORvar/maZqY6za3rgQ/p1Glg+j1hnc1GtYyQCPiAei95uTElg==
+ version "2.52.0"
+ resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.52.0.tgz#9df3de6028fae79569a985942b81110205a5a411"
+ integrity sha512-lSkBDGsVoXjqaBf7dsHwxBJz+p+hJEP72P+LOitA0yVs+Nzxj76FidkZE2thrmhjwGqLYiJo39opi7mAfaQ/Vg==
optionalDependencies:
- fsevents "~2.3.1"
+ fsevents "~2.3.2"
route-parser@^0.0.5:
version "0.0.5"
@@ -14300,6 +14651,15 @@ schema-utils@^2.6.5:
ajv "^6.12.4"
ajv-keywords "^3.5.2"
+schema-utils@^3.0.0:
+ version "3.0.0"
+ resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
+ integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
+ dependencies:
+ "@types/json-schema" "^7.0.6"
+ ajv "^6.12.5"
+ ajv-keywords "^3.5.2"
+
section-matter@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/section-matter/-/section-matter-1.0.0.tgz#e9041953506780ec01d59f292a19c7b850b84167"
@@ -14380,7 +14740,7 @@ send@0.17.1:
range-parser "~1.2.1"
statuses "~1.5.0"
-serialize-javascript@^3.1.0, serialize-javascript@^4.0.0:
+serialize-javascript@^3.1.0, serialize-javascript@^4.0.0, serialize-javascript@^5.0.1:
version "3.1.0"
resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
@@ -14532,9 +14892,9 @@ simple-get@^3.0.3:
simple-concat "^1.0.0"
simple-git@^2.12.0:
- version "2.38.0"
- resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.38.0.tgz#5bc66bec40bce4f8ef950f4966f427799b4dd758"
- integrity sha512-CORjrfirWMEGbJAxaXDH/PjZVOeATeG2bkafM9DsLVcFkbF9sXQGIIpEI6FeyXpvUsFK69T/pa4+4FKY9TUJMQ==
+ version "2.40.0"
+ resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.40.0.tgz#1f9da964caa032290ec25cb06ccacc2c17d99d75"
+ integrity sha512-7IO/eQwrN5kvS38TTu9ljhG9tx2nn0BTqZOmqpPpp51TvE44YIvLA6fETqEVA8w/SeEfPaVv6mk7Tsk9Jns+ag==
dependencies:
"@kwsites/file-exists" "^1.1.1"
"@kwsites/promise-deferred" "^1.1.1"
@@ -14696,7 +15056,7 @@ sort-keys@^4.0.0:
dependencies:
is-plain-obj "^2.0.0"
-source-list-map@^2.0.0:
+source-list-map@^2.0.0, source-list-map@^2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
@@ -14719,7 +15079,7 @@ source-map-support@^0.4.15:
dependencies:
source-map "^0.5.6"
-source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12:
+source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
version "0.5.19"
resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -14747,7 +15107,7 @@ source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
-source-map@^0.7.3:
+source-map@^0.7.3, source-map@~0.7.2:
version "0.7.3"
resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -14779,9 +15139,9 @@ spdx-expression-parse@^3.0.0:
spdx-license-ids "^3.0.0"
spdx-license-ids@^3.0.0:
- version "3.0.7"
- resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.7.tgz#e9c18a410e5ed7e12442a549fbd8afa767038d65"
- integrity sha512-U+MTEOO0AiDzxwFvoa4JVnMV6mZlJKk2sBLt90s7G0Gd0Mlknc7kxEn3nuDPNZRta7O2uy8oLcZLVT+4sqNZHQ==
+ version "3.0.9"
+ resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f"
+ integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==
spdy-transport@^3.0.0:
version "3.0.0"
@@ -14912,11 +15272,6 @@ std-env@^2.2.1:
dependencies:
ci-info "^3.0.0"
-stealthy-require@^1.1.1:
- version "1.1.1"
- resolved "https://registry.yarnpkg.com/stealthy-require/-/stealthy-require-1.1.1.tgz#35b09875b4ff49f26a777e509b3090a3226bf24b"
- integrity sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=
-
stream-browserify@^2.0.1:
version "2.0.2"
resolved "https://registry.yarnpkg.com/stream-browserify/-/stream-browserify-2.0.2.tgz#87521d38a44aa7ee91ce1cd2a47df0cb49dd660b"
@@ -15226,6 +15581,13 @@ supports-color@^7.0.0, supports-color@^7.1.0:
dependencies:
has-flag "^4.0.0"
+supports-color@^8.0.0:
+ version "8.1.1"
+ resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+ integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+ dependencies:
+ has-flag "^4.0.0"
+
supports-hyperlinks@^2.0.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz#4f77b42488765891774b70c79babd87f9bd594bb"
@@ -15273,10 +15635,10 @@ table@^5.2.3:
slice-ansi "^2.1.0"
string-width "^3.0.0"
-table@^6.0.4:
- version "6.7.0"
- resolved "https://registry.yarnpkg.com/table/-/table-6.7.0.tgz#26274751f0ee099c547f6cb91d3eff0d61d155b2"
- integrity sha512-SAM+5p6V99gYiiy2gT5ArdzgM1dLDed0nkrWmG6Fry/bUS/m9x83BwpJUOf1Qj/x2qJd+thL6IkIx7qPGRxqBw==
+table@^6.0.9:
+ version "6.7.1"
+ resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
+ integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
dependencies:
ajv "^8.0.1"
lodash.clonedeep "^4.5.0"
@@ -15290,6 +15652,11 @@ tapable@^1.0.0, tapable@^1.1.3:
resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+tapable@^2.0.0, tapable@^2.1.1, tapable@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.0.tgz#5c373d281d9c672848213d0e037d1c4165ab426b"
+ integrity sha512-FBk4IesMV1rBxX2tfiK8RAmogtWn53puLOQlvO8XuwlgxcYbP4mVPS9Ph4aeamSyyVjOl24aYWAuc8U5kCVwMw==
+
tar-fs@^1.16.2:
version "1.16.3"
resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509"
@@ -15403,7 +15770,19 @@ terser-webpack-plugin@^1.4.3:
webpack-sources "^1.4.0"
worker-farm "^1.7.0"
-terser@^4.1.2:
+terser-webpack-plugin@^5.1.1:
+ version "5.1.3"
+ resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.3.tgz#30033e955ca28b55664f1e4b30a1347e61aa23af"
+ integrity sha512-cxGbMqr6+A2hrIB5ehFIF+F/iST5ZOxvOmy9zih9ySbP1C2oEWQSOUS+2SNBTjzx5xLKO4xnod9eywdfq1Nb9A==
+ dependencies:
+ jest-worker "^27.0.2"
+ p-limit "^3.1.0"
+ schema-utils "^3.0.0"
+ serialize-javascript "^5.0.1"
+ source-map "^0.6.1"
+ terser "^5.7.0"
+
+terser@^4.1.2, terser@^4.6.3:
version "4.8.0"
resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
@@ -15412,6 +15791,15 @@ terser@^4.1.2:
source-map "~0.6.1"
source-map-support "~0.5.12"
+terser@^5.7.0:
+ version "5.7.0"
+ resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.0.tgz#a761eeec206bc87b605ab13029876ead938ae693"
+ integrity sha512-HP5/9hp2UaZt5fYkuhNBR8YyRcT8juw8+uFbAme53iN9hblvKnLUTKkmwJG6ocWpIKf8UK4DoeWG4ty0J6S6/g==
+ dependencies:
+ commander "^2.20.0"
+ source-map "~0.7.2"
+ source-map-support "~0.5.19"
+
test-exclude@^6.0.0:
version "6.0.0"
resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
@@ -15586,14 +15974,6 @@ toposort@^1.0.0:
resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
-tough-cookie@^2.3.3, tough-cookie@~2.5.0:
- version "2.5.0"
- resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
- integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
- dependencies:
- psl "^1.1.28"
- punycode "^2.1.1"
-
tough-cookie@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
@@ -15603,10 +15983,18 @@ tough-cookie@^4.0.0:
punycode "^2.1.1"
universalify "^0.1.2"
-tr46@^2.0.2:
- version "2.0.2"
- resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
- integrity sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==
+tough-cookie@~2.5.0:
+ version "2.5.0"
+ resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+ integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
+ dependencies:
+ psl "^1.1.28"
+ punycode "^2.1.1"
+
+tr46@^2.1.0:
+ version "2.1.0"
+ resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
+ integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
dependencies:
punycode "^2.1.1"
@@ -15641,9 +16029,9 @@ trim-newlines@^1.0.0:
integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
trim-newlines@^3.0.0:
- version "3.0.0"
- resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
- integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
+ version "3.0.1"
+ resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
+ integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
trim-off-newlines@^1.0.0:
version "1.0.1"
@@ -15698,9 +16086,9 @@ ts-jest@26.4.4:
yargs-parser "20.x"
ts-md5@^1.2.2:
- version "1.2.7"
- resolved "https://registry.yarnpkg.com/ts-md5/-/ts-md5-1.2.7.tgz#b76471fc2fd38f0502441f6c3b9494ed04537401"
- integrity sha512-emODogvKGWi1KO1l9c6YxLMBn6CEH3VrH5mVPIyOtxBG52BvV4jP3GWz6bOZCz61nLgBc3ffQYE4+EHfCD+V7w==
+ version "1.2.8"
+ resolved "https://registry.yarnpkg.com/ts-md5/-/ts-md5-1.2.8.tgz#919a47277b748db2a49181a346ec90497026cb6c"
+ integrity sha512-Vt4J3CeMoYKkAArpvLZiPAN5x8GrnII1zJ5EaLfxqmgdK4apAAUGtKL+mXt+bsMhl+euQUdxS9ulDlIPvPo+rA==
ts-mockito@^2.5.0:
version "2.6.1"
@@ -15736,12 +16124,12 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
-tslib@^2.0.0:
- version "2.2.0"
- resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
- integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
+tslib@^2.0.0, tslib@^2.0.3:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+ integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-tsutils@^3.0.0, tsutils@^3.17.1:
+tsutils@^3.0.0, tsutils@^3.17.1, tsutils@^3.21.0:
version "3.21.0"
resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
@@ -15863,9 +16251,9 @@ uglify-js@3.4.x:
source-map "~0.6.1"
uglify-js@^3.1.4:
- version "3.13.5"
- resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.5.tgz#5d71d6dbba64cf441f32929b1efce7365bb4f113"
- integrity sha512-xtB8yEqIkn7zmOyS2zUNBsYCBRhDkvlNxMMY2smuJ/qA8NCHeQvKCF3i9Z4k8FJH4+PJvZRtMrPynfZ75+CSZw==
+ version "3.13.9"
+ resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.13.9.tgz#4d8d21dcd497f29cfd8e9378b9df123ad025999b"
+ integrity sha512-wZbyTQ1w6Y7fHdt8sJnHfSIuWeDgk6B5rCb4E/AM6QNNPbOMIZph21PW5dRB3h7Df0GszN+t7RuUH6sWK5bF0g==
uid-number@0.0.6:
version "0.0.6"
@@ -15877,7 +16265,7 @@ umask@^1.1.0:
resolved "https://registry.yarnpkg.com/umask/-/umask-1.1.0.tgz#f29cebf01df517912bb58ff9c4e50fde8e33320d"
integrity sha1-8pzr8B31F5ErtY/5xOUP3o4zMg0=
-unbox-primitive@^1.0.0:
+unbox-primitive@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
@@ -16308,9 +16696,9 @@ vue-hot-reload-api@^2.3.0:
integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
vue-loader@^15.7.1:
- version "15.9.6"
- resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.6.tgz#f4bb9ae20c3a8370af3ecf09b8126d38ffdb6b8b"
- integrity sha512-j0cqiLzwbeImIC6nVIby2o/ABAWhlppyL/m5oJ67R5MloP0hj/DtFgb0Zmq3J9CG7AJ+AXIvHVnJAPBvrLyuDg==
+ version "15.9.7"
+ resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.7.tgz#15b05775c3e0c38407679393c2ce6df673b01044"
+ integrity sha512-qzlsbLV1HKEMf19IqCJqdNvFJRCI58WNbS6XbPqK13MrLz65es75w392MSQ5TsARAfIjUw+ATm3vlCXUJSOH9Q==
dependencies:
"@vue/component-compiler-utils" "^3.1.0"
hash-sum "^1.0.2"
@@ -16324,9 +16712,9 @@ vue-router@^3.4.5:
integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw==
vue-server-renderer@^2.6.10:
- version "2.6.12"
- resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.12.tgz#a8cb9c49439ef205293cb41c35d0d2b0541653a5"
- integrity sha512-3LODaOsnQx7iMFTBLjki8xSyOxhCtbZ+nQie0wWY4iOVeEtTg1a3YQAjd82WvKxrWHHTshjvLb7OXMc2/dYuxw==
+ version "2.6.14"
+ resolved "https://registry.yarnpkg.com/vue-server-renderer/-/vue-server-renderer-2.6.14.tgz#c8bffff152df6b47b858818ef8d524d2fc351654"
+ integrity sha512-HifYRa/LW7cKywg9gd4ZtvtRuBlstQBao5ZCWlg40fyB4OPoGfEXAzxb0emSLv4pBDOHYx0UjpqvxpiQFEuoLA==
dependencies:
chalk "^1.1.3"
hash-sum "^1.0.2"
@@ -16346,9 +16734,9 @@ vue-style-loader@^4.1.0:
loader-utils "^1.0.2"
vue-template-compiler@^2.6.10:
- version "2.6.12"
- resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.12.tgz#947ed7196744c8a5285ebe1233fe960437fcc57e"
- integrity sha512-OzzZ52zS41YUbkCBfdXShQTe69j1gQDZ9HIX8miuC9C3rBCk9wIRjLiZZLrmX9V+Ftq/YEyv1JaVr5Y/hNtByg==
+ version "2.6.14"
+ resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.6.14.tgz#a2f0e7d985670d42c9c9ee0d044fed7690f4f763"
+ integrity sha512-ODQS1SyMbjKoO1JBJZojSw6FE4qnh9rIpUZn2EUT86FKizx9uH5z6uXiIrm4/Nb/gwxTi/o17ZDEGWAXHvtC7g==
dependencies:
de-indent "^1.0.2"
he "^1.1.0"
@@ -16359,9 +16747,9 @@ vue-template-es2015-compiler@^1.9.0:
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==
vue@^2.6.10:
- version "2.6.12"
- resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.12.tgz#f5ebd4fa6bd2869403e29a896aed4904456c9123"
- integrity sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==
+ version "2.6.14"
+ resolved "https://registry.yarnpkg.com/vue/-/vue-2.6.14.tgz#e51aa5250250d569a3fbad3a8a5a687d6036e235"
+ integrity sha512-x2284lgYvjOMj3Za7kqzRcUSxBboHqtgRE2zlos1qWaOye5yUmHn42LB1250NJBLRwEcdrB0JRwyPTEPhfQjiQ==
vuepress-html-webpack-plugin@^3.2.0:
version "3.2.0"
@@ -16442,6 +16830,14 @@ watchpack@^1.7.4:
chokidar "^3.4.1"
watchpack-chokidar2 "^2.0.1"
+watchpack@^2.2.0:
+ version "2.2.0"
+ resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce"
+ integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==
+ dependencies:
+ glob-to-regexp "^0.4.1"
+ graceful-fs "^4.1.2"
+
wbuf@^1.1.0, wbuf@^1.7.3:
version "1.7.3"
resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
@@ -16572,7 +16968,15 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
source-list-map "^2.0.0"
source-map "~0.6.1"
-webpack@^4.0.0, webpack@^4.20.2, webpack@^4.8.1:
+webpack-sources@^2.3.0:
+ version "2.3.0"
+ resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-2.3.0.tgz#9ed2de69b25143a4c18847586ad9eccb19278cfa"
+ integrity sha512-WyOdtwSvOML1kbgtXbTDnEW0jkJ7hZr/bDByIwszhWd/4XX1A3XMkrbFMsuH4+/MfLlZCUzlAdg4r7jaGKEIgQ==
+ dependencies:
+ source-list-map "^2.0.1"
+ source-map "^0.6.1"
+
+webpack@^4.20.2, webpack@^4.8.1:
version "4.46.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.46.0.tgz#bf9b4404ea20a073605e0a011d188d77cb6ad542"
integrity sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==
@@ -16601,6 +17005,35 @@ webpack@^4.0.0, webpack@^4.20.2, webpack@^4.8.1:
watchpack "^1.7.4"
webpack-sources "^1.4.1"
+webpack@^5.36.2:
+ version "5.39.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.39.0.tgz#37d6899f1f40c31d5901abc0f39bc8cc7224138c"
+ integrity sha512-25CHmuDj+oOTyteI13sUqNlCnjCnySuhiKWE/cRYPQYeoQ3ijHgyWX27CiyUKLNGq27v8S0mrksyTreT/xo7pg==
+ dependencies:
+ "@types/eslint-scope" "^3.7.0"
+ "@types/estree" "^0.0.47"
+ "@webassemblyjs/ast" "1.11.0"
+ "@webassemblyjs/wasm-edit" "1.11.0"
+ "@webassemblyjs/wasm-parser" "1.11.0"
+ acorn "^8.2.1"
+ browserslist "^4.14.5"
+ chrome-trace-event "^1.0.2"
+ enhanced-resolve "^5.8.0"
+ es-module-lexer "^0.4.0"
+ eslint-scope "5.1.1"
+ events "^3.2.0"
+ glob-to-regexp "^0.4.1"
+ graceful-fs "^4.2.4"
+ json-parse-better-errors "^1.0.2"
+ loader-runner "^4.2.0"
+ mime-types "^2.1.27"
+ neo-async "^2.6.2"
+ schema-utils "^3.0.0"
+ tapable "^2.1.1"
+ terser-webpack-plugin "^5.1.1"
+ watchpack "^2.2.0"
+ webpack-sources "^2.3.0"
+
webpackbar@3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/webpackbar/-/webpackbar-3.2.0.tgz#bdaad103fad11a4e612500e72aaae98b08ba493f"
@@ -16652,12 +17085,12 @@ whatwg-mimetype@^2.3.0:
integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
whatwg-url@^8.0.0, whatwg-url@^8.4.0, whatwg-url@^8.5.0:
- version "8.5.0"
- resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.5.0.tgz#7752b8464fc0903fec89aa9846fc9efe07351fd3"
- integrity sha512-fy+R77xWv0AiqfLl4nuGUlQ3/6b5uNfQ4WAbGQVMYshCTCCPK9psC1nWh3XHuxGVCtlcDDQPQW1csmmIQo+fwg==
+ version "8.6.0"
+ resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.6.0.tgz#27c0205a4902084b872aecb97cf0f2a7a3011f4c"
+ integrity sha512-os0KkeeqUOl7ccdDT1qqUcS4KH4tcBTSKK5Nl5WKb2lyxInIZ/CpjkqKa1Ss12mjfdcRX9mHmPPs7/SxG1Hbdw==
dependencies:
lodash "^4.7.0"
- tr46 "^2.0.2"
+ tr46 "^2.1.0"
webidl-conversions "^6.1.0"
when@^3.7.7:
@@ -16848,23 +17281,23 @@ write@1.0.3:
mkdirp "^0.5.1"
ws@^5.2.2:
- version "5.2.2"
- resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f"
- integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA==
+ version "5.2.3"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d"
+ integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA==
dependencies:
async-limiter "~1.0.0"
ws@^6.2.1:
- version "6.2.1"
- resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
- integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+ version "6.2.2"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+ integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
dependencies:
async-limiter "~1.0.0"
-ws@^7.1.2, ws@^7.3.1, ws@^7.4.4:
- version "7.4.5"
- resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
- integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
+ws@^7.1.2, ws@^7.3.1, ws@^7.4.5:
+ version "7.4.6"
+ resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+ integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
xdg-basedir@^2.0.0:
version "2.0.0"
@@ -17108,6 +17541,11 @@ yn@3.1.1:
resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
+yocto-queue@^0.1.0:
+ version "0.1.0"
+ resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+ integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
+
zepto@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/zepto/-/zepto-1.2.0.tgz#e127bd9e66fd846be5eab48c1394882f7c0e4f98"
+
@@ -22,7 +22,7 @@