From 558e46783310028d1fa4b00f3330eaa1f6688b63 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Tue, 3 Aug 2021 06:50:56 +0300 Subject: [PATCH 01/28] chore: Code cleanup for async function Signed-off-by: Roman Nikitenko --- plugins/ssh-plugin/src/util/util.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/ssh-plugin/src/util/util.ts b/plugins/ssh-plugin/src/util/util.ts index 0870e0fec8..6ea02be3fe 100644 --- a/plugins/ssh-plugin/src/util/util.ts +++ b/plugins/ssh-plugin/src/util/util.ts @@ -22,9 +22,9 @@ export async function askHostName(message?: string): Promise return theia.window.showInputBox({ placeHolder: message ? message : 'Please provide a hostname e.g. github.com', - validateInput: (text: string) => { + validateInput: async (text: string) => { if (!hostNamePattern.test(text)) { - return Promise.resolve('Invalid hostname'); + return 'Invalid hostname'; } }, }); From 5c0f225e6e7876f0953998f4440876d9346a4d31 Mon Sep 17 00:00:00 2001 From: Florent Benoit Date: Fri, 6 Aug 2021 10:57:29 +0200 Subject: [PATCH 02/28] chore(issues): Add redirect button to create issues instead of having a template Change-Id: Ia2f13d6bc8f7bcc58710905dd577e22cadf74ec3 Signed-off-by: Florent Benoit --- .github/ISSUE_TEMPLATE/config.yml | 8 ++++++++ .github/ISSUE_TEMPLATE/where-to-report-issues.md | 16 ---------------- 2 files changed, 8 insertions(+), 16 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100644 .github/ISSUE_TEMPLATE/where-to-report-issues.md diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 0000000000..0307fe6f8f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,8 @@ +# Disable the blank issue +blank_issues_enabled: false + +# Make redirect to eclipse che issue tracker +contact_links: + - name: Create Issue + url: https://github.com/eclipse/che/issues/new/choose + about: File issues on the main Eclipse Che repository diff --git a/.github/ISSUE_TEMPLATE/where-to-report-issues.md b/.github/ISSUE_TEMPLATE/where-to-report-issues.md deleted file mode 100644 index d970b7c427..0000000000 --- a/.github/ISSUE_TEMPLATE/where-to-report-issues.md +++ /dev/null @@ -1,16 +0,0 @@ ---- -name: "⚠️ Where to report issues ?" -about: File issues on the main Eclipse Che repository at https://github.com/eclipse/che/issues -title: Issues needs to be filed on the main Eclipse Che repository -labels: '' -assignees: '' - ---- - -## Where to report issues? - -This repository is not the primary repository of Eclipse Che. - -🚨 Please don't submit new issues here. 🚨 - -All issues for Eclipse Che are getting managed at: https://github.com/eclipse/che/issues From f37bbc94fcf9ddd136d40e6aeeef4f185cd700c7 Mon Sep 17 00:00:00 2001 From: Roman Nikitenko Date: Thu, 5 Aug 2021 17:48:28 +0300 Subject: [PATCH 03/28] feat(multi-root): Multi-root is the only mode in Che-Theia, no feature toggle anymore Signed-off-by: Roman Nikitenko --- .../tests/_data/devfile-attributes.yaml | 1 - .../tests/_data/workspace-status-runtime.json | 3 -- .../src/node/che-workspace-server.ts | 9 ---- .../src/workspace-projects-manager.ts | 49 +++++++---------- .../tests/workspace-projects-manager.spec.ts | 53 ++++--------------- 5 files changed, 29 insertions(+), 86 deletions(-) diff --git a/extensions/eclipse-che-theia-remote-impl-che-server/tests/_data/devfile-attributes.yaml b/extensions/eclipse-che-theia-remote-impl-che-server/tests/_data/devfile-attributes.yaml index 8dfaa27e24..e54143d120 100644 --- a/extensions/eclipse-che-theia-remote-impl-che-server/tests/_data/devfile-attributes.yaml +++ b/extensions/eclipse-che-theia-remote-impl-che-server/tests/_data/devfile-attributes.yaml @@ -1,7 +1,6 @@ --- apiVersion: 1.0.0 attributes: - multiRoot: 'off' attributeName: 'attributeValue' metadata: name: test diff --git a/extensions/eclipse-che-theia-remote-impl-che-server/tests/_data/workspace-status-runtime.json b/extensions/eclipse-che-theia-remote-impl-che-server/tests/_data/workspace-status-runtime.json index f1171d3147..e2a9e8f67b 100644 --- a/extensions/eclipse-che-theia-remote-impl-che-server/tests/_data/workspace-status-runtime.json +++ b/extensions/eclipse-che-theia-remote-impl-che-server/tests/_data/workspace-status-runtime.json @@ -168,9 +168,6 @@ "metadata": { "name": "nodejs-mongo-l7t46" }, - "attributes": { - "multiRoot": "on" - }, "components": [ { "memoryLimit": "512Mi", diff --git a/extensions/eclipse-che-theia-workspace/src/node/che-workspace-server.ts b/extensions/eclipse-che-theia-workspace/src/node/che-workspace-server.ts index 0fe372517a..e4a2f89dce 100644 --- a/extensions/eclipse-che-theia-workspace/src/node/che-workspace-server.ts +++ b/extensions/eclipse-che-theia-workspace/src/node/che-workspace-server.ts @@ -14,7 +14,6 @@ import * as path from 'path'; import { inject, injectable } from 'inversify'; import { DefaultWorkspaceServer } from '@theia/workspace/lib/node/default-workspace-server'; -import { DevfileService } from '@eclipse-che/theia-remote-api/lib/common/devfile-service'; import { FileUri } from '@theia/core/lib/node'; import { WorkspaceService } from '@eclipse-che/theia-remote-api/lib/common/workspace-service'; @@ -28,20 +27,12 @@ interface TheiaWorkspacePath { @injectable() export class CheWorkspaceServer extends DefaultWorkspaceServer { - @inject(DevfileService) - protected devfileService: DevfileService; - @inject(WorkspaceService) protected workspaceService: WorkspaceService; // override any workspace that could have been defined through CLI and use entries from the devfile // if not possible, use default method protected async getRoot(): Promise { - const devfile = await this.devfileService.get(); - if (devfile?.metadata?.attributes?.multiRoot === 'off') { - return super.getRoot(); - } - const projectsRoot = await this.workspaceService.getProjectsRootDirectory(); // first, check if we have a che.theia-workspace file diff --git a/plugins/workspace-plugin/src/workspace-projects-manager.ts b/plugins/workspace-plugin/src/workspace-projects-manager.ts index 7251f6a2f2..b0b41b0d08 100644 --- a/plugins/workspace-plugin/src/workspace-projects-manager.ts +++ b/plugins/workspace-plugin/src/workspace-projects-manager.ts @@ -59,37 +59,29 @@ export class WorkspaceProjectsManager { this.output.appendLine(`Clone commands are ${JSON.stringify(cloneCommandList, undefined, 2)}`); - const isMultiRoot = devfile.metadata?.attributes?.multiRoot !== 'off'; - - this.output.appendLine(`multi root is ${isMultiRoot}`); - - const cloningPromise = this.executeCloneCommands(cloneCommandList, isMultiRoot); + const cloningPromise = this.executeCloneCommands(cloneCommandList); theia.window.withProgress({ location: { viewId: 'explorer' } }, () => cloningPromise); await cloningPromise; const { workspaceFile, workspaceFolders = [] } = theia.workspace; const isCustomWorkspaceRoot = workspaceFile && path.basename(workspaceFile.path) !== CHE_DEFAULT_WORKSPACE_ROOT_NAME; - if (isMultiRoot) { - // Backward compatibility for single-root workspaces - // we need it to support workspaces which were created before switching multi-root mode to ON by default - for (const project of projects) { - const projectPath = this.getProjectPath(project); - const shouldAddedToWorkspace = - !isCustomWorkspaceRoot || workspaceFolders.some(each => each.uri.path === projectPath); - if (!shouldAddedToWorkspace) { - return; - } - if (await fs.pathExists(projectPath)) { - await this.workspaceFolderUpdater.addWorkspaceFolder(projectPath); - } + + // Backward compatibility for single-root workspaces + // we need it to support workspaces which were created before switching multi-root mode to ON by default + for (const project of projects) { + const projectPath = this.getProjectPath(project); + const shouldAddedToWorkspace = + !isCustomWorkspaceRoot || workspaceFolders.some(each => each.uri.path === projectPath); + if (!shouldAddedToWorkspace) { + return; + } + if (await fs.pathExists(projectPath)) { + await this.workspaceFolderUpdater.addWorkspaceFolder(projectPath); } } await this.watchWorkspaceProjects(); - - if (isMultiRoot) { - await this.watchMultiRootProjects(); - } + await this.watchMultiRootProjects(); } async buildCloneCommands(projects: che.devfile.DevfileProject[]): Promise { @@ -110,7 +102,7 @@ export class WorkspaceProjectsManager { return commands; } - private async executeCloneCommands(cloneCommandList: TheiaImportCommand[], isMultiRoot: boolean): Promise { + private async executeCloneCommands(cloneCommandList: TheiaImportCommand[]): Promise { if (cloneCommandList.length === 0) { return; } @@ -122,12 +114,11 @@ export class WorkspaceProjectsManager { try { let cloningPromise = cloneCommand.execute(); - if (isMultiRoot) { - cloningPromise = cloningPromise.then(async projectPath => { - await this.workspaceFolderUpdater.addWorkspaceFolder(projectPath); - return projectPath; - }); - } + cloningPromise = cloningPromise.then(async projectPath => { + await this.workspaceFolderUpdater.addWorkspaceFolder(projectPath); + return projectPath; + }); + cloningPromises.push(cloningPromise); } catch (e) { this.output.appendLine(`Error while cloning: ${e}`); diff --git a/plugins/workspace-plugin/tests/workspace-projects-manager.spec.ts b/plugins/workspace-plugin/tests/workspace-projects-manager.spec.ts index 897cfa71d3..29e1bebcf1 100644 --- a/plugins/workspace-plugin/tests/workspace-projects-manager.spec.ts +++ b/plugins/workspace-plugin/tests/workspace-projects-manager.spec.ts @@ -150,7 +150,7 @@ che.devfile.get = getDevfileMock; const updateDevfileMock = jest.fn(); che.devfile.update = updateDevfileMock; -const devfile_Without_Attributes = { +const devfile = { metadata: {}, projects: [firstProject], }; @@ -160,24 +160,6 @@ const devfile_With_Two_Projects = { projects: [firstProject, secondProject], }; -const devfileWith_MultiRoot_On_Attribute = { - metadata: { - attributes: { - multiRoot: 'on', - }, - }, - projects: [firstProject], -}; - -const devfileWith_MultiRoot_Off_Attribute = { - metadata: { - attributes: { - multiRoot: 'off', - }, - }, - projects: [firstProject], -}; - const fileSystemWatcherMock = { onDidCreate: jest.fn(), onDidChange: jest.fn(), @@ -259,30 +241,13 @@ describe('Test Workspace Projects Manager', () => { }); test('Should add workspace folder when there are no attributes - multi root mode is ON by default', async () => { - getDevfileMock.mockReturnValue(devfile_Without_Attributes); + getDevfileMock.mockReturnValue(devfile); await workspaceProjectsManager.run(); expect(addWorkspaceFolderMock).toBeCalledTimes(1); }); - test('Should add workspace folder when there is the `multiRoot` attribute with `on` value', async () => { - getDevfileMock.mockReturnValue(devfileWith_MultiRoot_On_Attribute); - - await workspaceProjectsManager.run(); - - expect(addWorkspaceFolderMock).toBeCalledTimes(1); - }); - - test('Should NOT add workspace folder when there is the `multiRoot` attribute with `off` value', async () => { - getDevfileMock.mockReturnValue(devfileWith_MultiRoot_Off_Attribute); - - await workspaceProjectsManager.run(); - - expect(addWorkspaceFolderMock).toBeCalledTimes(0); - expect(showInfoMessageMock).toBeCalledTimes(2); - }); - test('Should clone the second project and add it as workspace folder when cloning of the first project was failed', async () => { const failedImportCommand: theiaCommands.TheiaImportCommand = new theiaCommands.TheiaGitCloneCommand( secondProject, @@ -308,7 +273,7 @@ describe('Test Workspace Projects Manager', () => { }); test('Should check steps of successful cloning process execution', async () => { - getDevfileMock.mockReturnValue(devfile_Without_Attributes); + getDevfileMock.mockReturnValue(devfile); await workspaceProjectsManager.run(); @@ -341,7 +306,7 @@ describe('Test Workspace Projects Manager', () => { test('Commands were NOT found for execution cloning process', async () => { buildProjectImportCommandMock.mockReturnValue(undefined); - getDevfileMock.mockReturnValue(devfile_Without_Attributes); + getDevfileMock.mockReturnValue(devfile); await workspaceProjectsManager.run(); @@ -385,7 +350,7 @@ describe('Test Workspace Projects Manager', () => { * - onProjectRemoved must NOT be called */ test('onProjectChanged must be called on change event', async () => { - getDevfileMock.mockReturnValue(devfileWith_MultiRoot_On_Attribute); + getDevfileMock.mockReturnValue(devfile); pathExistsItems = [PROJECTS_ROOT]; await workspaceProjectsManager.run(); @@ -427,7 +392,7 @@ describe('Test Workspace Projects Manager', () => { * ( devfileService.updateProject must NOT be called ) */ test('devfileService.updateProject must NOT be called for not Git repository', async () => { - getDevfileMock.mockReturnValue(devfileWith_MultiRoot_On_Attribute); + getDevfileMock.mockReturnValue(devfile); pathExistsItems = [PROJECTS_ROOT]; await workspaceProjectsManager.run(); @@ -461,7 +426,7 @@ describe('Test Workspace Projects Manager', () => { * - onProjectRemoved must be called */ test('onProjectRemoved must be called on change event for non existent item', async () => { - getDevfileMock.mockReturnValue(devfileWith_MultiRoot_On_Attribute); + getDevfileMock.mockReturnValue(devfile); pathExistsItems = [PROJECTS_ROOT]; await workspaceProjectsManager.run(); @@ -528,7 +493,7 @@ describe('Test Workspace Projects Manager', () => { }); test('Projects must be added to the default workspace', async () => { getDevfileMock.mockReturnValue({ - ...devfileWith_MultiRoot_On_Attribute, + ...devfile, projects: [firstProject, secondProject], }); const mockWorkspace = { @@ -546,7 +511,7 @@ describe('Test Workspace Projects Manager', () => { }); test('Project should be added to custom workspace only if it is declared on the *.theia-workspace config', async () => { getDevfileMock.mockReturnValue({ - ...devfileWith_MultiRoot_On_Attribute, + ...devfile, projects: [firstProject, secondProject], }); pathExistsItems = ['/projects/che-theia', '/projects/theia', '/projects/a']; From 2558cf1061c89d9669387e122b8e507cde8157dc Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Sat, 7 Aug 2021 00:10:29 +0000 Subject: [PATCH 04/28] chore: Update from ubi8/nodejs-12:1-90 to ubi8/nodejs-12:1-90.1626843814 Signed-off-by: Mykhailo Kuznietsov --- dockerfiles/theia/docker/ubi8/runtime-from.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/theia/docker/ubi8/runtime-from.dockerfile b/dockerfiles/theia/docker/ubi8/runtime-from.dockerfile index d26c0d45aa..f8f8167fa8 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-90 as runtime +FROM registry.access.redhat.com/ubi8/nodejs-12:1-90.1626843814 as runtime From 726c332420172135348df422f61dd91d86bb7c28 Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Sat, 7 Aug 2021 00:10:35 +0000 Subject: [PATCH 05/28] chore: Update from ubi8/nodejs-12:1-90 to ubi8/nodejs-12:1-90.1626843814 Signed-off-by: Mykhailo Kuznietsov --- dockerfiles/theia/docker/ubi8/build-result-from.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/theia/docker/ubi8/build-result-from.dockerfile b/dockerfiles/theia/docker/ubi8/build-result-from.dockerfile index e10fc7423b..c0c3b027b3 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-90 as build-result +FROM registry.access.redhat.com/ubi8/nodejs-12:1-90.1626843814 as build-result USER root From 927e9ee9e99b250ea8b5e7124120a333b4d07111 Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Sat, 7 Aug 2021 00:10:49 +0000 Subject: [PATCH 06/28] chore: Update from ubi8/nodejs-12:1-90 to ubi8/nodejs-12:1-90.1626843814 Signed-off-by: Mykhailo Kuznietsov --- dockerfiles/theia-dev/docker/ubi8/builder-image-from.dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dockerfiles/theia-dev/docker/ubi8/builder-image-from.dockerfile b/dockerfiles/theia-dev/docker/ubi8/builder-image-from.dockerfile index 5b02373b85..01a2af1e71 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-90 +FROM registry.access.redhat.com/ubi8/nodejs-12:1-90.1626843814 From bad938f8752e2acd77a16da9314de57390e91f89 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Thu, 12 Aug 2021 11:34:19 -0300 Subject: [PATCH 07/28] chore: Update ubi8/minimal and ubi8/nodejs-12 images (#1194) * chore: Update from ubi8-minimal:8.4-205.1626828526 to ubi8-minimal:8.4-208 Change-Id: I4dad534da5d98825dce5603ce490f36f49bd90d9 Signed-off-by: nickboldt * chore: Update from ubi8-minimal:8.4-205.1626828526 to ubi8-minimal:8.4-208 Change-Id: Id6bf5eb97109ef6b2c21d0b9a4c41b0edb07e7ae Signed-off-by: nickboldt * chore: Update from ubi8/nodejs-12:1-90.1626843814 to ubi8/nodejs-12:1-95 Change-Id: I17696fbbacab97b1d5015d223a7913792d1b2a10 Signed-off-by: nickboldt * chore: Update from ubi8/nodejs-12:1-90.1626843814 to ubi8/nodejs-12:1-95 Change-Id: I5f773a3a347323414e02be9ded0825ad9231883f Signed-off-by: nickboldt * chore: Update from ubi8/nodejs-12:1-90.1626843814 to ubi8/nodejs-12:1-95 Change-Id: I7119815130f69d2744e3d7c7a09c881cd9dbc876 Signed-off-by: nickboldt --- dockerfiles/theia-dev/docker/ubi8/builder-image-from.dockerfile | 2 +- .../docker/ubi8/runtime-from.dockerfile | 2 +- dockerfiles/theia-vsix-installer/docker/ubi8/from.dockerfile | 2 +- dockerfiles/theia/docker/ubi8/build-result-from.dockerfile | 2 +- dockerfiles/theia/docker/ubi8/runtime-from.dockerfile | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dockerfiles/theia-dev/docker/ubi8/builder-image-from.dockerfile b/dockerfiles/theia-dev/docker/ubi8/builder-image-from.dockerfile index 01a2af1e71..b6fe664946 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-90.1626843814 +FROM registry.access.redhat.com/ubi8/nodejs-12:1-95 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 f1bbefd821..b86d2101ef 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-205.1626828526 as runtime +FROM registry.access.redhat.com/ubi8-minimal:8.4-208 as runtime diff --git a/dockerfiles/theia-vsix-installer/docker/ubi8/from.dockerfile b/dockerfiles/theia-vsix-installer/docker/ubi8/from.dockerfile index f1bbefd821..b86d2101ef 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-205.1626828526 as runtime +FROM registry.access.redhat.com/ubi8-minimal:8.4-208 as runtime diff --git a/dockerfiles/theia/docker/ubi8/build-result-from.dockerfile b/dockerfiles/theia/docker/ubi8/build-result-from.dockerfile index c0c3b027b3..12463b4493 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-90.1626843814 as build-result +FROM registry.access.redhat.com/ubi8/nodejs-12:1-95 as build-result USER root diff --git a/dockerfiles/theia/docker/ubi8/runtime-from.dockerfile b/dockerfiles/theia/docker/ubi8/runtime-from.dockerfile index f8f8167fa8..4112e71583 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-90.1626843814 as runtime +FROM registry.access.redhat.com/ubi8/nodejs-12:1-95 as runtime From 02c59f4dd3f4069be6597d9dca0c6a97d0eb090c Mon Sep 17 00:00:00 2001 From: mtsmfm Date: Sun, 15 Aug 2021 10:09:26 +0000 Subject: [PATCH 08/28] chore: che-theia-all.devfile -> che-theia-dev.devfile --- CONTRIBUTING.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 6813c3b961..75b41fdeae 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,13 +27,13 @@ Each devfile could be run on any Che instances. Beware that each of them may nee Devfile could be launched through a factory or [chectl](https://github.com/che-incubator/chectl) cli. ``` -$ chectl workspace:start -f devfiles/che-theia-all.devfile.yaml +$ chectl workspace:start -f devfiles/che-theia-dev.devfile.yaml ``` ## Contribute to Theia or Che-Theia extensions or built-in Che-Theia plugins > Note that this devfile is going to evolve very soon and be splitted into multiple devfiles. -The devfile: [/devfiles/che-theia-all.devfile.yaml](./devfiles/che-theia-all.devfile.yaml) +The devfile: [/devfiles/che-theia-dev.devfile.yaml](./devfiles/che-theia-dev.devfile.yaml) In this section, we show how to setup a Che 7 environment to work on che-theia, and how to use it. For the whole workflows, we will need a workspace with such containers: @@ -61,7 +61,7 @@ In this section we are going to start a new workspace to work on che-theia. The The devfile could be started using `chectl`: ``` -chectl workspace:start -f https://raw.githubusercontent.com/eclipse-che/che-theia/main/devfiles/che-theia-all.devfile.yaml +chectl workspace:start -f https://raw.githubusercontent.com/eclipse-che/che-theia/main/devfiles/che-theia-dev.devfile.yaml ``` At workspace start, Che will clone Theia and Che-theia. From 109d2aef3b9c7846c7f17ee1f77ec5d269af7a17 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Tue, 17 Aug 2021 09:26:12 -0300 Subject: [PATCH 09/28] chore: CRW-1995 fix s390x rpm URL; refactor yum logic to do only one install (not two) and remove `||true` (#1189) * CRW-1995 s390x rpm in development/rawhide has moved to releases/34 Change-Id: Ie263bee67847aded8f2399184d925854d96c3d2f Signed-off-by: nickboldt * simplify dockerfiles so that we only do one yum install (not two) and only process fewer if-blocks Change-Id: I7d4d63002ae0d7739d44db7152509c50b37653ea Signed-off-by: nickboldt * don't check if libsecret and libsecret-devel are already installed Change-Id: I72392a22721e4728f5a1abf91a2fda9aba1028f1 Signed-off-by: nickboldt --- .../docker/ubi8/install-dependencies.dockerfile | 17 +++++++++++------ .../runtime-install-dependencies.dockerfile | 17 +++++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/dockerfiles/theia-dev/docker/ubi8/install-dependencies.dockerfile b/dockerfiles/theia-dev/docker/ubi8/install-dependencies.dockerfile index 8d6a9d922e..45009794ed 100644 --- a/dockerfiles/theia-dev/docker/ubi8/install-dependencies.dockerfile +++ b/dockerfiles/theia-dev/docker/ubi8/install-dependencies.dockerfile @@ -1,9 +1,14 @@ USER root # Install libsecret-devel on s390x and ppc64le for keytar build (binary included in npm package for x86) -RUN yum install -y curl make cmake gcc gcc-c++ python2 git git-core-doc openssh less bash tar gzip rsync patch \ - && { [ $(uname -m) == "s390x" ] && yum install -y \ - https://rpmfind.net/linux/fedora-secondary/releases/34/Everything/s390x/os/Packages/l/libsecret-0.20.4-2.fc34.s390x.rpm \ - https://rpmfind.net/linux/fedora-secondary/development/rawhide/Everything/s390x/os/Packages/l/libsecret-devel-0.20.4-2.fc34.s390x.rpm || true; } \ - && { [ $(uname -m) == "ppc64le" ] && yum install -y libsecret https://rpmfind.net/linux/centos/8-stream/BaseOS/ppc64le/os/Packages/libsecret-devel-0.18.6-1.el8.ppc64le.rpm || true; } \ - && { [ $(uname -m) == "x86_64" ] && yum install -y libsecret || true; } \ +RUN { if [[ $(uname -m) == "s390x" ]]; then LIBSECRET="\ + https://rpmfind.net/linux/fedora-secondary/releases/34/Everything/s390x/os/Packages/l/libsecret-0.20.4-2.fc34.s390x.rpm \ + https://rpmfind.net/linux/fedora-secondary/releases/34/Everything/s390x/os/Packages/l/libsecret-devel-0.20.4-2.fc34.s390x.rpm"; \ + elif [[ $(uname -m) == "ppc64le" ]]; then LIBSECRET="\ + libsecret \ + https://rpmfind.net/linux/centos/8-stream/BaseOS/ppc64le/os/Packages/libsecret-devel-0.18.6-1.el8.ppc64le.rpm"; \ + elif [[ $(uname -m) == "x86_64" ]]; then LIBSECRET="libsecret"; \ + else \ + LIBSECRET=""; echo "Warning: arch $(uname -m) not supported"; \ + fi; } \ + && yum install -y $LIBSECRET curl make cmake gcc gcc-c++ python2 git git-core-doc openssh less bash tar gzip rsync patch \ && yum -y clean all && rm -rf /var/cache/yum diff --git a/dockerfiles/theia/docker/ubi8/runtime-install-dependencies.dockerfile b/dockerfiles/theia/docker/ubi8/runtime-install-dependencies.dockerfile index dfe426b445..082ea7792c 100644 --- a/dockerfiles/theia/docker/ubi8/runtime-install-dependencies.dockerfile +++ b/dockerfiles/theia/docker/ubi8/runtime-install-dependencies.dockerfile @@ -13,12 +13,17 @@ ARG SSHPASS_VERSION="1.08" # Install sshpass for handling passwords for SSH keys # Install libsecret as Theia requires it # Install libsecret-devel on s390x and ppc64le for keytar build (binary included in npm package for x86) -RUN yum install -y sudo git bzip2 which bash curl openssh less \ - && { [ $(uname -m) == "s390x" ] && yum install -y \ - https://rpmfind.net/linux/fedora-secondary/releases/34/Everything/s390x/os/Packages/l/libsecret-0.20.4-2.fc34.s390x.rpm \ - https://rpmfind.net/linux/fedora-secondary/development/rawhide/Everything/s390x/os/Packages/l/libsecret-devel-0.20.4-2.fc34.s390x.rpm || true; } \ - && { [ $(uname -m) == "ppc64le" ] && yum install -y libsecret https://rpmfind.net/linux/centos/8-stream/BaseOS/ppc64le/os/Packages/libsecret-devel-0.18.6-1.el8.ppc64le.rpm || true; } \ - && { [ $(uname -m) == "x86_64" ] && yum install -y libsecret || true; } \ +RUN { if [[ $(uname -m) == "s390x" ]]; then LIBSECRET="\ + https://rpmfind.net/linux/fedora-secondary/releases/34/Everything/s390x/os/Packages/l/libsecret-0.20.4-2.fc34.s390x.rpm \ + https://rpmfind.net/linux/fedora-secondary/releases/34/Everything/s390x/os/Packages/l/libsecret-devel-0.20.4-2.fc34.s390x.rpm"; \ + elif [[ $(uname -m) == "ppc64le" ]]; then LIBSECRET="\ + libsecret \ + https://rpmfind.net/linux/centos/8-stream/BaseOS/ppc64le/os/Packages/libsecret-devel-0.18.6-1.el8.ppc64le.rpm"; \ + elif [[ $(uname -m) == "x86_64" ]]; then LIBSECRET="libsecret"; \ + else \ + LIBSECRET=""; echo "Warning: arch $(uname -m) not supported"; \ + fi; } \ + && yum install -y $LIBSECRET sudo git bzip2 which bash curl openssh less \ && curl -sSLo sshpass.tar.gz https://downloads.sourceforge.net/project/sshpass/sshpass/"${SSHPASS_VERSION}"/sshpass-"${SSHPASS_VERSION}".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 From 41bb0c11316543f321fcad7d09c0d94af79de276 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=A4der?= Date: Wed, 18 Aug 2021 08:09:02 +0000 Subject: [PATCH 10/28] Adapt QuickInputItem#execute to new API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Mäder --- .../src/browser/container-picker.ts | 9 +++------ .../src/browser/contribution/terminal-quick-open.ts | 6 ++---- .../src/browser/che-quick-open-workspace.ts | 10 +++------- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/extensions/eclipse-che-theia-plugin-ext/src/browser/container-picker.ts b/extensions/eclipse-che-theia-plugin-ext/src/browser/container-picker.ts index 263a211876..de02fd389d 100644 --- a/extensions/eclipse-che-theia-plugin-ext/src/browser/container-picker.ts +++ b/extensions/eclipse-che-theia-plugin-ext/src/browser/container-picker.ts @@ -49,9 +49,8 @@ export class ContainerPicker { containerName => ({ label: containerName, - execute: (item: QuickPickItem) => { + execute: () => { resolve(containerName); - return true; }, } as QuickPickItem) ) @@ -88,9 +87,8 @@ export class ContainerPicker { container => ({ label: container.name, - execute: (item: QuickPickItem) => { + execute: () => { handler(container.name); - return true; }, } as QuickPickItem) ); @@ -104,9 +102,8 @@ export class ContainerPicker { container => ({ label: container.name, - execute: (item: QuickPickItem) => { + execute: () => { handler(container.name); - return true; }, } as QuickPickItem) ); diff --git a/extensions/eclipse-che-theia-terminal/src/browser/contribution/terminal-quick-open.ts b/extensions/eclipse-che-theia-terminal/src/browser/contribution/terminal-quick-open.ts index 1720124964..f7e95df76d 100644 --- a/extensions/eclipse-che-theia-terminal/src/browser/contribution/terminal-quick-open.ts +++ b/extensions/eclipse-che-theia-terminal/src/browser/contribution/terminal-quick-open.ts @@ -46,9 +46,8 @@ export class TerminalQuickOpenService { container => ({ label: container.name, - execute: (item: QuickPickItem) => { + execute: () => { setTimeout(() => doOpen(container.name), 0); - return true; }, } as QuickPickItem) ); @@ -62,9 +61,8 @@ export class TerminalQuickOpenService { container => ({ label: container.name, - execute: (item: QuickPickItem) => { + execute: () => { setTimeout(() => doOpen(container.name), 0); - return true; }, } as QuickPickItem) ); diff --git a/extensions/eclipse-che-theia-workspace/src/browser/che-quick-open-workspace.ts b/extensions/eclipse-che-theia-workspace/src/browser/che-quick-open-workspace.ts index 61f49183ca..07dc81546a 100644 --- a/extensions/eclipse-che-theia-workspace/src/browser/che-quick-open-workspace.ts +++ b/extensions/eclipse-che-theia-workspace/src/browser/che-quick-open-workspace.ts @@ -48,14 +48,10 @@ export class QuickOpenCheWorkspace { label: workspace.name + (this.isCurrentWorkspace(workspace) ? ' (Current)' : ''), detail: `Stack: ${CheWorkspaceUtils.getWorkspaceStack(workspace)}`, iconClasses: [iconClass], - execute: (item: QuickPickItem) => { - if (this.isCurrentWorkspace(workspace)) { - return true; + execute: () => { + if (!this.isCurrentWorkspace(workspace)) { + acceptor(workspace); } - - acceptor(workspace); - - return true; }, }); this.items.push({ type: 'separator', label: groupLabel }); From 4432ee3a93c36b080bb30caafd55b20f7d23892a Mon Sep 17 00:00:00 2001 From: Igor Vinokur Date: Wed, 18 Aug 2021 13:45:29 +0300 Subject: [PATCH 11/28] fix: Adapt the Secrets plugin API to use kubernetes secrets (#1166) Rework the Secrets API from upstream theia to use kubernetes secrets --- che-theia-init-sources.yml | 1 + .../eclipse-che-theia-credentials/.gitignore | 10 ++ .../package.json | 55 +++++++++ .../src/browser/che-credentials-service.ts | 56 +++++++++ .../browser/credentials-frontend-module.ts | 26 ++++ .../src/common/credentials-protocol.ts | 25 ++++ .../src/node/che-credentials-server.ts | 111 ++++++++++++++++++ .../che-theia-credentials-backend-module.ts | 24 ++++ .../tests/no-op.spec.ts | 13 ++ .../tsconfig.json | 14 +++ .../assembly-compile.tsconfig.mst.json | 3 + 11 files changed, 338 insertions(+) create mode 100644 extensions/eclipse-che-theia-credentials/.gitignore create mode 100644 extensions/eclipse-che-theia-credentials/package.json create mode 100644 extensions/eclipse-che-theia-credentials/src/browser/che-credentials-service.ts create mode 100644 extensions/eclipse-che-theia-credentials/src/browser/credentials-frontend-module.ts create mode 100644 extensions/eclipse-che-theia-credentials/src/common/credentials-protocol.ts create mode 100644 extensions/eclipse-che-theia-credentials/src/node/che-credentials-server.ts create mode 100644 extensions/eclipse-che-theia-credentials/src/node/che-theia-credentials-backend-module.ts create mode 100644 extensions/eclipse-che-theia-credentials/tests/no-op.spec.ts create mode 100644 extensions/eclipse-che-theia-credentials/tsconfig.json diff --git a/che-theia-init-sources.yml b/che-theia-init-sources.yml index 7039026870..381936f081 100644 --- a/che-theia-init-sources.yml +++ b/che-theia-init-sources.yml @@ -21,6 +21,7 @@ sources: - extensions/eclipse-che-theia-remote-api - extensions/eclipse-che-theia-remote-impl-che-server - extensions/eclipse-che-theia-remote-impl-k8s + - extensions/eclipse-che-theia-credentials plugins: - plugins/containers-plugin - plugins/ext-plugin diff --git a/extensions/eclipse-che-theia-credentials/.gitignore b/extensions/eclipse-che-theia-credentials/.gitignore new file mode 100644 index 0000000000..7813a26eca --- /dev/null +++ b/extensions/eclipse-che-theia-credentials/.gitignore @@ -0,0 +1,10 @@ +conf +node_modules +dist +coverage +yarn-error.log +.vscode +lib +*.tgz +*.log +.eslintcache diff --git a/extensions/eclipse-che-theia-credentials/package.json b/extensions/eclipse-che-theia-credentials/package.json new file mode 100644 index 0000000000..2d6ca155bb --- /dev/null +++ b/extensions/eclipse-che-theia-credentials/package.json @@ -0,0 +1,55 @@ +{ + "name": "@eclipse-che/theia-credentials", + "keywords": [ + "theia-extension" + ], + "version": "0.0.1", + "description": "Eclipse Che - Theia credentials", + "dependencies": { + "@theia/core": "next", + "@kubernetes/client-node": "^0.12.1", + "@eclipse-che/theia-remote-impl-che-server": "0.0.1" + }, + "publishConfig": { + "access": "public" + }, + "theiaExtensions": [ + { + "frontend": "lib/browser/credentials-frontend-module" + }, + { + "backend": "lib/node/che-theia-credentials-backend-module" + } + ], + "license": "EPL-2.0", + "files": [ + "lib", + "src", + "scripts", + "conf" + ], + "scripts": { + "prepare": "yarn clean && yarn build && yarn test", + "clean": "rimraf lib", + "format": "if-env SKIP_FORMAT=true && echo 'skip format check' || prettier --check '{src,tests}/**/*.ts' package.json", + "format:fix": "prettier --write '{src,tests}/**/*.ts' package.json", + "lint": "if-env SKIP_LINT=true && echo 'skip lint check' || eslint --cache=true --no-error-on-unmatched-pattern=true '{src,tests}/**/*.ts'", + "lint:fix": "eslint --fix --cache=true --no-error-on-unmatched-pattern=true \"{src,tests}/**/*.{ts,tsx}\"", + "compile": "tsc", + "build": "concurrently -n \"format,lint,compile\" -c \"red,green,blue\" \"yarn format\" \"yarn lint\" \"yarn compile\"", + "watch": "tsc -w", + "test": "if-env SKIP_TEST=true && echo 'skip test' || jest --forceExit" + }, + "jest": { + "clearMocks": true, + "collectCoverage": true, + "collectCoverageFrom": [ + "src/**/*.{ts,tsx}" + ], + "coverageDirectory": "coverage", + "modulePathIgnorePatterns": [ + "/lib" + ], + "preset": "ts-jest" + } +} diff --git a/extensions/eclipse-che-theia-credentials/src/browser/che-credentials-service.ts b/extensions/eclipse-che-theia-credentials/src/browser/che-credentials-service.ts new file mode 100644 index 0000000000..44f8909919 --- /dev/null +++ b/extensions/eclipse-che-theia-credentials/src/browser/che-credentials-service.ts @@ -0,0 +1,56 @@ +/********************************************************************** + * Copyright (c) 2019-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 { CredentialsChangeEvent, CredentialsService } from '@theia/core/lib/browser/credentials-service'; +import { Emitter, Event } from '@theia/core'; +import { inject, injectable } from 'inversify'; + +import { CredentialsServer } from '../common/credentials-protocol'; + +@injectable() +export class CheCredentialsService implements CredentialsService { + @inject(CredentialsServer) + private readonly credentialsServer: CredentialsServer; + + private readonly onDidChangePasswordEmitter = new Emitter(); + readonly onDidChangePassword: Event = this.onDidChangePasswordEmitter.event; + + async deletePassword(service: string, account: string): Promise { + const result = await this.credentialsServer.deletePassword(this.getExtensionId(service), account); + if (result) { + this.onDidChangePasswordEmitter.fire({ service, account }); + } + return result; + } + + findCredentials(service: string): Promise> { + return this.credentialsServer.findCredentials(this.getExtensionId(service)); + } + + findPassword(service: string): Promise { + return this.credentialsServer.findPassword(this.getExtensionId(service)); + } + + async getPassword(service: string, account: string): Promise { + const passwordContent = await this.credentialsServer.getPassword(this.getExtensionId(service), account); + if (passwordContent) { + return JSON.stringify(passwordContent); + } + } + + async setPassword(service: string, account: string, password: string): Promise { + await this.credentialsServer.setPassword(this.getExtensionId(service), account, JSON.parse(password)); + this.onDidChangePasswordEmitter.fire({ service, account }); + } + + private getExtensionId(service: string): string { + return service.replace(window.location.hostname + '-', ''); + } +} diff --git a/extensions/eclipse-che-theia-credentials/src/browser/credentials-frontend-module.ts b/extensions/eclipse-che-theia-credentials/src/browser/credentials-frontend-module.ts new file mode 100644 index 0000000000..ecab144316 --- /dev/null +++ b/extensions/eclipse-che-theia-credentials/src/browser/credentials-frontend-module.ts @@ -0,0 +1,26 @@ +/********************************************************************** + * 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 { CREDENTIALS_SERVICE_PATH, CredentialsServer } from '../common/credentials-protocol'; + +import { CheCredentialsService } from './che-credentials-service'; +import { ContainerModule } from 'inversify'; +import { CredentialsService } from '@theia/core/lib/browser/credentials-service'; +import { WebSocketConnectionProvider } from '@theia/core/lib/browser'; + +export default new ContainerModule((bind, unbind, isBound, rebind) => { + bind(CheCredentialsService).toSelf().inSingletonScope(); + rebind(CredentialsService).to(CheCredentialsService).inSingletonScope(); + bind(CredentialsServer) + .toDynamicValue(context => + context.container.get(WebSocketConnectionProvider).createProxy(CREDENTIALS_SERVICE_PATH) + ) + .inSingletonScope(); +}); diff --git a/extensions/eclipse-che-theia-credentials/src/common/credentials-protocol.ts b/extensions/eclipse-che-theia-credentials/src/common/credentials-protocol.ts new file mode 100644 index 0000000000..8538991a33 --- /dev/null +++ b/extensions/eclipse-che-theia-credentials/src/common/credentials-protocol.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 + ***********************************************************************/ + +export const CREDENTIALS_SERVICE_PATH = '/services/credentials'; +export const CredentialsServer = Symbol('CredentialsServer'); + +export interface PasswordContent { + extensionId: string; + content: string; +} + +export interface CredentialsServer { + setPassword(service: string, account: string, passwordData: PasswordContent): Promise; + getPassword(service: string, account: string): Promise; + deletePassword(service: string, account: string): Promise; + findPassword(service: string): Promise; + findCredentials(service: string): Promise>; +} diff --git a/extensions/eclipse-che-theia-credentials/src/node/che-credentials-server.ts b/extensions/eclipse-che-theia-credentials/src/node/che-credentials-server.ts new file mode 100644 index 0000000000..b0aa4afba5 --- /dev/null +++ b/extensions/eclipse-che-theia-credentials/src/node/che-credentials-server.ts @@ -0,0 +1,111 @@ +/********************************************************************** + * 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 k8s from '@kubernetes/client-node'; + +import { CredentialsServer, PasswordContent } from '../common/credentials-protocol'; +import { inject, injectable } from 'inversify'; + +import { CheK8SServiceImpl } from '@eclipse-che/theia-remote-impl-che-server/lib/node/che-server-k8s-service-impl'; +import { CheServerWorkspaceServiceImpl } from '@eclipse-che/theia-remote-impl-che-server/lib/node/che-server-workspace-service-impl'; + +@injectable() +export class CheCredentialsServer implements CredentialsServer { + @inject(CheK8SServiceImpl) + private readonly cheK8SService: CheK8SServiceImpl; + + @inject(CheServerWorkspaceServiceImpl) + private readonly workspaceService: CheServerWorkspaceServiceImpl; + + private readonly CREDENTIALS_SECRET_NAME = 'workspace-credentials-secret'; + private readonly INFRASTRUCTURE_NAMESPACE = 'infrastructureNamespace'; + + async deletePassword(service: string, account: string): Promise { + try { + const patch = [ + { + op: 'remove', + path: `/data/${this.getSecretDataItemName(service, account)}`, + }, + ]; + const client = this.cheK8SService.makeApiClient(k8s.CoreV1Api); + client.defaultHeaders = { Accept: 'application/json', 'Content-Type': k8s.PatchUtils.PATCH_FORMAT_JSON_PATCH }; + await client.patchNamespacedSecret(this.CREDENTIALS_SECRET_NAME, await this.getWorkspaceNamespace(), patch); + return true; + } catch (e) { + console.error(e); + return false; + } + } + + async findCredentials(service: string): Promise> { + const secret = await this.cheK8SService + .makeApiClient(k8s.CoreV1Api) + .readNamespacedSecret(this.CREDENTIALS_SECRET_NAME, await this.getWorkspaceNamespace()); + const data = secret.body.data; + return data + ? Object.keys(data) + .filter(key => key.startsWith(service)) + .map(key => ({ + account: key.substring(key.indexOf('_') + 1), + password: Buffer.from(data[key], 'base64').toString('ascii'), + })) + : []; + } + + async findPassword(service: string): Promise { + const secret = await this.cheK8SService + .makeApiClient(k8s.CoreV1Api) + .readNamespacedSecret(this.CREDENTIALS_SECRET_NAME, await this.getWorkspaceNamespace()); + const data = secret.body.data; + if (data) { + const result = Object.keys(data).find(key => key.startsWith(service)); + if (result) { + return Buffer.from(data[result], 'base64').toString('ascii'); + } + } + } + + async getPassword(service: string, account: string): Promise { + const secret = await this.cheK8SService + .makeApiClient(k8s.CoreV1Api) + .readNamespacedSecret(this.CREDENTIALS_SECRET_NAME, await this.getWorkspaceNamespace()); + const data = secret.body.data; + if (data && data[this.getSecretDataItemName(service, account)]) { + return { + extensionId: service, + content: Buffer.from(secret.body.data![this.getSecretDataItemName(service, account)], 'base64').toString( + 'ascii' + ), + }; + } + } + + async setPassword(service: string, account: string, password: PasswordContent): Promise { + const client = this.cheK8SService.makeApiClient(k8s.CoreV1Api); + client.defaultHeaders = { + Accept: 'application/json', + 'Content-Type': k8s.PatchUtils.PATCH_FORMAT_STRATEGIC_MERGE_PATCH, + }; + await client.patchNamespacedSecret(this.CREDENTIALS_SECRET_NAME, await this.getWorkspaceNamespace(), { + data: { [this.getSecretDataItemName(service, account)]: Buffer.from(password.content).toString('base64') }, + }); + } + + private getSecretDataItemName(service: string, account: string): string { + return `${service}_${account}`; + } + + private async getWorkspaceNamespace(): Promise { + // grab current workspace + const workspace = await this.workspaceService.currentWorkspace(); + return workspace.attributes?.[this.INFRASTRUCTURE_NAMESPACE] || workspace.namespace || ''; + } +} diff --git a/extensions/eclipse-che-theia-credentials/src/node/che-theia-credentials-backend-module.ts b/extensions/eclipse-che-theia-credentials/src/node/che-theia-credentials-backend-module.ts new file mode 100644 index 0000000000..2177193080 --- /dev/null +++ b/extensions/eclipse-che-theia-credentials/src/node/che-theia-credentials-backend-module.ts @@ -0,0 +1,24 @@ +/********************************************************************** + * Copyright (c) 2019-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 { CREDENTIALS_SERVICE_PATH, CredentialsServer } from '../common/credentials-protocol'; +import { ConnectionHandler, JsonRpcConnectionHandler } from '@theia/core'; + +import { CheCredentialsServer } from './che-credentials-server'; +import { ContainerModule } from 'inversify'; + +export default new ContainerModule(bind => { + bind(CredentialsServer).to(CheCredentialsServer).inSingletonScope(); + bind(ConnectionHandler) + .toDynamicValue( + context => new JsonRpcConnectionHandler(CREDENTIALS_SERVICE_PATH, () => context.container.get(CredentialsServer)) + ) + .inSingletonScope(); +}); diff --git a/extensions/eclipse-che-theia-credentials/tests/no-op.spec.ts b/extensions/eclipse-che-theia-credentials/tests/no-op.spec.ts new file mode 100644 index 0000000000..3ec8409a6b --- /dev/null +++ b/extensions/eclipse-che-theia-credentials/tests/no-op.spec.ts @@ -0,0 +1,13 @@ +/********************************************************************** + * 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 + ***********************************************************************/ + +describe('no-op', function () { + it('no-op', function () {}); +}); diff --git a/extensions/eclipse-che-theia-credentials/tsconfig.json b/extensions/eclipse-che-theia-credentials/tsconfig.json new file mode 100644 index 0000000000..a6a8325366 --- /dev/null +++ b/extensions/eclipse-che-theia-credentials/tsconfig.json @@ -0,0 +1,14 @@ +{ + "extends": "../../configs/base.tsconfig.json", + "compilerOptions": { + "lib": [ + "es6", + "dom" + ], + "rootDir": "src", + "outDir": "lib" + }, + "include": [ + "src" + ] +} diff --git a/generator/src/templates/assembly-compile.tsconfig.mst.json b/generator/src/templates/assembly-compile.tsconfig.mst.json index cf94075e68..262018203d 100644 --- a/generator/src/templates/assembly-compile.tsconfig.mst.json +++ b/generator/src/templates/assembly-compile.tsconfig.mst.json @@ -50,6 +50,9 @@ }, { "path": "{{ packageRefPrefix}}eclipse-che-theia-mini-browser/tsconfig.json" + }, + { + "path": "{{ packageRefPrefix}}eclipse-che-theia-credentials/tsconfig.json" } ] } From 7116840a185b1f3c78a39159494e676abd5cc669 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=A4der?= Date: Thu, 19 Aug 2021 14:14:45 +0200 Subject: [PATCH 12/28] fix(webpack): webpack 5 build (#1196) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Mäder --- .../eclipse-che-theia-plugin-ext/package.json | 6 +- .../webpack.config.js | 24 +- generator/package.json | 2 +- .../src/templates/assembly-package.mst.json | 18 +- package.json | 3 +- yarn.lock | 1527 +++++++++-------- 6 files changed, 816 insertions(+), 764 deletions(-) diff --git a/extensions/eclipse-che-theia-plugin-ext/package.json b/extensions/eclipse-che-theia-plugin-ext/package.json index 6720c576c3..5a12a211d9 100644 --- a/extensions/eclipse-che-theia-plugin-ext/package.json +++ b/extensions/eclipse-che-theia-plugin-ext/package.json @@ -30,9 +30,9 @@ "mime": "2.5.2" }, "devDependencies": { - "clean-webpack-plugin": "^0.1.19", - "webpack": "^4.20.2", - "webpack-cli": "^3.1.1", + "clean-webpack-plugin": "^3.0.0", + "webpack": "^5.48.0", + "webpack-cli": "^4.7.0", "@types/js-yaml": "3.11.2", "reflect-metadata": "^0.1.13", "@types/reflect-metadata": "^0.1.0", diff --git a/extensions/eclipse-che-theia-plugin-ext/webpack.config.js b/extensions/eclipse-che-theia-plugin-ext/webpack.config.js index bac4fd1f69..2aeceedb18 100644 --- a/extensions/eclipse-che-theia-plugin-ext/webpack.config.js +++ b/extensions/eclipse-che-theia-plugin-ext/webpack.config.js @@ -9,18 +9,13 @@ **********************************************************************/ const path = require('path'); -const CleanWebpackPlugin = require('clean-webpack-plugin'); +const { CleanWebpackPlugin } = require('clean-webpack-plugin'); module.exports = { entry: './lib/plugin/webworker/che-api-worker-provider.js', devtool: 'source-map', mode: 'production', - node:{ - fs: 'empty', - child_process: 'empty', - net: 'empty', - crypto: 'empty' - }, + module: { rules: [ { @@ -38,9 +33,22 @@ module.exports = { ] }, plugins: [ - new CleanWebpackPlugin(['lib/webworker']) + new CleanWebpackPlugin({ cleanOnceBeforeBuildPatterns: ['lib/webworker']}) ], resolve: { + fallback: { + 'child_process': false, + 'crypto': false, + 'net': false, + 'fs': false, + 'os': false, + 'path': false, + 'constants': false, + 'stream': false, + 'assert': false, + 'util': false + + }, extensions: ['.ts', '.js'] }, output: { diff --git a/generator/package.json b/generator/package.json index b5cdb63ac3..2e059b1437 100644 --- a/generator/package.json +++ b/generator/package.json @@ -26,7 +26,7 @@ "@types/mustache": "0.8.32", "@types/read-pkg": "3.0.0", "@types/tmp": "^0.0.33", - "@types/webpack": "^4.0.0", + "@types/webpack": "^5.28.0", "@types/yargs": "12.0.1", "json2yaml": "^1.1.0" }, diff --git a/generator/src/templates/assembly-package.mst.json b/generator/src/templates/assembly-package.mst.json index f9d30cefc0..7d5693373b 100644 --- a/generator/src/templates/assembly-package.mst.json +++ b/generator/src/templates/assembly-package.mst.json @@ -45,7 +45,18 @@ "@theia/task": "{{ theiaVersion }}", "@theia/userstorage": "{{ theiaVersion }}", "@theia/variable-resolver": "{{ theiaVersion }}", - "@theia/workspace": "{{ theiaVersion }}" + "@theia/workspace": "{{ theiaVersion }}", + "babel-loader": "^8.2.2", + "buffer": "^6.0.3", + "source-map-loader": "^2.0.1", + "source-map-support": "^0.5.19", + "style-loader": "^2.0.0", + "umd-compat-loader": "^2.1.2", + "webpack": "^5.36.2", + "webpack-cli": "^4.7.0", + "worker-loader": "^3.0.8", + "async-limiter": "^2.0.0" + }, "bin": { "override-vs-loader": "./scripts/override-vs-loader.js" @@ -69,6 +80,9 @@ "devDependencies": { "@theia/cli": "{{ theiaVersion }}", "html-webpack-plugin": "^5.3.1", - "async-limiter": "^2.0.0" + "@theia/compression-webpack-plugin": "^3.0.0", + "circular-dependency-plugin": "^5.2.2", + "copy-webpack-plugin": "^8.1.1", + "webpack-cli": "^4.7.0" } } diff --git a/package.json b/package.json index 0e292b4447..1dbbb3fef0 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,8 @@ "serialize-javascript": "^3.1.0", "**/**/@types/node": "^12.0.0", "**/**/minimist": "^1.2.0", - "**/mkdirp": "^0.5.1" + "**/mkdirp": "^0.5.1", + "**/keytar": "^7.7.0" }, "workspaces": { "packages": [ diff --git a/yarn.lock b/yarn.lock index 9d4936b746..b827cc89a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16,25 +16,25 @@ dependencies: "@babel/highlight" "^7.14.5" -"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08" - integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw== +"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.15.0.tgz#2dbaf8b85334796cafbb0f5793a90a2fc010b176" + integrity sha512-0NqAC1IJE0S0+lL1SWFMxMkz1pKCNCjI4tr2Zx4LJSXxCLAdr6KyArnY+sno5m3yH9g737ygOyPABDsnXkpxiA== "@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.8" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.8.tgz#20cdf7c84b5d86d83fac8710a8bc605a7ba3f010" - integrity sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q== + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.15.0.tgz#749e57c68778b73ad8082775561f67f5196aafa8" + integrity sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw== dependencies: "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.8" - "@babel/helper-compilation-targets" "^7.14.5" - "@babel/helper-module-transforms" "^7.14.8" + "@babel/generator" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.0" + "@babel/helper-module-transforms" "^7.15.0" "@babel/helpers" "^7.14.8" - "@babel/parser" "^7.14.8" + "@babel/parser" "^7.15.0" "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.8" - "@babel/types" "^7.14.8" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" @@ -42,12 +42,12 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/generator@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070" - integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg== +"@babel/generator@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.15.0.tgz#a7d0c172e0d814974bad5aa77ace543b97917f15" + integrity sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ== dependencies: - "@babel/types" "^7.14.8" + "@babel/types" "^7.15.0" jsesc "^2.5.1" source-map "^0.5.0" @@ -66,26 +66,26 @@ "@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.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== +"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5", "@babel/helper-compilation-targets@^7.15.0", "@babel/helper-compilation-targets@^7.9.6": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz#973df8cbd025515f3ff25db0c05efc704fa79818" + integrity sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A== dependencies: - "@babel/compat-data" "^7.14.5" + "@babel/compat-data" "^7.15.0" "@babel/helper-validator-option" "^7.14.5" browserslist "^4.16.6" semver "^6.3.0" "@babel/helper-create-class-features-plugin@^7.14.5": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz#a6f8c3de208b1e5629424a9a63567f56501955fc" - integrity sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ== + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz#c9a137a4d137b2d0e2c649acf536d7ba1a76c0f7" + integrity sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q== dependencies: "@babel/helper-annotate-as-pure" "^7.14.5" "@babel/helper-function-name" "^7.14.5" - "@babel/helper-member-expression-to-functions" "^7.14.7" + "@babel/helper-member-expression-to-functions" "^7.15.0" "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" + "@babel/helper-replace-supers" "^7.15.0" "@babel/helper-split-export-declaration" "^7.14.5" "@babel/helper-create-regexp-features-plugin@^7.14.5": @@ -140,12 +140,12 @@ dependencies: "@babel/types" "^7.14.5" -"@babel/helper-member-expression-to-functions@^7.14.5", "@babel/helper-member-expression-to-functions@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970" - integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA== +"@babel/helper-member-expression-to-functions@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz#0ddaf5299c8179f27f37327936553e9bba60990b" + integrity sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg== dependencies: - "@babel/types" "^7.14.5" + "@babel/types" "^7.15.0" "@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" @@ -154,19 +154,19 @@ dependencies: "@babel/types" "^7.14.5" -"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz#d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49" - integrity sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA== +"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz#679275581ea056373eddbe360e1419ef23783b08" + integrity sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg== dependencies: "@babel/helper-module-imports" "^7.14.5" - "@babel/helper-replace-supers" "^7.14.5" + "@babel/helper-replace-supers" "^7.15.0" "@babel/helper-simple-access" "^7.14.8" "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/helper-validator-identifier" "^7.14.8" + "@babel/helper-validator-identifier" "^7.14.9" "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.8" - "@babel/types" "^7.14.8" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" "@babel/helper-optimise-call-expression@^7.14.5": version "7.14.5" @@ -189,17 +189,17 @@ "@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== +"@babel/helper-replace-supers@^7.14.5", "@babel/helper-replace-supers@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz#ace07708f5bf746bf2e6ba99572cce79b5d4e7f4" + integrity sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA== dependencies: - "@babel/helper-member-expression-to-functions" "^7.14.5" + "@babel/helper-member-expression-to-functions" "^7.15.0" "@babel/helper-optimise-call-expression" "^7.14.5" - "@babel/traverse" "^7.14.5" - "@babel/types" "^7.14.5" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" -"@babel/helper-simple-access@^7.14.5", "@babel/helper-simple-access@^7.14.8": +"@babel/helper-simple-access@^7.14.8": version "7.14.8" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924" integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg== @@ -220,10 +220,10 @@ dependencies: "@babel/types" "^7.14.5" -"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c" - integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow== +"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.9.tgz#6654d171b2024f6d8ee151bf2509699919131d48" + integrity sha512-pQYxPY0UP6IHISRitNe8bsijHex4TWZXi2HwKVsjPiltzlhse2znVcm9Ace510VT1kxIHjGJCZZQBX2gJDbo0g== "@babel/helper-validator-option@^7.14.5": version "7.14.5" @@ -241,13 +241,13 @@ "@babel/types" "^7.14.5" "@babel/helpers@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.8.tgz#839f88f463025886cff7f85a35297007e2da1b77" - integrity sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw== + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.15.3.tgz#c96838b752b95dcd525b4e741ed40bb1dc2a1357" + integrity sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g== dependencies: "@babel/template" "^7.14.5" - "@babel/traverse" "^7.14.8" - "@babel/types" "^7.14.8" + "@babel/traverse" "^7.15.0" + "@babel/types" "^7.15.0" "@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5": version "7.14.5" @@ -258,10 +258,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.0.0-beta.54", "@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4" - integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA== +"@babel/parser@^7.0.0-beta.54", "@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.15.0": + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.15.3.tgz#3416d9bea748052cfcb63dbcc27368105b1ed862" + integrity sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA== "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5": version "7.14.5" @@ -272,10 +272,10 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5" "@babel/plugin-proposal-optional-chaining" "^7.14.5" -"@babel/plugin-proposal-async-generator-functions@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace" - integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q== +"@babel/plugin-proposal-async-generator-functions@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz#7028dc4fa21dc199bbacf98b39bab1267d0eaf9a" + integrity sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw== dependencies: "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-remap-async-to-generator" "^7.14.5" @@ -559,16 +559,16 @@ "@babel/helper-plugin-utils" "^7.14.5" "@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== + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz#94c81a6e2fc230bcce6ef537ac96a1e4d2b3afaf" + integrity sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q== dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@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== +"@babel/plugin-transform-classes@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz#2a391ffb1e5292710b00f2e2c210e1435e7d449f" + integrity sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A== dependencies: "@babel/helper-annotate-as-pure" "^7.14.5" "@babel/helper-function-name" "^7.14.5" @@ -653,14 +653,14 @@ "@babel/helper-plugin-utils" "^7.14.5" babel-plugin-dynamic-import-node "^2.3.3" -"@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== +"@babel/plugin-transform-modules-commonjs@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz#3305896e5835f953b5cdb363acd9e8c2219a5281" + integrity sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig== dependencies: - "@babel/helper-module-transforms" "^7.14.5" + "@babel/helper-module-transforms" "^7.15.0" "@babel/helper-plugin-utils" "^7.14.5" - "@babel/helper-simple-access" "^7.14.5" + "@babel/helper-simple-access" "^7.14.8" babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.14.5": @@ -682,10 +682,10 @@ "@babel/helper-module-transforms" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-named-capturing-groups-regex@^7.14.7": - version "7.14.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e" - integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg== +"@babel/plugin-transform-named-capturing-groups-regex@^7.14.9": + version "7.14.9" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.9.tgz#c68f5c5d12d2ebaba3762e57c2c4f6347a46e7b2" + integrity sha512-l666wCVYO75mlAtGFfyFwnWmIXQm3kSH0C3IRnJqWcZbWkoihyAdDhFm2ZWaxWTqvBvhVFfJjMRQ0ez4oN1yYA== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.14.5" @@ -733,9 +733,9 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-transform-runtime@^7.11.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== + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.15.0.tgz#d3aa650d11678ca76ce294071fda53d7804183b3" + integrity sha512-sfHYkLGjhzWTq6xsuQ01oEsUYjkHRux9fW1iUA68dC7Qd8BS1Unq4aZ8itmQp95zUzIcyR2EbNMTzAicFj+guw== dependencies: "@babel/helper-module-imports" "^7.14.5" "@babel/helper-plugin-utils" "^7.14.5" @@ -796,16 +796,16 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/preset-env@^7.11.0": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.8.tgz#254942f5ca80ccabcfbb2a9f524c74bca574005b" - integrity sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg== + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.15.0.tgz#e2165bf16594c9c05e52517a194bf6187d6fe464" + integrity sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q== dependencies: - "@babel/compat-data" "^7.14.7" - "@babel/helper-compilation-targets" "^7.14.5" + "@babel/compat-data" "^7.15.0" + "@babel/helper-compilation-targets" "^7.15.0" "@babel/helper-plugin-utils" "^7.14.5" "@babel/helper-validator-option" "^7.14.5" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5" - "@babel/plugin-proposal-async-generator-functions" "^7.14.7" + "@babel/plugin-proposal-async-generator-functions" "^7.14.9" "@babel/plugin-proposal-class-properties" "^7.14.5" "@babel/plugin-proposal-class-static-block" "^7.14.5" "@babel/plugin-proposal-dynamic-import" "^7.14.5" @@ -838,7 +838,7 @@ "@babel/plugin-transform-async-to-generator" "^7.14.5" "@babel/plugin-transform-block-scoped-functions" "^7.14.5" "@babel/plugin-transform-block-scoping" "^7.14.5" - "@babel/plugin-transform-classes" "^7.14.5" + "@babel/plugin-transform-classes" "^7.14.9" "@babel/plugin-transform-computed-properties" "^7.14.5" "@babel/plugin-transform-destructuring" "^7.14.7" "@babel/plugin-transform-dotall-regex" "^7.14.5" @@ -849,10 +849,10 @@ "@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-commonjs" "^7.15.0" "@babel/plugin-transform-modules-systemjs" "^7.14.5" "@babel/plugin-transform-modules-umd" "^7.14.5" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.9" "@babel/plugin-transform-new-target" "^7.14.5" "@babel/plugin-transform-object-super" "^7.14.5" "@babel/plugin-transform-parameters" "^7.14.5" @@ -867,11 +867,11 @@ "@babel/plugin-transform-unicode-escapes" "^7.14.5" "@babel/plugin-transform-unicode-regex" "^7.14.5" "@babel/preset-modules" "^0.1.4" - "@babel/types" "^7.14.8" + "@babel/types" "^7.15.0" babel-plugin-polyfill-corejs2 "^0.2.2" babel-plugin-polyfill-corejs3 "^0.2.2" babel-plugin-polyfill-regenerator "^0.2.2" - core-js-compat "^3.15.0" + core-js-compat "^3.16.0" semver "^6.3.0" "@babel/preset-modules@^0.1.4": @@ -886,9 +886,9 @@ 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.8" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446" - integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg== + version "7.15.3" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.15.3.tgz#2e1c2880ca118e5b2f9988322bd8a7656a32502b" + integrity sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA== dependencies: regenerator-runtime "^0.13.4" @@ -901,27 +901,27 @@ "@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", "@babel/traverse@^7.14.8": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce" - integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg== +"@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", "@babel/traverse@^7.15.0": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.15.0.tgz#4cca838fd1b2a03283c1f38e141f639d60b3fc98" + integrity sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw== dependencies: "@babel/code-frame" "^7.14.5" - "@babel/generator" "^7.14.8" + "@babel/generator" "^7.15.0" "@babel/helper-function-name" "^7.14.5" "@babel/helper-hoist-variables" "^7.14.5" "@babel/helper-split-export-declaration" "^7.14.5" - "@babel/parser" "^7.14.8" - "@babel/types" "^7.14.8" + "@babel/parser" "^7.15.0" + "@babel/types" "^7.15.0" debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.54", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": - version "7.14.8" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728" - integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q== +"@babel/types@^7.0.0", "@babel/types@^7.0.0-beta.54", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.15.0", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4": + version "7.15.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.15.0.tgz#61af11f2286c4e9c69ca8deb5f4375a73c72dcbd" + integrity sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ== dependencies: - "@babel/helper-validator-identifier" "^7.14.8" + "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" "@bcoe/v8-coverage@^0.2.3": @@ -938,9 +938,9 @@ minimist "^1.2.0" "@devfile/api@latest": - version "2.2.0-alpha-1627025889" - resolved "https://registry.yarnpkg.com/@devfile/api/-/api-2.2.0-alpha-1627025889.tgz#f640371c8f3296bee0d8f81318c4ac654f489e24" - integrity sha512-MnH0XdM3gRJuG6vXUpw1rEj0Pd7bFQwNy+O/3r5fnppkZPSSNYX8PSJFGGnijxnvDLK9VKvNGZbDdi+bSRuBew== + version "2.2.0-alpha-1628805729" + resolved "https://registry.yarnpkg.com/@devfile/api/-/api-2.2.0-alpha-1628805729.tgz#89aee057516ef2a7502e3490cc5d19507d7cdf32" + integrity sha512-5RRVwEBHVokNqthbYCmgOWdG9D/b0RJA5QptmkxXsy2QCUPsuzf/g1AGjmYvv/2S3wXA/9R32jlfGpuluMA56w== dependencies: "@types/bluebird" "3.5.21" "@types/request" "*" @@ -948,15 +948,20 @@ request "^2.81.0" rewire "^3.0.2" +"@discoveryjs/json-ext@^0.5.0": + version "0.5.3" + resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d" + integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g== + "@eclipse-che/api@^7.0.0-beta-4.0", "@eclipse-che/api@^7.3.2", "@eclipse-che/api@latest": - version "7.33.2" - resolved "https://registry.yarnpkg.com/@eclipse-che/api/-/api-7.33.2.tgz#2a39403c26b4f2529bee41780488b681a59d60ff" - integrity sha512-6qw2WedF8i98J8vmGB+RXySVVIQ3wgfklA9qk2mXpKTe5GVWgU0GEvF1RudWpmL5jHB8zbxZ30xmt9gr/V74Mg== + version "7.34.2" + resolved "https://registry.yarnpkg.com/@eclipse-che/api/-/api-7.34.2.tgz#e047aece3627268231d7e677da87596bcf2f8adb" + integrity sha512-YxQhYPgOb+KU+po3ghQHfPEfwYMPVIO8/LkFgZM+Jr83K0F0cN72PNb4HVaPgyNHInjEQFmwYSculn4oFtaTbQ== "@eclipse-che/plugin@latest": - version "0.0.1-1627313472" - resolved "https://registry.yarnpkg.com/@eclipse-che/plugin/-/plugin-0.0.1-1627313472.tgz#143e7a6a572f2bede89ac8664b035ab4e3ce3822" - integrity sha512-273i1sfkAg36jXTLgXg3JeBmQx8bhWs4LGqjrXK2ORuWv7I5+xe7Sn320i1huJjiOAvUkM8VtOwQ9dNvm30//A== + version "0.0.1-1629115197" + resolved "https://registry.yarnpkg.com/@eclipse-che/plugin/-/plugin-0.0.1-1629115197.tgz#d5a3b2ef3f5f388263fd230567c9e1a8ab0a5d73" + integrity sha512-LCZhqYTt8UQRlzUosSbixp80tx4W9vPPblgzh9wfqfx1F3qpP90eWdsjO/LXEFkaxC5QGcE0PYHryP6o4jBQLA== dependencies: "@eclipse-che/api" latest @@ -2006,13 +2011,12 @@ infer-owner "^1.0.4" "@npmcli/run-script@^1.8.2": - version "1.8.5" - resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.5.tgz#f250a0c5e1a08a792d775a315d0ff42fc3a51e1d" - integrity sha512-NQspusBCpTjNwNRFMtz2C5MxoxyzlbuJ4YEhxAKrIonTiirKDtatsZictx9RgamQIx6+QuHMNmPl0wQdoESs9A== + version "1.8.6" + resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.6.tgz#18314802a6660b0d4baa4c3afe7f1ad39d8c28b7" + integrity sha512-e42bVZnC6VluBZBAFEr3YrdqSspG3bgilyg4nSLBJ7TRGNCzxHa92XAHxQBLYg0BmgwO4b2mf3h/l5EkEWRn3g== dependencies: "@npmcli/node-gyp" "^1.0.2" "@npmcli/promise-spawn" "^1.3.2" - infer-owner "^1.0.4" node-gyp "^7.1.0" read-package-json-fast "^2.0.1" @@ -2054,10 +2058,10 @@ "@octokit/types" "^6.0.3" universal-user-agent "^6.0.0" -"@octokit/openapi-types@^9.1.1": - version "9.1.1" - resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.1.1.tgz#fb87f2e2f44b95a5720d61dee409a9f1fbc59217" - integrity sha512-xmyPP9tVb4T4A6Lk6SL6ScnIqAHpPV4jfMZI8VtY286212ri9J/6IFGuLsZ26daADUmriuLejake4k+azEfnaw== +"@octokit/openapi-types@^9.5.0": + version "9.7.0" + resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.7.0.tgz#9897cdefd629cd88af67b8dbe2e5fb19c63426b2" + integrity sha512-TUJ16DJU8mekne6+KVcMV5g6g/rJlrnIKn7aALG9QrNpnEipFc1xjoarh0PKaAWf2Hf+HwthRKYt+9mCm5RsRg== "@octokit/plugin-enterprise-rest@^6.0.1": version "6.0.1" @@ -2065,23 +2069,23 @@ integrity sha512-93uGjlhUD+iNg1iWhUENAtJata6w5nE+V4urXOAlIXdco6xNZtUSfYY8dzp3Udy74aqO/B5UZL80x/YMa5PKRw== "@octokit/plugin-paginate-rest@^2.6.2": - version "2.14.0" - resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.14.0.tgz#f469cb4a908792fb44679c5973d8bba820c88b0f" - integrity sha512-S2uEu2uHeI7Vf+Lvj8tv3O5/5TCAa8GHS0dUQN7gdM7vKA6ZHAbR6HkAVm5yMb1mbedLEbxOuQ+Fa0SQ7tCDLA== + version "2.15.1" + resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.1.tgz#264189dd3ce881c6c33758824aac05a4002e056a" + integrity sha512-47r52KkhQDkmvUKZqXzA1lKvcyJEfYh3TKAIe5+EzMeyDM3d+/s5v11i2gTk8/n6No6DPi3k5Ind6wtDbo/AEg== dependencies: - "@octokit/types" "^6.18.0" + "@octokit/types" "^6.24.0" "@octokit/plugin-request-log@^1.0.2": 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.5.1": - version "5.5.1" - resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.5.1.tgz#31cce8fc3eda4d186bd90828cb7a2203ad95e3d1" - integrity sha512-Al57+OZmO65JpiPk4JS6u6kQ2y9qjoZtY1IWiSshc4N+F7EcrK8Rgy/cUJBB4WIcSFUQyF66EJQK1oKgXWeRNw== +"@octokit/plugin-rest-endpoint-methods@5.8.0": + version "5.8.0" + resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.8.0.tgz#33b342fe41f2603fdf8b958e6652103bb3ea3f3b" + integrity sha512-qeLZZLotNkoq+it6F+xahydkkbnvSK0iDjlXFo3jNTB+Ss0qIbYQb9V/soKLMkgGw8Q2sHjY5YEXiA47IVPp4A== dependencies: - "@octokit/types" "^6.21.1" + "@octokit/types" "^6.25.0" deprecation "^2.3.1" "@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0": @@ -2094,9 +2098,9 @@ once "^1.4.0" "@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== + version "5.6.1" + resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.1.tgz#f97aff075c37ab1d427c49082fefeef0dba2d8ce" + integrity sha512-Ls2cfs1OfXaOKzkcxnqw5MR6drMA/zWX/LIS/p8Yjdz7QKTPQLMsB3R+OvoxE6XnXeXEE2X7xe4G4l4X0gRiKQ== dependencies: "@octokit/endpoint" "^6.0.1" "@octokit/request-error" "^2.1.0" @@ -2106,21 +2110,21 @@ universal-user-agent "^6.0.0" "@octokit/rest@^18.1.0": - version "18.7.1" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.7.1.tgz#575ecf8b881b79540daa28b0fa3a2b3ae8ef2649" - integrity sha512-790Yv8Xpbqs3BtnMAO5hlOftVICHPdgZ/3qlTmeOoqrQGzT25BIpHkg/KKMeKG9Fg8d598PLxGhf80RswElv9g== + version "18.9.1" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.9.1.tgz#db1d7ac1d7b10e908f7d4b78fe35a392554ccb26" + integrity sha512-idZ3e5PqXVWOhtZYUa546IDHTHjkGZbj3tcJsN0uhCy984KD865e8GB2WbYDc2ZxFuJRiyd0AftpL2uPNhF+UA== dependencies: "@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.5.1" + "@octokit/plugin-rest-endpoint-methods" "5.8.0" -"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.18.0", "@octokit/types@^6.21.1": - version "6.21.1" - resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.21.1.tgz#d0f2b7598c88e13d0bd87e330d975e3fb2a90180" - integrity sha512-PP+m3T5EWZKawru4zi/FvX8KL2vkO5f1fLthx78/7743p7RtJUevt3z7698k+7oAYRA7YuVqfXthSEHqkDvZ8g== +"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.24.0", "@octokit/types@^6.25.0": + version "6.25.0" + resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.25.0.tgz#c8e37e69dbe7ce55ed98ee63f75054e7e808bf1a" + integrity sha512-bNvyQKfngvAd/08COlYIN54nRgxskmejgywodizQNyiKoXmWRAjKup2/LYwm+T9V0gsKH6tuld1gM0PzmOiB4Q== dependencies: - "@octokit/openapi-types" "^9.1.1" + "@octokit/openapi-types" "^9.5.0" "@panva/asn1.js@^1.0.0": version "1.0.0" @@ -2293,10 +2297,10 @@ dependencies: defer-to-connect "^2.0.0" -"@theia/application-package@1.16.0-next.9539f892", "@theia/application-package@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.16.0-next.9539f892.tgz#07861fb44b164c66eec9e40644f6700bc93b35b7" - integrity sha512-2MyUouxTtfCWrqcyi/dU+m2LLokl8fXNPFShzAgOkbo8TvsBevtahfedIL+x6Dsajk8GwhCBBuHIfDtpWv8BuQ== +"@theia/application-package@1.17.0-next.84bca9b3", "@theia/application-package@next": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.17.0-next.84bca9b3.tgz#3ca272800835db032fd62451e965ebdad4becb35" + integrity sha512-9Au+bi1/zcZJCAnRIbw6+Q0OCRDekCZNz05nSflFGaMyMN2DlOnap0XBCh/LU9fx2n/wTfkk6/mqmAg8Ur7KuQ== dependencies: "@types/fs-extra" "^4.0.2" "@types/request" "^2.0.3" @@ -2310,40 +2314,40 @@ semver "^5.4.1" write-json-file "^2.2.0" -"@theia/bulk-edit@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/bulk-edit/-/bulk-edit-1.16.0-next.9539f892.tgz#68550f3662f3039790bf1642653dc2c151063c99" - integrity sha512-JGH6jkkgbtaeoACuUNcvqgmANfM2qR6W5cF7udYQYa05opcSa10lBosRM4dsUS0CbNqVtznkcZlZkzsXk6OJPA== - dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/monaco" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" - -"@theia/callhierarchy@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/callhierarchy/-/callhierarchy-1.16.0-next.9539f892.tgz#0da4905a78d77234722b5fc6e9a5c8b8227bbf7c" - integrity sha512-3X4sxMU0+cHkLpkxr0qdb/TjevyeS7jT+ObIpGmMrWSSR6ErtQTreOmTIIuh6jdKTiBMEpOxS1OaB8c47HFGlQ== - dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/monaco" "1.16.0-next.9539f892" +"@theia/bulk-edit@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/bulk-edit/-/bulk-edit-1.17.0-next.84bca9b3.tgz#e124ecf548bf6e2e06fd4fc11e13c482d6186f71" + integrity sha512-h4UgpUztgle13d1XlCW+8OaNp8+EOMFpeaqZaXpYlSexUJdSYz35J9Q9hV2SdsxT2cRAz59oSKgAC3I4VgPQAQ== + dependencies: + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/monaco" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" + +"@theia/callhierarchy@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/callhierarchy/-/callhierarchy-1.17.0-next.84bca9b3.tgz#0dcf899edd8a86e666344883dc4c17257d6587c5" + integrity sha512-8Z0IupelFSiRtB6uJC3+paAxcSQT2ICBPs6dB6/j76OGrpqTFwzYv3sHJGV3B5MH9Qkzdw2SGqtEfrTwqLs4Pw== + dependencies: + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/monaco" "1.17.0-next.84bca9b3" ts-md5 "^1.2.2" -"@theia/console@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/console/-/console-1.16.0-next.9539f892.tgz#cc9196dbc7dc71f49f0ee415b289c4836cbad875" - integrity sha512-Cdra641Mgqne19K+hI9GVbHH5f52oyeX3nPCzMQwUvA7qVVvGtqsL2cOmFcu08NxIHC4/6ttzAXuEBCvDWI1zQ== +"@theia/console@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/console/-/console-1.17.0-next.84bca9b3.tgz#151d94800b1142af59a64e9747a104d006e30b8b" + integrity sha512-J5/VTjVoM9gplXtWV5/uSbYdTREMLHpO7WmWL2QNfcLejOXgK8g+L/I30m2wxHYTMeFIEZOGX85Yl2lBXELa6g== dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/monaco" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/monaco" "1.17.0-next.84bca9b3" anser "^2.0.1" -"@theia/core@1.16.0-next.9539f892", "@theia/core@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.16.0-next.9539f892.tgz#5c5b76f7a38696e78026896b9e328567dc6b9f7a" - integrity sha512-YfMbsefxJBIQVF09fw8kTW9jjuHmRM3he9HE/hhe0VMfaqEC2NYZ5J//yut1R3VrgfCZPQBEH9XbZW2fdOqi0w== +"@theia/core@1.17.0-next.84bca9b3", "@theia/core@next": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.17.0-next.84bca9b3.tgz#4753bfa1b4cfabcd9874cdaff7ed4bd2b7c3c62b" + integrity sha512-0iOTG7HHCgET7mSibvLb29L2VMBSV24gaCjxcO9gplcoBNXC7v2kaPUGhrEqhcoQ13cDnR5GOnBttschy5g3lQ== dependencies: "@babel/runtime" "^7.10.0" "@phosphor/algorithm" "1" @@ -2357,7 +2361,7 @@ "@phosphor/virtualdom" "1" "@phosphor/widgets" "1" "@primer/octicons-react" "^9.0.0" - "@theia/application-package" "1.16.0-next.9539f892" + "@theia/application-package" "1.17.0-next.84bca9b3" "@types/body-parser" "^1.16.4" "@types/cookie" "^0.3.3" "@types/dompurify" "^2.2.2" @@ -2372,6 +2376,7 @@ "@types/safer-buffer" "^2.1.0" "@types/ws" "^5.1.2" "@types/yargs" "^15" + "@vscode/codicons" "^0.0.21" ajv "^6.5.3" body-parser "^1.17.2" cookie "^0.4.0" @@ -2386,7 +2391,7 @@ iconv-lite "^0.6.0" inversify "^5.0.1" jschardet "^2.1.1" - keytar "7.7.0" + keytar "7.2.0" lodash.debounce "^4.0.8" lodash.throttle "^4.1.1" nsfw "^2.1.2" @@ -2407,25 +2412,25 @@ ws "^7.1.2" yargs "^15.3.1" -"@theia/debug@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/debug/-/debug-1.16.0-next.9539f892.tgz#75bfa6138e8ee3d03988fe4b154c5ccb5f18a029" - integrity sha512-MpPaK9v73gh7TWCWWgM5twpyIxDPY+AEYITeImE80q3AK32HoTjW3zR5orG/xopTgcGIGjir8+Ftyg/J70cIDw== - dependencies: - "@theia/console" "1.16.0-next.9539f892" - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/markers" "1.16.0-next.9539f892" - "@theia/monaco" "1.16.0-next.9539f892" - "@theia/output" "1.16.0-next.9539f892" - "@theia/preferences" "1.16.0-next.9539f892" - "@theia/process" "1.16.0-next.9539f892" - "@theia/task" "1.16.0-next.9539f892" - "@theia/terminal" "1.16.0-next.9539f892" - "@theia/userstorage" "1.16.0-next.9539f892" - "@theia/variable-resolver" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" +"@theia/debug@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/debug/-/debug-1.17.0-next.84bca9b3.tgz#b704488bbf28befd3495e69a591f1276ffd7895b" + integrity sha512-VLXmfFFBIkiQKfagLJyUMMHOEPfwCLqIpB5dwIoHVorerA+fIQrMMq7UB87pBQsvPzevb4YTnmZycAroCG8sGg== + dependencies: + "@theia/console" "1.17.0-next.84bca9b3" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/markers" "1.17.0-next.84bca9b3" + "@theia/monaco" "1.17.0-next.84bca9b3" + "@theia/output" "1.17.0-next.84bca9b3" + "@theia/preferences" "1.17.0-next.84bca9b3" + "@theia/process" "1.17.0-next.84bca9b3" + "@theia/task" "1.17.0-next.84bca9b3" + "@theia/terminal" "1.17.0-next.84bca9b3" + "@theia/userstorage" "1.17.0-next.84bca9b3" + "@theia/variable-resolver" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" jsonc-parser "^2.2.0" mkdirp "^0.5.0" p-debounce "^2.1.0" @@ -2434,35 +2439,35 @@ unzip-stream "^0.3.0" vscode-debugprotocol "^1.32.0" -"@theia/editor@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.16.0-next.9539f892.tgz#3313d83c851147bc0c95aaf4701bb33d8ee92e10" - integrity sha512-rIIbO3hEd9xYIbU/q+D1tQLm9iYMkI4dymdHRPhfm/SV2ihdP9Tjs0fXBad/CvVAQ4JkBjWvbqCT0ldr+uLYjQ== +"@theia/editor@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.17.0-next.84bca9b3.tgz#8724b2564d993f6c5faa8aad8463638466364d9e" + integrity sha512-RKubElFt9VYpdoDP0v552+syYT7iWhTZMAh7rEz7YUdOcxflh4vO/mRwsfaYtA/wqrbn1qS8fE4dPznV37u1TA== dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/variable-resolver" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/variable-resolver" "1.17.0-next.84bca9b3" "@types/base64-arraybuffer" "0.1.0" base64-arraybuffer "^0.1.5" -"@theia/file-search@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.16.0-next.9539f892.tgz#4b5cfd3fe4f58f846bc14a46a3f60dafe6ca3160" - integrity sha512-S5ntUQvZICuyAcXmFQ9lgWeQh0dQ7Hh2lRYW5vr45cNndzenH+qEP54RrT5sIsaCT0FHyWg1MlGi33AfKDD3XQ== - dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/monaco" "1.16.0-next.9539f892" - "@theia/process" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" +"@theia/file-search@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.17.0-next.84bca9b3.tgz#5086609ab638d6253b19cd5557e624d645c3c89d" + integrity sha512-2KyaGNZHgK/BnWswhCG360kPJpiqsZCz246jgwNI+d0DCrgS/HQ2+7kjPkwUOSxIBay6XuUqRpSfKd4atUSLpQ== + dependencies: + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/monaco" "1.17.0-next.84bca9b3" + "@theia/process" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" vscode-ripgrep "^1.2.4" -"@theia/filesystem@1.16.0-next.9539f892", "@theia/filesystem@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.16.0-next.9539f892.tgz#2421afe5aa40e853eb54f931de1e8abad081cd03" - integrity sha512-CRYWwSU4GrTVFWlIVwiJ11Bdr51OlpLIAt2WaO22Q5Z509hoX/DT4mEIciwF8i3ojMpoF6OKux/QtdcDgzY2cQ== +"@theia/filesystem@1.17.0-next.84bca9b3", "@theia/filesystem@next": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.17.0-next.84bca9b3.tgz#4fdc1885c0c872ad313fa8e113e1cb2315c3858b" + integrity sha512-B5fSk20nMU2SoZpSB7nvHzhY/Qmh9UKIyhKGqbJzVTeph8ETVMNO2qvDnWJD8qDNloQ6mQLKvnJiKi5nGPIKGw== dependencies: - "@theia/core" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" "@types/body-parser" "^1.17.0" "@types/rimraf" "^2.0.2" "@types/tar-fs" "^1.16.1" @@ -2476,33 +2481,33 @@ uuid "^8.0.0" vscode-languageserver-textdocument "^1.0.1" -"@theia/markers@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.16.0-next.9539f892.tgz#39212f7752174c59912de78c983af374206ec04e" - integrity sha512-CrU2cIHEkpdhU3nyqTDt9/ztDvm+LiGMhOTlqykbBO/ty94xvVSytrmoaAgpyASQ/ZDEzK0RsbANS5/5MdSL1A== +"@theia/markers@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.17.0-next.84bca9b3.tgz#d8daffb660ec72d3b43c81749c7ed150b459d764" + integrity sha512-OV0dVr0paddcaiRr5Ex07JtLchIoarvYHfLsyZvVd9TKCEVyWcU+XgbzvPQ9uw3ktolLbWYmSJrm93pbkqFikA== dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/navigator" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/navigator" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" -"@theia/messages@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.16.0-next.9539f892.tgz#7da00c94e972f673289a2ef04cc9461af53f1cfd" - integrity sha512-8ED5fApFYpdLnx4XkR3A+5gDwnDXle4dO6wYEhOpGcIwaQbpgezNc8VJDxebDHoMgXbPRp1QY9uvrRSgQwSilw== +"@theia/messages@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.17.0-next.84bca9b3.tgz#5c2737f0f06c45d29bd559479abbf82247892063" + integrity sha512-qQR3EmjETIJx758WWFB5vXY2axOJqMXPUX8qV6Mt9EwxH7tpupMENB9aeSLg6C7qQy986Q5qR3Gnx+LaBrmtLQ== dependencies: - "@theia/core" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" markdown-it "^8.4.0" react-perfect-scrollbar "^1.5.3" ts-md5 "^1.2.2" "@theia/mini-browser@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/mini-browser/-/mini-browser-1.16.0-next.9539f892.tgz#7ce21727fe438d5ceb10925aea8900a7e5434a7a" - integrity sha512-UEQTRH71QrKYxOA3i8iTQabOwVAR9nvZXwiAzwSLHxGCE7dhh2ZhPt/UB2hPR7TACAHMs1UV1Ey0WDsev/EEeg== + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/mini-browser/-/mini-browser-1.17.0-next.84bca9b3.tgz#61efe28b0f0077a188205998af5b889f1c1d684a" + integrity sha512-WRykj7UTiHwoUNHYUt1X4BlDsCLDKYlSG3ADexb64BKIyTp6DzHcK2wpuw8aqSGoB/ZlRBYtuWzYdJmbZzuwzg== dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" "@types/mime-types" "^2.1.0" mime-types "^2.1.18" pdfobject "^2.0.201604172" @@ -2514,18 +2519,18 @@ resolved "https://registry.yarnpkg.com/@theia/monaco-editor-core/-/monaco-editor-core-0.23.0.tgz#7a1cbb7a857a509ce8e75c9965abea752bd76e80" integrity sha512-WyrotTd6ZfeXAX4icgFALTzlqE356tAQ5nRuwa2E0Qdp2YIO9GDcw5G2l2NJ8INO2ygujbE5pEdD5kJM5N4TOQ== -"@theia/monaco@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.16.0-next.9539f892.tgz#35aa4422372a64f0152488815cb6d2180f991e1f" - integrity sha512-npQ0HaBsw130mUIMCgPaVXUykVGq3CWGDYE7fgLp4Tq9NWrRpD4CnqIoH30vAXRHPVqUgi5UelLvDb3FBA7Hig== +"@theia/monaco@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.17.0-next.84bca9b3.tgz#1fd75f599bd01aa53fa0f1f7bd7804112cc9e76c" + integrity sha512-302CeJBL/lu13aFWheO47zK33RcfnHEUN9gz11+cS2XrqiZwsTC1RHuTqcKx33Fzo+X2dqHb/9ic/8VBZ3Wudw== dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/markers" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/markers" "1.17.0-next.84bca9b3" "@theia/monaco-editor-core" "0.23.0" - "@theia/outline-view" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" + "@theia/outline-view" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" deepmerge "2.0.1" fast-plist "^0.1.2" idb "^4.0.5" @@ -2533,14 +2538,14 @@ onigasm "^2.2.0" vscode-textmate "^4.4.0" -"@theia/navigator@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.16.0-next.9539f892.tgz#aef9725a8453d38d47f0942a756e5fecdef40916" - integrity sha512-Pybgnjntiqe1h6DyDm8ZTWLzNZIzJG6lNY7MXlEkZIbocXRwygUxstzRXChv+cJUGy6rcNcUxyaYDPI6hZaPrw== +"@theia/navigator@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.17.0-next.84bca9b3.tgz#172b016e6c3efdf5b94078d8c9c8ecef7d10401a" + integrity sha512-mwz2kWXXT7jtRWqEgP/ZY9f095idJFWKkAyq6V83VPLojr6CI3oizBOlI9x1JWGISnaytExmkxI1oKJa3AFMDw== dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" minimatch "^3.0.4" "@theia/node-pty@0.9.0-theia.6": @@ -2550,86 +2555,86 @@ dependencies: nan "^2.14.0" -"@theia/outline-view@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.16.0-next.9539f892.tgz#4cd4ac77d8ed8fa5a6c8a94dfafa2005e3c70db0" - integrity sha512-DyiuZlV6X23jo8A7VSFWVkoNGXsl8kXDJ6OsSXjcuyx6I4ml8jJ5s9Lt976v3IWE9pqX3jUcQ6gDmE0sYRK2kw== +"@theia/outline-view@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.17.0-next.84bca9b3.tgz#3ef9ae95f8d94101cec7d428288af159a75a4be2" + integrity sha512-wQO78oj6IT9jSujWW2FsH4MtLP69Cs1sLbM9yvdy8+xr4K01vWeBmDxW+IYaOe7y7Z8r7ByfzD29JIf9vdMGow== dependencies: - "@theia/core" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" -"@theia/output@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/output/-/output-1.16.0-next.9539f892.tgz#47cc5c95502caa806700bebde83f25dd8f2ccb29" - integrity sha512-PwQ6TZOsHTqPw4huJQMG5BdYIrKlyQOhv66W0aJ3+ILMWRZDqGbdsdkUNYOMOmnSv51mEezMrJRkxe1H9SFnuA== +"@theia/output@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/output/-/output-1.17.0-next.84bca9b3.tgz#825afa08c2a5eb73e34e681a46cd38be212c804a" + integrity sha512-g1yhDCXG9DpQSGAudl+COOoXjRv41ypl2VT3J/HcsRlmLXncM8lEUW2Uu5dXdlQMgNyRojKjgC3IdpJujMx43g== dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/monaco" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/monaco" "1.17.0-next.84bca9b3" "@types/p-queue" "^2.3.1" p-queue "^2.4.2" "@theia/plugin-dev@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/plugin-dev/-/plugin-dev-1.16.0-next.9539f892.tgz#cae3c1e929c2eb801b8653ba89fcc44be5c0e800" - integrity sha512-lTFgS0bAR7KnOhij6oEnLnNDB0n95HOfrnDjgMeNLAZud3ndHtY4/H9v0DBwHmkUP/i+C5R45G9Sn+ml8NBrOg== - dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/debug" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/output" "1.16.0-next.9539f892" - "@theia/plugin-ext" "1.16.0-next.9539f892" - "@theia/preferences" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/plugin-dev/-/plugin-dev-1.17.0-next.84bca9b3.tgz#486dd145ec60b47eb2e827d1a8d321fa61a2791f" + integrity sha512-mIoElnWPSXUJW5M7I3SeMdbB1KoI80CDL/50J7CxSZJpxL2W/J6WvimPla4HcSwIB/KTc38SWz6ib+WJHy5JTQ== + dependencies: + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/debug" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/output" "1.17.0-next.84bca9b3" + "@theia/plugin-ext" "1.17.0-next.84bca9b3" + "@theia/preferences" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" "@types/request" "^2.0.3" ps-tree "^1.2.0" request "^2.82.0" "@theia/plugin-ext-vscode@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/plugin-ext-vscode/-/plugin-ext-vscode-1.16.0-next.9539f892.tgz#5fd0c4a739d22fc975f208d4ed041759987b0270" - integrity sha512-x2bDLRSwNp7FglkTilpDXYEKHjCRVtw5c1CpoOMGC/eUr56yvmwIgEaXgXVUftsijOATPEo0lMTBjcVoQ6OnEw== - dependencies: - "@theia/callhierarchy" "1.16.0-next.9539f892" - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/monaco" "1.16.0-next.9539f892" - "@theia/navigator" "1.16.0-next.9539f892" - "@theia/plugin" "1.16.0-next.9539f892" - "@theia/plugin-ext" "1.16.0-next.9539f892" - "@theia/terminal" "1.16.0-next.9539f892" - "@theia/userstorage" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/plugin-ext-vscode/-/plugin-ext-vscode-1.17.0-next.84bca9b3.tgz#9d0ebf59325ca7cd426aea721116d6cdd9469b19" + integrity sha512-nsJDJI4A1E3LyOLTGXQLHw0ThWTfzUB/aybQHZMz9lR+OvUx1qJp0VlJxr/uYtlLITOLCTN8WRuK74/UkoMhzA== + dependencies: + "@theia/callhierarchy" "1.17.0-next.84bca9b3" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/monaco" "1.17.0-next.84bca9b3" + "@theia/navigator" "1.17.0-next.84bca9b3" + "@theia/plugin" "1.17.0-next.84bca9b3" + "@theia/plugin-ext" "1.17.0-next.84bca9b3" + "@theia/terminal" "1.17.0-next.84bca9b3" + "@theia/userstorage" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" "@types/request" "^2.0.3" filenamify "^4.1.0" request "^2.82.0" -"@theia/plugin-ext@1.16.0-next.9539f892", "@theia/plugin-ext@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/plugin-ext/-/plugin-ext-1.16.0-next.9539f892.tgz#41ea2ededc18e6fff09490ab5532a6e1615b1e58" - integrity sha512-Fnd95s8QNmmPvc8YmhzwND7a/WYxQmGBYn06DO4IIV+TU4rYh13p1MNGN8dvd137yOu1tVLI1yiy7Y0RvjT0vQ== - dependencies: - "@theia/bulk-edit" "1.16.0-next.9539f892" - "@theia/callhierarchy" "1.16.0-next.9539f892" - "@theia/console" "1.16.0-next.9539f892" - "@theia/core" "1.16.0-next.9539f892" - "@theia/debug" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/file-search" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/markers" "1.16.0-next.9539f892" - "@theia/messages" "1.16.0-next.9539f892" - "@theia/monaco" "1.16.0-next.9539f892" - "@theia/navigator" "1.16.0-next.9539f892" - "@theia/output" "1.16.0-next.9539f892" - "@theia/plugin" "1.16.0-next.9539f892" - "@theia/preferences" "1.16.0-next.9539f892" - "@theia/scm" "1.16.0-next.9539f892" - "@theia/search-in-workspace" "1.16.0-next.9539f892" - "@theia/task" "1.16.0-next.9539f892" - "@theia/terminal" "1.16.0-next.9539f892" - "@theia/timeline" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" +"@theia/plugin-ext@1.17.0-next.84bca9b3", "@theia/plugin-ext@next": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/plugin-ext/-/plugin-ext-1.17.0-next.84bca9b3.tgz#e4bb516383a0cdf6eed474997a817c2870dd3be9" + integrity sha512-jWbTuTtTS+R2bLL+Sojp3W3pYZje5qsnYvAqfF5v5KGXJsh9fMPg51C53YuS6tnSAFeTwq/mp3GVCVRKf8I+mQ== + dependencies: + "@theia/bulk-edit" "1.17.0-next.84bca9b3" + "@theia/callhierarchy" "1.17.0-next.84bca9b3" + "@theia/console" "1.17.0-next.84bca9b3" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/debug" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/file-search" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/markers" "1.17.0-next.84bca9b3" + "@theia/messages" "1.17.0-next.84bca9b3" + "@theia/monaco" "1.17.0-next.84bca9b3" + "@theia/navigator" "1.17.0-next.84bca9b3" + "@theia/output" "1.17.0-next.84bca9b3" + "@theia/plugin" "1.17.0-next.84bca9b3" + "@theia/preferences" "1.17.0-next.84bca9b3" + "@theia/scm" "1.17.0-next.84bca9b3" + "@theia/search-in-workspace" "1.17.0-next.84bca9b3" + "@theia/task" "1.17.0-next.84bca9b3" + "@theia/terminal" "1.17.0-next.84bca9b3" + "@theia/timeline" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" "@types/mime" "^2.0.1" decompress "^4.2.1" escape-html "^1.0.3" @@ -2659,128 +2664,128 @@ read-pkg "4.0.1" yargs "12.0.1" -"@theia/plugin@1.16.0-next.9539f892", "@theia/plugin@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/plugin/-/plugin-1.16.0-next.9539f892.tgz#1f2d233fae8f7d8e0f470f58351b5febc9ec4de3" - integrity sha512-10HWOCQejjr4NOqgCNgHtgxhIe6s3KotrA9hQbgNsqU9Q292YvwE5HtkNiFdAGqjjWFDGbDDhWb7Gdbr4nQrRQ== - -"@theia/preferences@1.16.0-next.9539f892", "@theia/preferences@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.16.0-next.9539f892.tgz#351608d7df69f0af44124795a8f55d9e9b1300dd" - integrity sha512-5ejHIeQefXBRWt2ABocNYlb1u40Tbshn7k1wG7tl3v/GMLBcjJwc6cJxHA14vLwMEjqO6TDr9D/w2ljv50mAjg== - dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/monaco" "1.16.0-next.9539f892" - "@theia/userstorage" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" +"@theia/plugin@1.17.0-next.84bca9b3", "@theia/plugin@next": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/plugin/-/plugin-1.17.0-next.84bca9b3.tgz#d2fe932635c6c87691ecb8f6ed1e809e94a0416e" + integrity sha512-ghuJJsj8vRkotKGgbqBvjVHEhcr9bApC9MjHLlHa7y0EPqqq2OYU2VftO3nxvmrf73TFvb0WtHRGmD+A2wsUbQ== + +"@theia/preferences@1.17.0-next.84bca9b3", "@theia/preferences@next": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.17.0-next.84bca9b3.tgz#3d9bbcd90cf1c1692af4deb0f3d490fa8e2ae790" + integrity sha512-OmwzlPuZ769WHcQmm/JvvKwvQaCmttWPvwESBGK+/ffECBOp0Hit1mPcFsiTrWc1BY2f/3IC4r48Kp9IHSWt1Q== + dependencies: + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/monaco" "1.17.0-next.84bca9b3" + "@theia/userstorage" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" jsonc-parser "^2.2.0" -"@theia/process@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.16.0-next.9539f892.tgz#2ce525183cf7daa83fe29d778c883c4323460163" - integrity sha512-vdbym8glTHPGfRo8qOYGCU0IYfrtNUZfzebP9BV78ZpDZNIVPVthWcOua6epEAibyHzyRrfcR0AF/8Fd3MWsww== +"@theia/process@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.17.0-next.84bca9b3.tgz#40bfba23148e942f891b941f98d0232d07080289" + integrity sha512-eaVtOR7nJYQhwB/b1lx3hLgeemfe0j3VS3+Ifr5mYgQdoHphL6gI+n07l30X1nyp6pejGNrv4IPlB09UN3g7og== dependencies: - "@theia/core" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" "@theia/node-pty" "0.9.0-theia.6" string-argv "^0.1.1" -"@theia/scm@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.16.0-next.9539f892.tgz#241643bb9087e6b442e86eefdc0daa6476b50448" - integrity sha512-KpYy+HSnRuZ4mFMu4/IHqe1CTUxR2LWauqJgZC+0U1C+1gVGwM6X86asOhWXY17tQRi+Ph2VaAljVLGVReS+Vg== +"@theia/scm@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.17.0-next.84bca9b3.tgz#f5057ff9cee57b4051142eff3d18733a07d50bcb" + integrity sha512-UarJJ7ytVnVEyvG5XdvNCwRvJY/STmuRyZsR7XBEHCWSn5NQj+mg9oBXGPfzaEMmM1E5eQINxwbNBEo4aJL1HA== dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/navigator" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/navigator" "1.17.0-next.84bca9b3" "@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.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-1.16.0-next.9539f892.tgz#e1745488a6d42f3cb8ccc6d1c837307c10884513" - integrity sha512-dzLJaz4eQ6/nAPQndtMBMjurEneM6Mac6iCN8LgBEuR2lGRMdw88mWOJaemdnCzo/jGHlqvRPNnjiX23ClU7Mw== - dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/navigator" "1.16.0-next.9539f892" - "@theia/process" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" +"@theia/search-in-workspace@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-1.17.0-next.84bca9b3.tgz#21b11635422cd2235c590c0c012ee30a4c6558a0" + integrity sha512-Pfe8cAtCXz6i3H/FwE+cf7bxYwGr1EYPE9nHS7Og9ego/eIJAcdP9PndbzRzNbZsPTdgAA4V/wNhHovtSDhtIg== + dependencies: + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/navigator" "1.17.0-next.84bca9b3" + "@theia/process" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" minimatch "^3.0.4" vscode-ripgrep "^1.2.4" -"@theia/task@1.16.0-next.9539f892", "@theia/task@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/task/-/task-1.16.0-next.9539f892.tgz#130d41e99bcffe1e000cb877e7a6a7eba18efe26" - integrity sha512-XBQZD8ZB6/vXG9oYIxUbURe9YRbKDLGjCoVGZAKuaNFZBdyhD0HIz7YMhzT8WiJR7lPVs2nO74xBgF3B+rgZgg== - dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/markers" "1.16.0-next.9539f892" - "@theia/monaco" "1.16.0-next.9539f892" - "@theia/preferences" "1.16.0-next.9539f892" - "@theia/process" "1.16.0-next.9539f892" - "@theia/terminal" "1.16.0-next.9539f892" - "@theia/userstorage" "1.16.0-next.9539f892" - "@theia/variable-resolver" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" +"@theia/task@1.17.0-next.84bca9b3", "@theia/task@next": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/task/-/task-1.17.0-next.84bca9b3.tgz#417a73d33932dcc30b7d07b98472c41533b219f4" + integrity sha512-jwYwL/nziOzmj+ilWpuBSfOxJbGQM0sv1FtYX3TGtHIlRkWYtH0/+D6gyoBAb94cg+IqDSwBHLWkcXM9/HmwXg== + dependencies: + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/markers" "1.17.0-next.84bca9b3" + "@theia/monaco" "1.17.0-next.84bca9b3" + "@theia/preferences" "1.17.0-next.84bca9b3" + "@theia/process" "1.17.0-next.84bca9b3" + "@theia/terminal" "1.17.0-next.84bca9b3" + "@theia/userstorage" "1.17.0-next.84bca9b3" + "@theia/variable-resolver" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" ajv "^6.5.3" jsonc-parser "^2.2.0" p-debounce "^2.1.0" -"@theia/terminal@1.16.0-next.9539f892", "@theia/terminal@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.16.0-next.9539f892.tgz#ad9cd8279cb78dd97321d5f3af13fae98c4b7862" - integrity sha512-hYDXRlrmyE7BwrNgqpXI8RD2AP3dEVrI8RcFMCCC5NCP4sJYn/VpziDtsbdxh9g17ywqfVPXuhpzSrVPxRu3cQ== - dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/editor" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/monaco" "1.16.0-next.9539f892" - "@theia/process" "1.16.0-next.9539f892" - "@theia/workspace" "1.16.0-next.9539f892" +"@theia/terminal@1.17.0-next.84bca9b3", "@theia/terminal@next": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.17.0-next.84bca9b3.tgz#4d41d3227e8b69d9115cce583cb005bf2782ae0d" + integrity sha512-i+JDOmBYRnOvJcqkCwjxoV0Pt5ZJHW1U03X5sfK1lE7ESM2fOLl7Jn09Q5ht+Sf1L6iadElbPu2GKt2Mj7S10Q== + dependencies: + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/editor" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/monaco" "1.17.0-next.84bca9b3" + "@theia/process" "1.17.0-next.84bca9b3" + "@theia/workspace" "1.17.0-next.84bca9b3" xterm "~4.11.0" xterm-addon-fit "~0.5.0" xterm-addon-search "~0.8.0" -"@theia/timeline@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/timeline/-/timeline-1.16.0-next.9539f892.tgz#17b526687a7604215d0ef204a9cd000cb37815d2" - integrity sha512-lGGkemjUaMU+zS4b5vgz83u40WlSG9JS81gUzwc9n9z8qMCoVHegXQOfy9g/zJ9iLapuiODV1r2iTFIu7UZE4w== +"@theia/timeline@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/timeline/-/timeline-1.17.0-next.84bca9b3.tgz#9b04bbf073b62283816dd0c5e04b287d99e102e0" + integrity sha512-MTkgDJ7PXD8UzAnjUHDNRW1rvSKQW22ox8guc/yJPrnsrMjQlas1urIY2Hlvoz4Na+NeWD7lQMlcdL1eZPq3eg== dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/navigator" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/navigator" "1.17.0-next.84bca9b3" -"@theia/userstorage@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.16.0-next.9539f892.tgz#828c67385b718cb34169fc49b1f3502404a42615" - integrity sha512-ZBWATDinaaMvj1BAQ4Nzv7Ik/7CVvIHQknFUQwvU1wrZivApKsvo9Cj0pi4hPO0zOZWWSUlk87/oqPtTRAXb7w== +"@theia/userstorage@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.17.0-next.84bca9b3.tgz#067e91f75c2726f9807943374e4fb285a9ed1431" + integrity sha512-itMT7KDA5Ot3UlPN6+jHUoTo5jyoNY8JGiahbor6OHyjOIwZoY0tauL6JWCuEmV22mtR08naP1fP0zEGd9J/OQ== dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" -"@theia/variable-resolver@1.16.0-next.9539f892": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.16.0-next.9539f892.tgz#385f4322fa70788245330604881affbf51acb63f" - integrity sha512-2l4zNX6xrRdd96d3vsZSNxDqB06x5vnEkzzzh5ubQoeJBD2aG9YKurvSBfexXvq0dscO+lBzKsY9I6zdpG/YqA== +"@theia/variable-resolver@1.17.0-next.84bca9b3": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.17.0-next.84bca9b3.tgz#04016b8b891c405ccb49b10d801a8a9231d5aa34" + integrity sha512-q0lp0SM/mO3kYar8ccR9YxKbcQE96u9VYu1j3VL88pwuWohi5RSwoWohgDcG7gBdttAm+idXUx7OFtx7umfyzw== dependencies: - "@theia/core" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" -"@theia/workspace@1.16.0-next.9539f892", "@theia/workspace@next": - version "1.16.0-next.9539f892" - resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.16.0-next.9539f892.tgz#e691ca91e23856168c87a9d56ee5bd50abff123e" - integrity sha512-lNMgeGenWdG7LzNSllRrKF5UBUsx1w5dxOqgSG7kwW99fl5hTqALcx3URCedy+iK/1rt50mCKOrqOZwhuqVXOQ== +"@theia/workspace@1.17.0-next.84bca9b3", "@theia/workspace@next": + version "1.17.0-next.84bca9b3" + resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.17.0-next.84bca9b3.tgz#d6474b60a9bcb68f786bb5ff2ae5b223736e53d6" + integrity sha512-WF84UhUip0L8Dp5zXfYL/Z5JxRf/RSiCc0vof+TjtmI68M1W53grW1+Q/rAS1huFWLNSLtodaAVozOys8h83Jg== dependencies: - "@theia/core" "1.16.0-next.9539f892" - "@theia/filesystem" "1.16.0-next.9539f892" - "@theia/variable-resolver" "1.16.0-next.9539f892" + "@theia/core" "1.17.0-next.84bca9b3" + "@theia/filesystem" "1.17.0-next.84bca9b3" + "@theia/variable-resolver" "1.17.0-next.84bca9b3" ajv "^6.5.3" jsonc-parser "^2.2.0" moment "2.24.0" @@ -3033,9 +3038,9 @@ integrity sha512-S6+8JAYTE1qdsc9HMVsfY7+SgSuUU/Tp6TYTmITW0PZxiyIMvol3Gy//y69Wkhs0ti4py5qgR3uZH6uz/DNzJQ== "@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8": - version "7.0.8" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818" - integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg== + version "7.0.9" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" + integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== "@types/keyv@*": version "3.1.2" @@ -3059,14 +3064,14 @@ "@types/lodash" "*" "@types/lodash@*": - version "4.14.171" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.171.tgz#f01b3a5fe3499e34b622c362a46a609fdb23573b" - integrity sha512-7eQ2xYLLI/LsicL2nejW9Wyko3lcpN6O/z0ZLHrEQsg280zIdCv1t/0m6UtBjUHokCGBQ3gYTbHzDkZ1xOBwwg== + version "4.14.172" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a" + integrity sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw== "@types/mime-types@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.0.tgz#9ca52cda363f699c69466c2a6ccdaad913ea7a73" - integrity sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM= + version "2.1.1" + resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.1.tgz#d9ba43490fa3a3df958759adf69396c3532cf2c1" + integrity sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw== "@types/mime@^1": version "1.3.2" @@ -3089,9 +3094,9 @@ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/minipass@*": - version "2.2.1" - resolved "https://registry.yarnpkg.com/@types/minipass/-/minipass-2.2.1.tgz#a52138867c493ff14f07616efcbe2af7662b76fb" - integrity sha512-0bI74UwEJ+JjGqzkyoiCxLVGK5C3Vy5MYdDB6VCtUAulcrulHvqhIrQP9lh/gvMgaNzvvJljMW97rRHVvbTe8Q== + version "3.1.0" + resolved "https://registry.yarnpkg.com/@types/minipass/-/minipass-3.1.0.tgz#616dcc2205982d4c720f4c7e9a9fddc497245273" + integrity sha512-b2yPKwCrB8x9SB65kcCistMoe3wrYnxxt5rJSZ1kprw0uOXvhuKi9kTQ746Y+Pbqoh+9C0N4zt0ztmTnG9yg7A== dependencies: "@types/node" "*" @@ -3101,9 +3106,9 @@ integrity sha512-RTVWV485OOf4+nO2+feurk0chzHkSjkjALiejpHltyuMf/13fGymbbNNFrSKdSSUg1TIwzszXdWsVirxgqYiFA== "@types/node@*", "@types/node@^10.12.0", "@types/node@^12.0.0": - version "12.20.17" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.17.tgz#ffd44c2801fc527a6fe6e86bc9b900261df1c87e" - integrity sha512-so8EHl4S6MmatPS0f9sE1ND94/ocbcEshW5OpyYthRqeRpiYyW2uXYTo/84kmfdfeNrDycARkvuiXl6nO40NGg== + version "12.20.19" + resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.19.tgz#538e61fc220f77ae4a4663c3d8c3cb391365c209" + integrity sha512-niAuZrwrjKck4+XhoCw6AAVQBENHftpXw9F4ryk66fTgYaKQ53R4FI7c9vUGGw5vQis1HKBHDR1gcYI/Bq1xvw== "@types/normalize-package-data@*", "@types/normalize-package-data@^2.4.0": version "2.4.1" @@ -3153,26 +3158,26 @@ "@types/react" "^16" "@types/react-virtualized@^9.18.3": - version "9.21.12" - resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.21.12.tgz#5b76aa20c24b8df6dd210ed42f1e9192e1234f46" - integrity sha512-zt6EvLQPhnnSVnMGa5prpV4pROY9euU2k2aoAyuaiDdfSvrfvzxM9MhkpdVYKKfBVUqAlQpMeE/4DPhNGvp7Cg== + version "9.21.13" + resolved "https://registry.yarnpkg.com/@types/react-virtualized/-/react-virtualized-9.21.13.tgz#4222173abe7c9ed7504c75886c8367502ac7b9f1" + integrity sha512-tCIQ5wDKj+QJ3sMzjPKSLY0AXsznt+ovAUcq+JCLjPBOcAHbPt4FraGT9HKYEFfmp9E6+ELuN49i5bWtuBmi3w== dependencies: "@types/prop-types" "*" "@types/react" "*" "@types/react@*": - version "17.0.15" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.15.tgz#c7533dc38025677e312606502df7656a6ea626d0" - integrity sha512-uTKHDK9STXFHLaKv6IMnwp52fm0hwU+N89w/p9grdUqcFA6WuqDyPhaWopbNyE1k/VhgzmHl8pu1L4wITtmlLw== + version "17.0.18" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.18.tgz#4109cbbd901be9582e5e39e3d77acd7b66bb7fbe" + integrity sha512-YTLgu7oS5zvSqq49X5Iue5oAbVGhgPc5Au29SJC4VeE17V6gASoOxVkUDy9pXFMRFxCWCD9fLeweNFizo3UzOg== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" csstype "^3.0.2" "@types/react@^16", "@types/react@^16.8.0": - version "16.14.11" - resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.11.tgz#992a0cd4b66b9f27315042b5d96e976717368f04" - integrity sha512-Don0MtsZZ3fjwTJ2BsoqkyOy7e176KplEAKOpr/4XDdzinlyJBn9yfsKn5mcSgn4kh1B22+3tBnzBC1z63ybtQ== + version "16.14.13" + resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.13.tgz#14f77c75ea581fa632907440dfda23b3c6ab24c9" + integrity sha512-KznsRYfqPmbcA5pMxc4mYQ7UgsJa2tAgKE2YwEmY5xKaTVZXLAY/ImBohyQHnEoIjxIJR+Um4FmaEYDr3q3zlg== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -3337,15 +3342,15 @@ integrity sha512-hKB88y3YHL8oPOs/CNlaXtjWn93+Bs48sDQR37ZUqG2tLeCS7EA1cmnkKsuQsub9OKEB/y/Rw9zqJqqNSbqVlQ== "@types/webpack-sources@*": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.1.tgz#6af17e3a3ded71eec2b98008d7c12f498a0a4506" - integrity sha512-MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ== + version "3.2.0" + resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-3.2.0.tgz#16d759ba096c289034b26553d2df1bf45248d38b" + integrity sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg== dependencies: "@types/node" "*" "@types/source-list-map" "*" source-map "^0.7.3" -"@types/webpack@^4.0.0": +"@types/webpack@^4.4.31": version "4.41.30" resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.30.tgz#fd3db6d0d41e145a8eeeafcd3c4a7ccde9068ddc" integrity sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA== @@ -3357,6 +3362,15 @@ anymatch "^3.0.0" source-map "^0.6.0" +"@types/webpack@^5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.0.tgz#78dde06212f038d77e54116cfe69e88ae9ed2c03" + integrity sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w== + dependencies: + "@types/node" "*" + tapable "^2.2.0" + webpack "^5" + "@types/write-json-file@^2.2.1": version "2.2.1" resolved "https://registry.yarnpkg.com/@types/write-json-file/-/write-json-file-2.2.1.tgz#74155aaccbb0d532be21f9d66bebc4ea875a5a62" @@ -3395,27 +3409,27 @@ "@types/yargs-parser" "*" "@typescript-eslint/eslint-plugin@^4.8.1": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.5.tgz#8197f1473e7da8218c6a37ff308d695707835684" - integrity sha512-m31cPEnbuCqXtEZQJOXAHsHvtoDi9OVaeL5wZnO2KZTnkvELk+u6J6jHg+NzvWQxk+87Zjbc4lJS4NHmgImz6Q== + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.29.2.tgz#f54dc0a32b8f61c6024ab8755da05363b733838d" + integrity sha512-x4EMgn4BTfVd9+Z+r+6rmWxoAzBaapt4QFqE+d8L8sUtYZYLDTK6VG/y/SMMWA5t1/BVU5Kf+20rX4PtWzUYZg== dependencies: - "@typescript-eslint/experimental-utils" "4.28.5" - "@typescript-eslint/scope-manager" "4.28.5" + "@typescript-eslint/experimental-utils" "4.29.2" + "@typescript-eslint/scope-manager" "4.29.2" debug "^4.3.1" functional-red-black-tree "^1.0.1" regexpp "^3.1.0" semver "^7.3.5" tsutils "^3.21.0" -"@typescript-eslint/experimental-utils@4.28.5": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.5.tgz#66c28bef115b417cf9d80812a713e0e46bb42a64" - integrity sha512-bGPLCOJAa+j49hsynTaAtQIWg6uZd8VLiPcyDe4QPULsvQwLHGLSGKKcBN8/lBxIX14F74UEMK2zNDI8r0okwA== +"@typescript-eslint/experimental-utils@4.29.2": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.29.2.tgz#5f67fb5c5757ef2cb3be64817468ba35c9d4e3b7" + integrity sha512-P6mn4pqObhftBBPAv4GQtEK7Yos1fz/MlpT7+YjH9fTxZcALbiiPKuSIfYP/j13CeOjfq8/fr9Thr2glM9ub7A== dependencies: "@types/json-schema" "^7.0.7" - "@typescript-eslint/scope-manager" "4.28.5" - "@typescript-eslint/types" "4.28.5" - "@typescript-eslint/typescript-estree" "4.28.5" + "@typescript-eslint/scope-manager" "4.29.2" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/typescript-estree" "4.29.2" eslint-scope "^5.1.1" eslint-utils "^3.0.0" @@ -3441,32 +3455,32 @@ eslint-utils "^2.0.0" "@typescript-eslint/parser@^4.8.1": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.5.tgz#9c971668f86d1b5c552266c47788a87488a47d1c" - integrity sha512-NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw== + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.29.2.tgz#1c7744f4c27aeb74610c955d3dce9250e95c370a" + integrity sha512-WQ6BPf+lNuwteUuyk1jD/aHKqMQ9jrdCn7Gxt9vvBnzbpj7aWEf+aZsJ1zvTjx5zFxGCt000lsbD9tQPEL8u6g== dependencies: - "@typescript-eslint/scope-manager" "4.28.5" - "@typescript-eslint/types" "4.28.5" - "@typescript-eslint/typescript-estree" "4.28.5" + "@typescript-eslint/scope-manager" "4.29.2" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/typescript-estree" "4.29.2" debug "^4.3.1" -"@typescript-eslint/scope-manager@4.28.5": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz#3a1b70c50c1535ac33322786ea99ebe403d3b923" - integrity sha512-PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ== +"@typescript-eslint/scope-manager@4.29.2": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.29.2.tgz#442b0f029d981fa402942715b1718ac7fcd5aa1b" + integrity sha512-mfHmvlQxmfkU8D55CkZO2sQOueTxLqGvzV+mG6S/6fIunDiD2ouwsAoiYCZYDDK73QCibYjIZmGhpvKwAB5BOA== dependencies: - "@typescript-eslint/types" "4.28.5" - "@typescript-eslint/visitor-keys" "4.28.5" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/visitor-keys" "4.29.2" "@typescript-eslint/types@3.10.1": version "3.10.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727" integrity sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ== -"@typescript-eslint/types@4.28.5": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.5.tgz#d33edf8e429f0c0930a7c3d44e9b010354c422e9" - integrity sha512-MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA== +"@typescript-eslint/types@4.29.2": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.29.2.tgz#fc0489c6b89773f99109fb0aa0aaddff21f52fcd" + integrity sha512-K6ApnEXId+WTGxqnda8z4LhNMa/pZmbTFkDxEBLQAbhLZL50DjeY0VIDCml/0Y3FlcbqXZrABqrcKxq+n0LwzQ== "@typescript-eslint/typescript-estree@2.34.0": version "2.34.0" @@ -3495,13 +3509,13 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/typescript-estree@4.28.5": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz#4906d343de693cf3d8dcc301383ed638e0441cd1" - integrity sha512-FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw== +"@typescript-eslint/typescript-estree@4.29.2": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.29.2.tgz#a0ea8b98b274adbb2577100ba545ddf8bf7dc219" + integrity sha512-TJ0/hEnYxapYn9SGn3dCnETO0r+MjaxtlWZ2xU+EvytF0g4CqTpZL48SqSNn2hXsPolnewF30pdzR9a5Lj3DNg== dependencies: - "@typescript-eslint/types" "4.28.5" - "@typescript-eslint/visitor-keys" "4.28.5" + "@typescript-eslint/types" "4.29.2" + "@typescript-eslint/visitor-keys" "4.29.2" debug "^4.3.1" globby "^11.0.3" is-glob "^4.0.1" @@ -3515,14 +3529,19 @@ dependencies: eslint-visitor-keys "^1.1.0" -"@typescript-eslint/visitor-keys@4.28.5": - version "4.28.5" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz#ffee2c602762ed6893405ee7c1144d9cc0a29675" - integrity sha512-dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg== +"@typescript-eslint/visitor-keys@4.29.2": + version "4.29.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.29.2.tgz#d2da7341f3519486f50655159f4e5ecdcb2cd1df" + integrity sha512-bDgJLQ86oWHJoZ1ai4TZdgXzJxsea3Ee9u9wsTAvjChdj2WLcVsgWYAPeY7RQMn16tKrlQaBnpKv7KBfs4EQag== dependencies: - "@typescript-eslint/types" "4.28.5" + "@typescript-eslint/types" "4.29.2" eslint-visitor-keys "^2.0.0" +"@vscode/codicons@^0.0.21": + version "0.0.21" + resolved "https://registry.yarnpkg.com/@vscode/codicons/-/codicons-0.0.21.tgz#20ef724b141fdddba3ad86e85f34aaad29e4d3a0" + integrity sha512-oUfqbWTaEc2NIVLUxOK2Vi8AB/ixFfp52CkmR+pYZcWAr82IVIDDn50pdEDRXfJNIc4giHDSc5F5ZTsVMZK9Sg== + "@vue/babel-helper-vue-jsx-merge-props@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz#31624a7a505fb14da1d58023725a4c5f270e6a81" @@ -4056,6 +4075,23 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" +"@webpack-cli/configtest@^1.0.4": + version "1.0.4" + resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.0.4.tgz#f03ce6311c0883a83d04569e2c03c6238316d2aa" + integrity sha512-cs3XLy+UcxiP6bj0A6u7MLLuwdXJ1c3Dtc0RkKg+wiI1g/Ti1om8+/2hc2A2B60NbBNAbMgyBMHvyymWm/j4wQ== + +"@webpack-cli/info@^1.3.0": + version "1.3.0" + resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.3.0.tgz#9d78a31101a960997a4acd41ffd9b9300627fe2b" + integrity sha512-ASiVB3t9LOKHs5DyVUcxpraBXDOKubYu/ihHhU+t1UPpxsivg6Od2E2qU4gJCekfEddzRBzHhzA/Acyw/mlK/w== + dependencies: + envinfo "^7.7.3" + +"@webpack-cli/serve@^1.5.2": + version "1.5.2" + resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.5.2.tgz#ea584b637ff63c5a477f6f21604b5a205b72c9ec" + integrity sha512-vgJ5OLWadI8aKjDlOH3rb+dYyPd2GTZuQC/Tihjct6F9GpXGZINo3Y/IVuZVTM1eDQB+/AOsjPUWH/WySDaXvw== + "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -4100,6 +4136,11 @@ acorn-globals@^6.0.0: acorn "^7.1.1" acorn-walk "^7.1.1" +acorn-import-assertions@^1.7.6: + version "1.7.6" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78" + integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA== + acorn-jsx@^5.0.0, acorn-jsx@^5.3.1: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -4725,9 +4766,9 @@ babel-plugin-polyfill-corejs2@^0.2.2: semver "^6.1.1" babel-plugin-polyfill-corejs3@^0.2.2: - version "0.2.3" - resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz#72add68cf08a8bf139ba6e6dfc0b1d504098e57b" - integrity sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g== + version "0.2.4" + resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.4.tgz#68cb81316b0e8d9d721a92e0009ec6ecd4cd2ca9" + integrity sha512-z3HnJE5TY/j4EFEa/qpQMSbcUJZ5JQi+3UFjXzn6pQCmIKc5Ug5j98SuYyH+m4xQnvKlMDIW4plLfgyVnd0IcQ== dependencies: "@babel/helper-define-polyfill-provider" "^0.2.2" core-js-compat "^3.14.0" @@ -5113,16 +5154,16 @@ browserify-zlib@^0.2.0: dependencies: pako "~1.0.5" -browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6: - version "4.16.6" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2" - integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ== +browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.16.7: + version "4.16.7" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.7.tgz#108b0d1ef33c4af1b587c54f390e7041178e4335" + integrity sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA== dependencies: - caniuse-lite "^1.0.30001219" + caniuse-lite "^1.0.30001248" colorette "^1.2.2" - electron-to-chromium "^1.3.723" + electron-to-chromium "^1.3.793" escalade "^3.1.1" - node-releases "^1.1.71" + node-releases "^1.1.73" bs-logger@0.x: version "0.2.6" @@ -5162,9 +5203,9 @@ buffer-fill@^1.0.0: integrity sha1-+PeLdniYiO858gXNY39o5wISKyw= buffer-from@1.x, buffer-from@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" - integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + version "1.1.2" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" + integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ== buffer-indexof@^1.0.0: version "1.1.1" @@ -5445,10 +5486,10 @@ caniuse-api@^3.0.0: lodash.memoize "^4.1.2" lodash.uniq "^4.5.0" -caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219: - version "1.0.30001248" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001248.tgz#26ab45e340f155ea5da2920dadb76a533cb8ebce" - integrity sha512-NwlQbJkxUFJ8nMErnGtT0QTM2TJ33xgz4KXJSMIrjXIbDVdaYueGyjOrLKRtJC+rTiWfi6j5cnZN1NBiSBJGNw== +caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001248: + version "1.0.30001251" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz#6853a606ec50893115db660f82c094d18f096d85" + integrity sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A== capture-exit@^2.0.0: version "2.0.0" @@ -5507,9 +5548,9 @@ chalk@^3.0.0: supports-color "^7.1.0" chalk@^4.0.0, chalk@^4.1.0: - version "4.1.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" - integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + version "4.1.2" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" + integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== dependencies: ansi-styles "^4.1.0" supports-color "^7.1.0" @@ -5568,7 +5609,7 @@ chokidar@^3.4.1: optionalDependencies: fsevents "~2.3.2" -chownr@^1.0.1, chownr@^1.1.1: +chownr@^1.0.1, chownr@^1.1.1, chownr@^1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b" integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg== @@ -5633,12 +5674,13 @@ clean-stack@^2.0.0: resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b" integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A== -clean-webpack-plugin@^0.1.19: - version "0.1.19" - resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-0.1.19.tgz#ceda8bb96b00fe168e9b080272960d20fdcadd6d" - integrity sha512-M1Li5yLHECcN2MahoreuODul5LkjohJGFxLPTjl3j1ttKrF5rgjZET1SJduuqxLAuT1gAPOdkhg03qcaaU1KeA== +clean-webpack-plugin@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/clean-webpack-plugin/-/clean-webpack-plugin-3.0.0.tgz#a99d8ec34c1c628a4541567aa7b457446460c62b" + integrity sha512-MciirUH5r+cYLGCOL5JX/ZLzOZbVr1ot3Fw+KcvbhUb6PM+yycqd9ZhIlcigQ5gl+XhppNmw3bEFuaaMNyLj3A== dependencies: - rimraf "^2.6.1" + "@types/webpack" "^4.4.31" + del "^4.1.1" cli-boxes@^2.2.0: version "2.2.1" @@ -5811,9 +5853,9 @@ color@^3.0.0: color-string "^1.6.0" colorette@^1.2.1, colorette@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" - integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w== + version "1.3.0" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.3.0.tgz#ff45d2f0edb244069d3b772adeb04fed38d0a0af" + integrity sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w== columnify@^1.5.4: version "1.5.4" @@ -5850,6 +5892,11 @@ commander@^4.1.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== +commander@^7.0.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" + integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== + commander@~2.19.0: version "2.19.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a" @@ -6172,12 +6219,12 @@ copy-webpack-plugin@^5.0.2: serialize-javascript "^4.0.0" webpack-log "^2.0.0" -core-js-compat@^3.14.0, core-js-compat@^3.15.0, core-js-compat@^3.6.5: - version "3.15.2" - resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz#47272fbb479880de14b4e6081f71f3492f5bd3cb" - integrity sha512-Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ== +core-js-compat@^3.14.0, core-js-compat@^3.16.0, core-js-compat@^3.6.5: + version "3.16.1" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.16.1.tgz#c44b7caa2dcb94b673a98f27eee1c8312f55bc2d" + integrity sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ== dependencies: - browserslist "^4.16.6" + browserslist "^4.16.7" semver "7.0.0" core-js@^2.4.0, core-js@^2.5.0: @@ -6186,9 +6233,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.15.2" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.2.tgz#740660d2ff55ef34ce664d7e2455119c5bdd3d61" - integrity sha512-tKs41J7NJVuaya8DxIOCnl8QuPHx5/ZVbFo1oKgVl1qHFBBrDctzQGtuLjPpRdNTWmKPH6oEvgN/MUID+l485Q== + version "3.16.1" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.1.tgz#f4485ce5c9f3c6a7cb18fa80488e08d362097249" + integrity sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" @@ -6585,9 +6632,9 @@ de-indent@^1.0.2: integrity sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0= deasync@^0.1.19: - version "0.1.21" - resolved "https://registry.yarnpkg.com/deasync/-/deasync-0.1.21.tgz#bb11eabd4466c0d8776f0d82deb8a6126460d30f" - integrity sha512-kUmM8Y+PZpMpQ+B4AuOW9k2Pfx/mSupJtxOsLzmnHY2WqZUYRFccFn2RhzPAqt3Xb+sorK/badW2D4zNzqZz5w== + version "0.1.22" + resolved "https://registry.yarnpkg.com/deasync/-/deasync-0.1.22.tgz#eed0636ad8a600acc78e8d0e2f038db5e7f0c55c" + integrity sha512-o21R8Vhv3wX0E19jpATUJIAinQ1I2rHIlAnzRRsMynWlIrvU0HbCwjpquPIYR544Tvg9z/L+NZQev5cjVD1/nQ== dependencies: bindings "^1.5.0" node-addon-api "^1.7.1" @@ -6876,11 +6923,6 @@ destroy@~1.0.4: resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= -detect-file@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7" - integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc= - detect-indent@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208" @@ -7079,9 +7121,9 @@ domhandler@^4.0.0, domhandler@^4.2.0: domelementtype "^2.2.0" dompurify@^2.2.9: - version "2.3.0" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.0.tgz#07bb39515e491588e5756b1d3e8375b5964814e2" - integrity sha512-VV5C6Kr53YVHGOBKO/F86OYX6/iLTw2yVSI721gKetxpHCK/V5TaLEf9ODjRgl1KLSWRMY6cUhAbv/c+IUnwQw== + version "2.3.1" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.1.tgz#a47059ca21fd1212d3c8f71fdea6943b8bfbdf6a" + integrity sha512-xGWt+NHAQS+4tpgbOAI08yxW0Pr256Gu/FNE2frZVTbgrBUn8M7tz7/ktS/LZ2MHeGqz6topj0/xY+y8R5FBFw== domutils@^1.7.0: version "1.7.0" @@ -7185,10 +7227,10 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-to-chromium@^1.3.723: - version "1.3.789" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.789.tgz#c3ea060ba1e36e41c87943a47ed2daadc545be2b" - integrity sha512-lK4xn6C6ZF1kgLaC/EhOtC1MSKENExj3rMwGVnBTfHW81Z/Hb1Rge5YaWawN/YOXy3xCaESuE4KWSD50kOZ9rQ== +electron-to-chromium@^1.3.793: + version "1.3.807" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.807.tgz#c2eb803f4f094869b1a24151184ffbbdbf688b1f" + integrity sha512-p8uxxg2a23zRsvQ2uwA/OOI+O4BQxzaR7YKMIGGGQCpYmkFX2CVF5f0/hxLMV7yCr7nnJViCwHLhPfs52rIYCA== elliptic@^6.5.3: version "6.5.4" @@ -7247,7 +7289,7 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1: dependencies: once "^1.4.0" -enhanced-resolve@^4.1.1, enhanced-resolve@^4.5.0: +enhanced-resolve@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec" integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg== @@ -7294,7 +7336,7 @@ envify@^4.0.0: esprima "^4.0.0" through "~2.3.4" -envinfo@^7.2.0, envinfo@^7.7.4: +envinfo@^7.2.0, envinfo@^7.7.3, envinfo@^7.7.4: version "7.8.1" resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475" integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw== @@ -7319,9 +7361,9 @@ error-ex@^1.2.0, error-ex@^1.3.1: is-arrayish "^0.2.1" es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2: - version "1.18.3" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0" - integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw== + version "1.18.5" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.5.tgz#9b10de7d4c206a3581fd5b2124233e04db49ae19" + integrity sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -7329,11 +7371,12 @@ es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es- get-intrinsic "^1.1.1" has "^1.0.3" has-symbols "^1.0.2" + internal-slot "^1.0.3" is-callable "^1.2.3" is-negative-zero "^2.0.1" is-regex "^1.1.3" is-string "^1.0.6" - object-inspect "^1.10.3" + object-inspect "^1.11.0" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" @@ -7409,17 +7452,17 @@ eslint-config-prettier@^6.15.0: get-stdin "^6.0.0" eslint-import-resolver-node@^0.3.4: - version "0.3.4" - resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" - integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== + version "0.3.6" + resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd" + integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw== dependencies: - debug "^2.6.9" - resolve "^1.13.1" + debug "^3.2.7" + resolve "^1.20.0" eslint-module-utils@^2.6.0: - 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== + version "2.6.2" + resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534" + integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q== dependencies: debug "^3.2.7" pkg-dir "^2.0.0" @@ -7576,9 +7619,9 @@ eslint@^5.0.0: text-table "^0.2.0" eslint@^7.14.0: - version "7.31.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz#f972b539424bf2604907a970860732c5d99d3aca" - integrity sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA== + version "7.32.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d" + integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA== dependencies: "@babel/code-frame" "7.12.11" "@eslint/eslintrc" "^0.4.3" @@ -7816,13 +7859,6 @@ expand-template@^2.0.3: resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== -expand-tilde@^2.0.0, expand-tilde@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" - integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= - dependencies: - homedir-polyfill "^1.0.1" - expect@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" @@ -7987,6 +8023,11 @@ fast-plist@^0.1.2: resolved "https://registry.yarnpkg.com/fast-plist/-/fast-plist-0.1.2.tgz#a45aff345196006d406ca6cdcd05f69051ef35b8" integrity sha1-pFr/NFGWAG1AbKbNzQX2kFHvNbg= +fastest-levenshtein@^1.0.12: + version "1.0.12" + resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" + integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow== + fastq@^1.6.0: version "1.11.1" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807" @@ -8199,16 +8240,6 @@ find-up@^4.0.0, find-up@^4.1.0: locate-path "^5.0.0" path-exists "^4.0.0" -findup-sync@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1" - integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg== - dependencies: - detect-file "^1.0.0" - is-glob "^4.0.0" - micromatch "^3.0.4" - resolve-dir "^1.0.1" - flat-cache@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0" @@ -8232,9 +8263,9 @@ flatted@^2.0.0: integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA== flatted@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz#bbef080d95fca6709362c73044a1634f7c6e7d05" - integrity sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg== + version "3.2.2" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.2.tgz#64bfed5cb68fe3ca78b3eb214ad97b63bedce561" + integrity sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA== flush-write-stream@^1.0.0: version "1.1.1" @@ -8377,7 +8408,7 @@ fs-extra@^9.0.1, fs-extra@^9.1.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-minipass@^1.2.5: +fs-minipass@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7" integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA== @@ -8463,7 +8494,7 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5: resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e" integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg== -get-intrinsic@^1.0.2, get-intrinsic@^1.1.1: +get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6" integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q== @@ -8658,42 +8689,6 @@ global-dirs@^2.0.1: dependencies: ini "1.3.7" -global-modules@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" - integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== - dependencies: - global-prefix "^1.0.1" - is-windows "^1.0.1" - resolve-dir "^1.0.0" - -global-modules@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780" - integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A== - dependencies: - global-prefix "^3.0.0" - -global-prefix@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" - integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= - dependencies: - expand-tilde "^2.0.2" - homedir-polyfill "^1.0.1" - ini "^1.3.4" - is-windows "^1.0.1" - which "^1.2.14" - -global-prefix@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97" - integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg== - dependencies: - ini "^1.3.5" - kind-of "^6.0.2" - which "^1.3.1" - global@^4.3.2: version "4.4.0" resolved "https://registry.yarnpkg.com/global/-/global-4.4.0.tgz#3e7b105179006a323ed71aafca3e9c57a5cc6406" @@ -8708,9 +8703,9 @@ globals@^11.1.0, globals@^11.7.0: integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== globals@^13.6.0, globals@^13.9.0: - version "13.10.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676" - integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g== + version "13.11.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.11.0.tgz#40ef678da117fe7bd2e28f1fab24951bd0255be7" + integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== dependencies: type-fest "^0.20.2" @@ -8843,9 +8838,9 @@ got@^9.6.0: url-parse-lax "^3.0.0" graceful-fs@^4.1.0, graceful-fs@^4.1.10, graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4: - version "4.2.6" - resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" - integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== + version "4.2.8" + resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" + integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== gray-matter@^4.0.1: version "4.0.3" @@ -8941,6 +8936,13 @@ has-to-string-tag-x@^1.2.0: dependencies: has-symbol-support-x "^1.4.1" +has-tostringtag@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" + integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ== + dependencies: + has-symbols "^1.0.2" + has-unicode@^2.0.0, has-unicode@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -9046,13 +9048,6 @@ home-or-tmp@^2.0.0: os-homedir "^1.0.0" os-tmpdir "^1.0.1" -homedir-polyfill@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8" - integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA== - dependencies: - parse-passwd "^1.0.0" - hosted-git-info@^2.1.4: version "2.8.9" resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9" @@ -9605,11 +9600,25 @@ internal-ip@^4.3.0: default-gateway "^4.2.0" ipaddr.js "^1.9.0" -interpret@^1.0.0, interpret@^1.4.0: +internal-slot@^1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c" + integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA== + dependencies: + get-intrinsic "^1.1.0" + has "^1.0.3" + side-channel "^1.0.4" + +interpret@^1.0.0: version "1.4.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e" integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA== +interpret@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" + integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== + into-stream@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6" @@ -9685,11 +9694,12 @@ is-accessor-descriptor@^1.0.0: kind-of "^6.0.0" is-arguments@^1.0.4: - version "1.1.0" - resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.0.tgz#62353031dfbee07ceb34656a6bde59efecae8dd9" - integrity sha512-1Ij4lOMPl/xB5kBDn7I+b2ttPMKa8szhEIrXDuXQD/oe3HJLTLhqhgGspwgyGd6MOywBUqVvYicF72lkgDnIHg== + version "1.1.1" + resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b" + integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA== dependencies: - call-bind "^1.0.0" + call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-arrayish@^0.2.1: version "0.2.1" @@ -9702,9 +9712,11 @@ is-arrayish@^0.3.1: integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-bigint@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a" - integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA== + version "1.0.4" + resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" + integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg== + dependencies: + has-bigints "^1.0.1" is-binary-path@^1.0.0: version "1.0.1" @@ -9721,11 +9733,12 @@ is-binary-path@~2.1.0: binary-extensions "^2.0.0" is-boolean-object@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8" - integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng== + version "1.1.2" + resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719" + integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA== dependencies: call-bind "^1.0.2" + has-tostringtag "^1.0.0" is-buffer@^1.1.5: version "1.1.6" @@ -9740,9 +9753,9 @@ is-builtin-module@^3.0.0: builtin-modules "^3.0.0" is-callable@^1.1.4, is-callable@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" - integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== + version "1.2.4" + resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945" + integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w== is-ci@^2.0.0: version "2.0.0" @@ -9785,9 +9798,11 @@ is-data-descriptor@^1.0.0: kind-of "^6.0.0" is-date-object@^1.0.1: - 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== + version "1.0.5" + resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f" + integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ== + dependencies: + has-tostringtag "^1.0.0" is-descriptor@^0.1.0: version "0.1.6" @@ -9909,9 +9924,11 @@ is-npm@^4.0.0: integrity sha512-96ECIfh9xtDDlPylNPXhzjsykHsMJZ18ASpaWzQyBr4YRTcVjUvzaHayDAES2oU/3KpljhHUjtSRNiDwi0F0ig== is-number-object@^1.0.4: - version "1.0.5" - resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb" - integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw== + version "1.0.6" + resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0" + integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g== + dependencies: + has-tostringtag "^1.0.0" is-number@^3.0.0: version "3.0.0" @@ -9987,12 +10004,12 @@ is-potential-custom-element-name@^1.0.1: integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ== 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== + version "1.1.4" + resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" + integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg== dependencies: call-bind "^1.0.2" - has-symbols "^1.0.2" + has-tostringtag "^1.0.0" is-resolvable@^1.0.0: version "1.1.0" @@ -10022,9 +10039,11 @@ is-stream@^2.0.0: integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg== 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== + version "1.0.7" + resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd" + integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg== + dependencies: + has-tostringtag "^1.0.0" is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.4" @@ -10045,7 +10064,7 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-windows@^1.0.1, is-windows@^1.0.2: +is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA== @@ -10601,9 +10620,9 @@ jschardet@^2.1.1: integrity sha512-6I6xT7XN/7sBB7q8ObzKbmv5vN+blzLcboDE1BNEsEfmRXJValMxO6OIRT69ylPBRemS3rw6US+CMCar0OBc9g== jsdom@^16.4.0: - version "16.6.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.6.0.tgz#f79b3786682065492a3da6a60a4695da983805ac" - integrity sha512-Ty1vmF4NHJkolaEmdjtxTfSfkdb8Ywarwf63f+F8/mDD1uLSSWDxDuMiZxiPhwunLrn9LOSVItWj4bLYsLN3Dg== + version "16.7.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710" + integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw== dependencies: abab "^2.0.5" acorn "^8.2.4" @@ -10630,7 +10649,7 @@ jsdom@^16.4.0: whatwg-encoding "^1.0.5" whatwg-mimetype "^2.3.0" whatwg-url "^8.5.0" - ws "^7.4.5" + ws "^7.4.6" xml-name-validator "^3.0.0" jsesc@^1.3.0: @@ -10771,16 +10790,16 @@ jsprim@^1.2.2: verror "1.10.0" jszip@^3.1.5: - version "3.7.0" - resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.0.tgz#9b8b995a4e7c9024653ce743e902076a82fdf4e6" - integrity sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw== + version "3.7.1" + resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9" + integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg== dependencies: lie "~3.3.0" pako "~1.0.2" readable-stream "~2.3.6" set-immediate-shim "~1.0.1" -keytar@7.7.0: +keytar@7.2.0, 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== @@ -11465,7 +11484,7 @@ methods@~1.1.2: resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= -micromatch@3.1.10, micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4: +micromatch@3.1.10, micromatch@^3.1.10, micromatch@^3.1.4: version "3.1.10" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23" integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg== @@ -11647,7 +11666,7 @@ minipass-sized@^1.0.3: dependencies: minipass "^3.0.0" -minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0: +minipass@^2.6.0, minipass@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6" integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg== @@ -11662,7 +11681,7 @@ minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3: dependencies: yallist "^4.0.0" -minizlib@^1.2.1: +minizlib@^1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d" integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q== @@ -11833,9 +11852,9 @@ mute-stream@0.0.8, mute-stream@~0.0.4: integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== nan@^2.12.1, nan@^2.14.0, nan@^2.3.3: - version "2.14.2" - resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19" - integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ== + version "2.15.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" + integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== nanomatch@^1.2.9: version "1.2.13" @@ -12015,10 +12034,10 @@ node-notifier@^8.0.0: uuid "^8.3.0" which "^2.0.2" -node-releases@^1.1.71: - version "1.1.73" - resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20" - integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg== +node-releases@^1.1.73: + version "1.1.74" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.74.tgz#e5866488080ebaa70a93b91144ccde06f3c3463e" + integrity sha512-caJBVempXZPepZoZAPCWRTNxYQ+xtG/KAi4ozTA5A+nJ7IU+kLQCbqaUjb5Rwy14M9upBWiQ4NutcmW04LJSRw== noop-logger@^0.1.1: version "0.1.1" @@ -12303,7 +12322,7 @@ object-hash@^2.0.1: resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5" integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw== -object-inspect@^1.10.3, object-inspect@^1.9.0: +object-inspect@^1.11.0, object-inspect@^1.9.0: version "1.11.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1" integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg== @@ -12811,11 +12830,6 @@ parse-json@^5.0.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-passwd@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" - integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY= - parse-path@^4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.3.tgz#82d81ec3e071dcc4ab49aa9f2c9c0b8966bb22bf" @@ -13411,9 +13425,9 @@ prebuild-install@^5.2.4: 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== + version "6.1.4" + resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.1.4.tgz#ae3c0142ad611d58570b89af4986088a4937e00f" + integrity sha512-Z4vpywnK1lBg+zdPCVCsKq0xO66eEV9rWo2zrROGGiRS4JtueBOdlB1FnY8lcy7JsUud/Q3ijUxyWN26Ika0vQ== dependencies: detect-libc "^1.0.3" expand-template "^2.0.3" @@ -14026,6 +14040,13 @@ rechoir@^0.6.2: dependencies: resolve "^1.1.6" +rechoir@^0.7.0: + version "0.7.1" + resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686" + integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg== + dependencies: + resolve "^1.9.0" + reconnecting-websocket@^4.2.0: version "4.4.0" resolved "https://registry.yarnpkg.com/reconnecting-websocket/-/reconnecting-websocket-4.4.0.tgz#3b0e5b96ef119e78a03135865b8bb0af1b948783" @@ -14276,14 +14297,6 @@ resolve-cwd@^3.0.0: dependencies: resolve-from "^5.0.0" -resolve-dir@^1.0.0, resolve-dir@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" - integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= - dependencies: - expand-tilde "^2.0.0" - global-modules "^1.0.0" - resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" @@ -14304,7 +14317,7 @@ resolve-url@^0.2.1: resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a" integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo= -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.2.0, resolve@^1.20.0, resolve@^1.8.1: +resolve@^1.1.6, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.2.0, resolve@^1.20.0, resolve@^1.8.1, resolve@^1.9.0: version "1.20.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975" integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A== @@ -14394,7 +14407,7 @@ rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2, rimraf@latest: dependencies: glob "^7.1.3" -rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@^2.6.3: +rimraf@^2.5.4, rimraf@^2.6.2, rimraf@^2.6.3: version "2.7.1" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec" integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w== @@ -14410,9 +14423,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: inherits "^2.0.1" rollup@^2.44.0: - version "2.55.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.55.0.tgz#e23bb51194d9706b4661515a14feeefaaa1830c2" - integrity sha512-Atc3QqelKzrKwRkqnSdq0d2Mi8e0iGuL+kZebKMZ4ysyWHD5hw9VfVCAuODIW5837RENV8LXcbAEHurYf+ArvA== + version "2.56.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.56.2.tgz#a045ff3f6af53ee009b5f5016ca3da0329e5470f" + integrity sha512-s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ== optionalDependencies: fsevents "~2.3.2" @@ -14462,7 +14475,7 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== -safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0: +safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@^5.2.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -14768,9 +14781,9 @@ simple-get@^3.0.3: simple-concat "^1.0.0" simple-git@^2.12.0: - version "2.41.1" - resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.41.1.tgz#f7fe8a6183401a2cca36a2f6773db25bf78473ae" - integrity sha512-n1STz1tfnemvYndzWakgKa0JB4s/LrUG4btXMetWB9N9ZoIAJQd0ZtWj9sBwWxIZ/X/tYdA/tq+KHfFNAGzZhQ== + version "2.44.0" + resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-2.44.0.tgz#94eca4162b7e21707b5a1a40b22e6f29b007d3a8" + integrity sha512-wIjcAmymhzgdaM0Y/a+XxmNGlivvHQTPZDYXVmyHMShVDwdeVqu3+OOyDbYu0DnfVzqLs2EOxRTgMNbC3YquwQ== dependencies: "@kwsites/file-exists" "^1.1.1" "@kwsites/promise-deferred" "^1.1.1" @@ -14827,9 +14840,9 @@ slide@^1.1.6: integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc= smart-buffer@^4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba" - integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw== + version "4.2.0" + resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" + integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== smoothscroll-polyfill@^0.4.3: version "0.4.4" @@ -15015,9 +15028,9 @@ spdx-expression-parse@^3.0.0: spdx-license-ids "^3.0.0" spdx-license-ids@^3.0.0: - 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== + version "3.0.10" + resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.10.tgz#0d9becccde7003d6c658d487dd48a32f0bf3014b" + integrity sha512-oie3/+gKf7QtpitB0LYLETe+k8SifzsX4KixvpOsbI6S0kRiRQ5MKOio8eMSAKQ17N06+wdEOXRiId+zOxo0hA== spdy-transport@^3.0.0: version "3.0.0" @@ -15564,22 +15577,22 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^4.0.0, tar@^4.4.12: - version "4.4.15" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.15.tgz#3caced4f39ebd46ddda4d6203d48493a919697f8" - integrity sha512-ItbufpujXkry7bHH9NpQyTXPbJ72iTlXgkBAYsAjDXk3Ds8t/3NfO5P4xZGy7u+sYuQUbimgzswX4uQIEeNVOA== + version "4.4.17" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.17.tgz#44be5e3fa8353ee1d11db3b1401561223a5c3985" + integrity sha512-q7OwXq6NTdcYIa+k58nEMV3j1euhDhGCs/VRw9ymx/PbH0jtIM2+VTgDE/BW3rbLkrBUXs5fzEKgic5oUciu7g== dependencies: - chownr "^1.1.1" - fs-minipass "^1.2.5" - minipass "^2.8.6" - minizlib "^1.2.1" - mkdirp "^0.5.0" - safe-buffer "^5.1.2" - yallist "^3.0.3" + chownr "^1.1.4" + fs-minipass "^1.2.7" + minipass "^2.9.0" + minizlib "^1.3.3" + mkdirp "^0.5.5" + safe-buffer "^5.2.1" + yallist "^3.1.1" tar@^6.0.2, tar@^6.1.0: - version "6.1.2" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.2.tgz#1f045a90a6eb23557a603595f41a16c57d47adc6" - integrity sha512-EwKEgqJ7nJoS+s8QfLYVGMDmAsj+StbI2AM/RTHeUSsOw6Z8bwNBRv5z3CY0m7laC5qUAqruLX5AhMuc5deY3Q== + version "6.1.8" + resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.8.tgz#4fc50cfe56511c538ce15b71e05eebe66530cbd4" + integrity sha512-sb9b0cp855NbkMJcskdSYA7b11Q8JsX4qe4pyUAfHp+Y6jBjJeek2ZVlwEfWayshEIwlIzXx0Fain3QG9JPm2A== dependencies: chownr "^2.0.0" fs-minipass "^2.0.0" @@ -15976,9 +15989,9 @@ tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== 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== + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== tsutils@^3.0.0, tsutils@^3.17.1, tsutils@^3.21.0: version "3.21.0" @@ -16408,7 +16421,7 @@ uuid@^8.0.0, uuid@^8.3.0, uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -v8-compile-cache@^2.0.3, v8-compile-cache@^2.1.1: +v8-compile-cache@^2.0.3, v8-compile-cache@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== @@ -16552,9 +16565,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.8" + resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.9.8.tgz#4b0f602afaf66a996be1e534fb9609dc4ab10e61" + integrity sha512-GwSkxPrihfLR69/dSV3+5CdMQ0D+jXg8Ma1S4nQXKJAznYFX14vHdc/NetQc34Dw+rBbIJyP7JOuVb9Fhprvog== dependencies: "@vue/component-compiler-utils" "^3.1.0" hash-sum "^1.0.2" @@ -16734,22 +16747,24 @@ webpack-chain@^6.0.0: deepmerge "^1.5.2" javascript-stringify "^2.0.1" -webpack-cli@^3.1.1: - version "3.3.12" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.12.tgz#94e9ada081453cd0aa609c99e500012fd3ad2d4a" - integrity sha512-NVWBaz9k839ZH/sinurM+HcDvJOTXwSjYp1ku+5XKeOC03z8v5QitnK/x+lAxGXFyhdayoIf/GOpv85z3/xPag== +webpack-cli@^4.7.0: + version "4.8.0" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.8.0.tgz#5fc3c8b9401d3c8a43e2afceacfa8261962338d1" + integrity sha512-+iBSWsX16uVna5aAYN6/wjhJy1q/GKk4KjKvfg90/6hykCTSgozbfz5iRgDTSJt/LgSbYxdBX3KBHeobIs+ZEw== dependencies: - chalk "^2.4.2" - cross-spawn "^6.0.5" - enhanced-resolve "^4.1.1" - findup-sync "^3.0.0" - global-modules "^2.0.0" - import-local "^2.0.0" - interpret "^1.4.0" - loader-utils "^1.4.0" - supports-color "^6.1.0" - v8-compile-cache "^2.1.1" - yargs "^13.3.2" + "@discoveryjs/json-ext" "^0.5.0" + "@webpack-cli/configtest" "^1.0.4" + "@webpack-cli/info" "^1.3.0" + "@webpack-cli/serve" "^1.5.2" + colorette "^1.2.1" + commander "^7.0.0" + execa "^5.0.0" + fastest-levenshtein "^1.0.12" + import-local "^3.0.2" + interpret "^2.2.0" + rechoir "^0.7.0" + v8-compile-cache "^2.2.0" + webpack-merge "^5.7.3" webpack-dev-middleware@^3.7.2: version "3.7.3" @@ -16816,6 +16831,14 @@ webpack-merge@^4.1.2: dependencies: lodash "^4.17.15" +webpack-merge@^5.7.3: + version "5.8.0" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61" + integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q== + dependencies: + clone-deep "^4.0.1" + wildcard "^2.0.0" + webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" @@ -16824,12 +16847,12 @@ 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-sources@^3.0.1: - version "3.0.2" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.0.2.tgz#29942415daf201a06278f8e2b92e44e564a9288e" - integrity sha512-XQ6aGLmqoxZtmpbgwySGhYLNFav1W6+qgMWPGgn6qScxfGrQgMdigkUqZXQ7oB0ydUrvfs9RRyHaSfV153K8Xg== +webpack-sources@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d" + integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw== -webpack@^4.20.2, webpack@^4.8.1: +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== @@ -16858,10 +16881,10 @@ webpack@^4.20.2, webpack@^4.8.1: watchpack "^1.7.4" webpack-sources "^1.4.1" -webpack@^5.36.2: - version "5.47.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.47.0.tgz#3c13862b5d7b428792bfe76c5f67a0f43ba685f8" - integrity sha512-soKLGwcUM1R3YEbJhJNiZzy7T43TnI7ENda/ywfDp9G1mDlDTpO+qfc8I5b0AzMr9xM3jyvQ0n7ctJyiXuXW6Q== +webpack@^5, webpack@^5.36.2, webpack@^5.48.0: + version "5.50.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.50.0.tgz#5562d75902a749eb4d75131f5627eac3a3192527" + integrity sha512-hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag== dependencies: "@types/eslint-scope" "^3.7.0" "@types/estree" "^0.0.50" @@ -16869,6 +16892,7 @@ webpack@^5.36.2: "@webassemblyjs/wasm-edit" "1.11.1" "@webassemblyjs/wasm-parser" "1.11.1" acorn "^8.4.1" + acorn-import-assertions "^1.7.6" browserslist "^4.14.5" chrome-trace-event "^1.0.2" enhanced-resolve "^5.8.0" @@ -16885,7 +16909,7 @@ webpack@^5.36.2: tapable "^2.1.1" terser-webpack-plugin "^5.1.3" watchpack "^2.2.0" - webpack-sources "^3.0.1" + webpack-sources "^3.2.0" webpackbar@3.2.0: version "3.2.0" @@ -16977,7 +17001,7 @@ which-pm-runs@^1.0.0: resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb" integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs= -which@^1.2.0, which@^1.2.14, which@^1.2.8, which@^1.2.9, which@^1.3.1: +which@^1.2.0, which@^1.2.8, which@^1.2.9, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -17005,6 +17029,11 @@ widest-line@^3.1.0: dependencies: string-width "^4.0.0" +wildcard@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec" + integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw== + word-wrap@^1.2.3, word-wrap@~1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" @@ -17147,7 +17176,7 @@ ws@^6.2.1: dependencies: async-limiter "~1.0.0" -ws@^7.1.2, ws@^7.3.1, ws@^7.4.5: +ws@^7.1.2, ws@^7.3.1, ws@^7.4.6: version "7.5.3" resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== @@ -17243,7 +17272,7 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= -yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3: +yallist@^3.0.0, yallist@^3.0.2, yallist@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g== From 24f40bb267a57c18c53e8b6d23e6919b4da7737e Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Fri, 20 Aug 2021 15:55:11 +0300 Subject: [PATCH 13/28] fix: Use build.include sha commit version of theia during release (#1181) * fix: Use build.include sha commit version of theia during release Signed-off-by: Mykhailo Kuznietsov --- make-release.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/make-release.sh b/make-release.sh index aea75d8d14..cfaefae43f 100755 --- a/make-release.sh +++ b/make-release.sh @@ -62,9 +62,14 @@ if [[ "${BASEBRANCH}" != "${BRANCH}" ]]; then fi apply_files_edits () { - THEIA_VERSION=$(curl --silent http://registry.npmjs.org/-/package/@theia/core/dist-tags | sed 's/.*"next":"\(.*\)".*/\1/') + BUILD_INCLUDE_THEIA_COMMIT_SHA=$(grep -e "^THEIA_COMMIT_SHA=" build.include | cut -d '=' -f2 | tr -d '"') + if [ -z "${BUILD_INCLUDE_THEIA_COMMIT_SHA}"]; then + THEIA_VERSION=$(curl -sSL -H "Accept: application/vnd.npm.install-v1+json" https://registry.npmjs.org/@theia/core | jq -r '.versions | keys[]' | grep "${BUILD_INCLUDE_THEIA_COMMIT_SHA:0:8}") + else + THEIA_VERSION=$(curl -sSL http://registry.npmjs.org/-/package/@theia/core/dist-tags | jq -r '.next') + fi if [[ ! ${THEIA_VERSION} ]] || [[ ${THEIA_VERSION} == \"Unauthorized\" ]]; then - echo "Failed to get Theia next version from npmjs.org. Try again."; echo + echo "Failed to get Theia next version from npmjs.org or from build.include. Try again."; echo exit 1 fi From 1ad19a31b72e1b150987de2e376123e18aa46511 Mon Sep 17 00:00:00 2001 From: Vitaliy Gulyy Date: Wed, 25 Aug 2021 11:05:55 +0300 Subject: [PATCH 14/28] fix(tasks): revert temporary fixup of task reveal - che-theia/pull/1138 (#1199) Signed-off-by: Vitaliy Gulyy --- .../containers-plugin/src/containers-tree-data-provider.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/plugins/containers-plugin/src/containers-tree-data-provider.ts b/plugins/containers-plugin/src/containers-tree-data-provider.ts index 244de9e5a8..44fe405dd0 100644 --- a/plugins/containers-plugin/src/containers-tree-data-provider.ts +++ b/plugins/containers-plugin/src/containers-tree-data-provider.ts @@ -292,9 +292,7 @@ export async function containersTreeTaskLauncherCommandHandler(label: string, co } task.definition.target.containerName = containerName; - // 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); + theia.tasks.executeTask(task); return; } } From 81b2e3a7d41844ec23a57ba15502d2de5cd5b7ac Mon Sep 17 00:00:00 2001 From: RomanNikitenko Date: Tue, 31 Aug 2021 18:25:43 +0300 Subject: [PATCH 15/28] chore: Pin che-theia to the upstream Theia commit (#1205) * chore: Pin che-theia to the upstream Theia commit Signed-off-by: Roman Nikitenko --- build.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.include b/build.include index 0b1ad841f2..2d4d54a4be 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= +THEIA_COMMIT_SHA="9f4f56e388109178dbfed244522bbe49ba474c31" THEIA_GIT_REFS="refs\\/heads\\/master" THEIA_DOCKER_IMAGE_VERSION= From 042927f9ff2f652aa1923785b8407ccec423e441 Mon Sep 17 00:00:00 2001 From: Vitaliy Gulyy Date: Wed, 1 Sep 2021 11:21:12 +0300 Subject: [PATCH 16/28] chore(workspace-plugin): display additional confirmation before cloning a project (#1203) * chore(workspace-plugin): display additional confirmation before cloning a project Signed-off-by: Vitaliy Gulyy --- .../src/browser/che-navigator-widget.tsx | 4 +- .../workspace-plugin/src/theia-commands.ts | 30 ++++++++++++ .../tests/theia-commands.spec.ts | 48 +++++++++++++++++++ 3 files changed, 79 insertions(+), 3 deletions(-) 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 b8e87c3631..c4e4db30bd 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 @@ -100,9 +100,7 @@ export class CheFileNavigatorWidget extends FileNavigatorWidget { }); }; - protected cloneRepo = () => { - return this.commandService.executeCommand('git.clone'); - }; + protected cloneRepo = () => this.commandService.executeCommand('git.clone'); protected async initialize(): Promise { if (!this.devfile) { diff --git a/plugins/workspace-plugin/src/theia-commands.ts b/plugins/workspace-plugin/src/theia-commands.ts index 0f4e23d8ac..8fa34ffaa7 100644 --- a/plugins/workspace-plugin/src/theia-commands.ts +++ b/plugins/workspace-plugin/src/theia-commands.ts @@ -95,7 +95,37 @@ export class TheiaGitCloneCommand implements TheiaImportCommand { ); } + async isTrustedSource(source: string): Promise { + while (true) { + const YES = 'Yes, I trust'; + const NO = "No, I don't trust"; + let action = await theia.window.showWarningMessage(`Do you trust the authors of ${source} ?`, YES, NO); + + if (action === YES) { + return true; + } + + const SKIP = 'Skip'; + const GO_BACK = 'Go Back'; + action = await theia.window.showWarningMessage( + `Cloning of ${this.defaultRemoteLocation} will be skipped`, + SKIP, + GO_BACK + ); + + if (action === GO_BACK) { + continue; + } + + return false; + } + } + async execute(): Promise { + if (!(await this.isTrustedSource(this.defaultRemoteLocation))) { + return Promise.reject(new Error(`Cloning of ${this.defaultRemoteLocation} was skipped`)); + } + if (!git.isSecureGitURI(this.defaultRemoteLocation)) { // clone using regular URI return this.clone(); diff --git a/plugins/workspace-plugin/tests/theia-commands.spec.ts b/plugins/workspace-plugin/tests/theia-commands.spec.ts index 5a986dabc5..489c04e3fc 100644 --- a/plugins/workspace-plugin/tests/theia-commands.spec.ts +++ b/plugins/workspace-plugin/tests/theia-commands.spec.ts @@ -94,6 +94,9 @@ describe('Test theia-commands', () => { theia.window.withProgress = progressFunction; theia.window.showErrorMessage = jest.fn(); theia.window.showInformationMessage = jest.fn(); + theia.window.showWarningMessage = jest + .fn() + .mockImplementation((message: string, ...actions: string[]) => actions[0]); const project: che.devfile.DevfileProject = { name: 'che-theia', @@ -124,4 +127,49 @@ describe('Test theia-commands', () => { 'Project https://github.com/eclipse-che/che-theia.git cloned to /foo/che-theia using default branch which has been reset to che-13112.' ); }); + + test('clone should be skipped', async () => { + (theia as any).ProgressLocation = { + Notification: '', + }; + const progressFunction = jest.fn(); + theia.window.withProgress = progressFunction; + theia.window.showErrorMessage = jest.fn(); + theia.window.showInformationMessage = jest.fn(); + theia.window.showWarningMessage = jest.fn().mockImplementation((message: string, ...actions: string[]) => { + // the answer on the first prompt + const NO = "No, I don't trust"; + if (actions.includes(NO)) { + return NO; + } + + // confirm skipping the cloning + const SKIP = 'Skip'; + if (actions.includes(SKIP)) { + return SKIP; + } + + return undefined; + }); + + const project: che.devfile.DevfileProject = { + name: 'che-theia', + git: { + remotes: { + origin: 'https://github.com/eclipse-che/che-theia.git', + }, + }, + }; + const cloneCommand = new TheiaGitCloneCommand(project, '/foo'); + + try { + await cloneCommand.execute(); + } catch (error) { + expect(error.message).toEqual(`Cloning of ${project.git!.remotes.origin} was skipped`); + expect(progressFunction).not.toBeCalled(); + return; + } + + fail(); + }); }); From 12374cafdbefb2d1565ada53b4ae30a3940853dc Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Thu, 2 Sep 2021 15:47:38 +0300 Subject: [PATCH 17/28] chore: Rename next build job. Send notification of its failure to mattermost (#1209) Signed-off-by: Mykhailo Kuznietsov --- .../{build-publish-next.yml => next-build.yml} | 11 +++++++++++ 1 file changed, 11 insertions(+) rename .github/workflows/{build-publish-next.yml => next-build.yml} (74%) diff --git a/.github/workflows/build-publish-next.yml b/.github/workflows/next-build.yml similarity index 74% rename from .github/workflows/build-publish-next.yml rename to .github/workflows/next-build.yml index b56e61b62b..c876462c22 100644 --- a/.github/workflows/build-publish-next.yml +++ b/.github/workflows/next-build.yml @@ -47,3 +47,14 @@ jobs: run: printf "//registry.npmjs.org/:_authToken=${{ secrets.CHE_NPM_AUTH_TOKEN }}\n" >> ~/.npmrc - name: Publish packages to npmjs run: yarn publish:next + - name: Create failure MM message + if: ${{ failure() }} + run: | + echo "{\"text\":\":no_entry_sign: Next Che Theia build has failed: https://github.com/eclipse-che/che-theia/actions/workflows/next-build.yml\"}" > mattermost.json + - name: Send MM message + if: ${{ failure() }} + uses: mattermost/action-mattermost-notify@1.1.0 + env: + MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }} + MATTERMOST_CHANNEL: eclipse-che-ci + MATTERMOST_USERNAME: che-bot From a5dd6b65b135e6453322600ae062abf230134fd8 Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Thu, 2 Sep 2021 17:02:21 +0300 Subject: [PATCH 18/28] chore: Add an item to GitHub Pull Request template to remind the contributor about the PR for HappyPath tests (#1210) * chore: Add an item to GitHub Pull Request template to remind the contributor about the PR for HappyPath tests Signed-off-by: Artem Zatsarynnyi * Update .github/PULL_REQUEST_TEMPLATE.md Co-authored-by: Florent BENOIT --- .github/PULL_REQUEST_TEMPLATE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a4276c53c3..fdb51a1232 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -37,6 +37,8 @@ Pull Request Policy: https://github.com/eclipse/che/wiki/Development-Workflow#pu - [ ] [Relevant user documentation updated](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#relevant-contributing-documentation-updated) - [ ] [Relevant contributing documentation updated](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#relevant-contributing-documentation-updated) - [ ] [CI/CD changes implemented, documented and communicated](https://github.com/eclipse/che/blob/master/CONTRIBUTING.md#cicd-changes-implemented-documented-and-communicated) +- [ ] Optional Companion PR for updating the HappyPath tests is approved and ready to be merged + ### Reviewers From 3a549bd20cdec9b8cef0125e391ab15482a1c0fb Mon Sep 17 00:00:00 2001 From: Florent Benoit Date: Thu, 2 Sep 2021 17:39:03 +0200 Subject: [PATCH 19/28] fix: use internal service name instead of public URL if set Change-Id: I4c24c12d7077191c676e8b77109b52d745aa8889 Signed-off-by: Florent Benoit --- .../theia-vsix-installer/src/entrypoint.sh | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dockerfiles/theia-vsix-installer/src/entrypoint.sh b/dockerfiles/theia-vsix-installer/src/entrypoint.sh index d872f05a09..00c3fa4d3a 100755 --- a/dockerfiles/theia-vsix-installer/src/entrypoint.sh +++ b/dockerfiles/theia-vsix-installer/src/entrypoint.sh @@ -20,18 +20,26 @@ for container in $(echo "$WORKSPACE" | sed -e 's|[[,]\({"attributes":{"app.kuber mkdir -p "$dest" unset IFS for url in $(echo "$urls" | sed 's/[",]/ /g' - ); do + CURL_OPTIONS="" # check if URL starts with relative:extension/ # example of url: "relative:extension/resources/download_jboss_org/jbosstools/static/jdt_ls/stable/java-0.75.0-60.vsix if [[ "$url" =~ ^relative:extension/.* ]]; then - # if there is no CHE_PLUGIN_REGISTRY_URL env var, skip - if [ -z "${CHE_PLUGIN_REGISTRY_URL}" ]; then - echo "CHE_PLUGIN_REGISTRY_URL env var is not set, skipping relative url ${url}" + # if there is CHE_PLUGIN_REGISTRY_INTERNAL_URL env var, use it + if [ -n "$CHE_PLUGIN_REGISTRY_INTERNAL_URL" ]; then + # update URL by using the Plugin Registry internal URL as prefix + url=${CHE_PLUGIN_REGISTRY_INTERNAL_URL}/${url#relative:extension/} + elif [ -n "$CHE_PLUGIN_REGISTRY_URL" ]; then + # if there is CHE_PLUGIN_REGISTRY_URL env var, use it but also use insecure + # options as we don't have all certificates in a devWorkspace for now + CURL_OPTIONS="--insecure" + # update URL by using the Plugin Registry internal URL as prefix + url=${CHE_PLUGIN_REGISTRY_URL}/${url#relative:extension/} + else + echo "no plugin registry URL env var is set (CHE_PLUGIN_REGISTRY_INTERNAL_URL or CHE_PLUGIN_REGISTRY_URL), skipping relative url ${url}" continue fi - # update URL by using the Plugin Registry URL as prefix - url=${CHE_PLUGIN_REGISTRY_URL}/${url#relative:extension/} fi echo; echo "downloading $urls to $dest" - curl -L "$url" > "$dest/$(basename "$url")" + curl ${CURL_OPTIONS} -L "$url" > "$dest/$(basename "$url")" done done From 43844d53ab9e213d5bbd1b7eb9cf6240cbb722a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=A4der?= Date: Fri, 3 Sep 2021 13:09:18 +0200 Subject: [PATCH 20/28] Add process package dependency (#1212) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thomas Mäder --- generator/src/templates/assembly-package.mst.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generator/src/templates/assembly-package.mst.json b/generator/src/templates/assembly-package.mst.json index 7d5693373b..5cab5489e4 100644 --- a/generator/src/templates/assembly-package.mst.json +++ b/generator/src/templates/assembly-package.mst.json @@ -53,7 +53,6 @@ "style-loader": "^2.0.0", "umd-compat-loader": "^2.1.2", "webpack": "^5.36.2", - "webpack-cli": "^4.7.0", "worker-loader": "^3.0.8", "async-limiter": "^2.0.0" @@ -83,6 +82,7 @@ "@theia/compression-webpack-plugin": "^3.0.0", "circular-dependency-plugin": "^5.2.2", "copy-webpack-plugin": "^8.1.1", - "webpack-cli": "^4.7.0" + "webpack-cli": "^4.7.0", + "process": "^0.11.10" } } From 0fafc3f8e541ee4aed7dc24701a2fe12efd9217b Mon Sep 17 00:00:00 2001 From: Artem Zatsarynnyi Date: Fri, 3 Sep 2021 15:49:05 +0300 Subject: [PATCH 21/28] Enable CDN support for PR build check (#1208) * Enable CDN support for PR build check Signed-off-by: Artem Zatsarynnyi --- .github/workflows/pr-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 0c60a16041..03c23303f8 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -48,3 +48,7 @@ jobs: docker pull quay.io/eclipse/che-theia-dev:next docker tag quay.io/eclipse/che-theia-dev:next eclipse/che-theia-dev:next ./build.sh --root-yarn-opts:--ignore-scripts --dockerfile:Dockerfile.${{matrix.dist}} + # use CDN to make sure we're testing our webpack customizer properly + env: + CDN_PREFIX: https://static.developers.redhat.com/che/theia_artifacts/ + MONACO_CDN_PREFIX: https://cdn.jsdelivr.net/npm/ From 2dc9aeddc2fda89e33db0f6929a840791d908fa6 Mon Sep 17 00:00:00 2001 From: Mykhailo Kuznietsov Date: Tue, 7 Sep 2021 14:22:05 +0300 Subject: [PATCH 22/28] fix: fix GH Actions workflows sending notification on failure (#1214) * fix: fix GH Actions workflows sending notification on failure Signed-off-by: Mykhailo Kuznietsov --- .github/workflows/next-build.yml | 10 ++++++++-- .github/workflows/release.yml | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/next-build.yml b/.github/workflows/next-build.yml index c876462c22..c086bf65a4 100644 --- a/.github/workflows/next-build.yml +++ b/.github/workflows/next-build.yml @@ -10,6 +10,7 @@ name: Build & Publish `next` on: + workflow_dispatch: push: branches: - main @@ -47,14 +48,19 @@ jobs: run: printf "//registry.npmjs.org/:_authToken=${{ secrets.CHE_NPM_AUTH_TOKEN }}\n" >> ~/.npmrc - name: Publish packages to npmjs run: yarn publish:next + notify: + runs-on: ubuntu-20.04 + needs: build + if: always() && (needs.build.result == 'failure') + steps: - name: Create failure MM message if: ${{ failure() }} run: | echo "{\"text\":\":no_entry_sign: Next Che Theia build has failed: https://github.com/eclipse-che/che-theia/actions/workflows/next-build.yml\"}" > mattermost.json - name: Send MM message - if: ${{ failure() }} + if: ${{ success() }} || ${{ failure() }} uses: mattermost/action-mattermost-notify@1.1.0 env: MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }} - MATTERMOST_CHANNEL: eclipse-che-ci + MATTERMOST_CHANNEL: eclipse-che-releases MATTERMOST_USERNAME: che-bot diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c7b2181932..bd8ac6c598 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -89,6 +89,7 @@ jobs: notify: runs-on: ubuntu-20.04 needs: build + if: always() && ((needs.build.result == 'failure') || (needs.build.result == 'success')) steps: - name: Create failure MM message if: ${{ failure() }} From 65d90f2afb17b2e3188d2a5fb344b0395be9dfc2 Mon Sep 17 00:00:00 2001 From: Florent Benoit Date: Tue, 7 Sep 2021 09:25:22 +0200 Subject: [PATCH 23/28] chore(tsconfig): Use upper configuration instead of a custom one Change-Id: I0fd532e6e2012d61d7ce03bf089ccc47dd827814 Signed-off-by: Florent Benoit --- plugins/recommendations-plugin/tsconfig.json | 43 +++++++------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/plugins/recommendations-plugin/tsconfig.json b/plugins/recommendations-plugin/tsconfig.json index 42dfd02086..b0fe3c1cd0 100644 --- a/plugins/recommendations-plugin/tsconfig.json +++ b/plugins/recommendations-plugin/tsconfig.json @@ -1,33 +1,18 @@ { + "extends": "../../configs/base.tsconfig", "compilerOptions": { - "target": "es6", - "module": "commonjs", - "moduleResolution": "node", - "outDir": "./lib", - "sourceMap": true, - "noEmitOnError": true, - "noImplicitReturns" : true, - "noImplicitThis": true, - "noUnusedLocals": false, - "removeComments": true, - "noFallthroughCasesInSwitch": true, - "strict": true, - "strictPropertyInitialization": false, - "skipLibCheck": true, - "skipDefaultLibCheck": true, - "types": ["node", "reflect-metadata", "jest"], - "experimentalDecorators": true, - "emitDecoratorMetadata": true, - "lib": [ - "es6" - ], - } - , + "lib": [ + "es6", + "webworker" + ], + "sourceMap": true, + "rootDir": "src", + "outDir": "lib", + "types": [ + "node", "jest" + ] + }, "include": [ - "src/**/*" + "src" ] - , - "exclude": [ - "node_modules", - ] - } +} From cf562f10ee600be388fc10fe9df3864be61a360e Mon Sep 17 00:00:00 2001 From: Florent Benoit Date: Tue, 7 Sep 2021 09:25:54 +0200 Subject: [PATCH 24/28] chore(cleanup): Remove unused code Change-Id: I8e7a2a8d5a8feb04b9f91457d297e6a0d5ee0f29 Signed-off-by: Florent Benoit --- plugins/recommendations-plugin/src/devfile/devfile-handler.ts | 1 - .../recommendations-plugin/src/registry/che-plugin-registry.ts | 1 - .../tests/find/find-file-extensions.spec.ts | 3 --- .../tests/strategy/recommend-plugin-open-file-strategy.spec.ts | 1 - 4 files changed, 6 deletions(-) diff --git a/plugins/recommendations-plugin/src/devfile/devfile-handler.ts b/plugins/recommendations-plugin/src/devfile/devfile-handler.ts index 32dfac2caf..659d0dc8f7 100644 --- a/plugins/recommendations-plugin/src/devfile/devfile-handler.ts +++ b/plugins/recommendations-plugin/src/devfile/devfile-handler.ts @@ -8,7 +8,6 @@ * SPDX-License-Identifier: EPL-2.0 ***********************************************************************/ import * as che from '@eclipse-che/plugin'; -import * as theia from '@theia/plugin'; import { che as cheApi } from '@eclipse-che/api'; import { injectable } from 'inversify'; diff --git a/plugins/recommendations-plugin/src/registry/che-plugin-registry.ts b/plugins/recommendations-plugin/src/registry/che-plugin-registry.ts index 1c7dfc1be4..02c8258247 100644 --- a/plugins/recommendations-plugin/src/registry/che-plugin-registry.ts +++ b/plugins/recommendations-plugin/src/registry/che-plugin-registry.ts @@ -9,7 +9,6 @@ ***********************************************************************/ import * as che from '@eclipse-che/plugin'; -import * as theia from '@theia/plugin'; import { injectable, postConstruct } from 'inversify'; 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 328b49c4e8..e8727500e5 100644 --- a/plugins/recommendations-plugin/tests/find/find-file-extensions.spec.ts +++ b/plugins/recommendations-plugin/tests/find/find-file-extensions.spec.ts @@ -11,8 +11,6 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import 'reflect-metadata'; -import * as globby from 'globby'; -import * as path from 'path'; import * as theia from '@theia/plugin'; import { Container } from 'inversify'; @@ -30,7 +28,6 @@ describe('Test FindFile implementation', () => { 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, })); diff --git a/plugins/recommendations-plugin/tests/strategy/recommend-plugin-open-file-strategy.spec.ts b/plugins/recommendations-plugin/tests/strategy/recommend-plugin-open-file-strategy.spec.ts index dd75e6e1f8..4f90c5b7f8 100644 --- a/plugins/recommendations-plugin/tests/strategy/recommend-plugin-open-file-strategy.spec.ts +++ b/plugins/recommendations-plugin/tests/strategy/recommend-plugin-open-file-strategy.spec.ts @@ -32,7 +32,6 @@ describe('Test RecommendPluginOpenFileStrategy', () => { vscodeExtensionByLanguageId, }; - const installPluginsMock = jest.fn(); const fetchMethodMock = jest.fn(); const pluginsByLanguageFetcher = { fetch: fetchMethodMock, From 8514e58039a266dcd827c85b483b081b21f14983 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Sep 2021 00:51:01 +0000 Subject: [PATCH 25/28] build(deps): bump tar from 4.4.17 to 4.4.19 Bumps [tar](https://github.com/npm/node-tar) from 4.4.17 to 4.4.19. - [Release notes](https://github.com/npm/node-tar/releases) - [Changelog](https://github.com/npm/node-tar/blob/main/CHANGELOG.md) - [Commits](https://github.com/npm/node-tar/compare/v4.4.17...v4.4.19) --- updated-dependencies: - dependency-name: tar dependency-type: indirect ... Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index b827cc89a3..14eebf0b4a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -15577,9 +15577,9 @@ tar-stream@^2.1.4: readable-stream "^3.1.1" tar@^4.0.0, tar@^4.4.12: - version "4.4.17" - resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.17.tgz#44be5e3fa8353ee1d11db3b1401561223a5c3985" - integrity sha512-q7OwXq6NTdcYIa+k58nEMV3j1euhDhGCs/VRw9ymx/PbH0jtIM2+VTgDE/BW3rbLkrBUXs5fzEKgic5oUciu7g== + version "4.4.19" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.19.tgz#2e4d7263df26f2b914dee10c825ab132123742f3" + integrity sha512-a20gEsvHnWe0ygBY8JbxoM4w3SJdhc7ZAuxkLqh+nvNQN2IOt0B5lLgM490X5Hl8FF0dl0tOf2ewFYAlIFgzVA== dependencies: chownr "^1.1.4" fs-minipass "^1.2.7" From 277e9188a69666594b1bf27ee17a16df033e1d7a Mon Sep 17 00:00:00 2001 From: vibhutisawant <41043754+vibhutisawant@users.noreply.github.com> Date: Mon, 13 Sep 2021 19:06:53 +0530 Subject: [PATCH 26/28] feat(CI): Add Travis CI support (#1127) * feat(CI): Adds Travis CI support Signed-off-by: vibhutisawant * Adds travis suffix and removes workflows handled on GA * feat(CI): Implements review comments -Added SHA1_SUFFIX to build.include to differentiate between GA and Travis builds. -Added copyright header -Moved publish_multiarch.sh to .ci directory -Removed $TRAVIS-TAG variable from build files * syncing PR #1127 with PR #1197 --- .ci/travis/publish_multiarch.sh | 39 +++++ .github/workflows/check-theia-branch.yml | 27 ++++ .github/workflows/next-build.yml | 20 +++ .github/workflows/pr-build.yml | 24 +++ .github/workflows/release.yml | 26 +++ .travis.yml | 196 +++++++++++++++++++++++ build.include | 4 + build.sh | 13 ++ 8 files changed, 349 insertions(+) create mode 100755 .ci/travis/publish_multiarch.sh create mode 100644 .travis.yml diff --git a/.ci/travis/publish_multiarch.sh b/.ci/travis/publish_multiarch.sh new file mode 100755 index 0000000000..461a84607a --- /dev/null +++ b/.ci/travis/publish_multiarch.sh @@ -0,0 +1,39 @@ +#!/bin/bash +# +# 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 +# +# See: https://sipb.mit.edu/doc/safe-shell/ +set -e + +PUBLISH_IMAGES_LIST=( + che-theia-dev + che-theia + che-theia-endpoint-runtime-binary + che-theia-vsix-installer +) + +for image in "${PUBLISH_IMAGES_LIST[@]}"; do + the_image="${REGISTRY}/${ORGANIZATION}/${image}" + AMEND="" + AMEND+=" --amend ${the_image}:${TAG}-amd64"; + AMEND+=" --amend ${the_image}:${TAG}-arm64"; + AMEND+=" --amend ${the_image}:${TAG}-ppc64le"; + AMEND+=" --amend ${the_image}:${TAG}-s390x"; + + # Create manifest and push multiarch image + eval docker manifest create "${the_image}:${TAG}" "$AMEND" + docker manifest push "${the_image}:${TAG}" + + if [[ "${TAG}" == "next-travis" ]]; then + eval docker manifest create "${the_image}:${SHORT_SHA}" "$AMEND" + docker manifest push "${the_image}:${SHORT_SHA}" + else + eval docker manifest create "${the_image}:latest-travis" "$AMEND" + docker manifest push "${the_image}:latest-travis" + fi +done diff --git a/.github/workflows/check-theia-branch.yml b/.github/workflows/check-theia-branch.yml index 3c1dd0564b..443b96ffc6 100644 --- a/.github/workflows/check-theia-branch.yml +++ b/.github/workflows/check-theia-branch.yml @@ -38,3 +38,30 @@ jobs: docker pull quay.io/eclipse/che-theia-dev:next docker tag quay.io/eclipse/che-theia-dev:next eclipse/che-theia-dev:next ./build.sh --root-yarn-opts:--ignore-scripts --dockerfile:Dockerfile.alpine --build-args:THEIA_GITHUB_REPO=${{ github.event.inputs.theia_github_repo }} --branch:${{ github.event.inputs.theia_branch }} + + # TODO: uncomment this when we're happy that travis is working for PRs + # travis-build: + # runs-on: ubuntu-latest + # continue-on-error: true + # steps: + # - name: Trigger build on Travis CI + # run: | + # body="{ + # \"request\":{ + # \"config\": { + # \"env\": { + # \"global\": [ + # \"THEIA_GITHUB_REPO=${{ github.event.inputs.theia_github_repo }}\", + # \"THEIA_BRANCH=${{ github.event.inputs.theia_branch }}\" + # ] + # } + # } + # }}" + + # curl -s -X POST \ + # -H "Content-Type: application/json" \ + # -H "Accept: application/json" \ + # -H "Travis-API-Version: 3" \ + # -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \ + # -d "$body" \ + # https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests diff --git a/.github/workflows/next-build.yml b/.github/workflows/next-build.yml index c086bf65a4..6556255e57 100644 --- a/.github/workflows/next-build.yml +++ b/.github/workflows/next-build.yml @@ -64,3 +64,23 @@ jobs: MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }} MATTERMOST_CHANNEL: eclipse-che-releases MATTERMOST_USERNAME: che-bot + + # TODO: uncomment this when we're happy that travis is working for PRs + # travis-build: + # runs-on: ubuntu-latest + # continue-on-error: true + # steps: + # - name: Trigger build on Travis CI + # run: | + # body="{ + # \"request\":{ + # \"branch\":\"main\" + # }}" + + # curl -s -X POST \ + # -H "Content-Type: application/json" \ + # -H "Accept: application/json" \ + # -H "Travis-API-Version: 3" \ + # -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \ + # -d "$body" \ + # https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index 03c23303f8..cd971738fd 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -52,3 +52,27 @@ jobs: env: CDN_PREFIX: https://static.developers.redhat.com/che/theia_artifacts/ MONACO_CDN_PREFIX: https://cdn.jsdelivr.net/npm/ + + travis-build: + runs-on: ubuntu-latest + continue-on-error: true + steps: + - name: Trigger build on Travis CI + run: | + body="{ + \"request\":{ + \"config\": { + \"env\": { + \"global\": [ + \"PR_NUMBER=${{ github.event.pull_request.number }}\" + ] + } + } + }}" + curl -s -X POST \ + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -H "Travis-API-Version: 3" \ + -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \ + -d "$body" \ + https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bd8ac6c598..73daf71329 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -105,3 +105,29 @@ jobs: MATTERMOST_WEBHOOK_URL: ${{ secrets.MATTERMOST_WEBHOOK_URL }} MATTERMOST_CHANNEL: eclipse-che-releases MATTERMOST_USERNAME: che-bot + # TODO: uncomment this when we're happy that travis is working for PRs + # travis-release: + # needs: build + # runs-on: ubuntu-latest + # continue-on-error: true + # steps: + # - name: Trigger build on Travis CI + # run: | + # body="{ + # \"request\":{ + # \"config\": { + # \"env\": { + # \"global\": [ + # \"TAG=${{ github.event.inputs.version }}\" + # ] + # } + # } + # }}" + + # curl -s -X POST \ + # -H "Content-Type: application/json" \ + # -H "Accept: application/json" \ + # -H "Travis-API-Version: 3" \ + # -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \ + # -d "$body" \ + # https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..cf017f1cfd --- /dev/null +++ b/.travis.yml @@ -0,0 +1,196 @@ +# +# 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 + +# Che-Theia workflow +dist: focal +os: linux +cache: false +git: + depth: false + +language: node_js +node_js: "12.20.0" + +before_install: + - | + if [[ "${TRAVIS_CPU_ARCH}" == "ppc64le" ]]; then + # fix cpu count to avoid OOM failure + cat /proc/stat > /tmp/stat + sed -i '/^cpu[4-9]/d' /tmp/stat + sed -i '/^cpu[0-9][0-9]/d' /tmp/stat + sudo mount --bind /tmp/stat /proc/stat + fi +install: + # TODO when we're confident that sha-tagged travis-built images won't collide with GHA built ones, we can remove the -travis suffix here + - export SHORT_SHA=$(git rev-parse --short HEAD)-travis + - export GITHUB_TOKEN="$CHE_BOT_GITHUB_TOKEN" + - echo "$RH_CHE_AUTOMATION_DOCKERHUB_PASSWORD" | docker login -u "$RH_CHE_AUTOMATION_DOCKERHUB_USERNAME" --password-stdin + - echo "$QUAY_ECLIPSE_CHE_PASSWORD" | docker login quay.io -u "$QUAY_ECLIPSE_CHE_USERNAME" --password-stdin + +env: + global: + - TAG=next-travis + - REGISTRY=quay.io + - ORGANIZATION=eclipse + - PR_NUMBER= + +jobs: + fast_finish: true + allow_failures: + - if: env(PR_NUMBER) IS present + arch: arm64-graviton2 + - if: env(PR_NUMBER) IS present + arch: ppc64le + - if: env(PR_NUMBER) IS present + arch: s390x + include: + - &node-build + stage: PR Check + name: Node Build on amd64 + if: env(PR_NUMBER) IS present + arch: amd64 + install: + - sudo apt-get update && sudo apt-get install -y libsecret-1-dev + - git fetch origin +refs/pull/${PR_NUMBER}/merge + - git checkout -qf FETCH_HEAD + script: yarn + - <<: *node-build + name: Node Build on arm64 + arch: arm64-graviton2 + group: edge + virt: vm + - <<: *node-build + name: Node Build on ppc64le + arch: ppc64le + - <<: *node-build + name: Node Build on s390x + arch: s390x + - &docker-build + if: env(PR_NUMBER) IS present + name: Docker build (Alpine) on amd64 + arch: amd64 + env: DIST=alpine + install: + - git fetch origin +refs/pull/${PR_NUMBER}/merge + - git checkout -qf FETCH_HEAD + script: + - | + set -e + docker image prune -a -f + docker pull quay.io/eclipse/che-theia-dev:next-travis + docker tag quay.io/eclipse/che-theia-dev:next-travis eclipse/che-theia-dev:next-travis + TAG=$TAG-${TRAVIS_CPU_ARCH} ./build.sh --root-yarn-opts:--ignore-scripts --dockerfile:Dockerfile.$DIST + - <<: *docker-build + name: Docker build (Alpine) on arm64 + arch: arm64-graviton2 + group: edge + virt: vm + - <<: *docker-build + name: Docker build (Alpine) on ppc64le + arch: ppc64le + - <<: *docker-build + name: Docker build (Alpine) on s390x + arch: s390x + - <<: *docker-build + name: Docker build (ubi8) on amd64 + arch: amd64 + env: DIST=ubi8 + - <<: *docker-build + name: Docker build (ubi8) on arm64 + arch: arm64-graviton2 + group: edge + virt: vm + env: DIST=ubi8 + - <<: *docker-build + name: Docker build (ubi8) on ppc64le + arch: ppc64le + env: DIST=ubi8 + - <<: *docker-build + name: Docker build (ubi8) on s390x + arch: s390x + env: DIST=ubi8 + + - &build-and-push-next + stage: Build & Publish 'next-travis' + name: Build & Publish image on amd64 + if: type = api AND branch = main AND env(TAG) = "next-travis" AND env(THEIA_GITHUB_REPO) IS blank AND env(PR_NUMBER) IS blank + arch: amd64 + script: + - | + set -e + docker image prune -a -f + SUFFIX=travis-${TRAVIS_CPU_ARCH} TAG=$TAG-${TRAVIS_CPU_ARCH} ./build.sh --root-yarn-opts:--ignore-scripts --dockerfile:Dockerfile.alpine --push + - <<: *build-and-push-next + arch: arm64-graviton2 + group: edge + virt: vm + name: Build & Publish image on arm64 + - <<: *build-and-push-next + arch: ppc64le + name: Build & Publish image on ppc64le + - <<: *build-and-push-next + arch: s390x + name: Build & Publish image on s390x + + - stage: Publish multiarch image with 'next-travis' tag + if: type = api AND branch = main AND env(TAG) = "next-travis" AND env(THEIA_GITHUB_REPO) IS blank AND env(PR_NUMBER) IS blank + name: Publish multiarch image with next-travis tag + script: .ci/travis/publish_multiarch.sh + + - &check-a-theia-branch + stage: Check a Theia branch + name: Build an image against Theia branch on amd64 + arch: amd64 + if: type = api AND env(THEIA_GITHUB_REPO) AND env(THEIA_BRANCH) + script: + - | + set -e + docker image prune -a -f + docker pull quay.io/eclipse/che-theia-dev:next-travis + docker tag quay.io/eclipse/che-theia-dev:next-travis eclipse/che-theia-dev:next-travis + TAG=$TAG-${TRAVIS_CPU_ARCH} ./build.sh --root-yarn-opts:--ignore-scripts --dockerfile:Dockerfile.alpine --build-args:THEIA_GITHUB_REPO=${THEIA_GITHUB_REPO} --branch:${THEIA_BRANCH} + - <<: *check-a-theia-branch + arch: arm64-graviton2 + group: edge + virt: vm + name: Build an image against Theia branch on arm64 + - <<: *check-a-theia-branch + arch: ppc64le + name: Build an image against Theia branch on ppc64le + - <<: *check-a-theia-branch + arch: s390x + name: Build an image against Theia branch on s390x + + #Release Workflow + - &release-che-theia + stage: Release che-theia + name: Build and publish image on amd64 + if: type = api AND env(TAG) IS present AND env(TAG) != "next-travis" + arch: amd64 + script: + - | + BRANCH=${TAG%.*}.x + git checkout "${BRANCH}" + TAG=$TAG-travis + docker image prune -a -f + SUFFIX=travis-${TRAVIS_CPU_ARCH} TAG=$TAG-${TRAVIS_CPU_ARCH} ./build.sh --root-yarn-opts:--ignore-scripts --dockerfile:Dockerfile.alpine --push + - <<: *release-che-theia + arch: arm64-graviton2 + group: edge + virt: vm + name: Build and publish image on arm64 + - <<: *release-che-theia + arch: ppc64le + name: Build and publish image on ppc64le + - <<: *release-che-theia + arch: s390x + name: Build and publish image on s390x + + - stage: Publish multiarch image + if: type = api AND env(TAG) IS present AND env(TAG) != "next-travis" + script: TAG=$TAG-travis .ci/travis/publish_multiarch.sh diff --git a/build.include b/build.include index 2d4d54a4be..5791f13c64 100644 --- a/build.include +++ b/build.include @@ -17,6 +17,7 @@ THEIA_BRANCH="master" THEIA_COMMIT_SHA="9f4f56e388109178dbfed244522bbe49ba474c31" THEIA_GIT_REFS="refs\\/heads\\/master" THEIA_DOCKER_IMAGE_VERSION= +SHA1_SUFFIX= prepare_yarn_root_args() { IFS=',' read -r -a YARN_ARGS_ARRAY <<< "$@" @@ -109,6 +110,9 @@ publishImages() { echo y | docker push "${REGISTRY}/${image}:${THEIA_DOCKER_IMAGE_VERSION}" else SHORT_SHA=$(git rev-parse --short HEAD) + if [[ -n "${SHA1_SUFFIX}" ]]; then + SHORT_SHA=${SHORT_SHA}-${SHA1_SUFFIX} + fi echo "Publishing ${image}:${SHORT_SHA}..." docker tag "${image}:${IMAGE_TAG}" "${REGISTRY}/${image}:${SHORT_SHA}" echo y | docker push "${REGISTRY}/${image}:${SHORT_SHA}" diff --git a/build.sh b/build.sh index cc895334d1..77b7fe6587 100755 --- a/build.sh +++ b/build.sh @@ -15,6 +15,19 @@ set -o pipefail parse "$@" yarn ${YARN_OPTS} +#Added to handle experimental Travis tag +if [[ -n "${TAG:-}" ]]; then + if [[ -z "${THEIA_DOCKER_IMAGE_VERSION}" ]]; then + IMAGE_TAG=$TAG + if [[ -n "${SUFFIX:-}" ]] && [[ -z "${SHA1_SUFFIX}" ]]; then + SHA1_SUFFIX=$SUFFIX + fi + else + IMAGE_TAG=$IMAGE_TAG-$SUFFIX + THEIA_DOCKER_IMAGE_VERSION=$TAG + fi +fi + buildImages if is_publish_images; then From e50576e0028b44fe46f8e572abdd0a0f0017dbbd Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Mon, 13 Sep 2021 16:15:09 -0300 Subject: [PATCH 27/28] chore: Per Florent's explanation, let's tag if can pull; else skip. This is just a performance enhancement to reuse unchanged layers when building che-theia-dev, not an indicator to SKIP the che-theia-dev build. (#1216) Change-Id: I9bd488c936026b8fd26cd21b8301a81fc022a61f Signed-off-by: nickboldt --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cf017f1cfd..5bdbb675f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -82,8 +82,8 @@ jobs: - | set -e docker image prune -a -f - docker pull quay.io/eclipse/che-theia-dev:next-travis - docker tag quay.io/eclipse/che-theia-dev:next-travis eclipse/che-theia-dev:next-travis + docker pull quay.io/eclipse/che-theia-dev:next-travis && \ + docker tag quay.io/eclipse/che-theia-dev:next-travis eclipse/che-theia-dev:next-travis || true TAG=$TAG-${TRAVIS_CPU_ARCH} ./build.sh --root-yarn-opts:--ignore-scripts --dockerfile:Dockerfile.$DIST - <<: *docker-build name: Docker build (Alpine) on arm64 From f85127cc2f697967338c786ac0edd5e0608a9376 Mon Sep 17 00:00:00 2001 From: Nick Boldt Date: Thu, 16 Sep 2021 08:53:31 -0300 Subject: [PATCH 28/28] chore: since PR check working, enable travis for next-build and check-theia-branch (#1218) Change-Id: Ia838ca3eeefc16b05dfdb6c7e9b81d803a06137d Signed-off-by: nickboldt --- .github/workflows/check-theia-branch.yml | 49 ++++++++++++------------ .github/workflows/next-build.yml | 35 ++++++++--------- 2 files changed, 41 insertions(+), 43 deletions(-) diff --git a/.github/workflows/check-theia-branch.yml b/.github/workflows/check-theia-branch.yml index 443b96ffc6..bde43e71ee 100644 --- a/.github/workflows/check-theia-branch.yml +++ b/.github/workflows/check-theia-branch.yml @@ -39,29 +39,28 @@ jobs: docker tag quay.io/eclipse/che-theia-dev:next eclipse/che-theia-dev:next ./build.sh --root-yarn-opts:--ignore-scripts --dockerfile:Dockerfile.alpine --build-args:THEIA_GITHUB_REPO=${{ github.event.inputs.theia_github_repo }} --branch:${{ github.event.inputs.theia_branch }} - # TODO: uncomment this when we're happy that travis is working for PRs - # travis-build: - # runs-on: ubuntu-latest - # continue-on-error: true - # steps: - # - name: Trigger build on Travis CI - # run: | - # body="{ - # \"request\":{ - # \"config\": { - # \"env\": { - # \"global\": [ - # \"THEIA_GITHUB_REPO=${{ github.event.inputs.theia_github_repo }}\", - # \"THEIA_BRANCH=${{ github.event.inputs.theia_branch }}\" - # ] - # } - # } - # }}" + travis-build: + runs-on: ubuntu-latest + continue-on-error: true + steps: + - name: Trigger build on Travis CI + run: | + body="{ + \"request\":{ + \"config\": { + \"env\": { + \"global\": [ + \"THEIA_GITHUB_REPO=${{ github.event.inputs.theia_github_repo }}\", + \"THEIA_BRANCH=${{ github.event.inputs.theia_branch }}\" + ] + } + } + }}" - # curl -s -X POST \ - # -H "Content-Type: application/json" \ - # -H "Accept: application/json" \ - # -H "Travis-API-Version: 3" \ - # -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \ - # -d "$body" \ - # https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests + curl -s -X POST \ + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -H "Travis-API-Version: 3" \ + -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \ + -d "$body" \ + https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests diff --git a/.github/workflows/next-build.yml b/.github/workflows/next-build.yml index 6556255e57..8d1737e400 100644 --- a/.github/workflows/next-build.yml +++ b/.github/workflows/next-build.yml @@ -65,22 +65,21 @@ jobs: MATTERMOST_CHANNEL: eclipse-che-releases MATTERMOST_USERNAME: che-bot - # TODO: uncomment this when we're happy that travis is working for PRs - # travis-build: - # runs-on: ubuntu-latest - # continue-on-error: true - # steps: - # - name: Trigger build on Travis CI - # run: | - # body="{ - # \"request\":{ - # \"branch\":\"main\" - # }}" + travis-build: + runs-on: ubuntu-latest + continue-on-error: true + steps: + - name: Trigger build on Travis CI + run: | + body="{ + \"request\":{ + \"branch\":\"main\" + }}" - # curl -s -X POST \ - # -H "Content-Type: application/json" \ - # -H "Accept: application/json" \ - # -H "Travis-API-Version: 3" \ - # -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \ - # -d "$body" \ - # https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests + curl -s -X POST \ + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -H "Travis-API-Version: 3" \ + -H "Authorization: token ${{ secrets.TRAVIS_TOKEN }}" \ + -d "$body" \ + https://api.travis-ci.com/repo/eclipse-che%2Fche-theia/requests