From bbeeb08f1acbf00160af83b54fc23c1b709e3125 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Mon, 31 Jan 2022 18:29:10 +0100 Subject: [PATCH 01/16] Update Theia to 1.22.1 --- .vscode/launch.json | 16 + BUILDING.md | 4 +- arduino-ide-extension/package.json | 33 +- .../browser/arduino-frontend-contribution.tsx | 2 +- .../src/browser/contributions/about.ts | 2 +- .../src/browser/contributions/add-file.ts | 2 +- .../browser/contributions/add-zip-library.ts | 2 +- .../browser/contributions/archive-sketch.ts | 2 +- .../browser/contributions/board-selection.ts | 2 +- .../src/browser/contributions/close.ts | 2 +- .../contributions/open-sketch-external.ts | 2 +- .../src/browser/contributions/open-sketch.ts | 2 +- .../src/browser/contributions/quit-app.ts | 2 +- .../browser/contributions/save-as-sketch.ts | 2 +- .../plotter/plotter-frontend-contribution.ts | 2 +- .../theia/debug/debug-session-manager.ts | 14 +- .../workspace/workspace-delete-handler.ts | 2 +- .../theia/workspace/workspace-service.ts | 5 +- .../sketchbook-widget-contribution.ts | 4 +- .../electron-window-service.ts | 2 +- .../theia/core/electron-main-menu-factory.ts | 9 +- .../theia/electron-main-application.ts | 10 +- browser-app/package.json | 34 +- electron-app/package.json | 37 +- electron/build/template-package.json | 2 +- package.json | 2 +- yarn.lock | 1853 +++++------------ 27 files changed, 677 insertions(+), 1374 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 5c336c081..d6ed25954 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -37,6 +37,13 @@ "internalConsoleOptions": "openOnSessionStart", "outputCapture": "std" }, + { + "type": "chrome", + "request": "attach", + "name": "Attach to Electron Frontend", + "port": 9222, + "webRoot": "${workspaceFolder}/electron-app" + }, { "type": "node", "request": "launch", @@ -104,5 +111,14 @@ "program": "${workspaceRoot}/electron/packager/index.js", "cwd": "${workspaceFolder}/electron/packager" } + ], + "compounds": [ + { + "name": "Launch Electron Backend & Frontend", + "configurations": [ + "App (Electron)", + "Attach to Electron Frontend" + ] + } ] } diff --git a/BUILDING.md b/BUILDING.md index a19d8ef78..6ba8c28c9 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -57,9 +57,7 @@ Once you have all the tools installed, you can build the editor following these 3. Rebuild the electron dependencies ```sh - cd electron-app - yarn theia rebuild:electron - cd .. + yarn rebuild:electron ``` 4. Start the application diff --git a/arduino-ide-extension/package.json b/arduino-ide-extension/package.json index 5730290f7..364148625 100644 --- a/arduino-ide-extension/package.json +++ b/arduino-ide-extension/package.json @@ -21,22 +21,23 @@ }, "dependencies": { "@grpc/grpc-js": "^1.3.7", - "@theia/application-package": "1.19.0", - "@theia/core": "1.19.0", - "@theia/editor": "1.19.0", - "@theia/editor-preview": "1.19.0", - "@theia/filesystem": "1.19.0", - "@theia/git": "1.19.0", - "@theia/keymaps": "1.19.0", - "@theia/markers": "1.19.0", - "@theia/monaco": "1.19.0", - "@theia/navigator": "1.19.0", - "@theia/outline-view": "1.19.0", - "@theia/output": "1.19.0", - "@theia/preferences": "1.19.0", - "@theia/search-in-workspace": "1.19.0", - "@theia/terminal": "1.19.0", - "@theia/workspace": "1.19.0", + "@theia/application-package": "1.22.1", + "@theia/core": "1.22.1", + "@theia/editor": "1.22.1", + "@theia/editor-preview": "1.22.1", + "@theia/electron": "1.22.1", + "@theia/filesystem": "1.22.1", + "@theia/git": "1.22.1", + "@theia/keymaps": "1.22.1", + "@theia/markers": "1.22.1", + "@theia/monaco": "1.22.1", + "@theia/navigator": "1.22.1", + "@theia/outline-view": "1.22.1", + "@theia/output": "1.22.1", + "@theia/preferences": "1.22.1", + "@theia/search-in-workspace": "1.22.1", + "@theia/terminal": "1.22.1", + "@theia/workspace": "1.22.1", "@tippyjs/react": "^4.2.5", "@types/atob": "^2.1.2", "@types/auth0-js": "^9.14.0", diff --git a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx index 5224b54f8..b493bd3bf 100644 --- a/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx +++ b/arduino-ide-extension/src/browser/arduino-frontend-contribution.tsx @@ -1,6 +1,6 @@ import { inject, injectable, postConstruct } from 'inversify'; import * as React from 'react'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import { BoardsService, SketchesService, diff --git a/arduino-ide-extension/src/browser/contributions/about.ts b/arduino-ide-extension/src/browser/contributions/about.ts index 662781a00..3f93adba2 100644 --- a/arduino-ide-extension/src/browser/contributions/about.ts +++ b/arduino-ide-extension/src/browser/contributions/about.ts @@ -1,6 +1,6 @@ import { inject, injectable } from 'inversify'; import * as moment from 'moment'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import { isOSX, isWindows } from '@theia/core/lib/common/os'; import { ClipboardService } from '@theia/core/lib/browser/clipboard-service'; import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider'; diff --git a/arduino-ide-extension/src/browser/contributions/add-file.ts b/arduino-ide-extension/src/browser/contributions/add-file.ts index d6155d927..94316a1f4 100644 --- a/arduino-ide-extension/src/browser/contributions/add-file.ts +++ b/arduino-ide-extension/src/browser/contributions/add-file.ts @@ -1,5 +1,5 @@ import { inject, injectable } from 'inversify'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import { ArduinoMenus } from '../menu/arduino-menus'; import { SketchContribution, diff --git a/arduino-ide-extension/src/browser/contributions/add-zip-library.ts b/arduino-ide-extension/src/browser/contributions/add-zip-library.ts index 6b97c3ec2..a03d056f2 100644 --- a/arduino-ide-extension/src/browser/contributions/add-zip-library.ts +++ b/arduino-ide-extension/src/browser/contributions/add-zip-library.ts @@ -1,5 +1,5 @@ import { inject, injectable } from 'inversify'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import URI from '@theia/core/lib/common/uri'; import { ConfirmDialog } from '@theia/core/lib/browser/dialogs'; import { EnvVariablesServer } from '@theia/core/lib/common/env-variables'; diff --git a/arduino-ide-extension/src/browser/contributions/archive-sketch.ts b/arduino-ide-extension/src/browser/contributions/archive-sketch.ts index 315ad5156..2ab62dc22 100644 --- a/arduino-ide-extension/src/browser/contributions/archive-sketch.ts +++ b/arduino-ide-extension/src/browser/contributions/archive-sketch.ts @@ -1,5 +1,5 @@ import { injectable } from 'inversify'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import * as dateFormat from 'dateformat'; import URI from '@theia/core/lib/common/uri'; import { ArduinoMenus } from '../menu/arduino-menus'; diff --git a/arduino-ide-extension/src/browser/contributions/board-selection.ts b/arduino-ide-extension/src/browser/contributions/board-selection.ts index f8bf63aed..9dc085fbf 100644 --- a/arduino-ide-extension/src/browser/contributions/board-selection.ts +++ b/arduino-ide-extension/src/browser/contributions/board-selection.ts @@ -1,5 +1,5 @@ import { inject, injectable } from 'inversify'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import { MenuModelRegistry } from '@theia/core/lib/common/menu'; import { DisposableCollection, diff --git a/arduino-ide-extension/src/browser/contributions/close.ts b/arduino-ide-extension/src/browser/contributions/close.ts index b134873f2..1b335fa82 100644 --- a/arduino-ide-extension/src/browser/contributions/close.ts +++ b/arduino-ide-extension/src/browser/contributions/close.ts @@ -1,6 +1,6 @@ import { inject, injectable } from 'inversify'; import { toArray } from '@phosphor/algorithm'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import { MonacoEditor } from '@theia/monaco/lib/browser/monaco-editor'; import { EditorManager } from '@theia/editor/lib/browser/editor-manager'; import { ApplicationShell } from '@theia/core/lib/browser/shell/application-shell'; diff --git a/arduino-ide-extension/src/browser/contributions/open-sketch-external.ts b/arduino-ide-extension/src/browser/contributions/open-sketch-external.ts index 0f66a27ea..976902588 100644 --- a/arduino-ide-extension/src/browser/contributions/open-sketch-external.ts +++ b/arduino-ide-extension/src/browser/contributions/open-sketch-external.ts @@ -1,5 +1,5 @@ import { injectable } from 'inversify'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import URI from '@theia/core/lib/common/uri'; import { ArduinoMenus } from '../menu/arduino-menus'; import { diff --git a/arduino-ide-extension/src/browser/contributions/open-sketch.ts b/arduino-ide-extension/src/browser/contributions/open-sketch.ts index 6e80becc1..879ab144f 100644 --- a/arduino-ide-extension/src/browser/contributions/open-sketch.ts +++ b/arduino-ide-extension/src/browser/contributions/open-sketch.ts @@ -1,5 +1,5 @@ import { inject, injectable } from 'inversify'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import { MaybePromise } from '@theia/core/lib/common/types'; import { Widget, ContextMenuRenderer } from '@theia/core/lib/browser'; import { diff --git a/arduino-ide-extension/src/browser/contributions/quit-app.ts b/arduino-ide-extension/src/browser/contributions/quit-app.ts index a37bad9a6..c0e784726 100644 --- a/arduino-ide-extension/src/browser/contributions/quit-app.ts +++ b/arduino-ide-extension/src/browser/contributions/quit-app.ts @@ -1,5 +1,5 @@ import { injectable } from 'inversify'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import { isOSX } from '@theia/core/lib/common/os'; import { Contribution, diff --git a/arduino-ide-extension/src/browser/contributions/save-as-sketch.ts b/arduino-ide-extension/src/browser/contributions/save-as-sketch.ts index fbf81f8af..0c265d0c2 100644 --- a/arduino-ide-extension/src/browser/contributions/save-as-sketch.ts +++ b/arduino-ide-extension/src/browser/contributions/save-as-sketch.ts @@ -1,5 +1,5 @@ import { injectable } from 'inversify'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import * as dateFormat from 'dateformat'; import { ArduinoMenus } from '../menu/arduino-menus'; import { diff --git a/arduino-ide-extension/src/browser/serial/plotter/plotter-frontend-contribution.ts b/arduino-ide-extension/src/browser/serial/plotter/plotter-frontend-contribution.ts index a7ca8b1de..f4e957063 100644 --- a/arduino-ide-extension/src/browser/serial/plotter/plotter-frontend-contribution.ts +++ b/arduino-ide-extension/src/browser/serial/plotter/plotter-frontend-contribution.ts @@ -10,7 +10,7 @@ import { SerialModel } from '../serial-model'; import { ArduinoMenus } from '../../menu/arduino-menus'; import { Contribution } from '../../contributions/contribution'; import { Endpoint, FrontendApplication } from '@theia/core/lib/browser'; -import { ipcRenderer } from '@theia/core/shared/electron'; +import { ipcRenderer } from '@theia/electron/shared/electron'; import { SerialConfig } from '../../../common/protocol'; import { SerialConnectionManager } from '../serial-connection-manager'; import { SerialPlotter } from './protocol'; diff --git a/arduino-ide-extension/src/browser/theia/debug/debug-session-manager.ts b/arduino-ide-extension/src/browser/theia/debug/debug-session-manager.ts index 3bbde36f6..424e41622 100644 --- a/arduino-ide-extension/src/browser/theia/debug/debug-session-manager.ts +++ b/arduino-ide-extension/src/browser/theia/debug/debug-session-manager.ts @@ -62,9 +62,15 @@ export class DebugSessionManager extends TheiaDebugSessionManager { } ); } - // TODO: remove as https://github.com/eclipse-theia/theia/issues/10164 is fixed - async terminateSessions(): Promise { - await super.terminateSessions(); - this.destroy(this.currentSession?.id); + async terminateSession(session?: DebugSession): Promise { + if (!session) { + this.updateCurrentSession(this._currentSession); + session = this._currentSession; + } + // The cortex-debug extension does not respond to close requests + // So we simply terminate the debug session immediately + // Alternatively the `super.terminateSession` call will terminate it after 5 seconds without a response + await this.debug.terminateDebugSession(session!.id); + await super.terminateSession(session); } } diff --git a/arduino-ide-extension/src/browser/theia/workspace/workspace-delete-handler.ts b/arduino-ide-extension/src/browser/theia/workspace/workspace-delete-handler.ts index 0c4a157ef..7c88e8ba7 100644 --- a/arduino-ide-extension/src/browser/theia/workspace/workspace-delete-handler.ts +++ b/arduino-ide-extension/src/browser/theia/workspace/workspace-delete-handler.ts @@ -1,5 +1,5 @@ import { inject, injectable } from 'inversify'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import URI from '@theia/core/lib/common/uri'; import { WorkspaceDeleteHandler as TheiaWorkspaceDeleteHandler } from '@theia/workspace/lib/browser/workspace-delete-handler'; import { SketchesServiceClientImpl } from '../../../common/protocol/sketches-service-client-impl'; diff --git a/arduino-ide-extension/src/browser/theia/workspace/workspace-service.ts b/arduino-ide-extension/src/browser/theia/workspace/workspace-service.ts index 691740a47..2ae44272b 100644 --- a/arduino-ide-extension/src/browser/theia/workspace/workspace-service.ts +++ b/arduino-ide-extension/src/browser/theia/workspace/workspace-service.ts @@ -18,6 +18,7 @@ import { ArduinoWorkspaceRootResolver } from '../../arduino-workspace-resolver'; import { BoardsServiceProvider } from '../../boards/boards-service-provider'; import { BoardsConfig } from '../../boards/boards-config'; import { nls } from '@theia/core/lib/common'; +import { URI as VSCodeUri } from '@theia/core/shared/vscode-uri'; @injectable() export class WorkspaceService extends TheiaWorkspaceService { @@ -67,7 +68,7 @@ export class WorkspaceService extends TheiaWorkspaceService { this.workspaceUri = (async () => { try { const hash = window.location.hash; - const [recentWorkspaces, recentSketches] = await Promise.all([ + const [recentWorkspacesPaths, recentSketches] = await Promise.all([ this.server.getRecentWorkspaces(), this.sketchService .getSketches({}) @@ -75,6 +76,8 @@ export class WorkspaceService extends TheiaWorkspaceService { SketchContainer.toArray(container).map((s) => s.uri) ), ]); + // On Dindows, `getRecentWorkspaces` returns only file paths, not URIs as expected by the `isValid` method. + const recentWorkspaces = recentWorkspacesPaths.map(e => VSCodeUri.file(e).toString()); const toOpen = await new ArduinoWorkspaceRootResolver({ isValid: this.isValid.bind(this), }).resolve({ hash, recentWorkspaces, recentSketches }); diff --git a/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget-contribution.ts b/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget-contribution.ts index 15e1a8e25..a60be2bfa 100644 --- a/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget-contribution.ts +++ b/arduino-ide-extension/src/browser/widgets/sketchbook/sketchbook-widget-contribution.ts @@ -1,4 +1,4 @@ -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import { inject, injectable } from 'inversify'; import { CommandRegistry } from '@theia/core/lib/common/command'; import { MenuModelRegistry } from '@theia/core/lib/common/menu'; @@ -80,7 +80,7 @@ export class SketchbookWidgetContribution } onStart(): void { - this.shell.currentChanged.connect(() => + this.shell.onDidChangeCurrentWidget(() => this.onCurrentWidgetChangedHandler() ); diff --git a/arduino-ide-extension/src/electron-browser/electron-window-service.ts b/arduino-ide-extension/src/electron-browser/electron-window-service.ts index ee7587118..1011afd3c 100644 --- a/arduino-ide-extension/src/electron-browser/electron-window-service.ts +++ b/arduino-ide-extension/src/electron-browser/electron-window-service.ts @@ -1,5 +1,5 @@ import { inject, injectable, postConstruct } from 'inversify'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import { FrontendApplicationStateService } from '@theia/core/lib/browser/frontend-application-state'; import { ConnectionStatus, diff --git a/arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts b/arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts index 370f3251f..3cd93cbe0 100644 --- a/arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts +++ b/arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts @@ -1,5 +1,5 @@ import { injectable } from 'inversify'; -import { remote } from 'electron'; +import * as remote from '@theia/core/electron-shared/@electron/remote'; import { isOSX } from '@theia/core/lib/common/os'; import { Keybinding } from '@theia/core/lib/common/keybinding'; import { @@ -15,7 +15,6 @@ import { ArduinoMenus, PlaceholderMenuNode, } from '../../../browser/menu/arduino-menus'; -import electron = require('@theia/core/shared/electron'); @injectable() export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory { @@ -35,9 +34,9 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory { await this.preferencesService.ready; const createdMenuBar = this.createElectronMenuBar(); if (isOSX) { - electron.remote.Menu.setApplicationMenu(createdMenuBar); + remote.Menu.setApplicationMenu(createdMenuBar); } else { - electron.remote.getCurrentWindow().setMenu(createdMenuBar); + remote.getCurrentWindow().setMenu(createdMenuBar); } } @@ -81,7 +80,7 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory { protected createOSXMenu(): Electron.MenuItemConstructorOptions { const { submenu } = super.createOSXMenu(); const label = 'Arduino IDE'; - if (!!submenu && !(submenu instanceof remote.Menu)) { + if (!!submenu && !(submenu instanceof Electron.Menu)) { const [, , /* about */ /* preferences */ ...rest] = submenu; const about = this.fillMenuTemplate( [], diff --git a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts index e625a8288..aec1688b4 100644 --- a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts +++ b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts @@ -1,10 +1,5 @@ import { inject, injectable } from 'inversify'; -import { - app, - BrowserWindow, - BrowserWindowConstructorOptions, - screen, -} from 'electron'; +import { app, BrowserWindow, BrowserWindowConstructorOptions, ipcMain, screen } from '@theia/electron/shared/electron'; import { fork } from 'child_process'; import { AddressInfo } from 'net'; import { join } from 'path'; @@ -17,7 +12,7 @@ import { TheiaBrowserWindowOptions, } from '@theia/core/lib/electron-main/electron-main-application'; import { SplashServiceImpl } from '../splash/splash-service-impl'; -import { ipcMain } from '@theia/core/shared/electron'; +import * as electronRemoteMain from '@theia/core/electron-shared/@electron/remote/main'; app.commandLine.appendSwitch('disable-http-cache'); @@ -152,6 +147,7 @@ export class ElectronMainApplication extends TheiaElectronMainApplication { this.attachSaveWindowState(electronWindow); this.attachGlobalShortcuts(electronWindow); this.restoreMaximizedState(electronWindow, options); + electronRemoteMain.enable(electronWindow.webContents); return electronWindow; } diff --git a/browser-app/package.json b/browser-app/package.json index ebc7354fe..731a07623 100644 --- a/browser-app/package.json +++ b/browser-app/package.json @@ -4,26 +4,26 @@ "version": "2.0.0-rc3", "license": "AGPL-3.0-or-later", "dependencies": { - "@theia/core": "1.19.0", - "@theia/debug": "1.19.0", - "@theia/editor": "1.19.0", - "@theia/editor-preview": "1.19.0", - "@theia/file-search": "1.19.0", - "@theia/filesystem": "1.19.0", - "@theia/keymaps": "1.19.0", - "@theia/messages": "1.19.0", - "@theia/monaco": "1.19.0", - "@theia/navigator": "1.19.0", - "@theia/plugin-ext": "1.19.0", - "@theia/plugin-ext-vscode": "1.19.0", - "@theia/preferences": "1.19.0", - "@theia/process": "1.19.0", - "@theia/terminal": "1.19.0", - "@theia/workspace": "1.19.0", + "@theia/core": "1.22.1", + "@theia/debug": "1.22.1", + "@theia/editor": "1.22.1", + "@theia/editor-preview": "1.22.1", + "@theia/file-search": "1.22.1", + "@theia/filesystem": "1.22.1", + "@theia/keymaps": "1.22.1", + "@theia/messages": "1.22.1", + "@theia/monaco": "1.22.1", + "@theia/navigator": "1.22.1", + "@theia/plugin-ext": "1.22.1", + "@theia/plugin-ext-vscode": "1.22.1", + "@theia/preferences": "1.22.1", + "@theia/process": "1.22.1", + "@theia/terminal": "1.22.1", + "@theia/workspace": "1.22.1", "arduino-ide-extension": "2.0.0-rc3" }, "devDependencies": { - "@theia/cli": "1.19.0" + "@theia/cli": "1.22.1" }, "scripts": { "prepare": "theia build --mode development", diff --git a/electron-app/package.json b/electron-app/package.json index c154fe248..5cf039a8f 100644 --- a/electron-app/package.json +++ b/electron-app/package.json @@ -5,27 +5,28 @@ "license": "AGPL-3.0-or-later", "main": "src-gen/frontend/electron-main.js", "dependencies": { - "@theia/core": "1.19.0", - "@theia/debug": "1.19.0", - "@theia/editor": "1.19.0", - "@theia/editor-preview": "1.19.0", - "@theia/electron": "1.19.0", - "@theia/file-search": "1.19.0", - "@theia/filesystem": "1.19.0", - "@theia/keymaps": "1.19.0", - "@theia/messages": "1.19.0", - "@theia/monaco": "1.19.0", - "@theia/navigator": "1.19.0", - "@theia/plugin-ext": "1.19.0", - "@theia/plugin-ext-vscode": "1.19.0", - "@theia/preferences": "1.19.0", - "@theia/process": "1.19.0", - "@theia/terminal": "1.19.0", - "@theia/workspace": "1.19.0", + "@theia/core": "1.22.1", + "@theia/debug": "1.22.1", + "@theia/editor": "1.22.1", + "@theia/editor-preview": "1.22.1", + "@theia/electron": "1.22.1", + "@theia/file-search": "1.22.1", + "@theia/filesystem": "1.22.1", + "@theia/keymaps": "1.22.1", + "@theia/messages": "1.22.1", + "@theia/monaco": "1.22.1", + "@theia/navigator": "1.22.1", + "@theia/plugin-ext": "1.22.1", + "@theia/plugin-ext-vscode": "1.22.1", + "@theia/preferences": "1.22.1", + "@theia/process": "1.22.1", + "@theia/terminal": "1.22.1", + "@theia/workspace": "1.22.1", "arduino-ide-extension": "2.0.0-rc3" }, "devDependencies": { - "@theia/cli": "1.19.0" + "@theia/cli": "1.22.1", + "electron": "^15.3.5" }, "scripts": { "prepare": "theia build --mode development", diff --git a/electron/build/template-package.json b/electron/build/template-package.json index 274776b46..c55779883 100644 --- a/electron/build/template-package.json +++ b/electron/build/template-package.json @@ -9,7 +9,7 @@ "node-log-rotate": "^0.1.5" }, "devDependencies": { - "@theia/cli": "1.19.0", + "@theia/cli": "1.22.1", "cross-env": "^7.0.2", "electron-builder": "22.7.0", "electron-notarize": "^0.3.0", diff --git a/package.json b/package.json index 467053316..73ddd25e1 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "node": ">=12.14.1 <13" }, "devDependencies": { - "@theia/cli": "1.19.0", + "@theia/cli": "1.22.1", "@types/sinon": "^2.3.5", "@types/jsdom": "^11.0.4", "@typescript-eslint/eslint-plugin": "^4.27.0", diff --git a/yarn.lock b/yarn.lock index e8323cd7b..0e267bdce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -878,10 +878,10 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.5.tgz#9283c9ce5b289a3c4f61c12757469e59377f81f3" integrity sha512-6nFkfkmSeV/rqSaS4oWHgmpnYw194f6hmWF5is6b0J1naJZoiD0NTc9AiUwPHvWsowkjuHErCZT1wa0jg+BLIA== -"@electron/get@^1.0.1": - version "1.12.4" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.12.4.tgz#a5971113fc1bf8fa12a8789dc20152a7359f06ab" - integrity sha512-6nr9DbJPUR9Xujw6zD3y+rS95TyItEVM0NVjt1EehY2vUWfIgPiIPVHxCvaTS0xr2B+DRxovYVKbuOWqC35kjg== +"@electron/get@^1.12.4": + version "1.13.0" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz#95c6bcaff4f9a505ea46792424f451efea89228c" + integrity sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ== dependencies: debug "^4.1.1" env-paths "^2.2.0" @@ -894,10 +894,10 @@ global-agent "^2.0.2" global-tunnel-ng "^2.7.1" -"@electron/get@^1.12.4": - version "1.13.0" - resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.0.tgz#95c6bcaff4f9a505ea46792424f451efea89228c" - integrity sha512-+SjZhRuRo+STTO1Fdhzqnv9D2ZhjxXP6egsJ9kiO8dtP68cDx7dFCwWi64dlMQV7sWcfW1OYCW4wviEBzmRsfQ== +"@electron/get@^1.13.0": + version "1.13.1" + resolved "https://registry.yarnpkg.com/@electron/get/-/get-1.13.1.tgz#42a0aa62fd1189638bd966e23effaebb16108368" + integrity sha512-U5vkXDZ9DwXtkPqlB45tfYnnYBN8PePp1z/XDCupnSpdrxT8/ThCv9WCwPLf9oqiSGZTkH6dx2jDUPuoXpjkcA== dependencies: debug "^4.1.1" env-paths "^2.2.0" @@ -907,9 +907,14 @@ semver "^6.2.0" sumchecker "^3.0.1" optionalDependencies: - global-agent "^2.0.2" + global-agent "^3.0.0" global-tunnel-ng "^2.7.1" +"@electron/remote@^2.0.1": + version "2.0.4" + resolved "https://registry.yarnpkg.com/@electron/remote/-/remote-2.0.4.tgz#c3dae436aed79d1b8adcefc5a4963c06750ad5d8" + integrity sha512-8m2P/d2RH986PmMW5lKygbPEjEYJ7RgCe37Y8DQ1wujKMH6VjmLIB+Y+DP2SA611svCZc58TRSd8FraGvcfGZw== + "@emotion/cache@^10.0.27", "@emotion/cache@^10.0.9": version "10.0.29" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-10.0.29.tgz#87e7e64f412c060102d589fe7c6dc042e6f9d1e0" @@ -2210,28 +2215,31 @@ dependencies: defer-to-connect "^1.0.1" -"@theia/application-manager@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.19.0.tgz#e608e55e1bc5252b185e6f8917ea274de2a8dc7a" - integrity sha512-h4PspeMtDyHnpz3qELTKwUeWTFmpXe4OzDmET6u6NgXh93ba94gnIh0OZg7xjDD/3vrJLz1yQhVc263FioxBjw== +"@theia/application-manager@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.22.1.tgz#3acc0ec661ffeae9b4c1a794b1af711791ebdca3" + integrity sha512-h+3txYDqizTNWFfz6g8H9S5r1XLqJG+r3nM8pXHr2881oL+MXGpNAWk6LAy9SOKLxsX7zQRik57dPJCo6mzS8A== dependencies: "@babel/core" "^7.10.0" "@babel/plugin-transform-classes" "^7.10.0" "@babel/plugin-transform-runtime" "^7.10.0" "@babel/preset-env" "^7.10.0" - "@theia/application-package" "1.19.0" - "@theia/compression-webpack-plugin" "^3.0.0" + "@theia/application-package" "1.22.1" + "@theia/ffmpeg" "1.22.1" "@types/fs-extra" "^4.0.2" + "@types/semver" "^7.3.8" babel-loader "^8.2.2" buffer "^6.0.3" circular-dependency-plugin "^5.2.2" + compression-webpack-plugin "^9.0.0" copy-webpack-plugin "^8.1.1" css-loader "^6.2.0" - electron-rebuild "^1.8.6" - font-awesome-webpack "0.0.5-beta.2" + electron-rebuild "^1.11.0" fs-extra "^4.0.2" ignore-loader "^0.1.2" less "^3.0.3" + node-abi "*" + semver "^7.3.5" setimmediate "^1.0.5" source-map-loader "^2.0.1" source-map-support "^0.5.19" @@ -2242,10 +2250,10 @@ worker-loader "^3.0.8" yargs "^15.3.1" -"@theia/application-package@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.19.0.tgz#a6045bec3ebcc7acb80dbfbb644c7fd429799aeb" - integrity sha512-+WToWAofmvFafuY6kmsNAKz1IRwWwurHmj4U7JYpJ2jgey3H7lcO6qUMd8ZfWt3wK9ckPqlnuasuI7nHTZgcrA== +"@theia/application-package@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.22.1.tgz#f6fc3ca8bb7505b47c16b6924d38e64f79e01952" + integrity sha512-nJhU5W3vuXP9s5iQuwjT0OZ7uV+2H/Yrga7rFk1QHSDrVhHHukGluYlXxADRhBDxVaXUlcgbUspTtmBY40oAWw== dependencies: "@types/fs-extra" "^4.0.2" "@types/request" "^2.0.3" @@ -2259,36 +2267,37 @@ semver "^5.4.1" write-json-file "^2.2.0" -"@theia/bulk-edit@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/bulk-edit/-/bulk-edit-1.19.0.tgz#f822e8db865d745eca027ada0e98739250bf88de" - integrity sha512-acwWHfIYccMy8KAVXV1Pmrk+CJCzdJ878iqJy9W3f+lH8UY8IKpAvxobRIiMVywCS+cxiPE+IlJtH4I2Qhm1rg== - dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/monaco" "1.19.0" - "@theia/workspace" "1.19.0" - -"@theia/callhierarchy@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/callhierarchy/-/callhierarchy-1.19.0.tgz#24f7bd8b3abdb55ff5c120b7200235b099b96c11" - integrity sha512-xRjTWobnx/RThneL1E7wx+mvAfjroFaofdpDpgaP8f1+CtkeDMtPKK0Q5eCzkXPt7b4nM3R8xTboxOQ0VJWYQA== - dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/monaco" "1.19.0" +"@theia/bulk-edit@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/bulk-edit/-/bulk-edit-1.22.1.tgz#6b2c3dd4ca41b1d75cac0a7e51afe7f3899b0636" + integrity sha512-VQ120BYssHbYe1ilp7wh07Iy9vIk1U1dXecJmuarEWbHUnAMvWQXB+1z88T+jt/CiZvMzd4nvoimIyPfVBvKaw== + dependencies: + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/monaco" "1.22.1" + "@theia/workspace" "1.22.1" + +"@theia/callhierarchy@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/callhierarchy/-/callhierarchy-1.22.1.tgz#dad24e699bd57b6f98c78050cdd1c096643a57ec" + integrity sha512-gLeXGgkBblj/3T8FGaM3mMr1PnbEhSqSkCyNWbXyxUzntISFfKu08K9aSexFWn7t99ox6VF9E/wRbd8VUNdiBg== + dependencies: + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/monaco" "1.22.1" ts-md5 "^1.2.2" -"@theia/cli@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.19.0.tgz#d9316b5e294ad5e7c4f66fd6d44efd9419d60955" - integrity sha512-qMpI4cjVWzYbStN/+9wxyWCimKCVmrP+uSykRqlRFnRJcsLQC1om8ED98//9BgwYW5y3zSwB7rmBd/S0Io8tsQ== +"@theia/cli@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.22.1.tgz#e3f2d1ffcfe29f3bcb897074e72816d23530466b" + integrity sha512-JfXAFgMt7EZ5njoXjD38ISIvWKyWCyZMhEOC2kMQGbirPWJcFZHPOK5hhhWWH7/V0QOsLygluZSSNN/1ad+5XA== dependencies: - "@theia/application-manager" "1.19.0" - "@theia/application-package" "1.19.0" - "@theia/localization-manager" "1.19.0" - "@theia/ovsx-client" "1.19.0" + "@theia/application-manager" "1.22.1" + "@theia/application-package" "1.22.1" + "@theia/ffmpeg" "1.22.1" + "@theia/localization-manager" "1.22.1" + "@theia/ovsx-client" "1.22.1" "@types/chai" "^4.2.7" "@types/mkdirp" "^0.5.2" "@types/mocha" "^5.2.7" @@ -2297,42 +2306,31 @@ "@types/requestretry" "^1.12.3" "@types/tar" "^4.0.3" chai "^4.2.0" - colors "^1.4.0" + chalk "4.0.0" decompress "^4.2.1" https-proxy-agent "^5.0.0" mocha "^7.0.0" - node-fetch "^2.6.0" + node-fetch "^2.6.7" proxy-from-env "^1.1.0" puppeteer "^2.0.0" puppeteer-to-istanbul "^1.2.2" temp "^0.9.1" + unzipper "^0.9.11" yargs "^15.3.1" -"@theia/compression-webpack-plugin@^3.0.0": - version "3.0.0" - resolved "https://registry.yarnpkg.com/@theia/compression-webpack-plugin/-/compression-webpack-plugin-3.0.0.tgz#3d1b932327caf33b218fd5d3d1a64a5dbee4324a" - integrity sha512-s9s8cZGisG5p+RsznZkhu4WKsgawpcxPX2GacQPok+SAuQHpORGBpAHxHOIOIsXMpJkheVmeBEpB0LfSzoV5bQ== - dependencies: - cacache "^11.2.0" - find-cache-dir "^3.0.0" - neo-async "^2.5.0" - schema-utils "^1.0.0" - serialize-javascript "^1.4.0" - webpack-sources "^1.0.1" - -"@theia/console@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/console/-/console-1.19.0.tgz#79a594b68cb525304cfd11a28d3654d61c2c89d3" - integrity sha512-Ze/qqH/bekVEB0QLI10tBxQ4NGMwQvuUW7OYZTuIwMM7iUSY/krgMe+1WJlh9802hSNPNZiOhMtnvBqw8kCNtg== +"@theia/console@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/console/-/console-1.22.1.tgz#4e7b3c78e815202139b3dd42f43c2383ebaad005" + integrity sha512-oJ5VP5pvgU2kz4PadFT/iYG9gOU10bAPEiGXixvcLZznAhozTrQwf0iL2BUsZVkW++HNY/gsrgn+p6W43ZC2tQ== dependencies: - "@theia/core" "1.19.0" - "@theia/monaco" "1.19.0" + "@theia/core" "1.22.1" + "@theia/monaco" "1.22.1" anser "^2.0.1" -"@theia/core@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.19.0.tgz#b198f7eabd4e751cf1d20f8bfcc57ef2e8857b52" - integrity sha512-4o90p0D+GYhFr8yN8oiyr1Ak6bwoEKxGJxRC5xiQiNR6ZIOfCxMOEWiQntGq5jB+1VO0TYdImyGRzgvJX+/Hig== +"@theia/core@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.22.1.tgz#b5af739a46de49b56fb18d1bb4ebd92522ba4c3b" + integrity sha512-fAVGz4ktV8UjDS6vwLqAR2bAjVLfy67DPj9hNK5c16q2Osw0GD+dvAf71gny2dDZHGAusfirA7ePXCgQE7lVlw== dependencies: "@babel/runtime" "^7.10.0" "@phosphor/algorithm" "1" @@ -2346,7 +2344,7 @@ "@phosphor/virtualdom" "1" "@phosphor/widgets" "1" "@primer/octicons-react" "^9.0.0" - "@theia/application-package" "1.19.0" + "@theia/application-package" "1.22.1" "@types/body-parser" "^1.16.4" "@types/cookie" "^0.3.3" "@types/dompurify" "^2.2.2" @@ -2354,6 +2352,7 @@ "@types/fs-extra" "^4.0.2" "@types/lodash.debounce" "4.0.3" "@types/lodash.throttle" "^4.1.3" + "@types/markdown-it" "^12.2.3" "@types/react" "^16.8.0" "@types/react-dom" "^16.8.0" "@types/react-virtualized" "^9.18.3" @@ -2361,7 +2360,7 @@ "@types/safer-buffer" "^2.1.0" "@types/ws" "^5.1.2" "@types/yargs" "^15" - "@vscode/codicons" "^0.0.21" + "@vscode/codicons" "*" ajv "^6.5.3" body-parser "^1.17.2" cookie "^0.4.0" @@ -2379,6 +2378,7 @@ keytar "7.2.0" lodash.debounce "^4.0.8" lodash.throttle "^4.1.1" + markdown-it "^12.3.2" nsfw "^2.1.2" p-debounce "^2.1.0" perfect-scrollbar "^1.3.0" @@ -2392,31 +2392,30 @@ safer-buffer "^2.1.2" uuid "^8.3.2" vscode-languageserver-protocol "~3.15.3" - vscode-languageserver-types "^3.15.1" vscode-uri "^2.1.1" vscode-ws-jsonrpc "^0.2.0" ws "^7.1.2" yargs "^15.3.1" -"@theia/debug@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/debug/-/debug-1.19.0.tgz#e4d6cb67666dfea18b9b0a278d05fc0e62f47f5a" - integrity sha512-Bcv6JEB8Fmt9ZkBVPOcpbN6iP1WL7pXsXig+4DqsENIHFJucITks0579GU87cd6WveIm37sjmcOdEMPeNxEKWg== - dependencies: - "@theia/console" "1.19.0" - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/markers" "1.19.0" - "@theia/monaco" "1.19.0" - "@theia/output" "1.19.0" - "@theia/preferences" "1.19.0" - "@theia/process" "1.19.0" - "@theia/task" "1.19.0" - "@theia/terminal" "1.19.0" - "@theia/userstorage" "1.19.0" - "@theia/variable-resolver" "1.19.0" - "@theia/workspace" "1.19.0" +"@theia/debug@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/debug/-/debug-1.22.1.tgz#1c97fb6845e615f9330fdeeb8ffe593199039be4" + integrity sha512-nYDQkaVnvJYNMv/1MvSmdH6asolDQRDyePIlRdsV2rFpAssj3p9H/YBkhEmxoxemUBWVodV73I4MXWS4guZokQ== + dependencies: + "@theia/console" "1.22.1" + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/markers" "1.22.1" + "@theia/monaco" "1.22.1" + "@theia/output" "1.22.1" + "@theia/preferences" "1.22.1" + "@theia/process" "1.22.1" + "@theia/task" "1.22.1" + "@theia/terminal" "1.22.1" + "@theia/userstorage" "1.22.1" + "@theia/variable-resolver" "1.22.1" + "@theia/workspace" "1.22.1" jsonc-parser "^2.2.0" mkdirp "^0.5.0" p-debounce "^2.1.0" @@ -2425,58 +2424,62 @@ unzip-stream "^0.3.0" vscode-debugprotocol "^1.32.0" -"@theia/editor-preview@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/editor-preview/-/editor-preview-1.19.0.tgz#3d1db40b55569e61d6b4dd30aff9a800758eada1" - integrity sha512-/9XKYhp+bB1F99lJfwTxAUeNwHns8kKLlQCpPwtkE2K9yS10vNqM3wL6mKL7sMgwI6a81gWW1fqI9uI562idow== +"@theia/editor-preview@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/editor-preview/-/editor-preview-1.22.1.tgz#1aaa299321275de48fc4fa8a3b9f82ecfc6a9036" + integrity sha512-fVOCZeRs3tHt89hlsdAwIQ89kY3TlAaYBlGET1LZGFEubW8qDuvLo/RWHhppTC3+hXbraTnnoJpimCSHpITd0A== dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/navigator" "1.19.0" + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/navigator" "1.22.1" -"@theia/editor@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.19.0.tgz#66a1699ca78cc65a7a5527f6dbcd280d833f5c42" - integrity sha512-7CUjp3lUg/0vtZlvikWvhKTWl4ys8p9WcvH/rcUDuvcJ85IYv+Sz2rwQUHuN8/XPIsHnMDZGhNkX0u/4lznlLw== +"@theia/editor@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.22.1.tgz#15027a18a3a2bc068783d539d2afa3827514aca0" + integrity sha512-ltDIdfrywKKu5mbbm3g7vN4ZpGVq/kimTKfvpjja6gcBsZ0RcASjdzEth/v8ZIVovp/UbSUFdT2+7i76iYbSFA== dependencies: - "@theia/core" "1.19.0" - "@theia/variable-resolver" "1.19.0" + "@theia/core" "1.22.1" + "@theia/variable-resolver" "1.22.1" "@types/base64-arraybuffer" "0.1.0" base64-arraybuffer "^0.1.5" -"@theia/electron@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-1.19.0.tgz#82a667365246d7dc714380e98e64f45781bf9d72" - integrity sha512-D/fYYuCMWZIdWfocU3kx+968jB6Epb/3aKZKmia4mheu4iXeQ0ANIHO8DM0XNWYy7IZGqh7GlGONgHmjWjR9WQ== +"@theia/electron@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/electron/-/electron-1.22.1.tgz#3e1750a0d6d8213d5daf14d91604e23d07f4d722" + integrity sha512-SLSptp9hyTxI0PWSDiufxuxgIO96Ng3A1q67uaQKCOdeFcN76OlnT5uM47EhVZm9QUfLceX7PC2NsrKjiE3uOw== dependencies: - "@electron/get" "^1.12.4" - electron "^9.0.2" - electron-store "^5.1.1" + "@electron/remote" "^2.0.1" + electron-store "^8.0.0" fix-path "^3.0.0" - native-keymap "^2.1.2" - node-gyp "^7.0.0" + native-keymap "^2.2.1" + +"@theia/ffmpeg@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/ffmpeg/-/ffmpeg-1.22.1.tgz#87cbe5c2eb6e377fd31ae824f66a270380addddb" + integrity sha512-APoyq533evMBP1hFK2g6WbX3c86rr/UI02hgvOkRj/z+N3jRlPXrA+peAUmXbayweauHU9kX/Bf/nwHdIWw+WA== + dependencies: + "@electron/get" "^1.12.4" unzipper "^0.9.11" - yargs "^15.3.1" -"@theia/file-search@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.19.0.tgz#f9f7f8c3b378c83d269d1ce1c86aabc2edd4e87b" - integrity sha512-YtiTLlh8EV5qGkj8bif6PiFkF/gaElSPSS2u+IeXCJl6+NE0aE3WZu51VE1GeKW8eZHFwYj32OsC7bqcOl4b+g== - dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/monaco" "1.19.0" - "@theia/process" "1.19.0" - "@theia/workspace" "1.19.0" +"@theia/file-search@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/file-search/-/file-search-1.22.1.tgz#59371529997dba05409b4f5f2fc9e68b644a5b1a" + integrity sha512-3bLifb26Hw/MjiZvtJ5ymV29p+JzVH+Q5sT8zj58p6nzKshkMayF4UN5NMBkrhwagj+HaOZiN7p8TwF8q/Yxmw== + dependencies: + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/monaco" "1.22.1" + "@theia/process" "1.22.1" + "@theia/workspace" "1.22.1" vscode-ripgrep "^1.2.4" -"@theia/filesystem@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.19.0.tgz#1abddbcca544801b3194fe04947d23d60c4b72e5" - integrity sha512-ETGWpg+jOTIeWeUTS7ve8bQxE1YoI9wDDPomaBzZtdv+2veSfqAEyau5hx9ZabrvdCflxFXGom/fOKd1mchZUw== +"@theia/filesystem@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.22.1.tgz#d49f8bb74359aea2a608c4ecb5ab17ed7e03f711" + integrity sha512-108Ldmmcsg+2pFpJzuxloOVAMgrbX8mUPnRTnzAFaLjYgK/wfsGnmFmDNbvWkREQlsKV/4QDcfsfPsNh9Mh4Sw== dependencies: - "@theia/core" "1.19.0" + "@theia/core" "1.22.1" "@types/body-parser" "^1.17.0" "@types/multer" "^1.4.7" "@types/rimraf" "^2.0.2" @@ -2494,19 +2497,19 @@ uuid "^8.0.0" vscode-languageserver-textdocument "^1.0.1" -"@theia/git@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/git/-/git-1.19.0.tgz#48ad2ad1d28fdcb63ad7366ef509d402e0420101" - integrity sha512-cPFJGlKrkv6nz8+AhVrO6fpvQl+PmWfx4lDvYE1OAzuCaCnifGqqF8oaBcIL43kBIMnMJCSRVeJPdk2kAURrIQ== - dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/monaco" "1.19.0" - "@theia/navigator" "1.19.0" - "@theia/scm" "1.19.0" - "@theia/scm-extra" "1.19.0" - "@theia/workspace" "1.19.0" +"@theia/git@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/git/-/git-1.22.1.tgz#902ff74e50d077301e48978c8ba553faa70a5148" + integrity sha512-7H2y6X3qA7Zkqez2pWJX01BsYd0gls8ag979i7xwrAjuPV03UDNfFa+m1/89Bq2A3bgM64vJzifYeSz5cY7zBw== + dependencies: + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/monaco" "1.22.1" + "@theia/navigator" "1.22.1" + "@theia/scm" "1.22.1" + "@theia/scm-extra" "1.22.1" + "@theia/workspace" "1.22.1" "@types/diff" "^3.2.2" "@types/p-queue" "^2.3.1" diff "^3.4.0" @@ -2518,23 +2521,22 @@ p-queue "^2.4.2" ts-md5 "^1.2.2" -"@theia/keymaps@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/keymaps/-/keymaps-1.19.0.tgz#f449cadb8fa8bc8ed110a3a0b38cd6a0fb351ada" - integrity sha512-1o+t4kq3VKoKXmGUTdBOpMZxsKnAf9gfXJPyFeow2Qjsl+kdDsBurL8If4LH1PRYi6C+ATkyo7YycZ4/60BsuQ== +"@theia/keymaps@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/keymaps/-/keymaps-1.22.1.tgz#0eafe7118832e4ca4f82dfc2c7c4eb51e554c448" + integrity sha512-Yw6LNAFyBGqV6ZZkrf4lme64x8EMAWGsCBKS5yBpU8X9FrPj0bCCLFifwVbwOyiX6b0v+LhLHY30EuIaJcIWkg== dependencies: - "@theia/core" "1.19.0" - "@theia/monaco" "1.19.0" - "@theia/userstorage" "1.19.0" - "@theia/workspace" "1.19.0" + "@theia/core" "1.22.1" + "@theia/monaco" "1.22.1" + "@theia/userstorage" "1.22.1" + "@theia/workspace" "1.22.1" "@types/lodash.debounce" "4.0.3" - ajv "^6.5.3" jsonc-parser "^2.2.0" -"@theia/localization-manager@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/localization-manager/-/localization-manager-1.19.0.tgz#6b6eab185c032b376f72c0ddc2a07e6a51ebd4ea" - integrity sha512-bzVZNraNU181CyRI7EVKbkFSM7Q/gZ79avXoZISTWNQSZBdU7mHJiSDDZIIl9qzJdjo5fxtml5oUI98TRw0lnA== +"@theia/localization-manager@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/localization-manager/-/localization-manager-1.22.1.tgz#1e47daaf06ecc780488395230bad655aa59379c9" + integrity sha512-EHwHGCNIfEEoAhU285crzBDZe56LRiXIrZyPr3vHfV9sI88ZGqiIcQYpBS7tIzQdc+NMBwoQyfk/BWM4xllXcg== dependencies: "@types/fs-extra" "^4.0.2" deepmerge "^4.2.2" @@ -2542,23 +2544,22 @@ glob "^7.2.0" typescript "^4.4.3" -"@theia/markers@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.19.0.tgz#5926256dbc6a3ca1e5f3587ba87ebf747e18f8f3" - integrity sha512-kvjPL8llku578ChNB60YtL1dnaqRU74PDOInnhZYvqo8M1TQFbqlgXco9VujZacrZCi3nhtWshJxf0td3hKeQg== +"@theia/markers@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.22.1.tgz#fe423c2e872a93e4be7b1111dc27474b418e8fc9" + integrity sha512-0obkcawh4Xz5Vr31E4RZVdJ0yffrDd1FaMT/Eo+GYVKRscBjTV7xhJ97+3mr8rDGW7w+wFqYnWk8K1n8g5y9sg== dependencies: - "@theia/core" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/navigator" "1.19.0" - "@theia/workspace" "1.19.0" + "@theia/core" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/navigator" "1.22.1" + "@theia/workspace" "1.22.1" -"@theia/messages@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.19.0.tgz#f0e9f9b8e4567f281e00982e925506a1948db494" - integrity sha512-ancIsyoR6FhqL1AzWwBYTzINUzReZ1pANaG6S3sDGaP8qWeFVXReRAM7qSCkSUiFkknTuCqfQ8RLSSRg+8VXpA== +"@theia/messages@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.22.1.tgz#3fae69b12240249287578cc66cd4f0e2878bb84a" + integrity sha512-Yio28WemJIaNraWcHKQVAkjmCYm4xr/a5m2aDU+J9i4W7bAlqZH5hOXgIIWTMjjfnKMJ9SLkngPbCXl0/3TGvg== dependencies: - "@theia/core" "1.19.0" - markdown-it "^8.4.0" + "@theia/core" "1.22.1" react-perfect-scrollbar "^1.5.3" ts-md5 "^1.2.2" @@ -2567,116 +2568,108 @@ resolved "https://registry.yarnpkg.com/@theia/monaco-editor-core/-/monaco-editor-core-0.23.0.tgz#7a1cbb7a857a509ce8e75c9965abea752bd76e80" integrity sha512-WyrotTd6ZfeXAX4icgFALTzlqE356tAQ5nRuwa2E0Qdp2YIO9GDcw5G2l2NJ8INO2ygujbE5pEdD5kJM5N4TOQ== -"@theia/monaco@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.19.0.tgz#ce4c2db38763201ef3c5d1e4c6b58796dd1e42d6" - integrity sha512-1k4rBQn7TA+v0TEsnmTMgGHfvSWlXrDbrxh5Iv9JsfgGYNaofKVyUD/v8ZVSrb4kqybhabHVhIBZe6UWzLDBpw== +"@theia/monaco@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.22.1.tgz#b9e588dcd5671d8a0a982b2b2147a433902c89d7" + integrity sha512-1JyqViYDcAKmAOBb8ZuvZ0cGsucO+LnmXnfn6+zXLvxk81mZ9LUPPJ7OzfUKdyWOEWDWF7Q6H0ygTSJKPec6PA== dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/markers" "1.19.0" + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/markers" "1.22.1" "@theia/monaco-editor-core" "0.23.0" - "@theia/outline-view" "1.19.0" - "@theia/workspace" "1.19.0" + "@theia/outline-view" "1.22.1" + "@theia/workspace" "1.22.1" fast-plist "^0.1.2" idb "^4.0.5" jsonc-parser "^2.2.0" onigasm "^2.2.0" vscode-textmate "^4.4.0" -"@theia/navigator@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.19.0.tgz#0541a032297840d9f74c348d9879a8d8e3c4fcfb" - integrity sha512-zZOI6+qrluodmsW96y7LWTWlWLGJPILw05+oTTJv4alIBxl+geKA8J7HH3ibVWXX6hK2FNe25UohzTQ7Uqwjbg== +"@theia/navigator@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.22.1.tgz#d715776e17de6bd7d0a28acadf4f04fcc8155c40" + integrity sha512-uv9wA2pQf4GT+4CbzpH75MUHW0Zub0x9ICzS3xLafmUCXkcF38rvG1u1x/qz4ZHJcPUmsZhfLSrml7cZoclOVg== dependencies: - "@theia/core" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/workspace" "1.19.0" + "@theia/core" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/workspace" "1.22.1" minimatch "^3.0.4" -"@theia/node-pty@0.9.0-theia.6": - version "0.9.0-theia.6" - resolved "https://registry.yarnpkg.com/@theia/node-pty/-/node-pty-0.9.0-theia.6.tgz#b34710419a0b4917cc97e6a7f4d1b5535cae03ab" - integrity sha512-TvzoyV1dXWIldBldc7emPNqj9Iy8hWmlNZt/kV6m4bW1NyQrG2/P2MGOy8Ei85IA6G8GVcfZms8TwNiqscC0TA== - dependencies: - nan "^2.14.0" - -"@theia/outline-view@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.19.0.tgz#6fc34a3fd7ec73586405208a203ad25a93d9ac4f" - integrity sha512-mUH1hjr/n8P7JcofTBtsx2CCpDHA9dUCG3J2i2fs6KdrWRou2WuFdnW9EG/PKDRqTTMQiJBgYOb9dBfbi7vBgw== +"@theia/outline-view@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.22.1.tgz#015b42359ced414cb21f372cddf413d4c9b488f9" + integrity sha512-xk2cM/F62iFHnEgntihDlirrdpKnL4oyzdcdxoTDn7oND+oY0GDkV+tTxf70Ox4MPP7iE7UwUv2GrzuSNhLoVQ== dependencies: - "@theia/core" "1.19.0" + "@theia/core" "1.22.1" perfect-scrollbar "^1.3.0" -"@theia/output@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/output/-/output-1.19.0.tgz#71d83f1fb4a5505bfbfec5acc4cfdbff46777a3b" - integrity sha512-H9EedIxLzYxmP7vzFvgB4PWBLsVtf8WPu/x6nOblaPwiEQVQdIzB6yvqXx1oZgSay1RwPVJzuHpv70F7NEbwPA== +"@theia/output@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/output/-/output-1.22.1.tgz#6f4ab3b4cad9a5d58cd6362a42e17bb397255851" + integrity sha512-OMs2dryRk8OlheC93cyy0kfqaTsQR9nDZkVdclODxOChZnMIT4pqJPz19OGFXY4sdEdwZxeJFMiFRFJQOrDhsQ== dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/monaco" "1.19.0" + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/monaco" "1.22.1" "@types/p-queue" "^2.3.1" p-queue "^2.4.2" -"@theia/ovsx-client@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.19.0.tgz#6d350c831c7e3280a10269b1ce72f4312896d441" - integrity sha512-TCdEURZTywMv7TbvFZpYjCF/mrB2ltu+9gVIk49eGAQISbmyWOoq3h9D4p+r+HTC+9TvBwAP6LSkvfHjuu+3tw== +"@theia/ovsx-client@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.22.1.tgz#5cdd4ebcec2434411080fc868db1d6bedc5902fe" + integrity sha512-FgLqEgag3yf9tR+peWjq/lUM/Nj8m9SzBgxzNI9FQscV+pP4L9PdgcMb6AgasXgXENlVBG+mg7T52/gh2XHNlQ== dependencies: "@types/bent" "^7.0.1" bent "^7.1.0" semver "^5.4.1" -"@theia/plugin-ext-vscode@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/plugin-ext-vscode/-/plugin-ext-vscode-1.19.0.tgz#85d129d6dd7ad77a337547b21051dd2fff625f4b" - integrity sha512-OdXDXNBI7pU2Wziy2WY10m8tpQ/Mcj5oCkmO/kkBQk/TsbyNxJjIdDQWU/sGUiupOXjJZcuuCbNwJC+n5bFhug== - dependencies: - "@theia/callhierarchy" "1.19.0" - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/monaco" "1.19.0" - "@theia/navigator" "1.19.0" - "@theia/plugin" "1.19.0" - "@theia/plugin-ext" "1.19.0" - "@theia/terminal" "1.19.0" - "@theia/userstorage" "1.19.0" - "@theia/workspace" "1.19.0" +"@theia/plugin-ext-vscode@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/plugin-ext-vscode/-/plugin-ext-vscode-1.22.1.tgz#bd2b35fe3b823d1a81baeb07640b985d22bf62a9" + integrity sha512-v2v1XFR0ELxb2iRs/P37x/MMUTojQ2uTdBtkKKazQpdNB43Nv4r10yG2a+l4PvIlKt83S4Q+V1d5qXr+cThJFQ== + dependencies: + "@theia/callhierarchy" "1.22.1" + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/monaco" "1.22.1" + "@theia/navigator" "1.22.1" + "@theia/plugin" "1.22.1" + "@theia/plugin-ext" "1.22.1" + "@theia/terminal" "1.22.1" + "@theia/userstorage" "1.22.1" + "@theia/workspace" "1.22.1" "@types/request" "^2.0.3" filenamify "^4.1.0" request "^2.82.0" -"@theia/plugin-ext@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/plugin-ext/-/plugin-ext-1.19.0.tgz#9b9a4bd0b1992f1d631609e167465e22194647ff" - integrity sha512-fxx6hMPUkwiIwYzxJ1KOwcb2U+659Uge/aRZf4dEC9ESqeLEo5LqpfXkOLABfym8MDLSXHaUjX2hnbgFpIOAxA== - dependencies: - "@theia/bulk-edit" "1.19.0" - "@theia/callhierarchy" "1.19.0" - "@theia/console" "1.19.0" - "@theia/core" "1.19.0" - "@theia/debug" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/file-search" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/markers" "1.19.0" - "@theia/messages" "1.19.0" - "@theia/monaco" "1.19.0" - "@theia/navigator" "1.19.0" - "@theia/output" "1.19.0" - "@theia/plugin" "1.19.0" - "@theia/preferences" "1.19.0" - "@theia/scm" "1.19.0" - "@theia/search-in-workspace" "1.19.0" - "@theia/task" "1.19.0" - "@theia/terminal" "1.19.0" - "@theia/timeline" "1.19.0" - "@theia/workspace" "1.19.0" - "@types/markdown-it" "*" +"@theia/plugin-ext@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/plugin-ext/-/plugin-ext-1.22.1.tgz#4e3b5b79e13749d92e5b26bff561321ff20ed902" + integrity sha512-vDYC7BDqAB28g+Lcj6tlzyAaZJCbqhNWRWuMxGItleujBsgLFs6jpATYnTWBZvgRZvc+mMnsYUj5XaHhG5VMrw== + dependencies: + "@theia/bulk-edit" "1.22.1" + "@theia/callhierarchy" "1.22.1" + "@theia/console" "1.22.1" + "@theia/core" "1.22.1" + "@theia/debug" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/file-search" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/markers" "1.22.1" + "@theia/messages" "1.22.1" + "@theia/monaco" "1.22.1" + "@theia/navigator" "1.22.1" + "@theia/output" "1.22.1" + "@theia/plugin" "1.22.1" + "@theia/preferences" "1.22.1" + "@theia/scm" "1.22.1" + "@theia/search-in-workspace" "1.22.1" + "@theia/task" "1.22.1" + "@theia/terminal" "1.22.1" + "@theia/timeline" "1.22.1" + "@theia/workspace" "1.22.1" "@types/mime" "^2.0.1" decompress "^4.2.1" escape-html "^1.0.3" @@ -2685,7 +2678,6 @@ jsonc-parser "^2.2.0" lodash.clonedeep "^4.5.0" macaddress "^0.2.9" - markdown-it "^8.4.0" mime "^2.4.4" ps-tree "^1.2.0" request "^2.82.0" @@ -2694,140 +2686,141 @@ vscode-debugprotocol "^1.32.0" vscode-textmate "^4.0.1" -"@theia/plugin@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/plugin/-/plugin-1.19.0.tgz#0582e954070a8ce03ec784ef39e0b8a3f3e43640" - integrity sha512-Afhjg4RZPM4tyFQ2yjqf6LrEI+3aSAkaibGw99Jdcv2m/IXpARa3VdyZX00VDbEgMLiFtfXHckiCp5L8yhY7ug== - -"@theia/preferences@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.19.0.tgz#2bc870e3fb686c05b1582cef4878f766fa7715f6" - integrity sha512-c1wnvbFThqEFZZtcj18MHOZSkMxk0A3dHPW02+aKQYt2eIaRX1D8Whn7rxIRKs8WziggMk2xvKgjN/phZ99ERw== - dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/monaco" "1.19.0" - "@theia/userstorage" "1.19.0" - "@theia/workspace" "1.19.0" +"@theia/plugin@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/plugin/-/plugin-1.22.1.tgz#dc3b39b9bd5f338f2f67336988d68848015308ae" + integrity sha512-aUrprrcsBfmctQE2Ju4ADJjbLF09988GSUbWRMiNp5OvnDXQsb9V3BfXTQUQqcHsCTBds7KVqCC3WA0D9PoAWQ== + +"@theia/preferences@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.22.1.tgz#463e93b6fe6e469555334783444c1555204b8289" + integrity sha512-11Zs3iOJas185QFDnV6cjv2VDxKKuoQ0wCPhuW6laz67y6mrvsw2O8vuDfobp7WTnFNf8mr2ydr1fyaTxh+D9w== + dependencies: + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/monaco" "1.22.1" + "@theia/userstorage" "1.22.1" + "@theia/workspace" "1.22.1" + async-mutex "^0.3.1" jsonc-parser "^2.2.0" -"@theia/process@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.19.0.tgz#c2b00608ad39c7b73f9ab9b9bbbf11208f7270e4" - integrity sha512-yn4UxC3Y2cWGeEpX4vCVp8T332v8lu5OB+Zb+xtprQ5O7MODMrYbnNgrp9HparYJfu/K7xO9S2J0hQV6QO5B9g== +"@theia/process@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.22.1.tgz#0d9381a5ddff6d3c6bc5d51553ba4db000719942" + integrity sha512-zQTtgO8FHomtYkrVPF3oOd549yoV0UTsPGwVqHYNDO1vCGBSE/wE/LXV3/nbjBcUnHMrvH+AjiteN0CSlVVvLQ== dependencies: - "@theia/core" "1.19.0" - "@theia/node-pty" "0.9.0-theia.6" + "@theia/core" "1.22.1" + node-pty "0.11.0-beta17" string-argv "^0.1.1" -"@theia/scm-extra@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/scm-extra/-/scm-extra-1.19.0.tgz#2bc3b8863518d909d2b58c970648564dd1517fdd" - integrity sha512-ihXvl6RVIoEXwyoR580UWqr6p7cp0k+iAHssjfsPWbgVf916PWJFL/qE8xyixYtzKwp+kwifff6CrewxBvXnwQ== - dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/navigator" "1.19.0" - "@theia/scm" "1.19.0" - -"@theia/scm@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.19.0.tgz#f4848970181084ad689835db79cc2154b025e6b9" - integrity sha512-rc4e60p16a2/TEU9kAhR3XF89GdTcGmJxeuQRGrq8NzZjbIyHmW2CMdmFY8T6vwBRA80vlwfDmqr2F0zL5cCXQ== - dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/navigator" "1.19.0" +"@theia/scm-extra@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/scm-extra/-/scm-extra-1.22.1.tgz#8fef0e067e2422aadc0826ea5397f16689f53d17" + integrity sha512-6HQ+4Kzd37LzCSGBe3IKtOwkeBEq4RivYocHUFhXp8IcDIgsyeRpCLELYy50Egjok4rv9w0IyFP8IkFcqBAPxg== + dependencies: + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/navigator" "1.22.1" + "@theia/scm" "1.22.1" + +"@theia/scm@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/scm/-/scm-1.22.1.tgz#c86269d6bf7dcc72d5e1e15eca1e90534fda42df" + integrity sha512-eQ0u0EIVQRmOCXhxJLzaaQySt8jBfMQnFBz4Uk8Bn0ganMYhysn/yxYG3R4g+nOd/lnSkNyyqnAuIpjpwD1o2g== + dependencies: + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/navigator" "1.22.1" "@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.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-1.19.0.tgz#20fa0da70a7650751d0a0642225604bcabf53521" - integrity sha512-7gCgDNCvWphaJjftqXLL0+XEww6Kyz5tnRAffNkURR8X8FnBbptWMePq1sUCewdsWrkxQeRBoGagVV2jy/qLxA== - dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/navigator" "1.19.0" - "@theia/process" "1.19.0" - "@theia/workspace" "1.19.0" +"@theia/search-in-workspace@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/search-in-workspace/-/search-in-workspace-1.22.1.tgz#4a7319bc847010cbd551a86a0c97761fc12f81f7" + integrity sha512-StheMzeNToN28NRR1rCcP0G6H79dd1vLz1eEGZmAf9IH84hIgDTpqJlN6daBI1TQk/ntAXPge+ChVIUQxkGHdA== + dependencies: + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/navigator" "1.22.1" + "@theia/process" "1.22.1" + "@theia/workspace" "1.22.1" minimatch "^3.0.4" vscode-ripgrep "^1.2.4" -"@theia/task@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/task/-/task-1.19.0.tgz#4089ef3f2d1b8fe3c800f3dde276d93d66910152" - integrity sha512-gGbVK08Ve5we1pO/X7HyjW3WJCjXBKG/G9G7taLhgzOjLrbXrJIDyEzxGm9BIeN5oJ9KfoaEJ5Y0NRz98ZKaTQ== - dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/markers" "1.19.0" - "@theia/monaco" "1.19.0" - "@theia/preferences" "1.19.0" - "@theia/process" "1.19.0" - "@theia/terminal" "1.19.0" - "@theia/userstorage" "1.19.0" - "@theia/variable-resolver" "1.19.0" - "@theia/workspace" "1.19.0" +"@theia/task@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/task/-/task-1.22.1.tgz#f5229aa5cb568413e08a95dae47df8ea1453eecb" + integrity sha512-dnxk1emRKCoQQ2BTbUAkDuTE6BTAtJI55r8Fo5M/FOpByRrb+9iKzED7Ehge4VzqDXeYtJDTMlIFrzBiJ1avQg== + dependencies: + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/markers" "1.22.1" + "@theia/monaco" "1.22.1" + "@theia/preferences" "1.22.1" + "@theia/process" "1.22.1" + "@theia/terminal" "1.22.1" + "@theia/userstorage" "1.22.1" + "@theia/variable-resolver" "1.22.1" + "@theia/workspace" "1.22.1" ajv "^6.5.3" async-mutex "^0.3.1" jsonc-parser "^2.2.0" p-debounce "^2.1.0" -"@theia/terminal@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.19.0.tgz#3ed47a50830708f681d27d5514f9626ab08e10f2" - integrity sha512-WOLJ/YKjtjCpvI2px3AlbifTxN1DIytOe/nVjc2yOZZLKD/hFYVPGqzMghpS1JOSfSvYdwxgzCwDZOlSAEnFkA== - dependencies: - "@theia/core" "1.19.0" - "@theia/editor" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/monaco" "1.19.0" - "@theia/process" "1.19.0" - "@theia/workspace" "1.19.0" - xterm "~4.11.0" - xterm-addon-fit "~0.5.0" - xterm-addon-search "~0.8.0" - -"@theia/timeline@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/timeline/-/timeline-1.19.0.tgz#453baa24a0241ff7e459a42414d9a86f496c85f9" - integrity sha512-/wcBYdmN2pde65/DjbByZkqJTTuemXGndokjhW6OaQvuPUOLIYQaAlrhypJXtED4X3RDoykVYkQqbYtdUBAn1A== - dependencies: - "@theia/core" "1.19.0" - "@theia/navigator" "1.19.0" - -"@theia/userstorage@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.19.0.tgz#1a226ebe099f395f36e792077f3eb1e6eb7bbde2" - integrity sha512-azCZX3p/C6Z+K0qPNCIOkS80c2yCYHu5jU4FsPkM8UXfcM2ilprxMDmpZVCTsPno6vohm+aT3W5r1oyhLRA1IQ== - dependencies: - "@theia/core" "1.19.0" - "@theia/filesystem" "1.19.0" - -"@theia/variable-resolver@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.19.0.tgz#fb728ac5bec6ad0a8edb6e1a2330183109bbae59" - integrity sha512-1VV1XC1HZpVGDbS5QAGga6XVnLkm0arT8Bh4UaYUrGQtR4WyfdVktjCrF6J2TUmqQXOendixk7g2UEEq/pehIA== - dependencies: - "@theia/core" "1.19.0" - -"@theia/workspace@1.19.0": - version "1.19.0" - resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.19.0.tgz#09aa42264d38504c8e390317e6275730558b0473" - integrity sha512-FTZwuvHbrQwRbFxLZbgfdvLT53UCi4qXEAaPFLYK4g5z2oAwoAhxOQzhuIOn21c3sjJzlFirKZgU6Rmvdx++Lg== - dependencies: - "@theia/core" "1.19.0" - "@theia/filesystem" "1.19.0" - "@theia/variable-resolver" "1.19.0" +"@theia/terminal@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.22.1.tgz#b4156d13f88c56263f1b8a024049d69f14496919" + integrity sha512-ilQj+jWbzXjdb2fR8Y6TYvDPzXeGCz+m5GhAfLBsN0r2W++fG+vYjtkq9G4UKcBd+PqrTf+hCHjs2zlgRShShQ== + dependencies: + "@theia/core" "1.22.1" + "@theia/editor" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/monaco" "1.22.1" + "@theia/process" "1.22.1" + "@theia/workspace" "1.22.1" + xterm "^4.16.0" + xterm-addon-fit "^0.5.0" + xterm-addon-search "^0.8.2" + +"@theia/timeline@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/timeline/-/timeline-1.22.1.tgz#46b947dd4841c581c0defa2fabbbf3a2e93aee15" + integrity sha512-78kgOR9h0dorv4Dx/uRgTZIEBCbbwPcZGoneEO2KLDSXf4OYaxzXWK3/nKPgT6VbMs//jZIg4O4C1mBPtigIQw== + dependencies: + "@theia/core" "1.22.1" + "@theia/navigator" "1.22.1" + +"@theia/userstorage@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.22.1.tgz#95790c5a7394b1a8c9d0ba11c31404e963537717" + integrity sha512-Rg5O4yoPc8aWzVIi6YegmY4YaQrsV1O1I3SIp9PWWNqrYZjfDn9JFW4RmDtuUoI8n/mmjDUO8AhCwzY9jBB5fA== + dependencies: + "@theia/core" "1.22.1" + "@theia/filesystem" "1.22.1" + +"@theia/variable-resolver@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.22.1.tgz#504fcf12c360e4700a9bb4fcd1b30c0b75726b86" + integrity sha512-1QMqE6g6L7MMsZH+45nulAXbKEBbpwBkwYUx8c7msT+McWrQ9os+0Ff47i5P2FFvYY4WUR6uxA67JIu7EuaYoQ== + dependencies: + "@theia/core" "1.22.1" + +"@theia/workspace@1.22.1": + version "1.22.1" + resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.22.1.tgz#a280f5e36fbf686cada4fb1bcb25298b7d71ea2a" + integrity sha512-E8F3LScvLUshSvb1k1pT9lXWSWMlFOauqkEqR+5pgB3NXWGguFVzXeztkrVBeNJBd10IIZcBO/Wt/G8aJzuXbw== + dependencies: + "@theia/core" "1.22.1" + "@theia/filesystem" "1.22.1" + "@theia/variable-resolver" "1.22.1" ajv "^6.5.3" jsonc-parser "^2.2.0" moment "2.24.0" @@ -3037,7 +3030,7 @@ "@types/tough-cookie" "*" parse5 "^4.0.0" -"@types/json-schema@*", "@types/json-schema@^7.0.8": +"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": 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== @@ -3090,7 +3083,7 @@ resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9" integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w== -"@types/markdown-it@*": +"@types/markdown-it@^12.2.3": version "12.2.3" resolved "https://registry.yarnpkg.com/@types/markdown-it/-/markdown-it-12.2.3.tgz#0d6f6e5e413f8daaa26522904597be3d6cd93b51" integrity sha512-GKMHFfv3458yYy+v/N8gjufHO6MSZKCOXpZc5GXIWWy8uldwfmPn98vp81gZ5f9SVw8YYBctgfJ22a2d7AOMeQ== @@ -3179,10 +3172,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.55.tgz#a147f282edec679b894d4694edb5abeb595fecbd" integrity sha512-koZJ89uLZufDvToeWO5BrC4CR4OUfHnUz2qoPs/daQH6qq3IN62QFxCTZ+bKaCE0xaoCAJYE4AXre8AbghCrhg== -"@types/node@^12.0.12": - version "12.20.6" - resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.6.tgz#7b73cce37352936e628c5ba40326193443cfba25" - integrity sha512-sRVq8d+ApGslmkE9e3i+D3gFGk7aZHAT+G4cIpIEdLJYPsWiSPwcAnJEjddLQQDqV3Ra2jOclX/Sv6YrvGYiWA== +"@types/node@^14.6.2": + version "14.18.9" + resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.9.tgz#0e5944eefe2b287391279a19b407aa98bd14436d" + integrity sha512-j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q== "@types/normalize-package-data@^2.4.0": version "2.4.0" @@ -3344,6 +3337,11 @@ resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== +"@types/semver@^7.3.8": + version "7.3.9" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.9.tgz#152c6c20a7688c30b967ec1841d31ace569863fc" + integrity sha512-L/TMpyURfBkf+o/526Zb6kd/tchUP3iBDEPjqjb+U2MAJhVRxxrmr2fwpe08E7QsV7YLcpq0tUaQ9O9x97ZIxQ== + "@types/serve-static@*": version "1.13.9" resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e" @@ -3516,10 +3514,10 @@ "@typescript-eslint/types" "4.28.0" 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== +"@vscode/codicons@*": + version "0.0.27" + resolved "https://registry.yarnpkg.com/@vscode/codicons/-/codicons-0.0.27.tgz#3b842cbcfb478e1c9e1dc6efbbdedd059cc3e567" + integrity sha512-NpLkfzPfEOO6s2HH+ISITlaXKYB2XeoYZQY2IV39EaJV3NIBygiLqybHrVtKbaDFfeXyP8McmvvnbWd6YykpGg== "@webassemblyjs/ast@1.11.1": version "1.11.1" @@ -3788,17 +3786,26 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" -ajv-errors@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d" - integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ== +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" -ajv-keywords@^3.1.0, ajv-keywords@^3.5.2: +ajv-keywords@^3.5.2: version "3.5.2" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.5.3: +ajv-keywords@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16" + integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw== + dependencies: + fast-deep-equal "^3.1.3" + +ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@^6.5.3: version "6.12.6" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -3808,6 +3815,16 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^8.0.0, ajv@^8.6.3, ajv@^8.8.0: + version "8.9.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18" + integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + ajv@^8.0.1: version "8.6.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz#60cc45d9c46a477d80d92c48076d972c342e5720" @@ -3818,11 +3835,6 @@ ajv@^8.0.1: require-from-string "^2.0.2" uri-js "^4.2.2" -alphanum-sort@^1.0.1, alphanum-sort@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" - integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM= - anser@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/anser/-/anser-2.0.1.tgz#8d9069291fee18306ffaf2e364a690dcc8ed78ad" @@ -4064,11 +4076,6 @@ ansi-strikethrough@^0.1.1: dependencies: ansi-wrap "0.1.0" -ansi-styles@^2.2.1: - version "2.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" - integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4= - ansi-styles@^3.2.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" @@ -4164,6 +4171,11 @@ argparse@^1.0.10, argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + arr-diff@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520" @@ -4345,6 +4357,11 @@ atob@^2.1.2: resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9" integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg== +atomically@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe" + integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w== + auth0-js@^9.14.0: version "9.15.0" resolved "https://registry.yarnpkg.com/auth0-js/-/auth0-js-9.15.0.tgz#ebb88aa87e9aee313f084e3295a57eadaf2d4f8c" @@ -4365,18 +4382,6 @@ autolinker@~0.28.0: dependencies: gulp-header "^1.7.1" -autoprefixer@^6.3.1: - version "6.7.7" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" - integrity sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ= - dependencies: - browserslist "^1.7.6" - caniuse-db "^1.0.30000634" - normalize-range "^0.1.2" - num2fraction "^1.2.2" - postcss "^5.2.16" - postcss-value-parser "^3.2.3" - autosize@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/autosize/-/autosize-4.0.2.tgz#073cfd07c8bf45da4b9fd153437f5bafbba1e4c9" @@ -4392,15 +4397,6 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59" integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA== -babel-code-frame@^6.11.0: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b" - integrity sha1-Y/1D99weO7fONZR9uP42mj9Yx0s= - dependencies: - chalk "^1.1.3" - esutils "^2.0.2" - js-tokens "^3.0.2" - babel-loader@^8.2.2: version "8.2.2" resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.2.tgz#9363ce84c10c9a40e6c753748e1441b60c8a0b81" @@ -4477,11 +4473,6 @@ back@~0.1.5: resolved "https://registry.yarnpkg.com/back/-/back-0.1.5.tgz#342b96b804657b03ec9a31f248a11f200608dcc2" integrity sha1-NCuWuARlewPsmjHySKEfIAYI3MI= -balanced-match@^0.4.2: - version "0.4.2" - resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838" - integrity sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg= - balanced-match@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767" @@ -4541,11 +4532,6 @@ big-integer@^1.6.17: resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.48.tgz#8fd88bd1632cba4a1c8c3e3d7159f08bb95b4b9e" integrity sha512-j51egjPa7/i+RdiRuJbPdJ2FIUYYPhvYLjzoYbcMMm62ooO6F94fETG4MTs46zPAF9Brs04OajboA/qTGuz78w== -big.js@^3.1.3: - version "3.2.0" - resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e" - integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q== - big.js@^5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328" @@ -4660,14 +4646,6 @@ browser-stdout@1.3.1: resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60" integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw== -browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: - version "1.7.7" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9" - integrity sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk= - dependencies: - caniuse-db "^1.0.30000639" - electron-to-chromium "^1.2.7" - browserslist@^4.14.5, browserslist@^4.16.3: version "4.16.3" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.3.tgz#340aa46940d7db878748567c5dea24a48ddf3717" @@ -4783,26 +4761,6 @@ bytesish@^0.4.1: resolved "https://registry.yarnpkg.com/bytesish/-/bytesish-0.4.4.tgz#f3b535a0f1153747427aee27256748cff92347e6" integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ== -cacache@^11.2.0: - version "11.3.3" - resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc" - integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA== - dependencies: - bluebird "^3.5.5" - chownr "^1.1.1" - figgy-pudding "^3.5.1" - glob "^7.1.4" - graceful-fs "^4.1.15" - lru-cache "^5.1.1" - mississippi "^3.0.0" - mkdirp "^0.5.1" - move-concurrently "^1.0.1" - promise-inflight "^1.0.1" - rimraf "^2.6.3" - ssri "^6.0.1" - unique-filename "^1.1.1" - y18n "^4.0.0" - cacache@^12.0.0, cacache@^12.0.3: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" @@ -4943,21 +4901,6 @@ camelcase@^5.0.0, camelcase@^5.3.1: resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== -caniuse-api@^1.5.2: - version "1.6.1" - resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c" - integrity sha1-tTTnxzTE+B7F++isoq0kNUuWLGw= - dependencies: - browserslist "^1.3.6" - caniuse-db "^1.0.30000529" - lodash.memoize "^4.1.2" - lodash.uniq "^4.5.0" - -caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30001204" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30001204.tgz#95959fa4ebf08c871eff3274518e382cd0f8a223" - integrity sha512-Q4X8pJp5li4mEiNmQMamOFrWbFB29anrWNe9U9/Qcuh7nseuH4D8XNIq7rHy/dt264SuoVOX+36qRMyhTvGnHQ== - caniuse-lite@^1.0.30001181: version "1.0.30001204" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz#256c85709a348ec4d175e847a3b515c66e79f2aa" @@ -5002,18 +4945,15 @@ chainsaw@~0.1.0: dependencies: traverse ">=0.3.0 <0.4" -chalk@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" - integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg= +chalk@4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.0.0.tgz#6e98081ed2d17faab615eb52ac66ec1fe6209e72" + integrity sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A== dependencies: - ansi-styles "^2.2.1" - escape-string-regexp "^1.0.2" - has-ansi "^2.0.0" - strip-ansi "^3.0.0" - supports-color "^2.0.0" + ansi-styles "^4.1.0" + supports-color "^7.1.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.3.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -5112,13 +5052,6 @@ circular-json@^0.3.1: resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66" integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A== -clap@^1.0.9: - version "1.2.3" - resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51" - integrity sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA== - dependencies: - chalk "^1.1.3" - class-utils@^0.3.5: version "0.3.6" resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" @@ -5252,13 +5185,6 @@ clsx@^1.0.4, clsx@^1.1.0: resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188" integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA== -coa@~1.0.1: - version "1.0.4" - resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd" - integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0= - dependencies: - q "^1.1.2" - code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" @@ -5272,7 +5198,7 @@ collection-visit@^1.0.0: map-visit "^1.0.0" object-visit "^1.0.0" -color-convert@^1.3.0, color-convert@^1.9.0: +color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -5291,51 +5217,21 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= -color-name@^1.0.0, color-name@~1.1.4: +color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== -color-string@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991" - integrity sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE= - dependencies: - color-name "^1.0.0" - -color@^0.11.0: - version "0.11.4" - resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764" - integrity sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q= - dependencies: - clone "^1.0.2" - color-convert "^1.3.0" - color-string "^0.3.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== -colormin@^1.0.5: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133" - integrity sha1-6i90IKcrlogaOKrlnsEkpvcpgTM= - dependencies: - color "^0.11.0" - css-color-names "0.0.4" - has "^1.0.1" - -colors@^1.3.3, colors@^1.4.0: +colors@^1.3.3: version "1.4.0" resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78" integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA== -colors@~1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.1.2.tgz#168a4701756b6a7f51a12ce0c97bfa28c084ed63" - integrity sha1-FopHAXVran9RoSzgyXv6KMCE7WM= - colour@~0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/colour/-/colour-0.7.1.tgz#9cb169917ec5d12c0736d3e8685746df1cadf778" @@ -5384,6 +5280,14 @@ component-emitter@^1.2.1, component-emitter@^1.3.0: resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0" integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg== +compression-webpack-plugin@^9.0.0: + version "9.2.0" + resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-9.2.0.tgz#57fd539d17c5907eebdeb4e83dcfe2d7eceb9ef6" + integrity sha512-R/Oi+2+UHotGfu72fJiRoVpuRifZT0tTC6UqFD/DUo+mv8dbOow9rVOuTvDv5nPPm3GZhHL/fKkwxwIHnJ8Nyw== + dependencies: + schema-utils "^4.0.0" + serialize-javascript "^6.0.0" + computed-style@~0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/computed-style/-/computed-style-0.1.4.tgz#7f344fd8584b2e425bedca4a1afc0e300bb05d74" @@ -5421,21 +5325,21 @@ concat-with-sourcemaps@*: dependencies: source-map "^0.6.1" -conf@^6.2.1: - version "6.2.4" - resolved "https://registry.yarnpkg.com/conf/-/conf-6.2.4.tgz#49d23c4e21ef2ac2860f7b5ed25b7b7e484f769f" - integrity sha512-GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ== - dependencies: - ajv "^6.10.2" - debounce-fn "^3.0.1" - dot-prop "^5.0.0" - env-paths "^2.2.0" - json-schema-typed "^7.0.1" - make-dir "^3.0.0" - onetime "^5.1.0" - pkg-up "^3.0.1" - semver "^6.2.0" - write-file-atomic "^3.0.0" +conf@^10.0.3: + version "10.1.1" + resolved "https://registry.yarnpkg.com/conf/-/conf-10.1.1.tgz#ff08046d5aeeee0eaff55d57f5b4319193c3dfda" + integrity sha512-z2civwq/k8TMYtcn3SVP0Peso4otIWnHtcTuHhQ0zDZDdP4NTxqEc8owfkz4zBsdMYdn/LFcE+ZhbCeqkhtq3Q== + dependencies: + ajv "^8.6.3" + ajv-formats "^2.1.1" + atomically "^1.7.0" + debounce-fn "^4.0.0" + dot-prop "^6.0.1" + env-paths "^2.2.1" + json-schema-typed "^7.0.3" + onetime "^5.1.2" + pkg-up "^3.1.0" + semver "^7.3.5" config-chain@^1.1.11: version "1.1.12" @@ -5728,11 +5632,6 @@ crypto-js@^3.2.1: resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.3.0.tgz#846dd1cce2f68aacfa156c8578f926a609b7976b" integrity sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q== -css-color-names@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0" - integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA= - css-element-queries@^1.2.0: version "1.2.3" resolved "https://registry.yarnpkg.com/css-element-queries/-/css-element-queries-1.2.3.tgz#e14940b1fcd4bf0da60ea4145d05742d7172e516" @@ -5752,83 +5651,11 @@ css-loader@^6.2.0: postcss-value-parser "^4.1.0" semver "^7.3.5" -css-loader@~0.26.1: - version "0.26.4" - resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-0.26.4.tgz#b61e9e30db94303e6ffc892f10ecd09ad025a1fd" - integrity sha1-th6eMNuUMD5v/IkvEOzQmtAlof0= - dependencies: - babel-code-frame "^6.11.0" - css-selector-tokenizer "^0.7.0" - cssnano ">=2.6.1 <4" - loader-utils "^1.0.2" - lodash.camelcase "^4.3.0" - object-assign "^4.0.1" - postcss "^5.0.6" - postcss-modules-extract-imports "^1.0.0" - postcss-modules-local-by-default "^1.0.1" - postcss-modules-scope "^1.0.0" - postcss-modules-values "^1.1.0" - source-list-map "^0.1.7" - -css-selector-tokenizer@^0.7.0: - version "0.7.3" - resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.3.tgz#735f26186e67c749aaf275783405cf0661fae8f1" - integrity sha512-jWQv3oCEL5kMErj4wRnK/OPoBi0D+P1FR2cDCKYPaMeD2eW3/mttav8HT4hT1CKopiJI/psEULjkClhvJo4Lvg== - dependencies: - cssesc "^3.0.0" - fastparse "^1.1.2" - cssesc@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg== -"cssnano@>=2.6.1 <4": - version "3.10.0" - resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38" - integrity sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg= - dependencies: - autoprefixer "^6.3.1" - decamelize "^1.1.2" - defined "^1.0.0" - has "^1.0.1" - object-assign "^4.0.1" - postcss "^5.0.14" - postcss-calc "^5.2.0" - postcss-colormin "^2.1.8" - postcss-convert-values "^2.3.4" - postcss-discard-comments "^2.0.4" - postcss-discard-duplicates "^2.0.1" - postcss-discard-empty "^2.0.1" - postcss-discard-overridden "^0.1.1" - postcss-discard-unused "^2.2.1" - postcss-filter-plugins "^2.0.0" - postcss-merge-idents "^2.1.5" - postcss-merge-longhand "^2.0.1" - postcss-merge-rules "^2.0.3" - postcss-minify-font-values "^1.0.2" - postcss-minify-gradients "^1.0.1" - postcss-minify-params "^1.0.4" - postcss-minify-selectors "^2.0.4" - postcss-normalize-charset "^1.1.0" - postcss-normalize-url "^3.0.7" - postcss-ordered-values "^2.1.0" - postcss-reduce-idents "^2.2.2" - postcss-reduce-initial "^1.0.0" - postcss-reduce-transforms "^1.0.3" - postcss-svgo "^2.1.1" - postcss-unique-selectors "^2.0.2" - postcss-value-parser "^3.2.3" - postcss-zindex "^2.0.1" - -csso@~2.3.1: - version "2.3.2" - resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85" - integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U= - dependencies: - clap "^1.0.9" - source-map "^0.5.3" - cssom@0.3.x, "cssom@>= 0.3.2 < 0.4.0": version "0.3.8" resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a" @@ -5898,12 +5725,12 @@ dateformat@^3.0.0, dateformat@^3.0.3: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -debounce-fn@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-3.0.1.tgz#034afe8b904d985d1ec1aa589cd15f388741d680" - integrity sha512-aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q== +debounce-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz#ed76d206d8a50e60de0dd66d494d82835ffe61c7" + integrity sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ== dependencies: - mimic-fn "^2.1.0" + mimic-fn "^3.0.0" debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.5.1, debug@^2.6.9: version "2.6.9" @@ -6130,11 +5957,6 @@ define-property@^2.0.2: is-descriptor "^1.0.2" isobject "^3.0.1" -defined@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693" - integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM= - delayed-stream@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619" @@ -6256,13 +6078,20 @@ dot-prop@^4.2.0: dependencies: is-obj "^1.0.0" -dot-prop@^5.0.0, dot-prop@^5.1.0: +dot-prop@^5.1.0: version "5.3.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88" integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q== dependencies: is-obj "^2.0.0" +dot-prop@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" + integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== + dependencies: + is-obj "^2.0.0" + download@^7.1.0: version "7.1.0" resolved "https://registry.yarnpkg.com/download/-/download-7.1.0.tgz#9059aa9d70b503ee76a132897be6dec8e5587233" @@ -6353,7 +6182,7 @@ ee-first@1.1.1: resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= -electron-rebuild@^1.8.6: +electron-rebuild@^1.11.0: version "1.11.0" resolved "https://registry.yarnpkg.com/electron-rebuild/-/electron-rebuild-1.11.0.tgz#e384773a9ad30fe0a6a5bbb326b779d51f668b6a" integrity sha512-cn6AqZBQBVtaEyj5jZW1/LOezZZ22PA1HvhEP7asvYPJ8PDF4i4UFt9be4i9T7xJKiSiomXvY5Fd+dSq3FXZxA== @@ -6368,26 +6197,26 @@ electron-rebuild@^1.8.6: spawn-rx "^3.0.0" yargs "^14.2.0" -electron-store@^5.1.1: - version "5.2.0" - resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-5.2.0.tgz#a15718fc1fa21acfd07af55f9b94f9fa6a536665" - integrity sha512-iU3WDqEDAYNYR9XV7p0tJajq/zs9z7Nrn0sAoR5nDyn8h/9dr9kusKbTxD8NtVEBD1TB1pkGMqcbIt/y6knDwQ== +electron-store@^8.0.0: + version "8.0.1" + resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-8.0.1.tgz#9b598c1d2edeffebee9d8c1cd957ad368c528925" + integrity sha512-ZyLvNywiqSpbwC/pp89O/AycVWY/UJIkmtyzF2Bd0Nm/rLmcFc0NTGuLdg6+LE8mS8qsiK5JMoe4PnrecLHH5w== dependencies: - conf "^6.2.1" - type-fest "^0.7.1" + conf "^10.0.3" + type-fest "^1.0.2" -electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.649: +electron-to-chromium@^1.3.649: version "1.3.695" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.695.tgz#955f419cf99137226180cc4cca2e59015a4e248d" integrity sha512-lz66RliUqLHU1Ojxx1A4QUxKydjiQ79Y4dZyPobs2Dmxj5aVL2TM3KoQ2Gs7HS703Bfny+ukI3KOxwAB0xceHQ== -electron@^9.0.2: - version "9.4.4" - resolved "https://registry.yarnpkg.com/electron/-/electron-9.4.4.tgz#2a74a0655a74bd326216672c5ae6ed3a44451446" - integrity sha512-dcPlTrMWQu5xuSm6sYV42KK/BRIqh3erM8v/WtZqaDmG7pkCeJpvw26Dgbqhdt78XmqqGiN96giEe6A3S9vpAQ== +electron@^15.3.5: + version "15.3.6" + resolved "https://registry.yarnpkg.com/electron/-/electron-15.3.6.tgz#19b9aee1e063b1983b3d7f535567d90e0e1b4d04" + integrity sha512-mOOTcZH/Vlq9GP3B8G3aMvZQ4eZyCjUZZpLccABqsPyLUMEixcdx750DQ7M+iHYyo0BWxj/JuHblzQXgNnPkfg== dependencies: - "@electron/get" "^1.0.1" - "@types/node" "^12.0.12" + "@electron/get" "^1.13.0" + "@types/node" "^14.6.2" extract-zip "^1.0.3" emoji-regex@^7.0.1: @@ -6400,11 +6229,6 @@ emoji-regex@^8.0.0: resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emojis-list@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389" - integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k= - emojis-list@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" @@ -6449,12 +6273,12 @@ ent@^2.2.0: resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d" integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0= -entities@~1.1.1: - version "1.1.2" - resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" - integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== +entities@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/entities/-/entities-2.1.0.tgz#992d3129cf7df6870b96c57858c249a120f8b8b5" + integrity sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w== -env-paths@^2.2.0: +env-paths@^2.2.0, env-paths@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== @@ -6733,11 +6557,6 @@ espree@^7.3.0, espree@^7.3.1: acorn-jsx "^5.3.1" eslint-visitor-keys "^1.3.0" -esprima@^2.6.0: - version "2.7.3" - resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581" - integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE= - esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" @@ -7066,11 +6885,6 @@ fastest-levenshtein@^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== -fastparse@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9" - integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ== - fastq@^1.6.0: version "1.11.0" resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.0.tgz#bb9fb955a07130a918eb63c1f5161cc32a5d0858" @@ -7197,7 +7011,7 @@ finalhandler@~1.1.2: statuses "~1.5.0" unpipe "~1.0.0" -find-cache-dir@^3.0.0, find-cache-dir@^3.3.1: +find-cache-dir@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.1.tgz#89b33fad4a4670daa94f855f7fbe31d6d84fe880" integrity sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ== @@ -7284,11 +7098,6 @@ flatted@^3.1.0: resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== -flatten@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b" - integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg== - flush-write-stream@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/flush-write-stream/-/flush-write-stream-1.1.1.tgz#8dd7d873a1babc207d94ead0c2e0e44276ebf2e8" @@ -7297,15 +7106,6 @@ flush-write-stream@^1.0.0: inherits "^2.0.3" readable-stream "^2.3.6" -font-awesome-webpack@0.0.5-beta.2: - version "0.0.5-beta.2" - resolved "https://registry.yarnpkg.com/font-awesome-webpack/-/font-awesome-webpack-0.0.5-beta.2.tgz#9ea5f22f0615d08e76d8db341563649a726286d6" - integrity sha1-nqXyLwYV0I522Ns0FWNkmnJihtY= - dependencies: - css-loader "~0.26.1" - less-loader "~2.2.3" - style-loader "~0.13.1" - font-awesome@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133" @@ -7738,6 +7538,18 @@ global-agent@^2.0.2: semver "^7.3.2" serialize-error "^7.0.1" +global-agent@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/global-agent/-/global-agent-3.0.0.tgz#ae7cd31bd3583b93c5a16437a1afe27cc33a1ab6" + integrity sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q== + dependencies: + boolean "^3.0.1" + es6-error "^4.1.1" + matcher "^3.0.0" + roarr "^2.15.3" + semver "^7.3.2" + serialize-error "^7.0.1" + global-tunnel-ng@^2.7.1: version "2.7.1" resolved "https://registry.yarnpkg.com/global-tunnel-ng/-/global-tunnel-ng-2.7.1.tgz#d03b5102dfde3a69914f5ee7d86761ca35d57d8f" @@ -7855,7 +7667,7 @@ got@^9.6.0: to-readable-stream "^1.0.0" url-parse-lax "^3.0.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.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: version "4.2.6" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee" integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ== @@ -7998,23 +7810,11 @@ hard-rejection@^2.1.0: resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" integrity sha512-VIZB+ibDhx7ObhAe7OVtoEbuP4h/MuOTHJ+J8h/eBXotJYl0fBgR72xDFCKgIh22OJZIOVNxBMWuhAr10r8HdA== -has-ansi@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" - integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE= - dependencies: - ansi-regex "^2.0.0" - has-bigints@^1.0.0, has-bigints@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113" integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA== -has-flag@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa" - integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo= - has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" @@ -8078,7 +7878,7 @@ has-values@^1.0.0: is-number "^3.0.0" kind-of "^4.0.0" -has@^1.0.1, has@^1.0.3: +has@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw== @@ -8143,11 +7943,6 @@ hosted-git-info@^4.0.1: dependencies: lru-cache "^6.0.0" -html-comment-regex@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7" - integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ== - html-encoding-sniffer@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8" @@ -8277,11 +8072,6 @@ iconv-lite@^0.6.0, iconv-lite@^0.6.2: dependencies: safer-buffer ">= 2.1.2 < 3.0.0" -icss-replace-symbols@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" - integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0= - icss-utils@^5.0.0, icss-utils@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae" @@ -8405,11 +8195,6 @@ indent-string@^4.0.0: resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251" integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg== -indexes-of@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607" - integrity sha1-8w9xbI4r00bHtn0985FVZqfAVgc= - infer-owner@^1.0.3, infer-owner@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467" @@ -8528,11 +8313,6 @@ ipaddr.js@1.9.1: resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== -is-absolute-url@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6" - integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY= - is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -8874,13 +8654,6 @@ is-string@^1.0.6: resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f" integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w== -is-svg@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9" - integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk= - dependencies: - html-comment-regex "^1.1.0" - is-symbol@^1.0.2, is-symbol@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937" @@ -8895,7 +8668,7 @@ is-text-path@^1.0.1: dependencies: text-extensions "^1.0.0" -is-typedarray@^1.0.0, is-typedarray@~1.0.0: +is-typedarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= @@ -8988,11 +8761,6 @@ jest-worker@^27.0.6: merge-stream "^2.0.0" supports-color "^8.0.0" -js-base64@^2.1.9: - version "2.6.4" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.6.4.tgz#f4e686c5de1ea1f867dbcad3d46d969428df98c4" - integrity sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ== - js-cookie@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8" @@ -9003,11 +8771,6 @@ js-cookie@^2.2.0: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== -js-tokens@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" - integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls= - js-yaml@3.13.1: version "3.13.1" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" @@ -9024,14 +8787,6 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" -js-yaml@~3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80" - integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A= - dependencies: - argparse "^1.0.7" - esprima "^2.6.0" - jsbn@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-1.1.0.tgz#b01307cb29b618a1ed26ec79e911f803c4da0040" @@ -9114,7 +8869,7 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema-typed@^7.0.1: +json-schema-typed@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9" integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A== @@ -9134,11 +8889,6 @@ json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus= -json5@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" - integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE= - json5@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" @@ -9302,13 +9052,6 @@ lerna@^3.20.2: import-local "^2.0.0" npmlog "^4.1.2" -less-loader@~2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-2.2.3.tgz#b6d8f8139c8493df09d992a93a00734b08f84528" - integrity sha1-ttj4E5yEk98J2ZKpOgBzSwj4RSg= - dependencies: - loader-utils "^0.2.5" - less@^3.0.3: version "3.13.1" resolved "https://registry.yarnpkg.com/less/-/less-3.13.1.tgz#0ebc91d2a0e9c0c6735b83d496b0ab0583077909" @@ -9353,10 +9096,10 @@ lines-and-columns@^1.1.6: resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00" integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA= -linkify-it@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-2.2.0.tgz#e3b54697e78bf915c70a38acd78fd09e0058b1cf" - integrity sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw== +linkify-it@^3.0.1: + version "3.0.3" + resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-3.0.3.tgz#a98baf44ce45a550efb4d49c769d07524cc2fa2e" + integrity sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ== dependencies: uc.micro "^1.0.1" @@ -9436,17 +9179,7 @@ loader-runner@^4.2.0: resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384" integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw== -loader-utils@^0.2.5: - version "0.2.17" - resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348" - integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g= - dependencies: - big.js "^3.1.3" - emojis-list "^2.0.0" - json5 "^0.5.0" - object-assign "^4.0.1" - -loader-utils@^1.0.2, loader-utils@^1.0.3, loader-utils@^1.4.0: +loader-utils@^1.0.3, loader-utils@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613" integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA== @@ -9527,11 +9260,6 @@ lodash.ismatch@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37" integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc= -lodash.memoize@^4.1.2: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" - integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= - lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" @@ -9788,14 +9516,14 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -markdown-it@^8.4.0: - version "8.4.2" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.2.tgz#386f98998dc15a37722aa7722084f4020bdd9b54" - integrity sha512-GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ== +markdown-it@^12.3.2: + version "12.3.2" + resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-12.3.2.tgz#bf92ac92283fe983fe4de8ff8abfb5ad72cd0c90" + integrity sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg== dependencies: - argparse "^1.0.7" - entities "~1.1.1" - linkify-it "^2.0.0" + argparse "^2.0.1" + entities "~2.1.0" + linkify-it "^3.0.1" mdurl "^1.0.1" uc.micro "^1.0.5" @@ -9806,11 +9534,6 @@ matcher@^3.0.0: dependencies: escape-string-regexp "^4.0.0" -math-expression-evaluator@^1.2.14: - version "1.3.7" - resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.3.7.tgz#1b62225db86af06f7ea1fd9576a34af605a5b253" - integrity sha512-nrbaifCl42w37hYd6oRLvoymFK42tWB+WQTMFtksDGQMi5GvlJwnz/CsS30FFAISFLtX+A0csJ0xLiuuyyec7w== - mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -9979,6 +9702,11 @@ mimic-fn@^2.0.0, mimic-fn@^2.1.0: resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== +mimic-fn@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" + integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== + mimic-response@^1.0.0, mimic-response@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b" @@ -10099,7 +9827,7 @@ mkdirp@*, mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdirp@0.5.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4, mkdirp@~0.5.1: +mkdirp@0.5.5, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.4: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -10286,10 +10014,10 @@ napi-build-utils@^1.0.1: resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806" integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg== -native-keymap@^2.1.2: - version "2.2.1" - resolved "https://registry.yarnpkg.com/native-keymap/-/native-keymap-2.2.1.tgz#537023ec6e73591a68659f6a14eba8e1965b0633" - integrity sha512-rsEf2gbFFNEy3MxxQocCn9XpNyqBa8kMFFrjXFWCp3lWuhk3svHnWYZOj3Or8lNoAIjVxAPLdMClraLXHz6dnw== +native-keymap@^2.2.1: + version "2.5.0" + resolved "https://registry.yarnpkg.com/native-keymap/-/native-keymap-2.5.0.tgz#4d567497efb0d2efbfd53048f14093f25984c2b4" + integrity sha512-EfdMpTcX40mlHBJSWidFV4WLpwwaebK3D3JFuO/42voOAnG2WHgDdg6JerbqcxXvRhvIg934GV+9PjB3jzfu9A== native-request@^1.0.5: version "1.0.8" @@ -10320,7 +10048,7 @@ negotiator@0.6.2: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== -neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.2: +neo-async@^2.6.0, neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== @@ -10346,17 +10074,17 @@ nise@^5.1.0: just-extend "^4.0.2" path-to-regexp "^1.7.0" -node-abi@^2.11.0, node-abi@^2.7.0: - version "2.21.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.21.0.tgz#c2dc9ebad6f4f53d6ea9b531e7b8faad81041d48" - integrity sha512-smhrivuPqEM3H5LmnY3KU6HfYv0u4QklgAxfFyRNujKUzbUcYZ+Jc2EhukB9SRcD2VpqhxM7n/MIcp1Ua1/JMg== +node-abi@*: + version "3.5.0" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.5.0.tgz#26e8b7b251c3260a5ac5ba5aef3b4345a0229248" + integrity sha512-LtHvNIBgOy5mO8mPEUtkCW/YCRWYEKshIvqhe1GHHyXEHEB5mgICyYnAcl4qan3uFeRROErKGzatFHPf6kDxWw== dependencies: - semver "^5.4.1" + semver "^7.3.5" -node-abi@^2.21.0: - version "2.26.0" - resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.26.0.tgz#355d5d4bc603e856f74197adbf3f5117a396ba40" - integrity sha512-ag/Vos/mXXpWLLAYWsAoQdgS+gW7IwvgMLOgqopm/DbzAjazLltzgzpVMsFlgmo9TzG5hGXeaBZx2AI731RIsQ== +node-abi@^2.11.0, node-abi@^2.21.0, node-abi@^2.7.0: + version "2.30.1" + resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.30.1.tgz#c437d4b1fe0e285aaf290d45b45d4d7afedac4cf" + integrity sha512-/2D0wOQPgaUWzVSVgRMx+trKJRC2UG4SUc4oCJoXx9Uxjtp0Vy3/kt7zcbxHF8+Z/pK3UloLWzBISg72brfy1w== dependencies: semver "^5.4.1" @@ -10387,7 +10115,7 @@ node-fetch-npm@^2.0.2: json-parse-better-errors "^1.0.0" safe-buffer "^5.1.1" -node-fetch@^2.5.0, node-fetch@^2.6.0, node-fetch@^2.6.1: +node-fetch@^2.5.0, node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== @@ -10433,22 +10161,6 @@ node-gyp@^6.0.1: tar "^4.4.12" which "^1.3.1" -node-gyp@^7.0.0: - version "7.1.2" - resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-7.1.2.tgz#21a810aebb187120251c3bcec979af1587b188ae" - integrity sha512-CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ== - dependencies: - env-paths "^2.2.0" - glob "^7.1.4" - graceful-fs "^4.2.3" - nopt "^5.0.0" - npmlog "^4.1.2" - request "^2.88.2" - rimraf "^3.0.2" - semver "^7.3.2" - tar "^6.0.2" - which "^2.0.2" - node-pre-gyp@^0.15.0: version "0.15.0" resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz#c2fc383276b74c7ffa842925241553e8b40f1087" @@ -10465,6 +10177,13 @@ node-pre-gyp@^0.15.0: semver "^5.3.0" tar "^4.4.2" +node-pty@0.11.0-beta17: + version "0.11.0-beta17" + resolved "https://registry.yarnpkg.com/node-pty/-/node-pty-0.11.0-beta17.tgz#7df6a60dced6bf7a3a282b65cf51980c68954af6" + integrity sha512-JALo4LgYKmzmmXI23CIfS6DpCuno647YJpNg3RT6jCKTHWrt+RHeB6JAlb/pJG9dFNSeaiIAWD+0waEg2AzlfA== + dependencies: + nan "^2.14.0" + node-releases@^1.1.70: version "1.1.71" resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb" @@ -10520,11 +10239,6 @@ normalize-path@^3.0.0, normalize-path@~3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-range@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942" - integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI= - normalize-url@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6" @@ -10534,16 +10248,6 @@ normalize-url@2.0.1: query-string "^5.0.1" sort-keys "^2.0.0" -normalize-url@^1.4.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c" - integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw= - dependencies: - object-assign "^4.0.1" - prepend-http "^1.0.0" - query-string "^4.1.0" - sort-keys "^1.0.0" - normalize-url@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559" @@ -10654,11 +10358,6 @@ nsfw@^2.1.2: dependencies: node-addon-api "*" -num2fraction@^1.2.2: - version "1.2.2" - resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede" - integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4= - number-is-nan@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" @@ -11329,7 +11028,7 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: dependencies: find-up "^4.0.0" -pkg-up@^3.0.1: +pkg-up@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== @@ -11353,164 +11052,11 @@ posix-character-classes@^0.1.0: resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab" integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs= -postcss-calc@^5.2.0: - version "5.3.1" - resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e" - integrity sha1-d7rnypKK2FcW4v2kLyYb98HWW14= - dependencies: - postcss "^5.0.2" - postcss-message-helpers "^2.0.0" - reduce-css-calc "^1.2.6" - -postcss-colormin@^2.1.8: - version "2.2.2" - resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b" - integrity sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks= - dependencies: - colormin "^1.0.5" - postcss "^5.0.13" - postcss-value-parser "^3.2.3" - -postcss-convert-values@^2.3.4: - version "2.6.1" - resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d" - integrity sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0= - dependencies: - postcss "^5.0.11" - postcss-value-parser "^3.1.2" - -postcss-discard-comments@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d" - integrity sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0= - dependencies: - postcss "^5.0.14" - -postcss-discard-duplicates@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932" - integrity sha1-uavye4isGIFYpesSq8riAmO5GTI= - dependencies: - postcss "^5.0.4" - -postcss-discard-empty@^2.0.1: - version "2.1.0" - resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5" - integrity sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU= - dependencies: - postcss "^5.0.14" - -postcss-discard-overridden@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58" - integrity sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg= - dependencies: - postcss "^5.0.16" - -postcss-discard-unused@^2.2.1: - version "2.2.3" - resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433" - integrity sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM= - dependencies: - postcss "^5.0.14" - uniqs "^2.0.0" - -postcss-filter-plugins@^2.0.0: - version "2.0.3" - resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz#82245fdf82337041645e477114d8e593aa18b8ec" - integrity sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ== - dependencies: - postcss "^5.0.4" - -postcss-merge-idents@^2.1.5: - version "2.1.7" - resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270" - integrity sha1-TFUwMTwI4dWzu/PSu8dH4njuonA= - dependencies: - has "^1.0.1" - postcss "^5.0.10" - postcss-value-parser "^3.1.1" - -postcss-merge-longhand@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658" - integrity sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg= - dependencies: - postcss "^5.0.4" - -postcss-merge-rules@^2.0.3: - version "2.1.2" - resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721" - integrity sha1-0d9d+qexrMO+VT8OnhDofGG19yE= - dependencies: - browserslist "^1.5.2" - caniuse-api "^1.5.2" - postcss "^5.0.4" - postcss-selector-parser "^2.2.2" - vendors "^1.0.0" - -postcss-message-helpers@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e" - integrity sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4= - -postcss-minify-font-values@^1.0.2: - version "1.0.5" - resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69" - integrity sha1-S1jttWZB66fIR0qzUmyv17vey2k= - dependencies: - object-assign "^4.0.1" - postcss "^5.0.4" - postcss-value-parser "^3.0.2" - -postcss-minify-gradients@^1.0.1: - version "1.0.5" - resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1" - integrity sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE= - dependencies: - postcss "^5.0.12" - postcss-value-parser "^3.3.0" - -postcss-minify-params@^1.0.4: - version "1.2.2" - resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3" - integrity sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM= - dependencies: - alphanum-sort "^1.0.1" - postcss "^5.0.2" - postcss-value-parser "^3.0.2" - uniqs "^2.0.0" - -postcss-minify-selectors@^2.0.4: - version "2.1.1" - resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf" - integrity sha1-ssapjAByz5G5MtGkllCBFDEXNb8= - dependencies: - alphanum-sort "^1.0.2" - has "^1.0.1" - postcss "^5.0.14" - postcss-selector-parser "^2.0.0" - -postcss-modules-extract-imports@^1.0.0: - version "1.2.1" - resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.1.tgz#dc87e34148ec7eab5f791f7cd5849833375b741a" - integrity sha512-6jt9XZwUhwmRUhb/CkyJY020PYaPJsCyt3UjbaWo6XEbH/94Hmv6MP7fG2C5NDU/BcHzyGYxNtHvM+LTf9HrYw== - dependencies: - postcss "^6.0.1" - postcss-modules-extract-imports@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d" integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw== -postcss-modules-local-by-default@^1.0.1: - version "1.2.0" - resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" - integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk= - dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" - postcss-modules-local-by-default@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c" @@ -11520,14 +11066,6 @@ postcss-modules-local-by-default@^4.0.0: postcss-selector-parser "^6.0.2" postcss-value-parser "^4.1.0" -postcss-modules-scope@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" - integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A= - dependencies: - css-selector-tokenizer "^0.7.0" - postcss "^6.0.1" - postcss-modules-scope@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06" @@ -11535,14 +11073,6 @@ postcss-modules-scope@^3.0.0: dependencies: postcss-selector-parser "^6.0.4" -postcss-modules-values@^1.1.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" - integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA= - dependencies: - icss-replace-symbols "^1.1.0" - postcss "^6.0.1" - postcss-modules-values@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c" @@ -11550,64 +11080,6 @@ postcss-modules-values@^4.0.0: dependencies: icss-utils "^5.0.0" -postcss-normalize-charset@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1" - integrity sha1-757nEhLX/nWceO0WL2HtYrXLk/E= - dependencies: - postcss "^5.0.5" - -postcss-normalize-url@^3.0.7: - version "3.0.8" - resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222" - integrity sha1-EI90s/L82viRov+j6kWSJ5/HgiI= - dependencies: - is-absolute-url "^2.0.0" - normalize-url "^1.4.0" - postcss "^5.0.14" - postcss-value-parser "^3.2.3" - -postcss-ordered-values@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d" - integrity sha1-7sbCpntsQSqNsgQud/6NpD+VwR0= - dependencies: - postcss "^5.0.4" - postcss-value-parser "^3.0.1" - -postcss-reduce-idents@^2.2.2: - version "2.4.0" - resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3" - integrity sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM= - dependencies: - postcss "^5.0.4" - postcss-value-parser "^3.0.2" - -postcss-reduce-initial@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea" - integrity sha1-aPgGlfBF0IJjqHmtJA343WT2ROo= - dependencies: - postcss "^5.0.4" - -postcss-reduce-transforms@^1.0.3: - version "1.0.4" - resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1" - integrity sha1-/3b02CEkN7McKYpC0uFEQCV3GuE= - dependencies: - has "^1.0.1" - postcss "^5.0.8" - postcss-value-parser "^3.0.1" - -postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2: - version "2.2.3" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90" - integrity sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A= - dependencies: - flatten "^1.0.2" - indexes-of "^1.0.1" - uniq "^1.0.1" - postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: version "6.0.6" resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea" @@ -11616,63 +11088,11 @@ postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4: cssesc "^3.0.0" util-deprecate "^1.0.2" -postcss-svgo@^2.1.1: - version "2.1.6" - resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d" - integrity sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0= - dependencies: - is-svg "^2.0.0" - postcss "^5.0.14" - postcss-value-parser "^3.2.3" - svgo "^0.7.0" - -postcss-unique-selectors@^2.0.2: - version "2.0.2" - resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d" - integrity sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0= - dependencies: - alphanum-sort "^1.0.1" - postcss "^5.0.4" - uniqs "^2.0.0" - -postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0: - version "3.3.1" - resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" - integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== - postcss-value-parser@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz#443f6a20ced6481a2bda4fa8532a6e55d789a2cb" integrity sha512-97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ== -postcss-zindex@^2.0.1: - version "2.2.0" - resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22" - integrity sha1-0hCd3AVbka9n/EyzsCWUZjnSryI= - dependencies: - has "^1.0.1" - postcss "^5.0.4" - uniqs "^2.0.0" - -postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16: - version "5.2.18" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5" - integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg== - dependencies: - chalk "^1.1.3" - js-base64 "^2.1.9" - source-map "^0.5.6" - supports-color "^3.2.3" - -postcss@^6.0.1: - version "6.0.23" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" - integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag== - dependencies: - chalk "^2.4.1" - source-map "^0.6.1" - supports-color "^5.4.0" - postcss@^8.2.15: version "8.3.6" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea" @@ -11738,11 +11158,6 @@ prelude-ls@~1.1.2: resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ= -prepend-http@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" - integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= - prepend-http@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897" @@ -11948,7 +11363,7 @@ puppeteer@^2.0.0: rimraf "^2.6.1" ws "^6.1.0" -q@^1.1.2, q@^1.5.1: +q@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc= @@ -11970,14 +11385,6 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA== -query-string@^4.1.0: - version "4.3.4" - resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb" - integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s= - dependencies: - object-assign "^4.1.0" - strict-uri-encode "^1.0.0" - query-string@^5.0.1: version "5.1.1" resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb" @@ -12375,22 +11782,6 @@ redent@^3.0.0: indent-string "^4.0.0" strip-indent "^3.0.0" -reduce-css-calc@^1.2.6: - version "1.3.0" - resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716" - integrity sha1-dHyRTgSWFKTJz7umKYca0dKSdxY= - dependencies: - balanced-match "^0.4.2" - math-expression-evaluator "^1.2.14" - reduce-function-call "^1.0.1" - -reduce-function-call@^1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.3.tgz#60350f7fb252c0a67eb10fd4694d16909971300f" - integrity sha512-Hl/tuV2VDgWgCSEeWMLwxLZqX7OK59eU1guxXsRKTAyeYimivsKdtcV4fu3r710tpG5GmDKDhQ0HSZLExnNmyQ== - dependencies: - balanced-match "^1.0.0" - reflect-metadata@^0.1.10: version "0.1.13" resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08" @@ -12523,7 +11914,7 @@ request-promise-native@^1.0.5: stealthy-require "^1.1.1" tough-cookie "^2.3.3" -request@^2.82.0, request@^2.86.0, request@^2.87.0, request@^2.88.0, request@^2.88.2: +request@^2.82.0, request@^2.86.0, request@^2.87.0, request@^2.88.0: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== @@ -12759,7 +12150,7 @@ safe-regex@^1.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== -sax@^1.2.4, sax@~1.2.1: +sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== @@ -12772,15 +12163,6 @@ scheduler@^0.19.1: loose-envify "^1.1.0" object-assign "^4.1.1" -schema-utils@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" - integrity sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g== - dependencies: - ajv "^6.1.0" - ajv-errors "^1.0.0" - ajv-keywords "^3.1.0" - schema-utils@^2.6.5: version "2.7.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7" @@ -12799,6 +12181,16 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: ajv "^6.12.5" ajv-keywords "^3.5.2" +schema-utils@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" + integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg== + dependencies: + "@types/json-schema" "^7.0.9" + ajv "^8.8.0" + ajv-formats "^2.1.1" + ajv-keywords "^5.0.0" + seek-bzip@^1.0.5: version "1.0.6" resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.6.tgz#35c4171f55a680916b52a07859ecf3b5857f21c4" @@ -12864,11 +12256,6 @@ serialize-error@^7.0.1: dependencies: type-fest "^0.13.1" -serialize-javascript@^1.4.0: - version "1.9.1" - resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.9.1.tgz#cfc200aef77b600c47da9bb8149c943e798c2fdb" - integrity sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A== - serialize-javascript@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4" @@ -13136,16 +12523,6 @@ sort-keys@^2.0.0: dependencies: is-plain-obj "^1.0.0" -source-list-map@^0.1.7: - version "0.1.8" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106" - integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY= - -source-list-map@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" - integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== - source-map-js@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" @@ -13184,7 +12561,7 @@ source-map-url@^0.4.0: resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56" integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw== -source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0: +source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7, source-map@~0.5.0: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -13582,13 +12959,6 @@ style-loader@^2.0.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -style-loader@~0.13.1: - version "0.13.2" - resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.13.2.tgz#74533384cf698c7104c7951150b49717adc2f3bb" - integrity sha1-dFMzhM9pjHEEx5URULSXF63C87s= - dependencies: - loader-utils "^1.0.2" - success-symbol@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/success-symbol/-/success-symbol-0.1.0.tgz#24022e486f3bf1cdca094283b769c472d3b72897" @@ -13625,19 +12995,7 @@ supports-color@6.0.0: dependencies: has-flag "^3.0.0" -supports-color@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" - integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc= - -supports-color@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6" - integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY= - dependencies: - has-flag "^1.0.0" - -supports-color@^5.3.0, supports-color@^5.4.0: +supports-color@^5.3.0: version "5.5.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -13658,19 +13016,6 @@ supports-color@^8.0.0: dependencies: has-flag "^4.0.0" -svgo@^0.7.0: - version "0.7.2" - resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5" - integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U= - dependencies: - coa "~1.0.1" - colors "~1.1.2" - csso "~2.3.1" - js-yaml "~3.7.0" - mkdirp "~0.5.1" - sax "~1.2.1" - whet.extend "~0.9.9" - symbol-tree@^3.2.2: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -13750,18 +13095,6 @@ tar@^4.0.0, tar@^4.0.2, tar@^4.4.10, tar@^4.4.12, tar@^4.4.2, tar@^4.4.8: safe-buffer "^5.1.2" yallist "^3.0.3" -tar@^6.0.2: - version "6.1.0" - resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.0.tgz#d1724e9bcc04b977b18d5c573b333a2207229a83" - integrity sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA== - dependencies: - chownr "^2.0.0" - fs-minipass "^2.0.0" - minipass "^3.0.0" - minizlib "^2.1.1" - mkdirp "^1.0.3" - yallist "^4.0.0" - tar@^6.1.0: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621" @@ -14118,16 +13451,16 @@ type-fest@^0.6.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== -type-fest@^0.7.1: - version "0.7.1" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.7.1.tgz#8dda65feaf03ed78f0a3f9678f1869147f7c5c48" - integrity sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg== - type-fest@^0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== +type-fest@^1.0.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" + integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== + type-is@^1.6.4, type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -14136,13 +13469,6 @@ type-is@^1.6.4, type-is@~1.6.17, type-is@~1.6.18: media-typer "0.3.0" mime-types "~2.1.24" -typedarray-to-buffer@^3.1.5: - version "3.1.5" - resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080" - integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q== - dependencies: - is-typedarray "^1.0.0" - typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -14269,16 +13595,6 @@ union-value@^1.0.0: is-extendable "^0.1.1" set-value "^2.0.1" -uniq@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff" - integrity sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8= - -uniqs@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02" - integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI= - unique-filename@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230" @@ -14485,11 +13801,6 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= -vendors@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e" - integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w== - verror@1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" @@ -14544,11 +13855,6 @@ vscode-languageserver-types@3.15.1: resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.15.1.tgz#17be71d78d2f6236d414f0001ce1ef4d23e6b6de" integrity sha512-+a9MPUQrNGRrGU630OGbYVQ+11iOIovjCkqxajPa9w57Sd5ruK8WQNsslzpa0x/QJqC8kRc2DUxWjIFwoNm4ZQ== -vscode-languageserver-types@^3.15.1: - version "3.16.0" - resolved "https://registry.yarnpkg.com/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0.tgz#ecf393fc121ec6974b2da3efb3155644c514e247" - integrity sha512-k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA== - vscode-ripgrep@^1.2.4: version "1.11.2" resolved "https://registry.yarnpkg.com/vscode-ripgrep/-/vscode-ripgrep-1.11.2.tgz#a1d9c717a20f625b7e14680cc7db25ffafd132d4" @@ -14640,14 +13946,6 @@ webpack-merge@^5.7.3: clone-deep "^4.0.1" wildcard "^2.0.0" -webpack-sources@^1.0.1: - version "1.4.3" - resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" - integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ== - dependencies: - source-list-map "^2.0.0" - source-map "~0.6.1" - webpack-sources@^3.2.0: version "3.2.1" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.1.tgz#251a7d9720d75ada1469ca07dbb62f3641a05b6d" @@ -14726,11 +14024,6 @@ when@^3.7.7: resolved "https://registry.yarnpkg.com/when/-/when-3.7.8.tgz#c7130b6a7ea04693e842cdc9e7a1f2aa39a39f82" integrity sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I= -whet.extend@~0.9.9: - version "0.9.9" - resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1" - integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE= - which-boxed-primitive@^1.0.1, which-boxed-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6" @@ -14759,7 +14052,7 @@ which@1.3.1, which@^1.2.8, which@^1.2.9, which@^1.3.1: dependencies: isexe "^2.0.0" -which@^2.0.1, which@^2.0.2: +which@^2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== @@ -14867,16 +14160,6 @@ write-file-atomic@^2.0.0, write-file-atomic@^2.3.0, write-file-atomic@^2.4.2: imurmurhash "^0.1.4" signal-exit "^3.0.2" -write-file-atomic@^3.0.0: - version "3.0.3" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8" - integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q== - dependencies: - imurmurhash "^0.1.4" - is-typedarray "^1.0.0" - signal-exit "^3.0.2" - typedarray-to-buffer "^3.1.5" - write-json-file@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/write-json-file/-/write-json-file-2.3.0.tgz#2b64c8a33004d54b8698c76d585a77ceb61da32f" @@ -14956,20 +14239,20 @@ xtend@^4.0.0, xtend@~4.0.1: resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== -xterm-addon-fit@~0.5.0: +xterm-addon-fit@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596" integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ== -xterm-addon-search@~0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.0.tgz#e33eab918df7eac7e7baf95dd2b3d14133754881" - integrity sha512-MPJGPVPpHRUw9cLIuqQbrVepmENMOybVUSxIALz5h1ryyQBrVqVujq2hL5aroX5/dZJoHx9lGHQTVLQ07SKgKA== +xterm-addon-search@^0.8.2: + version "0.8.2" + resolved "https://registry.yarnpkg.com/xterm-addon-search/-/xterm-addon-search-0.8.2.tgz#be7aa74d5ff12c901707c6ff674229f214318032" + integrity sha512-I1863mjn8P6uVrqm/X+btalVsqjAKLhnhpbP7SavAOpEkI1jJhbHU2UTp7NjeRtcKTks6UWk/ycgds5snDSejg== -xterm@~4.11.0: - version "4.11.0" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.11.0.tgz#d7dabc7af5299579e4663fedf2b3a179af9aaff9" - integrity sha512-NeJH909WTO2vth/ZlC0gkP3AGzupbvVHVlmtrpBw56/sGFXaF9bNdKgqKa3tf8qbGvXMzL2JhCcHVklqFztIRw== +xterm@^4.16.0: + version "4.16.0" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.16.0.tgz#af25223c72917438842121e1bcd1b60ffd7e8476" + integrity sha512-nAbuigL9CYkI075mdfqpnB8cHZNKxENCj1CQ9Tm5gSvWkMtkanmRN2mkHGjSaET1/3+X9BqISFFo7Pd2mXVjiQ== y18n@^3.2.0, y18n@^3.2.1: version "3.2.2" From 593d15f06544a0065cb19e03f0573fa4468b0224 Mon Sep 17 00:00:00 2001 From: Francesco Stasi Date: Mon, 31 Jan 2022 19:33:42 +0100 Subject: [PATCH 02/16] updated CI --- .github/workflows/build.yml | 2 +- .github/workflows/check-i18n-task.yml | 2 +- .github/workflows/i18n-nightly-push.yml | 2 +- .github/workflows/i18n-weekly-pull.yml | 2 +- electron/build/template-package.json | 2 +- electron/packager/package.json | 2 +- package.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 854666a9f..02d4a37bd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: - name: Install Node.js 12.x uses: actions/setup-node@v1 with: - node-version: '12.14.1' + node-version: '14.18.2' registry-url: 'https://registry.npmjs.org' - name: Install Python 2.7 diff --git a/.github/workflows/check-i18n-task.yml b/.github/workflows/check-i18n-task.yml index 121a9a844..f1568b4a2 100644 --- a/.github/workflows/check-i18n-task.yml +++ b/.github/workflows/check-i18n-task.yml @@ -28,7 +28,7 @@ jobs: - name: Install Node.js 12.x uses: actions/setup-node@v2 with: - node-version: '12.14.1' + node-version: '14.18.2' registry-url: 'https://registry.npmjs.org' - name: Install dependencies diff --git a/.github/workflows/i18n-nightly-push.yml b/.github/workflows/i18n-nightly-push.yml index c62f16a7f..2406dd5bb 100644 --- a/.github/workflows/i18n-nightly-push.yml +++ b/.github/workflows/i18n-nightly-push.yml @@ -15,7 +15,7 @@ jobs: - name: Install Node.js 12.x uses: actions/setup-node@v2 with: - node-version: '12.14.1' + node-version: '14.18.2' registry-url: 'https://registry.npmjs.org' - name: Install dependencies diff --git a/.github/workflows/i18n-weekly-pull.yml b/.github/workflows/i18n-weekly-pull.yml index 1a361febe..c33822e7f 100644 --- a/.github/workflows/i18n-weekly-pull.yml +++ b/.github/workflows/i18n-weekly-pull.yml @@ -15,7 +15,7 @@ jobs: - name: Install Node.js 12.x uses: actions/setup-node@v2 with: - node-version: '12.14.1' + node-version: '14.18.2' registry-url: 'https://registry.npmjs.org' - name: Install dependencies diff --git a/electron/build/template-package.json b/electron/build/template-package.json index c55779883..76127a5b3 100644 --- a/electron/build/template-package.json +++ b/electron/build/template-package.json @@ -26,7 +26,7 @@ "patch": "ncp ./patch/main.js ./src-gen/backend/main.js" }, "engines": { - "node": ">=12.14.1 <13" + "node": ">=14.0.0 <15" }, "repository": { "type": "git", diff --git a/electron/packager/package.json b/electron/packager/package.json index 4caf2a5a8..6ffbeb1ef 100644 --- a/electron/packager/package.json +++ b/electron/packager/package.json @@ -31,7 +31,7 @@ "yargs": "^12.0.5" }, "engines": { - "node": ">=12.14.1 <13" + "node": ">=14.0.0 <15" }, "mocha": { "reporter": "spec", diff --git a/package.json b/package.json index 73ddd25e1..881153166 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "license": "AGPL-3.0-or-later", "private": true, "engines": { - "node": ">=12.14.1 <13" + "node": ">=14.0.0 <15" }, "devDependencies": { "@theia/cli": "1.22.1", From 3118b4ce341ef76f412d06da3df3eee1aeeee897 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Thu, 3 Feb 2022 13:44:03 +0100 Subject: [PATCH 03/16] Simply use `--ignore-engines` --- .github/workflows/build.yml | 12 ++++++------ .github/workflows/check-i18n-task.yml | 4 ++-- .github/workflows/i18n-nightly-push.yml | 4 ++-- .github/workflows/i18n-weekly-pull.yml | 6 +++--- electron/packager/index.js | 10 +++++----- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02d4a37bd..f01ea9f48 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,16 +33,16 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Install Node.js 12.x + - name: Install Node.js 14.x uses: actions/setup-node@v1 with: - node-version: '14.18.2' + node-version: '14.x' registry-url: 'https://registry.npmjs.org' - - name: Install Python 2.7 + - name: Install Python 3.x uses: actions/setup-python@v2 with: - python-version: '2.7' + python-version: '3.x' - name: Package shell: bash @@ -77,8 +77,8 @@ jobs: fi fi - yarn --cwd ./electron/packager/ - yarn --cwd ./electron/packager/ package + yarn --ignore-engines --cwd ./electron/packager/ + yarn --ignore-engines --cwd ./electron/packager/ package - name: Upload [GitHub Actions] uses: actions/upload-artifact@v2 diff --git a/.github/workflows/check-i18n-task.yml b/.github/workflows/check-i18n-task.yml index f1568b4a2..902b2bf1f 100644 --- a/.github/workflows/check-i18n-task.yml +++ b/.github/workflows/check-i18n-task.yml @@ -32,7 +32,7 @@ jobs: registry-url: 'https://registry.npmjs.org' - name: Install dependencies - run: yarn + run: yarn --ignore-engines - name: Check for errors - run: yarn i18n:check + run: yarn i18n:check --ignore-engines diff --git a/.github/workflows/i18n-nightly-push.yml b/.github/workflows/i18n-nightly-push.yml index 2406dd5bb..df504be1b 100644 --- a/.github/workflows/i18n-nightly-push.yml +++ b/.github/workflows/i18n-nightly-push.yml @@ -19,10 +19,10 @@ jobs: registry-url: 'https://registry.npmjs.org' - name: Install dependencies - run: yarn + run: yarn --ignore-engines - name: Run i18n:push script - run: yarn run i18n:push + run: yarn --ignore-engines run i18n:push env: TRANSIFEX_ORGANIZATION: ${{ secrets.TRANSIFEX_ORGANIZATION }} TRANSIFEX_PROJECT: ${{ secrets.TRANSIFEX_PROJECT }} diff --git a/.github/workflows/i18n-weekly-pull.yml b/.github/workflows/i18n-weekly-pull.yml index c33822e7f..6a538958a 100644 --- a/.github/workflows/i18n-weekly-pull.yml +++ b/.github/workflows/i18n-weekly-pull.yml @@ -15,14 +15,14 @@ jobs: - name: Install Node.js 12.x uses: actions/setup-node@v2 with: - node-version: '14.18.2' + node-version: '14.x' registry-url: 'https://registry.npmjs.org' - name: Install dependencies - run: yarn + run: yarn --ignore-engines - name: Run i18n:pull script - run: yarn run i18n:pull + run: yarn --ignore-engines run i18n:pull env: TRANSIFEX_ORGANIZATION: ${{ secrets.TRANSIFEX_ORGANIZATION }} TRANSIFEX_PROJECT: ${{ secrets.TRANSIFEX_PROJECT }} diff --git a/electron/packager/index.js b/electron/packager/index.js index 32a5295a2..0f7fa249a 100644 --- a/electron/packager/index.js +++ b/electron/packager/index.js @@ -103,12 +103,12 @@ //-------------------------------------------------------------------------------------------------+ // Rebuild the extension with the copied `yarn.lock`. It is a must to use the same Theia versions. | //-------------------------------------------------------------------------------------------------+ - exec(`yarn --network-timeout 1000000 --cwd ${path('..', workingCopy)}`, `Building the ${productName} application`); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)}`, `Building the ${productName} application`); //-------------------------------------------------------------------------------------------------------------------------+ // Test the application. With this approach, we cannot publish test results to GH Actions but save 6-10 minutes per builds | //-------------------------------------------------------------------------------------------------------------------------+ - exec(`yarn --network-timeout 1000000 --cwd ${path('..', workingCopy)} test`, `Testing the ${productName} application`); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)} test`, `Testing the ${productName} application`); // Collect all unused dependencies by the backend. We have to remove them from the electron app. // The `bundle.js` already contains everything we need for the frontend. @@ -176,8 +176,8 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()} //-------------------------------------------------------------------------------------------+ // Install all private and public dependencies for the electron application and build Theia. | //-------------------------------------------------------------------------------------------+ - exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')}`, 'Installing dependencies'); - exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''}`, `Building the ${productName} application`); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')}`, 'Installing dependencies'); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''}`, `Building the ${productName} application`); //------------------------------------------------------------------------------+ // Create a throw away dotenv file which we use to feed the builder with input. | @@ -193,7 +193,7 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()} //-----------------------------------+ // Package the electron application. | //-----------------------------------+ - exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} package`, `Packaging your ${productName} application`); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} package`, `Packaging your ${productName} application`); //-----------------------------------------------------------------------------------------------------+ // Copy to another folder. Azure does not support wildcard for `PublishBuildArtifacts@1.pathToPublish` | From 18d6823a26b9d8e36b15ffa05da5788a773386b9 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Thu, 3 Feb 2022 15:25:03 +0100 Subject: [PATCH 04/16] Use correct --ignore-engines --- .github/workflows/check-i18n-task.yml | 4 ++-- .github/workflows/i18n-nightly-push.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-i18n-task.yml b/.github/workflows/check-i18n-task.yml index 902b2bf1f..5829db1fd 100644 --- a/.github/workflows/check-i18n-task.yml +++ b/.github/workflows/check-i18n-task.yml @@ -28,11 +28,11 @@ jobs: - name: Install Node.js 12.x uses: actions/setup-node@v2 with: - node-version: '14.18.2' + node-version: '14.x' registry-url: 'https://registry.npmjs.org' - name: Install dependencies run: yarn --ignore-engines - name: Check for errors - run: yarn i18n:check --ignore-engines + run: yarn --ignore-engines i18n:check diff --git a/.github/workflows/i18n-nightly-push.yml b/.github/workflows/i18n-nightly-push.yml index df504be1b..48c625bab 100644 --- a/.github/workflows/i18n-nightly-push.yml +++ b/.github/workflows/i18n-nightly-push.yml @@ -15,7 +15,7 @@ jobs: - name: Install Node.js 12.x uses: actions/setup-node@v2 with: - node-version: '14.18.2' + node-version: '14.x' registry-url: 'https://registry.npmjs.org' - name: Install dependencies From 094c71a55b92a162a570bc62ef75964a3f627319 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Thu, 3 Feb 2022 16:03:28 +0100 Subject: [PATCH 05/16] Fix semver#valid call --- electron/packager/config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/electron/packager/config.js b/electron/packager/config.js index 033186575..2bf92c362 100644 --- a/electron/packager/config.js +++ b/electron/packager/config.js @@ -72,9 +72,9 @@ function getVersion() { } if (!isRelease) { if (isNightly) { - version = `${version}-nightly.${timestamp()}`; + version = `${version}-nightly-${timestamp()}`; } else { - version = `${version}-snapshot.${currentCommitish()}`; + version = `${version}-snapshot-${currentCommitish()}`; } if (!semver.valid(version)) { throw new Error(`Invalid patched version: '${version}'.`); From 72bbed78f57c4e1bc01fd4292af1276a4d3ae9c2 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Thu, 3 Feb 2022 16:26:23 +0100 Subject: [PATCH 06/16] Use C++17 --- electron/packager/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/electron/packager/index.js b/electron/packager/index.js index 0f7fa249a..dca6fa700 100644 --- a/electron/packager/index.js +++ b/electron/packager/index.js @@ -103,7 +103,7 @@ //-------------------------------------------------------------------------------------------------+ // Rebuild the extension with the copied `yarn.lock`. It is a must to use the same Theia versions. | //-------------------------------------------------------------------------------------------------+ - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)}`, `Building the ${productName} application`); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)} -std=c++17`, `Building the ${productName} application`); //-------------------------------------------------------------------------------------------------------------------------+ // Test the application. With this approach, we cannot publish test results to GH Actions but save 6-10 minutes per builds | @@ -176,8 +176,8 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()} //-------------------------------------------------------------------------------------------+ // Install all private and public dependencies for the electron application and build Theia. | //-------------------------------------------------------------------------------------------+ - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')}`, 'Installing dependencies'); - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''}`, `Building the ${productName} application`); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} -std=c++17`, 'Installing dependencies'); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''} -std=c++17`, `Building the ${productName} application`); //------------------------------------------------------------------------------+ // Create a throw away dotenv file which we use to feed the builder with input. | From 4a4fbe6791b545f7548808c0c53964ccc39b1316 Mon Sep 17 00:00:00 2001 From: Francesco Stasi Date: Thu, 3 Feb 2022 17:31:37 +0100 Subject: [PATCH 07/16] updated documentation --- .github/workflows/check-i18n-task.yml | 2 +- .github/workflows/i18n-nightly-push.yml | 2 +- .github/workflows/i18n-weekly-pull.yml | 2 +- BUILDING.md | 2 +- docs/internal/Arm.md | 7 +++---- docs/internal/Ubuntu.md | 8 ++++---- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check-i18n-task.yml b/.github/workflows/check-i18n-task.yml index 5829db1fd..4691709f1 100644 --- a/.github/workflows/check-i18n-task.yml +++ b/.github/workflows/check-i18n-task.yml @@ -25,7 +25,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 - - name: Install Node.js 12.x + - name: Install Node.js 14.x uses: actions/setup-node@v2 with: node-version: '14.x' diff --git a/.github/workflows/i18n-nightly-push.yml b/.github/workflows/i18n-nightly-push.yml index 48c625bab..d4519ecff 100644 --- a/.github/workflows/i18n-nightly-push.yml +++ b/.github/workflows/i18n-nightly-push.yml @@ -12,7 +12,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Install Node.js 12.x + - name: Install Node.js 14.x uses: actions/setup-node@v2 with: node-version: '14.x' diff --git a/.github/workflows/i18n-weekly-pull.yml b/.github/workflows/i18n-weekly-pull.yml index 6a538958a..9230263a3 100644 --- a/.github/workflows/i18n-weekly-pull.yml +++ b/.github/workflows/i18n-weekly-pull.yml @@ -12,7 +12,7 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Install Node.js 12.x + - name: Install Node.js 14.x uses: actions/setup-node@v2 with: node-version: '14.x' diff --git a/BUILDING.md b/BUILDING.md index 6ba8c28c9..55b3d9f58 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -47,7 +47,7 @@ Once you have all the tools installed, you can build the editor following these 1. Install the dependencies and build ```sh - yarn + yarn --ignore-engines ``` 2. Rebuild the dependencies diff --git a/docs/internal/Arm.md b/docs/internal/Arm.md index dc912c016..8bcca9db4 100644 --- a/docs/internal/Arm.md +++ b/docs/internal/Arm.md @@ -2,19 +2,18 @@ Building the Pro IDE on Linux `armv7l` (aka `armhf`) and `aarch64` (aka `arm64`): -1. Install Node.js 12.x with [nvm](https://github.com/nvm-sh/nvm#install--update-script): +1. Install Node.js 14.x with [nvm](https://github.com/nvm-sh/nvm#install--update-script): ``` wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash ``` Restart your shell then: ``` - nvm install 12.14.1 - nvm use 12.14.1 + nvm install 14 + nvm use 14 ``` Verify: ``` node -v - v12.14.1 ``` 2. Install [Yarn](https://classic.yarnpkg.com/en/docs/install/#debian-stable): diff --git a/docs/internal/Ubuntu.md b/docs/internal/Ubuntu.md index d4ba25543..21ef2676b 100644 --- a/docs/internal/Ubuntu.md +++ b/docs/internal/Ubuntu.md @@ -18,16 +18,16 @@ sudo apt update \ build-essential \ && wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.3/install.sh | bash \ && source ~/.bashrc \ -&& nvm install 12.14.1 \ -&& nvm use 12.14.1 \ -&& nvm alias default 12.14.1 \ +&& nvm install 14 \ +&& nvm use 14 \ +&& nvm alias default 14 \ && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - \ && echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list \ && sudo apt update && sudo apt install --no-install-recommends yarn \ && mkdir -p ~/dev/git/ \ && rm -rf ~/dev/git/arduino-ide \ && git clone --depth 1 https://github.com/arduino/arduino-ide.git ~/dev/git/arduino-ide \ -&& yarn --cwd ~/dev/git/arduino-ide \ +&& yarn --cwd ~/dev/git/arduino-ide --ignore-engines \ && yarn --cwd ~/dev/git/arduino-ide rebuild:electron \ && yarn --cwd ~/dev/git/arduino-ide/electron-app start ``` From fe91f6bfcb87c721141453324899acd16d6b88be Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Mon, 7 Feb 2022 12:11:19 +0100 Subject: [PATCH 08/16] Fix the C++ version --- electron/build/template-package.json | 4 ++-- electron/packager/index.js | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/electron/build/template-package.json b/electron/build/template-package.json index 76127a5b3..cfe41baf5 100644 --- a/electron/build/template-package.json +++ b/electron/build/template-package.json @@ -20,8 +20,8 @@ "scripts": { "build": "yarn download:plugins && theia build --mode development && yarn patch", "build:publish": "yarn download:plugins && theia build --mode production && yarn patch", - "package": "cross-env DEBUG=* && electron-builder --publish=never", - "package:publish": "cross-env DEBUG=* && electron-builder --publish=always", + "package": "cross-env DEBUG=* && electron-builder --publish=never -std=c++14", + "package:publish": "cross-env DEBUG=* && electron-builder --publish=always -std=c++14", "download:plugins": "theia download:plugins", "patch": "ncp ./patch/main.js ./src-gen/backend/main.js" }, diff --git a/electron/packager/index.js b/electron/packager/index.js index dca6fa700..0f7fa249a 100644 --- a/electron/packager/index.js +++ b/electron/packager/index.js @@ -103,7 +103,7 @@ //-------------------------------------------------------------------------------------------------+ // Rebuild the extension with the copied `yarn.lock`. It is a must to use the same Theia versions. | //-------------------------------------------------------------------------------------------------+ - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)} -std=c++17`, `Building the ${productName} application`); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)}`, `Building the ${productName} application`); //-------------------------------------------------------------------------------------------------------------------------+ // Test the application. With this approach, we cannot publish test results to GH Actions but save 6-10 minutes per builds | @@ -176,8 +176,8 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()} //-------------------------------------------------------------------------------------------+ // Install all private and public dependencies for the electron application and build Theia. | //-------------------------------------------------------------------------------------------+ - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} -std=c++17`, 'Installing dependencies'); - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''} -std=c++17`, `Building the ${productName} application`); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')}`, 'Installing dependencies'); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''}`, `Building the ${productName} application`); //------------------------------------------------------------------------------+ // Create a throw away dotenv file which we use to feed the builder with input. | From da0d1ab0e2ee48560eace1775cfdac6150362940 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Mon, 7 Feb 2022 12:22:50 +0100 Subject: [PATCH 09/16] Build flag for cpp --- electron/build/template-package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/electron/build/template-package.json b/electron/build/template-package.json index cfe41baf5..0ccceccdc 100644 --- a/electron/build/template-package.json +++ b/electron/build/template-package.json @@ -20,8 +20,8 @@ "scripts": { "build": "yarn download:plugins && theia build --mode development && yarn patch", "build:publish": "yarn download:plugins && theia build --mode production && yarn patch", - "package": "cross-env DEBUG=* && electron-builder --publish=never -std=c++14", - "package:publish": "cross-env DEBUG=* && electron-builder --publish=always -std=c++14", + "package": "cross-env DEBUG=* CXXFLAGS=\"--std=c++14\" && electron-builder --publish=never", + "package:publish": "cross-env DEBUG=* CXXFLAGS=\"--std=c++14\" && electron-builder --publish=always", "download:plugins": "theia download:plugins", "patch": "ncp ./patch/main.js ./src-gen/backend/main.js" }, From e9d311b0eb5c4fed497e0d18a887b46539751a49 Mon Sep 17 00:00:00 2001 From: Francesco Stasi Date: Mon, 7 Feb 2022 15:45:59 +0100 Subject: [PATCH 10/16] add disclaimer with correct node version --- BUILDING.md | 1 + 1 file changed, 1 insertion(+) diff --git a/BUILDING.md b/BUILDING.md index 55b3d9f58..cdfc0efda 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -42,6 +42,7 @@ The _frontend_ is running as an Electron renderer process and can invoke service If you’re familiar with TypeScript, the [Theia IDE](https://theia-ide.org/), and if you want to contribute to the project, you should be able to build the Arduino IDE locally. Please refer to the [Theia IDE prerequisites](https://github.com/theia-ide/theia/blob/master/doc/) documentation for the setup instructions. +> **Note**: Node.js 14 must be used instead of the version 12 recommended at the link above. Once you have all the tools installed, you can build the editor following these steps From dc0b6446b9a438d50956607ea752178830d82a46 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Tue, 8 Feb 2022 16:43:38 +0100 Subject: [PATCH 11/16] Update `electron-builder` --- electron/build/template-package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/electron/build/template-package.json b/electron/build/template-package.json index 0ccceccdc..c5b60e2b6 100644 --- a/electron/build/template-package.json +++ b/electron/build/template-package.json @@ -3,7 +3,7 @@ "author": "Arduino SA", "resolutions": { "**/fs-extra": "^4.0.3", - "electron-builder": "22.7.0" + "electron-builder": "22.10.5" }, "dependencies": { "node-log-rotate": "^0.1.5" @@ -11,7 +11,7 @@ "devDependencies": { "@theia/cli": "1.22.1", "cross-env": "^7.0.2", - "electron-builder": "22.7.0", + "electron-builder": "22.10.5", "electron-notarize": "^0.3.0", "is-ci": "^2.0.0", "ncp": "^2.0.0", @@ -20,8 +20,8 @@ "scripts": { "build": "yarn download:plugins && theia build --mode development && yarn patch", "build:publish": "yarn download:plugins && theia build --mode production && yarn patch", - "package": "cross-env DEBUG=* CXXFLAGS=\"--std=c++14\" && electron-builder --publish=never", - "package:publish": "cross-env DEBUG=* CXXFLAGS=\"--std=c++14\" && electron-builder --publish=always", + "package": "cross-env DEBUG=* && electron-builder --publish=never", + "package:publish": "cross-env DEBUG=* && electron-builder --publish=always", "download:plugins": "theia download:plugins", "patch": "ncp ./patch/main.js ./src-gen/backend/main.js" }, From c2e6e30b0579b7db7ad3fc371cc2ea3be72ee694 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Tue, 8 Feb 2022 16:48:18 +0100 Subject: [PATCH 12/16] Fix `Electron.Menu` issue --- .../electron-browser/theia/core/electron-main-menu-factory.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts b/arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts index 3cd93cbe0..e96cb4196 100644 --- a/arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts +++ b/arduino-ide-extension/src/electron-browser/theia/core/electron-main-menu-factory.ts @@ -80,7 +80,7 @@ export class ElectronMainMenuFactory extends TheiaElectronMainMenuFactory { protected createOSXMenu(): Electron.MenuItemConstructorOptions { const { submenu } = super.createOSXMenu(); const label = 'Arduino IDE'; - if (!!submenu && !(submenu instanceof Electron.Menu)) { + if (!!submenu && Array.isArray(submenu)) { const [, , /* about */ /* preferences */ ...rest] = submenu; const about = this.fillMenuTemplate( [], From 70d3748fd4ad761cad1503e2a33149cbc3aa3bb4 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Tue, 8 Feb 2022 17:29:31 +0100 Subject: [PATCH 13/16] Skip electron rebuild --- electron/build/template-package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/electron/build/template-package.json b/electron/build/template-package.json index c5b60e2b6..88a6826d9 100644 --- a/electron/build/template-package.json +++ b/electron/build/template-package.json @@ -51,6 +51,7 @@ "build": { "productName": "Arduino IDE", "asar": false, + "npmRebuild": false, "directories": { "buildResources": "resources" }, @@ -65,8 +66,7 @@ "!node_modules/@theia/**/lib/*browser/*", "node_modules/@theia/core/lib/browser/*", "!node_modules/@typefox/monaco-editor-core/*", - "!node_modules/oniguruma/*", - "!node_modules/onigasm/*" + "!node_modules/electron/**" ], "extraResources": [ { From 4775259e1e9592457e585dbdc44be2e9530d2fe7 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Wed, 9 Feb 2022 17:24:43 +0100 Subject: [PATCH 14/16] Rebuild native dependencies beforehand --- electron/build/template-package.json | 1 + electron/packager/index.js | 1 + 2 files changed, 2 insertions(+) diff --git a/electron/build/template-package.json b/electron/build/template-package.json index 88a6826d9..7365222e0 100644 --- a/electron/build/template-package.json +++ b/electron/build/template-package.json @@ -20,6 +20,7 @@ "scripts": { "build": "yarn download:plugins && theia build --mode development && yarn patch", "build:publish": "yarn download:plugins && theia build --mode production && yarn patch", + "rebuild": "yarn theia rebuild:electron", "package": "cross-env DEBUG=* && electron-builder --publish=never", "package:publish": "cross-env DEBUG=* && electron-builder --publish=always", "download:plugins": "theia download:plugins", diff --git a/electron/packager/index.js b/electron/packager/index.js index 0f7fa249a..975ec0918 100644 --- a/electron/packager/index.js +++ b/electron/packager/index.js @@ -178,6 +178,7 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()} //-------------------------------------------------------------------------------------------+ exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')}`, 'Installing dependencies'); exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''}`, `Building the ${productName} application`); + exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} rebuild`, 'Rebuild native dependencies'); //------------------------------------------------------------------------------+ // Create a throw away dotenv file which we use to feed the builder with input. | From 505dd205e361351aecc0fd7eabe78a9a971da9f1 Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Fri, 11 Feb 2022 13:32:06 +0100 Subject: [PATCH 15/16] Use resolutions section --- .github/workflows/build.yml | 4 +-- .github/workflows/check-i18n-task.yml | 4 +-- .github/workflows/i18n-nightly-push.yml | 4 +-- .github/workflows/i18n-weekly-pull.yml | 4 +-- BUILDING.md | 2 +- .../theia/electron-main-application.ts | 2 +- docs/internal/Ubuntu.md | 2 +- electron/packager/index.js | 12 ++++----- package.json | 4 +++ yarn.lock | 27 +++++++++++-------- 10 files changed, 37 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f01ea9f48..651d77e9a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -77,8 +77,8 @@ jobs: fi fi - yarn --ignore-engines --cwd ./electron/packager/ - yarn --ignore-engines --cwd ./electron/packager/ package + yarn --cwd ./electron/packager/ + yarn --cwd ./electron/packager/ package - name: Upload [GitHub Actions] uses: actions/upload-artifact@v2 diff --git a/.github/workflows/check-i18n-task.yml b/.github/workflows/check-i18n-task.yml index 4691709f1..e8c01a8b6 100644 --- a/.github/workflows/check-i18n-task.yml +++ b/.github/workflows/check-i18n-task.yml @@ -32,7 +32,7 @@ jobs: registry-url: 'https://registry.npmjs.org' - name: Install dependencies - run: yarn --ignore-engines + run: yarn - name: Check for errors - run: yarn --ignore-engines i18n:check + run: yarn i18n:check diff --git a/.github/workflows/i18n-nightly-push.yml b/.github/workflows/i18n-nightly-push.yml index d4519ecff..670cf3184 100644 --- a/.github/workflows/i18n-nightly-push.yml +++ b/.github/workflows/i18n-nightly-push.yml @@ -19,10 +19,10 @@ jobs: registry-url: 'https://registry.npmjs.org' - name: Install dependencies - run: yarn --ignore-engines + run: yarn - name: Run i18n:push script - run: yarn --ignore-engines run i18n:push + run: yarn run i18n:push env: TRANSIFEX_ORGANIZATION: ${{ secrets.TRANSIFEX_ORGANIZATION }} TRANSIFEX_PROJECT: ${{ secrets.TRANSIFEX_PROJECT }} diff --git a/.github/workflows/i18n-weekly-pull.yml b/.github/workflows/i18n-weekly-pull.yml index 9230263a3..d6db2312c 100644 --- a/.github/workflows/i18n-weekly-pull.yml +++ b/.github/workflows/i18n-weekly-pull.yml @@ -19,10 +19,10 @@ jobs: registry-url: 'https://registry.npmjs.org' - name: Install dependencies - run: yarn --ignore-engines + run: yarn - name: Run i18n:pull script - run: yarn --ignore-engines run i18n:pull + run: yarn run i18n:pull env: TRANSIFEX_ORGANIZATION: ${{ secrets.TRANSIFEX_ORGANIZATION }} TRANSIFEX_PROJECT: ${{ secrets.TRANSIFEX_PROJECT }} diff --git a/BUILDING.md b/BUILDING.md index cdfc0efda..a9e10f47e 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -48,7 +48,7 @@ Once you have all the tools installed, you can build the editor following these 1. Install the dependencies and build ```sh - yarn --ignore-engines + yarn ``` 2. Rebuild the dependencies diff --git a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts index 196d10ae6..9a26d81fd 100644 --- a/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts +++ b/arduino-ide-extension/src/electron-main/theia/electron-main-application.ts @@ -1,5 +1,5 @@ import { inject, injectable } from 'inversify'; -import { app, BrowserWindow, BrowserWindowConstructorOptions, ipcMain, screen } from '@theia/electron/shared/electron'; +import { app, BrowserWindow, BrowserWindowConstructorOptions, ipcMain, screen } from '@theia/core/electron-shared/electron'; import { fork } from 'child_process'; import { AddressInfo } from 'net'; import { join } from 'path'; diff --git a/docs/internal/Ubuntu.md b/docs/internal/Ubuntu.md index 21ef2676b..5c67b516a 100644 --- a/docs/internal/Ubuntu.md +++ b/docs/internal/Ubuntu.md @@ -27,7 +27,7 @@ sudo apt update \ && mkdir -p ~/dev/git/ \ && rm -rf ~/dev/git/arduino-ide \ && git clone --depth 1 https://github.com/arduino/arduino-ide.git ~/dev/git/arduino-ide \ -&& yarn --cwd ~/dev/git/arduino-ide --ignore-engines \ +&& yarn --cwd ~/dev/git/arduino-ide \ && yarn --cwd ~/dev/git/arduino-ide rebuild:electron \ && yarn --cwd ~/dev/git/arduino-ide/electron-app start ``` diff --git a/electron/packager/index.js b/electron/packager/index.js index 975ec0918..70ddc014f 100644 --- a/electron/packager/index.js +++ b/electron/packager/index.js @@ -103,12 +103,12 @@ //-------------------------------------------------------------------------------------------------+ // Rebuild the extension with the copied `yarn.lock`. It is a must to use the same Theia versions. | //-------------------------------------------------------------------------------------------------+ - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)}`, `Building the ${productName} application`); + exec(`yarn --network-timeout 1000000 --cwd ${path('..', workingCopy)}`, `Building the ${productName} application`); //-------------------------------------------------------------------------------------------------------------------------+ // Test the application. With this approach, we cannot publish test results to GH Actions but save 6-10 minutes per builds | //-------------------------------------------------------------------------------------------------------------------------+ - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', workingCopy)} test`, `Testing the ${productName} application`); + exec(`yarn --network-timeout 1000000 --cwd ${path('..', workingCopy)} test`, `Testing the ${productName} application`); // Collect all unused dependencies by the backend. We have to remove them from the electron app. // The `bundle.js` already contains everything we need for the frontend. @@ -176,9 +176,9 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()} //-------------------------------------------------------------------------------------------+ // Install all private and public dependencies for the electron application and build Theia. | //-------------------------------------------------------------------------------------------+ - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')}`, 'Installing dependencies'); - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''}`, `Building the ${productName} application`); - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} rebuild`, 'Rebuild native dependencies'); + exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')}`, 'Installing dependencies'); + exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} build${isElectronPublish ? ':publish' : ''}`, `Building the ${productName} application`); + exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} rebuild`, 'Rebuild native dependencies'); //------------------------------------------------------------------------------+ // Create a throw away dotenv file which we use to feed the builder with input. | @@ -194,7 +194,7 @@ ${fs.readFileSync(path('..', 'build', 'package.json')).toString()} //-----------------------------------+ // Package the electron application. | //-----------------------------------+ - exec(`yarn --ignore-engines --network-timeout 1000000 --cwd ${path('..', 'build')} package`, `Packaging your ${productName} application`); + exec(`yarn --network-timeout 1000000 --cwd ${path('..', 'build')} package`, `Packaging your ${productName} application`); //-----------------------------------------------------------------------------------------------------+ // Copy to another folder. Azure does not support wildcard for `PublishBuildArtifacts@1.pathToPublish` | diff --git a/package.json b/package.json index 881153166..0f1a760df 100644 --- a/package.json +++ b/package.json @@ -33,6 +33,10 @@ "typescript": "^3.9.2", "jsdom": "^11.5.1" }, + "resolutions": { + "find-git-exec": "0.0.4", + "dugite-extra": "0.1.15" + }, "scripts": { "prepare": "cross-env THEIA_ELECTRON_SKIP_REPLACE_FFMPEG=1 lerna run prepare && yarn download:plugins", "cleanup": "npx rimraf ./**/node_modules && rm -rf ./node_modules ./.browser_modules ./arduino-ide-extension/build ./arduino-ide-extension/downloads ./arduino-ide-extension/Examples ./arduino-ide-extension/lib ./browser-app/lib ./browser-app/src-gen ./browser-app/gen-webpack.config.js ./electron-app/lib ./electron-app/src-gen ./electron-app/gen-webpack.config.js", diff --git a/yarn.lock b/yarn.lock index 0e267bdce..ad3488736 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6120,15 +6120,15 @@ drivelist@^9.0.2: nan "^2.14.0" prebuild-install "^5.2.4" -dugite-extra@0.1.14: - version "0.1.14" - resolved "https://registry.yarnpkg.com/dugite-extra/-/dugite-extra-0.1.14.tgz#514c89b6c597bf8b748b4febd53382559a2a8fdd" - integrity sha512-apUiaj322iSSBx5X7/8Dg3GP6mDLl5y6RaeEWBpLUHfBKxQyTTVHG0YpzYCKe2ke1EbrSmreVNo1FwDnIb3qlw== +dugite-extra@0.1.14, dugite-extra@0.1.15: + version "0.1.15" + resolved "https://registry.yarnpkg.com/dugite-extra/-/dugite-extra-0.1.15.tgz#322406b628ea5515c5c6fcd65e4d040543d6268a" + integrity sha512-beLmQcIXLA8aXqWQZF/ooECoZvYKpBywIFwgqAoYnV04NdWUXDtZ6mMcjQf5eAz5PjXGXAYSuQ31zkPL8J85+A== dependencies: byline "^5.0.0" dugite-no-gpl "1.69.0" - find-git-exec "^0.0.3" - upath "^1.0.0" + find-git-exec "^0.0.4" + upath "^2.0.1" dugite-no-gpl@1.69.0: version "1.69.0" @@ -7020,10 +7020,10 @@ find-cache-dir@^3.3.1: make-dir "^3.0.2" pkg-dir "^4.1.0" -find-git-exec@^0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/find-git-exec/-/find-git-exec-0.0.3.tgz#4ce941859ebe7f359fb8e56aafd2acf3c955b52c" - integrity sha512-cGsuku5hwdOpToV6axI0fRCABuw1yozFtQv13pVK0j7BjILU8buDtHKmSrsZN340Sjj3Z42n8fcF1Xu4nRuBbA== +find-git-exec@0.0.4, find-git-exec@^0.0.3, find-git-exec@^0.0.4: + version "0.0.4" + resolved "https://registry.yarnpkg.com/find-git-exec/-/find-git-exec-0.0.4.tgz#f1d0d35f93ad99bc81aacd357388d00ae902bc92" + integrity sha512-klzQwno+dpdeahtHhvZZ5Yn6K+zme1Aj+YJ4ZD+DywSLrQoyCywTrsubUZa1hHRehmfwBThoeKjS7fsaxhpfNA== dependencies: "@types/node" "^10.14.22" "@types/which" "^1.3.2" @@ -13678,11 +13678,16 @@ unzipper@^0.9.11: readable-stream "~2.3.6" setimmediate "~1.0.4" -upath@^1.0.0, upath@^1.1.2, upath@^1.2.0: +upath@^1.1.2, upath@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894" integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg== +upath@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/upath/-/upath-2.0.1.tgz#50c73dea68d6f6b990f51d279ce6081665d61a8b" + integrity sha512-1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w== + uri-js@^4.2.2: version "4.4.1" resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" From 2d8976197de8f2bb550b1169b44dcf35bd20d09a Mon Sep 17 00:00:00 2001 From: Mark Sujew Date: Fri, 11 Feb 2022 14:13:59 +0100 Subject: [PATCH 16/16] Update template-package.json as well --- electron/build/template-package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/electron/build/template-package.json b/electron/build/template-package.json index 7365222e0..38bc38bc8 100644 --- a/electron/build/template-package.json +++ b/electron/build/template-package.json @@ -3,7 +3,9 @@ "author": "Arduino SA", "resolutions": { "**/fs-extra": "^4.0.3", - "electron-builder": "22.10.5" + "electron-builder": "22.10.5", + "find-git-exec": "0.0.4", + "dugite-extra": "0.1.15" }, "dependencies": { "node-log-rotate": "^0.1.5"