diff --git a/open-bpmn.glsp-client/open-bpmn-app/gen-webpack.node.config.js b/open-bpmn.glsp-client/open-bpmn-app/gen-webpack.node.config.js new file mode 100644 index 00000000..5bfc57a4 --- /dev/null +++ b/open-bpmn.glsp-client/open-bpmn-app/gen-webpack.node.config.js @@ -0,0 +1,127 @@ +/** + * Don't touch this file. It will be regenerated by theia build. + * To customize webpack configuration change /home/rsoika/git/open-bpmn/open-bpmn.glsp-client/open-bpmn-app/webpack.config.js + */ +// @ts-check +const path = require('path'); +const yargs = require('yargs'); +const webpack = require('webpack'); +const TerserPlugin = require('terser-webpack-plugin'); +const NativeWebpackPlugin = require('@theia/native-webpack-plugin'); + +const { mode } = yargs.option('mode', { + description: "Mode to use", + choices: ["development", "production"], + default: "production" +}).argv; + +const production = mode === 'production'; + +/** @type {import('webpack').EntryObject} */ +const commonJsLibraries = {}; +for (const [entryPointName, entryPointPath] of Object.entries({ + + 'nsfw-watcher': '@theia/filesystem/lib/node/nsfw-watcher', + +})) { + commonJsLibraries[entryPointName] = { + import: require.resolve(entryPointPath), + library: { + type: 'commonjs2', + }, + }; +} + +const ignoredResources = new Set(); + +if (process.platform !== 'win32') { + ignoredResources.add('@vscode/windows-ca-certs'); +} + +const nativePlugin = new NativeWebpackPlugin({ + out: 'native', + ripgrep: false, + pty: true, + nativeBindings: { + drivelist: 'drivelist/build/Release/drivelist.node' + } +}); + +/** @type {import('webpack').Configuration} */ +const config = { + mode, + devtool: mode === 'development' ? 'source-map' : false, + target: 'node', + node: { + global: false, + __filename: false, + __dirname: false + }, + output: { + filename: '[name].js', + path: path.resolve(__dirname, 'lib', 'backend'), + devtoolModuleFilenameTemplate: 'webpack:///[absolute-resource-path]?[loaders]', + }, + entry: { + // Main entry point of the Theia application backend: + 'main': require.resolve('./src-gen/backend/main'), + // Theia's IPC mechanism: + 'ipc-bootstrap': require.resolve('@theia/core/lib/node/messaging/ipc-bootstrap'), + + // Make sure the node-pty thread worker can be executed: + 'worker/conoutSocketWorker': require.resolve('node-pty/lib/worker/conoutSocketWorker'), + + + ...commonJsLibraries + }, + module: { + rules: [ + // Make sure we can still find and load our native addons. + { + test: /\.node$/, + loader: 'node-loader', + options: { + name: 'native/[name].[ext]' + } + }, + { + test: /\.js$/, + enforce: 'pre', + loader: 'source-map-loader' + }, + // jsonc-parser exposes its UMD implementation by default, which + // confuses Webpack leading to missing js in the bundles. + { + test: /node_modules[\/](jsonc-parser)/, + loader: 'umd-compat-loader' + } + ] + }, + plugins: [ + // Some native dependencies (bindings, @vscode/ripgrep) need special code replacements + nativePlugin, + // Optional node dependencies can be safely ignored + new webpack.IgnorePlugin({ + checkResource: resource => ignoredResources.has(resource) + }) + ], + optimization: { + // Split and reuse code across the various entry points + splitChunks: { + chunks: 'all' + }, + // Only minimize if we run webpack in production mode + minimize: production, + minimizer: [ + new TerserPlugin({ + exclude: /^(lib|builtins)\// + }) + ] + }, +}; + +module.exports = { + config, + nativePlugin, + ignoredResources +}; diff --git a/open-bpmn.glsp-client/open-bpmn-app/package.json b/open-bpmn.glsp-client/open-bpmn-app/package.json index b7da1916..39eab690 100644 --- a/open-bpmn.glsp-client/open-bpmn-app/package.json +++ b/open-bpmn.glsp-client/open-bpmn-app/package.json @@ -6,21 +6,21 @@ "license": "(GPL-3.0)", "dependencies": { "@open-bpmn/open-bpmn-theia": "1.0.3", - "@theia/core": "1.34.0", - "@theia/editor": "1.34.0", - "@theia/filesystem": "1.34.0", - "@theia/markers": "1.34.0", - "@theia/messages": "1.34.0", - "@theia/monaco": "1.34.0", - "@theia/navigator": "1.34.0", - "@theia/preferences": "1.34.0", - "@theia/process": "1.34.0", - "@theia/terminal": "1.34.0", - "@theia/workspace": "1.34.0", + "@theia/core": "1.39.0-next.20", + "@theia/editor": "1.39.0-next.20", + "@theia/filesystem": "1.39.0-next.20", + "@theia/markers": "1.39.0-next.20", + "@theia/messages": "1.39.0-next.20", + "@theia/monaco": "1.39.0-next.20", + "@theia/navigator": "1.39.0-next.20", + "@theia/preferences": "1.39.0-next.20", + "@theia/process": "1.39.0-next.20", + "@theia/terminal": "1.39.0-next.20", + "@theia/workspace": "1.39.0-next.20", "sprotty-theia": "0.13.0-next.9cbedec" }, "devDependencies": { - "@theia/cli": "1.34.0" + "@theia/cli": "1.39.0-next.20" }, "scripts": { "build": "theia build --mode development", diff --git a/open-bpmn.glsp-client/open-bpmn-app/src-gen/backend/main.js b/open-bpmn.glsp-client/open-bpmn-app/src-gen/backend/main.js index afe45cd2..9d9de2e0 100644 --- a/open-bpmn.glsp-client/open-bpmn-app/src-gen/backend/main.js +++ b/open-bpmn.glsp-client/open-bpmn-app/src-gen/backend/main.js @@ -15,4 +15,4 @@ serverAddress.then(({ port, address }) => { } }); -module.exports = serverAddress; +globalThis.serverAddress = serverAddress; diff --git a/open-bpmn.glsp-client/open-bpmn-app/src-gen/backend/server.js b/open-bpmn.glsp-client/open-bpmn-app/src-gen/backend/server.js index 20b6d524..8986e955 100644 --- a/open-bpmn.glsp-client/open-bpmn-app/src-gen/backend/server.js +++ b/open-bpmn.glsp-client/open-bpmn-app/src-gen/backend/server.js @@ -20,7 +20,7 @@ container.load(messagingBackendModule); container.load(loggerBackendModule); function defaultServeStatic(app) { - app.use(express.static(path.resolve(__dirname, '../../lib'))) + app.use(express.static(path.resolve(__dirname, '../../lib/frontend'))) } function load(raw) { diff --git a/open-bpmn.glsp-client/open-bpmn-app/src-gen/frontend/index.js b/open-bpmn.glsp-client/open-bpmn-app/src-gen/frontend/index.js index aedfaeb8..60896d0d 100644 --- a/open-bpmn.glsp-client/open-bpmn-app/src-gen/frontend/index.js +++ b/open-bpmn.glsp-client/open-bpmn-app/src-gen/frontend/index.js @@ -11,7 +11,7 @@ FrontendApplicationConfigProvider.set({ "light": "light", "dark": "dark" }, - "defaultIconTheme": "none", + "defaultIconTheme": "theia-file-icons", "electron": { "windowOptions": {} }, @@ -26,7 +26,6 @@ self.MonacoEnvironment = { } } - const preloader = require('@theia/core/lib/browser/preloader'); // We need to fetch some data from the backend before the frontend starts (nls, os) @@ -47,17 +46,16 @@ module.exports = preloader.preload().then(() => { .then(function () { return import('@theia/core/lib/browser/window/browser-window-module').then(load) }) .then(function () { return import('@theia/core/lib/browser/keyboard/browser-keyboard-module').then(load) }) .then(function () { return import('@theia/core/lib/browser/request/browser-request-module').then(load) }) - .then(function () { return import('@theia/messages/lib/browser/messages-frontend-module').then(load) }) - .then(function () { return import('@theia/variable-resolver/lib/browser/variable-resolver-frontend-module').then(load) }) - .then(function () { return import('@theia/editor/lib/browser/editor-frontend-module').then(load) }) .then(function () { return import('@theia/filesystem/lib/browser/filesystem-frontend-module').then(load) }) .then(function () { return import('@theia/filesystem/lib/browser/download/file-download-frontend-module').then(load) }) .then(function () { return import('@theia/filesystem/lib/browser/file-dialog/file-dialog-module').then(load) }) + .then(function () { return import('@theia/messages/lib/browser/messages-frontend-module').then(load) }) + .then(function () { return import('@theia/variable-resolver/lib/browser/variable-resolver-frontend-module').then(load) }) + .then(function () { return import('@theia/editor/lib/browser/editor-frontend-module').then(load) }) .then(function () { return import('@theia/workspace/lib/browser/workspace-frontend-module').then(load) }) .then(function () { return import('@theia/markers/lib/browser/problem/problem-frontend-module').then(load) }) .then(function () { return import('@theia/outline-view/lib/browser/outline-view-frontend-module').then(load) }) .then(function () { return import('@theia/monaco/lib/browser/monaco-frontend-module').then(load) }) - .then(function () { return import('sprotty-theia/lib/theia/diagram-module').then(load) }) .then(function () { return import('@eclipse-glsp/theia-integration/lib/browser/theia-integration-frontend-module').then(load) }) .then(function () { return import('@open-bpmn/open-bpmn-theia/lib/browser/bpmn-frontend-module').then(load) }) .then(function () { return import('@theia/navigator/lib/browser/navigator-frontend-module').then(load) }) @@ -65,6 +63,7 @@ module.exports = preloader.preload().then(() => { .then(function () { return import('@theia/preferences/lib/browser/preference-frontend-module').then(load) }) .then(function () { return import('@theia/process/lib/common/process-common-module').then(load) }) .then(function () { return import('@theia/terminal/lib/browser/terminal-frontend-module').then(load) }) + .then(function () { return import('sprotty-theia/lib/theia/diagram-module').then(load) }) .then(start).catch(reason => { console.error('Failed to start the frontend application.'); if (reason) { diff --git a/open-bpmn.glsp-client/open-bpmn-glsp/package.json b/open-bpmn.glsp-client/open-bpmn-glsp/package.json index 182bb64e..8d08793c 100644 --- a/open-bpmn.glsp-client/open-bpmn-glsp/package.json +++ b/open-bpmn.glsp-client/open-bpmn-glsp/package.json @@ -24,7 +24,7 @@ } ], "dependencies": { - "@eclipse-glsp/client": "1.1.0-RC04", + "@eclipse-glsp/client": "1.1.0-RC10", "@open-bpmn/open-bpmn-model": "1.0.3", "@open-bpmn/open-bpmn-properties": "1.0.3", "balloon-css": "^0.5.0" diff --git a/open-bpmn.glsp-client/open-bpmn-glsp/src/bpmn-helperlines.tsx b/open-bpmn.glsp-client/open-bpmn-glsp/src/bpmn-helperlines.tsx index 4937b748..b78f40cf 100644 --- a/open-bpmn.glsp-client/open-bpmn-glsp/src/bpmn-helperlines.tsx +++ b/open-bpmn.glsp-client/open-bpmn-glsp/src/bpmn-helperlines.tsx @@ -22,7 +22,7 @@ import { import { EventNode, isBoundaryEvent, isBPMNLabelNode, isBPMNNode, isTaskNode, LabelNode, TaskNode } from '@open-bpmn/open-bpmn-model'; import { inject, injectable } from 'inversify'; import { VNode } from 'snabbdom'; -import { CommandExecutionContext, CommandReturn, IView, RenderingContext, SChildElement, svg, TYPES } from 'sprotty'; +import { CommandExecutionContext, CommandReturn, IView, RenderingContext, SChildElementImpl, svg, TYPES } from 'sprotty'; import { Bounds, Point } from 'sprotty-protocol'; // eslint-disable-next-line @typescript-eslint/no-unused-vars const JSX = { createElement: svg }; @@ -43,7 +43,7 @@ const JSX = { createElement: svg }; * The HelperLinesElement defines the SModelElement * to containing a list of helperLines. */ -export class HelperLinesElement extends SChildElement { +export class HelperLinesElement extends SChildElementImpl { override type: string; override id: string; readonly helperLines: ReadonlyArray = []; @@ -186,7 +186,7 @@ export class BPMNElementSnapper implements ISnapper { if (isBoundsAware(modelElement)) { // we need to find out if we are in a container.... - if (modelElement instanceof SChildElement) { + if (modelElement instanceof SChildElementImpl) { childs=modelElement.parent.children; } @@ -299,7 +299,7 @@ export class HelperLineListener extends MouseListener { const boundsAware = findParentByFeature(element, isBoundsAware); if (boundsAware !== undefined) { let current: SModelElement = boundsAware; - while (current instanceof SChildElement) { + while (current instanceof SChildElementImpl) { const parent = current.parent; if ('pool' === parent.type) { return parent; @@ -479,7 +479,7 @@ export class RemoveHelperLinesCommand extends FeedbackCommand { */ export function removeHelperLines(root: SModelRoot): void { const helperLines = root.index.getById(helpLineId(root)); - if (helperLines instanceof SChildElement) { + if (helperLines instanceof SChildElementImpl) { root.remove(helperLines); } } diff --git a/open-bpmn.glsp-client/open-bpmn-glsp/src/di.config.ts b/open-bpmn.glsp-client/open-bpmn-glsp/src/di.config.ts index cea2ad55..4952cddc 100644 --- a/open-bpmn.glsp-client/open-bpmn-glsp/src/di.config.ts +++ b/open-bpmn.glsp-client/open-bpmn-glsp/src/di.config.ts @@ -14,14 +14,23 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 ********************************************************************************/ import { - boundsFeature, CircularNodeView, configureCommand, - configureDefaultModelElements, configureModelElement, configureView, ConsoleLogger, - createDiagramContainer, + CircularNodeView, + ConsoleLogger, + ContainerConfiguration, DeleteElementContextMenuItemProvider, - DiamondNodeView, editLabelFeature, ForeignObjectView, LogLevel, moveFeature, overrideViewerOptions, + DiamondNodeView, + ForeignObjectView, LogLevel, RectangularNodeView, RoundedCornerNodeView, SCompartment, - SCompartmentView, selectFeature, SLabel, SLabelView, TYPES + SCompartmentView, + SLabel, SLabelView, TYPES, + boundsFeature, + configureCommand, + configureDefaultModelElements, configureModelElement, configureView, + editLabelFeature, + initializeDiagramContainer, + moveFeature, overrideViewerOptions, + selectFeature } from '@eclipse-glsp/client'; import { BPMNEdge, @@ -129,9 +138,26 @@ const bpmnDiagramModule = new ContainerModule((bind, unbind, isBound, rebind) => /* * Create the createClientContainer with the diagramModule and the BPMN bpmnPropertyModule... */ -export default function createBPMNDiagramContainer(widgetId: string): Container { - // Note: the widgetId is generated by the GLSP core and is something like 'bpmn-diagram_0' - const container = createDiagramContainer(bpmnDiagramModule, BPMNPropertyModule); +// export default function createBPMNDiagramContainer(widgetId: string): Container { +// // Note: the widgetId is generated by the GLSP core and is something like 'bpmn-diagram_0' +// const container = createDiagramContainer(bpmnDiagramModule, BPMNPropertyModule); +// overrideViewerOptions(container, { +// baseDiv: widgetId, +// hiddenDiv: widgetId + '_hidden' +// }); +// return container; +// } + +export function createBPMNDiagramContainer(widgetId: string, ...containerConfiguration: ContainerConfiguration): Container { + return initializeBPMNDiagramContainer(new Container(), widgetId, ...containerConfiguration); +} + +export function initializeBPMNDiagramContainer( + container: Container, + widgetId: string, + ...containerConfiguration: ContainerConfiguration +): Container { + initializeDiagramContainer(container, bpmnDiagramModule, BPMNPropertyModule, ...containerConfiguration); overrideViewerOptions(container, { baseDiv: widgetId, hiddenDiv: widgetId + '_hidden' diff --git a/open-bpmn.glsp-client/open-bpmn-glsp/src/index.ts b/open-bpmn.glsp-client/open-bpmn-glsp/src/index.ts index 6b8aede3..11cbc94b 100644 --- a/open-bpmn.glsp-client/open-bpmn-glsp/src/index.ts +++ b/open-bpmn.glsp-client/open-bpmn-glsp/src/index.ts @@ -13,9 +13,10 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 ********************************************************************************/ -import createBPMNDiagramContainer from './di.config'; +// import createBPMNDiagramContainer from './di.config'; export * from './bpmn-element-views'; export * from './bpmn-routing-views'; -export { createBPMNDiagramContainer }; +// export { createBPMNDiagramContainer }; +export * from './di.config'; diff --git a/open-bpmn.glsp-client/open-bpmn-model/package.json b/open-bpmn.glsp-client/open-bpmn-model/package.json index 81c389f7..b09ef292 100644 --- a/open-bpmn.glsp-client/open-bpmn-model/package.json +++ b/open-bpmn.glsp-client/open-bpmn-model/package.json @@ -11,7 +11,7 @@ "watch": "tsc -w" }, "dependencies": { - "@eclipse-glsp/client": "1.1.0-RC04" + "@eclipse-glsp/client": "1.1.0-RC10" }, "files": [ "lib", diff --git a/open-bpmn.glsp-client/open-bpmn-properties/package.json b/open-bpmn.glsp-client/open-bpmn-properties/package.json index b097e89e..602afa8b 100644 --- a/open-bpmn.glsp-client/open-bpmn-properties/package.json +++ b/open-bpmn.glsp-client/open-bpmn-properties/package.json @@ -4,7 +4,7 @@ "description": "GLSP property panel for BPMN 2.0", "license": "(GPL-3.0)", "dependencies": { - "@eclipse-glsp/client": "1.1.0-RC04", + "@eclipse-glsp/client": "1.1.0-RC10", "@open-bpmn/open-bpmn-model": "1.0.3", "@jsonforms/core": "3.0.0", "@jsonforms/react": "3.0.0", diff --git a/open-bpmn.glsp-client/open-bpmn-properties/src/bpmn-property-panel.tsx b/open-bpmn.glsp-client/open-bpmn-properties/src/bpmn-property-panel.tsx index 52d0b0c1..7a23438a 100644 --- a/open-bpmn.glsp-client/open-bpmn-properties/src/bpmn-property-panel.tsx +++ b/open-bpmn.glsp-client/open-bpmn-properties/src/bpmn-property-panel.tsx @@ -15,7 +15,9 @@ ********************************************************************************/ import { EditorContextService, EnableToolPaletteAction, - GLSPActionDispatcher, hasArguments + GLSPActionDispatcher, hasArguments, + SModelElement, + SModelRoot } from '@eclipse-glsp/client'; import { Action, RequestContextActions, SetContextActions } from '@eclipse-glsp/protocol'; import { @@ -24,8 +26,6 @@ import { EnableToolsAction, IActionHandler, ICommand, - SModelElement, - SModelRoot, SetUIExtensionVisibilityAction, TYPES } from 'sprotty'; diff --git a/open-bpmn.glsp-client/open-bpmn-theia/package.json b/open-bpmn.glsp-client/open-bpmn-theia/package.json index 6fb398de..be7cc31e 100644 --- a/open-bpmn.glsp-client/open-bpmn-theia/package.json +++ b/open-bpmn.glsp-client/open-bpmn-theia/package.json @@ -28,7 +28,7 @@ ], "dependencies": { "@open-bpmn/open-bpmn-glsp": "1.0.3", - "@eclipse-glsp/theia-integration": "1.1.0-RC04" + "@eclipse-glsp/theia-integration": "1.1.0-RC10" }, "scripts": { "prepare": "yarn run clean && yarn run build", diff --git a/open-bpmn.glsp-client/open-bpmn-theia/src/browser/bpmn-frontend-module.ts b/open-bpmn.glsp-client/open-bpmn-theia/src/browser/bpmn-frontend-module.ts index 8fbb1ddd..8868b9a3 100644 --- a/open-bpmn.glsp-client/open-bpmn-theia/src/browser/bpmn-frontend-module.ts +++ b/open-bpmn.glsp-client/open-bpmn-theia/src/browser/bpmn-frontend-module.ts @@ -13,9 +13,9 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 ********************************************************************************/ -import { ContainerContext, GLSPClientContribution, GLSPTheiaFrontendModule } from '@eclipse-glsp/theia-integration'; + +import { ContainerContext, DiagramConfiguration, GLSPClientContribution, GLSPTheiaFrontendModule } from '@eclipse-glsp/theia-integration'; import { CommandContribution, MenuContribution } from '@theia/core'; -import { DiagramConfiguration } from 'sprotty-theia'; import { BPMNLanguage } from '../common/bpmn-language'; import { BPMNGLSPClientContribution } from './bpmn-glsp-client-contribution'; import { BPMNPropertiesCommandContribution, BPMNPropertiesMenuContribution } from './bpmn-property-commands'; @@ -23,11 +23,11 @@ import { BPMNDiagramConfiguration } from './diagram/bpmn-diagram-configuration'; export class BPMNTheiaFrontendModule extends GLSPTheiaFrontendModule { protected override enableCopyPaste = true; - readonly diagramLanguage = BPMNLanguage; bindDiagramConfiguration(context: ContainerContext): void { context.bind(DiagramConfiguration).to(BPMNDiagramConfiguration); } + readonly diagramLanguage = BPMNLanguage; override configure(context: ContainerContext): void { // Custom workflow commands and menus diff --git a/open-bpmn.glsp-client/open-bpmn-theia/src/browser/bpmn-glsp-client-contribution.ts b/open-bpmn.glsp-client/open-bpmn-theia/src/browser/bpmn-glsp-client-contribution.ts index cedff862..7c5331ce 100644 --- a/open-bpmn.glsp-client/open-bpmn-theia/src/browser/bpmn-glsp-client-contribution.ts +++ b/open-bpmn.glsp-client/open-bpmn-theia/src/browser/bpmn-glsp-client-contribution.ts @@ -14,17 +14,22 @@ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 ********************************************************************************/ import { Args, MaybePromise } from '@eclipse-glsp/client'; -import { BaseGLSPClientContribution } from '@eclipse-glsp/theia-integration/lib/browser'; -import { injectable } from '@theia/core/shared/inversify'; + +import { BaseGLSPClientContribution, WebSocketConnectionOptions } from '@eclipse-glsp/theia-integration/lib/browser'; +import { EnvVariablesServer } from '@theia/core/lib/common/env-variables'; +import { inject, injectable } from '@theia/core/shared/inversify'; import { BPMNLanguage } from '../common/bpmn-language'; -export interface WorkflowInitializeOptions { +export interface BPMNInitializeOptions { timestamp: Date; message: string; } @injectable() export class BPMNGLSPClientContribution extends BaseGLSPClientContribution { + @inject(EnvVariablesServer) + protected readonly envVariablesServer: EnvVariablesServer; + readonly id = BPMNLanguage.contributionId; readonly fileExtensions = BPMNLanguage.fileExtensions; @@ -34,4 +39,27 @@ export class BPMNGLSPClientContribution extends BaseGLSPClientContribution { ['message']: 'Custom Options Available' }; } + + protected override async getWebSocketConnectionOptions(): Promise { + const webSocketPort = await this.getWebSocketPortFromEnv(); + if (webSocketPort) { + return { + path: this.id, + port: webSocketPort + }; + } + return undefined; + } + + protected async getWebSocketPortFromEnv(): Promise { + const envVar = await this.envVariablesServer.getValue('WEBSOCKET_PORT'); + if (envVar && envVar.value) { + const webSocketPort = Number.parseInt(envVar.value, 10); + if (isNaN(webSocketPort) || webSocketPort < 0 || webSocketPort > 65535) { + throw new Error('Value of environment variable WEBSOCKET_PORT is not a valid port'); + } + return webSocketPort; + } + return undefined; + } } diff --git a/open-bpmn.glsp-client/open-bpmn-theia/src/browser/diagram/bpmn-diagram-configuration.ts b/open-bpmn.glsp-client/open-bpmn-theia/src/browser/diagram/bpmn-diagram-configuration.ts index 1ec93e20..cbd18e40 100644 --- a/open-bpmn.glsp-client/open-bpmn-theia/src/browser/diagram/bpmn-diagram-configuration.ts +++ b/open-bpmn.glsp-client/open-bpmn-theia/src/browser/diagram/bpmn-diagram-configuration.ts @@ -13,20 +13,21 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 ********************************************************************************/ -import { createBPMNDiagramContainer } from '@open-bpmn/open-bpmn-glsp'; -import { configureDiagramServer,GLSPDiagramConfiguration} from '@eclipse-glsp/theia-integration'; +import { ContainerConfiguration } from '@eclipse-glsp/client'; +import { GLSPDiagramConfiguration, GLSPTheiaDiagramServer, configureDiagramServer } from '@eclipse-glsp/theia-integration'; +import { initializeBPMNDiagramContainer } from '@open-bpmn/open-bpmn-glsp/lib'; import { Container, injectable } from '@theia/core/shared/inversify'; import { BPMNLanguage } from '../../common/bpmn-language'; -import { BPMNDiagramServer } from './bpmn-diagram-server'; +// import { BPMNDiagramServer } from './bpmn-diagram-server'; @injectable() export class BPMNDiagramConfiguration extends GLSPDiagramConfiguration { diagramType: string = BPMNLanguage.diagramType; - doCreateContainer(widgetId: string): Container { - const container = createBPMNDiagramContainer(widgetId); - configureDiagramServer(container, BPMNDiagramServer); + configureContainer(container: Container, widgetId: string, ...containerConfiguration: ContainerConfiguration): Container { + initializeBPMNDiagramContainer(container, widgetId, ...containerConfiguration); + configureDiagramServer(container, GLSPTheiaDiagramServer); return container; } } diff --git a/open-bpmn.glsp-client/open-bpmn-theia/src/browser/diagram/bpmn-diagram-server.ts b/open-bpmn.glsp-client/open-bpmn-theia/src/browser/diagram/bpmn-diagram-server.ts deleted file mode 100644 index f77b0cf6..00000000 --- a/open-bpmn.glsp-client/open-bpmn-theia/src/browser/diagram/bpmn-diagram-server.ts +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2020-2022 EclipseSource and others. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v. 2.0 which is available at - * http://www.eclipse.org/legal/epl-2.0. - * - * This Source Code may also be made available under the following Secondary - * Licenses when the conditions for such availability set forth in the Eclipse - * Public License v. 2.0 are satisfied: GNU General Public License, version 2 - * with the GNU Classpath Exception which is available at - * https://www.gnu.org/software/classpath/license.html. - * - * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 - ********************************************************************************/ -// import { ApplyTaskEditOperation } from '@eclipse-glsp-examples/workflow-glsp/lib/direct-task-editing/direct-task-editor'; -import { ActionHandlerRegistry } from '@eclipse-glsp/client'; -import { GLSPTheiaDiagramServer } from '@eclipse-glsp/theia-integration'; -import { injectable } from '@theia/core/shared/inversify'; - -@injectable() -export class BPMNDiagramServer extends GLSPTheiaDiagramServer { - override initialize(registry: ActionHandlerRegistry): void { - super.initialize(registry); - // registry.register('editTask', this); - // registry.register(ApplyTaskEditOperation.KIND, this); - } -} diff --git a/open-bpmn.glsp-client/open-bpmn-theia/src/common/bpmn-language.ts b/open-bpmn.glsp-client/open-bpmn-theia/src/common/bpmn-language.ts index 52eb1a34..c527c633 100644 --- a/open-bpmn.glsp-client/open-bpmn-theia/src/common/bpmn-language.ts +++ b/open-bpmn.glsp-client/open-bpmn-theia/src/common/bpmn-language.ts @@ -19,5 +19,6 @@ export const BPMNLanguage: GLSPDiagramLanguage = { contributionId: 'Bpmn', label: 'BPMN 2.0 diagram', diagramType: 'bpmn-diagram', - fileExtensions: ['.bpmn','.bpmn2'] + fileExtensions: ['.bpmn','.bpmn2'], + iconClass: 'codicon codicon-type-hierarchy-sub' }; diff --git a/open-bpmn.glsp-client/yarn.lock b/open-bpmn.glsp-client/yarn.lock index 20dd44f4..60ccea8b 100644 --- a/open-bpmn.glsp-client/yarn.lock +++ b/open-bpmn.glsp-client/yarn.lock @@ -934,14 +934,15 @@ resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70" integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw== -"@eclipse-glsp/client@1.1.0-RC04": - version "1.1.0-RC04" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-1.1.0-RC04.tgz#47203752b97ab48026cfa61010e3281a26dbfecc" - integrity sha512-/apRDV0HGmGQPf4wy2SjzfTV4C7JX1RQAetJXu0FXq7l/l1rNsT/IVsIP9GSuJ6yYf+PttEYzLNv8hIOIPIYtw== +"@eclipse-glsp/client@1.1.0-RC10": + version "1.1.0-RC10" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/client/-/client-1.1.0-RC10.tgz#c32c91f5c1410f32c97bf506ecf9b97c7dafeb20" + integrity sha512-vMdUu5X8waKNXGRU9DEylvTkMfayiCtWRy4e+TWygfiiM7G7wD8AZPL4fGQoDT3h7ulsgpXV+Mcorysp86P6lw== dependencies: - "@eclipse-glsp/protocol" "1.1.0-RC04" + "@eclipse-glsp/protocol" "1.1.0-RC10" autocompleter "5.1.0" - sprotty "0.13.0-next.f4445dd.342" + lodash "4.17.21" + sprotty "0.14.0-next.02bbac0.26" "@eclipse-glsp/config@1.1.0-next.d03ad9f.112": version "1.1.0-next.d03ad9f.112" @@ -989,22 +990,22 @@ resolved "https://registry.yarnpkg.com/@eclipse-glsp/prettier-config/-/prettier-config-1.1.0-next.d03ad9f.112.tgz#ff7d10ca4e840d3052a4a6094116423aa7cc9b01" integrity sha512-aJhAiHcdOCcX1jBh4QXX4UutfQTGD+5t44rF/qgLUkGcxiTVDoDDE/Uv6AcMqpC4SXHHzeqHR7MJy+TJDbicNA== -"@eclipse-glsp/protocol@1.1.0-RC04": - version "1.1.0-RC04" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-1.1.0-RC04.tgz#a96c628aff909ab443261dbe289080513c18dbcf" - integrity sha512-Ds0aKL7CjAFMOiNY4MZd2HnXxlklvMhC+bxuH1ab0uj7ot6b9j3o8YrDZqLHqIYChNrEmoUEYRW71nFkWcrj3A== +"@eclipse-glsp/protocol@1.1.0-RC10": + version "1.1.0-RC10" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/protocol/-/protocol-1.1.0-RC10.tgz#123fc350277431ce36a719b582c0cc12746df6a9" + integrity sha512-00sT68AbyiiMF63kXdQcQz0vPpf4Nuf1pWoxsJq82npyCIL1PP2rqqE3v+RfQQFic0cmYQObXhJCueK/BjvDaw== dependencies: - sprotty-protocol "0.13.0-next.f4445dd.342" + sprotty-protocol "0.14.0-next.02bbac0.26" uuid "7.0.3" - vscode-ws-jsonrpc "^2.0.1" + vscode-jsonrpc "^8.0.2" -"@eclipse-glsp/theia-integration@1.1.0-RC04": - version "1.1.0-RC04" - resolved "https://registry.yarnpkg.com/@eclipse-glsp/theia-integration/-/theia-integration-1.1.0-RC04.tgz#0e9713e196d9a415e3ee3a5fccc563285680882f" - integrity sha512-YPlfYV0H8wie30CCp4ElL7Mj3O+pRvUe5sdGHM2FzPY9CS48HWY5Giw/Iymvn8kaSiP0a7zV7e7w1BnBnbadWA== +"@eclipse-glsp/theia-integration@1.1.0-RC10": + version "1.1.0-RC10" + resolved "https://registry.yarnpkg.com/@eclipse-glsp/theia-integration/-/theia-integration-1.1.0-RC10.tgz#4b38d0358bfdaa63f0510e2bdca6fec37e0597cb" + integrity sha512-gEXW+61rsl2u3QiwHQHVAt990gGLYcWSegisz/vH45/g/DMbqp+jxnlWjQLSVIYLH7jvqn4aDMS+lH5pdkrdsA== dependencies: - "@eclipse-glsp/client" "1.1.0-RC04" - vscode-jsonrpc "8.0.2" + "@eclipse-glsp/client" "1.1.0-RC10" + ws "~8.11.0" "@eclipse-glsp/ts-config@1.1.0-next.d03ad9f.112+d03ad9f": version "1.1.0-next.d03ad9f.112" @@ -1119,10 +1120,10 @@ resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72" integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw== -"@jridgewell/source-map@^0.3.2": - version "0.3.2" - resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb" - integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw== +"@jridgewell/source-map@^0.3.3": + version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91" + integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ== dependencies: "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" @@ -1716,17 +1717,31 @@ "@phosphor/signaling" "^1.3.1" "@phosphor/virtualdom" "^1.2.0" +"@puppeteer/browsers@0.5.0": + version "0.5.0" + resolved "https://registry.yarnpkg.com/@puppeteer/browsers/-/browsers-0.5.0.tgz#1a1ee454b84a986b937ca2d93146f25a3fe8b670" + integrity sha512-Uw6oB7VvmPRLE4iKsjuOh8zgDabhNX67dzo8U/BB0f9527qx+4eeUs+korU98OhG5C4ubg7ufBgVi63XYwS6TQ== + dependencies: + debug "4.3.4" + extract-zip "2.0.1" + https-proxy-agent "5.0.1" + progress "2.0.3" + proxy-from-env "1.1.0" + tar-fs "2.1.1" + unbzip2-stream "1.4.3" + yargs "17.7.1" + "@sindresorhus/df@^1.0.1": version "1.0.1" resolved "https://registry.yarnpkg.com/@sindresorhus/df/-/df-1.0.1.tgz#c69b66f52f6fcdd287c807df210305dbaf78500d" integrity sha512-1Hyp7NQnD/u4DSxR2DGW78TF9k7R0wZ8ev0BpMAIzA6yTQSHqNb5wTuvtcPYf4FWbVse2rW7RgDsyL8ua2vXHw== -"@sindresorhus/df@^2.1.0": - version "2.1.0" - resolved "https://registry.yarnpkg.com/@sindresorhus/df/-/df-2.1.0.tgz#d208cf27e06f0bb476d14d7deccd7d726e9aa389" - integrity sha512-yozEsK3X8sEjh9fiolh3JntMUuGKe2n2t8gtE3yZ1PqAFFeaSxTrSiEVORy/YkPzUsxQ85RzLcGqmqSOgiFhtg== +"@sindresorhus/df@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@sindresorhus/df/-/df-3.1.1.tgz#94200f9277e4a7fdd35ce8ab8b6bc5b52b164d31" + integrity sha512-SME/vtXaJcnQ/HpeV6P82Egy+jThn11IKfwW8+/XVoRD0rmPHVTeKMtww1oWdVnMykzVPjmrDN9S8NBndPEHCQ== dependencies: - execa "^0.2.2" + execa "^2.0.1" "@sindresorhus/is@^4.0.0": version "4.6.0" @@ -1773,7 +1788,7 @@ resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553" integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg== -"@stroncium/procfs@^1.0.0": +"@stroncium/procfs@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@stroncium/procfs/-/procfs-1.2.1.tgz#6b9be6fd20fb0a4c20e99a8695e083c699bb2b45" integrity sha512-X1Iui3FUNZP18EUvysTHxt+Avu2nlVzyf90YM8OYgP6SGzTzzX/0JgObfO1AQQDzuZtNNz29bVh8h5R97JrjxA== @@ -1785,17 +1800,18 @@ dependencies: defer-to-connect "^2.0.0" -"@theia/application-manager@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.34.0.tgz#9de1f45bc5370deae2a6b507a1b5b197ac7722d5" - integrity sha512-UNwVLwxSZkF/okwuf/aPlPCYvuoqkv6vwB3gGrRn37StTGHFA6VaUSQuXRBwjBEFPNk6TxVfhzZFcPefrOy9Uw== +"@theia/application-manager@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.39.0-next.20.tgz#2f85d677c58471eda8051a663284d93398a98a7b" + integrity sha512-fo7naEKUHD8f/1dxOGmxVFCJPQLVCP/ZrMZEyrOewjw3y2lpgDr1g75WoByU4bHQK7vAHDdAHORBI92ahm8FGw== 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.34.0" - "@theia/ffmpeg" "1.34.0" + "@theia/application-package" "1.39.0-next.20+7012fd29f" + "@theia/ffmpeg" "1.39.0-next.20+7012fd29f" + "@theia/native-webpack-plugin" "1.39.0-next.20+7012fd29f" "@types/fs-extra" "^4.0.2" "@types/semver" "^7.3.8" babel-loader "^8.2.2" @@ -1809,6 +1825,7 @@ less "^3.0.3" mini-css-extract-plugin "^2.6.1" node-abi "*" + node-loader "^2.0.0" path-browserify "^1.0.1" semver "^7.3.5" setimmediate "^1.0.5" @@ -1818,60 +1835,60 @@ string-replace-loader "^3.1.0" style-loader "^2.0.0" umd-compat-loader "^2.1.2" - webpack "^5.48.0" + webpack "^5.76.0" webpack-cli "4.7.0" worker-loader "^3.0.8" yargs "^15.3.1" -"@theia/application-package@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.34.0.tgz#5eb0984e40627ade2e013b4cf6a4d432d064890f" - integrity sha512-ASy3m+ULpXuAXMNZ01C9keAsMG7Dj/GAMykonq1qDpEy6tFp5Lc3Tgv0UFH3x5GaBVh1oTFtPsHJTyFzecBl1g== +"@theia/application-package@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.39.0-next.20.tgz#99627e12d74dade68160908afa44cf90b31ab901" + integrity sha512-vsxttkiGYJjXFXnWvsBlR3f5Bk6c4RhFy9DxYQAbuXQCbXjzLOPKfPSZEAJSn1PtTF48FrIPGmT5mTg4d9wHww== dependencies: + "@theia/request" "1.39.0-next.20+7012fd29f" "@types/fs-extra" "^4.0.2" - "@types/request" "^2.0.3" "@types/semver" "^5.4.0" "@types/write-json-file" "^2.2.1" deepmerge "^4.2.2" fs-extra "^4.0.2" is-electron "^2.1.0" nano "^9.0.5" - request "^2.82.0" resolve-package-path "^4.0.3" semver "^5.4.1" write-json-file "^2.2.0" -"@theia/cli@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.34.0.tgz#ca9fa3f0b120ee196aac61075380b35ced919084" - integrity sha512-aUXlGttqDsV9Bk19RO99uvbC5Ff57n3qkMLeZ/AXIgatvfclpdVw9v1QqFFIX7MKOxP90L8ze/j6fzksb/bN1Q== - dependencies: - "@theia/application-manager" "1.34.0" - "@theia/application-package" "1.34.0" - "@theia/ffmpeg" "1.34.0" - "@theia/localization-manager" "1.34.0" - "@theia/ovsx-client" "1.34.0" - "@theia/request" "1.34.0" +"@theia/cli@1.39.0-next.20": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.39.0-next.20.tgz#907312ce58ef70de3d2c70f1021d4a875e5a2223" + integrity sha512-+lXorZHUMsH69A8Xr/09E0sfyLtL+JJoDAmficP994W09Jh8ZXJ87bGsdFYaGu8fiEdvt+REEjH/WDSZOPJ9jw== + dependencies: + "@theia/application-manager" "1.39.0-next.20+7012fd29f" + "@theia/application-package" "1.39.0-next.20+7012fd29f" + "@theia/ffmpeg" "1.39.0-next.20+7012fd29f" + "@theia/localization-manager" "1.39.0-next.20+7012fd29f" + "@theia/ovsx-client" "1.39.0-next.20+7012fd29f" + "@theia/request" "1.39.0-next.20+7012fd29f" "@types/chai" "^4.2.7" "@types/mocha" "^10.0.0" "@types/node-fetch" "^2.5.7" - "@types/puppeteer" "^2.0.0" chai "^4.2.0" chalk "4.0.0" decompress "^4.2.1" + escape-string-regexp "4.0.0" glob "^8.0.3" limiter "^2.1.0" log-update "^4.0.0" mocha "^10.1.0" - puppeteer "^2.0.0" - puppeteer-to-istanbul "^1.2.2" + puppeteer "^19.7.2" + puppeteer-core "^19.7.2" + puppeteer-to-istanbul "^1.4.0" temp "^0.9.1" yargs "^15.3.1" -"@theia/core@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.34.0.tgz#66c456dc71df09c778882f2e7a6fcccf237bb018" - integrity sha512-A/b0JT3ErkXFxpcK7qS1f1L10sHOLK0nnFydbT7DfP7yy+QDSV9JG8ZJggbs3fOPsGAUj2DG56zbIubxlBUmyQ== +"@theia/core@1.39.0-next.20", "@theia/core@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.39.0-next.20.tgz#f124cc4eb470bc50a9b948784f6ad8ee51188d9d" + integrity sha512-nzqvdHHPLrXUeRY1ePTthWIP1VUThbKNqLvYDbTM5/WXBVyCy2OhnuirG1q9yOxgoSC/btlPz7H/hCJx9fsqlw== dependencies: "@babel/runtime" "^7.10.0" "@phosphor/algorithm" "1" @@ -1884,8 +1901,8 @@ "@phosphor/signaling" "1" "@phosphor/virtualdom" "1" "@phosphor/widgets" "1" - "@theia/application-package" "1.34.0" - "@theia/request" "1.34.0" + "@theia/application-package" "1.39.0-next.20+7012fd29f" + "@theia/request" "1.39.0-next.20+7012fd29f" "@types/body-parser" "^1.16.4" "@types/cookie" "^0.3.3" "@types/dompurify" "^2.2.2" @@ -1902,6 +1919,7 @@ "@types/yargs" "^15" "@vscode/codicons" "*" ajv "^6.5.3" + async-mutex "^0.4.0" body-parser "^1.17.2" cookie "^0.4.0" dompurify "^2.2.9" @@ -1916,7 +1934,7 @@ http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" iconv-lite "^0.6.0" - inversify "^5.1.1" + inversify "^6.0.1" jschardet "^2.1.1" keytar "7.2.0" lodash.debounce "^4.0.8" @@ -1941,28 +1959,28 @@ ws "^7.1.2" yargs "^15.3.1" -"@theia/editor@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.34.0.tgz#d9f607a7863f7eba3910b127b116334d1eb00c45" - integrity sha512-dOzgdMP/j8sQ4rc3Phb98vM/Kog60cCTZXLkWRXJDN2svpTHnXU1NJba2zcrd/T7+bqYctrwqVHOJ3f9coYGdw== +"@theia/editor@1.39.0-next.20", "@theia/editor@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.39.0-next.20.tgz#92668055ec5acc1273d883d695fce3c1b9fc89df" + integrity sha512-qLXRpefC0g9H+f/L4DW29nRjDiQgot75jeZP98eiGsNkvIZO6/MQhsHSFENmYiHwaIUiGD1fdjqrP7oRDQW/2w== dependencies: - "@theia/core" "1.34.0" - "@theia/variable-resolver" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" + "@theia/variable-resolver" "1.39.0-next.20+7012fd29f" -"@theia/ffmpeg@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/ffmpeg/-/ffmpeg-1.34.0.tgz#47273a6cab7e0223b524147dac821b5a770a7ad8" - integrity sha512-nm6REvH3k033Y3pO83G2splh5YoGSQ0cEoXeOE5xAbmshziFuSSTVLzg5OvHTGbuKuAoLD7UarXQAagoQZ+1Fw== +"@theia/ffmpeg@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/ffmpeg/-/ffmpeg-1.39.0-next.20.tgz#75619dbb0bcbef86293bf9e00c7fd35f781f4362" + integrity sha512-khn6r08H+kpcGQqkR3BgruWEX1KTfOsBze8ElqFkKHE3HB0Xxvm9gbTYpJlg3WKAXM8QThoqufPo8cgqHPjbbw== dependencies: "@electron/get" "^2.0.0" unzipper "^0.9.11" -"@theia/filesystem@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.34.0.tgz#d58fc46fbf52b55439f7cfbb5424e147f10970aa" - integrity sha512-+1tYzqHoO1Ecl0N3p9NonHnKQrtNmjph5pGcG3swOwxAr/XEz/yz1rMDdceqwstN2XLr9UyupvWhZjgTkvADBQ== +"@theia/filesystem@1.39.0-next.20", "@theia/filesystem@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.39.0-next.20.tgz#38f0ba8e94ac78eb10dd29e03c8a3387f56d82a3" + integrity sha512-MTtsXhLLMmDrOy7FvMzllii8TaX56mlDdiD4jRCf74s61NNwWzK3uU8VNbymyYfCgCdnMyZZxqQb4nTfb97KeA== dependencies: - "@theia/core" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" "@types/body-parser" "^1.17.0" "@types/multer" "^1.4.7" "@types/rimraf" "^2.0.2" @@ -1975,14 +1993,14 @@ multer "1.4.4-lts.1" rimraf "^2.6.2" tar-fs "^1.16.2" - trash "^6.1.1" + trash "^7.2.0" uuid "^8.0.0" vscode-languageserver-textdocument "^1.0.1" -"@theia/localization-manager@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/localization-manager/-/localization-manager-1.34.0.tgz#76a2e7dbd994e91e1cd7a490efee3eea388219c1" - integrity sha512-oUM9PvKWvO7EgGXi10Cl8a2VWgmDDGM6sYHsgXO7qajO0ECvo5vJuIrtHNy/qpRZZLBGDfvmLvLjtQl6wE6tgA== +"@theia/localization-manager@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/localization-manager/-/localization-manager-1.39.0-next.20.tgz#342b9aa7ed865f52034afefbea1603e8387255cc" + integrity sha512-WadqAi0kJfNZp1bu36yDavGkbRU4E2pAn1GF3Mzq436iFBuvuNDsJzxCqfka4frb3K5YzYkVsRF4Fuc9ozmQOA== dependencies: "@types/bent" "^7.0.1" "@types/fs-extra" "^4.0.2" @@ -1993,21 +2011,21 @@ glob "^7.2.0" typescript "~4.5.5" -"@theia/markers@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.34.0.tgz#0f2bb4292101d1e5e3f8c5fae5ae36b04bb14d31" - integrity sha512-CY479KdsV7+AsQAHw7qhqF+eMQOGmMwWUQsTSHrr+0qkX5uZEKc7AJ6+dxnwa/EvaAaXi5PBZDHXgkLrBLQFtg== +"@theia/markers@1.39.0-next.20", "@theia/markers@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.39.0-next.20.tgz#dd19c6459894b6724ed32be5f05525a619fc4c46" + integrity sha512-RE0+0faoM/xXYFtnyaeLkiqC4fNHI4dMFpGwuDuY4RlwBBMpGSxnHRF2erfjxZb8SFYLXc9rjYIAsiUjzjfqSg== dependencies: - "@theia/core" "1.34.0" - "@theia/filesystem" "1.34.0" - "@theia/workspace" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" + "@theia/filesystem" "1.39.0-next.20+7012fd29f" + "@theia/workspace" "1.39.0-next.20+7012fd29f" -"@theia/messages@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.34.0.tgz#0289800d60ba73a87f8ec076b3126a30c1675306" - integrity sha512-tBxG20Vg43Cnv2lamf2DR7+TA7ZWmP9cdOPU6j6Kid1EFvyCGHrQZ6ayNXtuoyPqnDHPrqp2Gjw+ynYRn+Jxvw== +"@theia/messages@1.39.0-next.20": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.39.0-next.20.tgz#b6adbd7a3ea27db76ef186f7861f963cd0b02bbe" + integrity sha512-olGLPvKXRgohMMNMnJL2tRTkzpjySQmmiw2muzDN6xTqqQfreUGsEy6km8yaczemOfyNtphBeBgrRAKc2bPy6g== dependencies: - "@theia/core" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" react-perfect-scrollbar "^1.5.3" ts-md5 "^1.2.2" @@ -2016,119 +2034,128 @@ resolved "https://registry.yarnpkg.com/@theia/monaco-editor-core/-/monaco-editor-core-1.72.3.tgz#911d674c6e0c490442a355cfaa52beec919a025e" integrity sha512-2FK5m0G5oxiqCv0ZrjucMx5fVgQ9Jqv0CgxGvSzDc4wRrauBdeBoX90J99BEIOJ8Jp3W0++GoRBdh0yQNIGL2g== -"@theia/monaco@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.34.0.tgz#0dbc78e6fb13bce7ecaba4cbeda0d8bb8062e270" - integrity sha512-brS6deSNzoVnugAkw6/gPxzYIgO7QoUs6d+IeloMMvk8AfuI5bD3E3M+nFgpK5Gm+chwlYfhv+OX9KlG/b1HaQ== +"@theia/monaco@1.39.0-next.20", "@theia/monaco@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.39.0-next.20.tgz#eb4ffacb5dbf60bc80f1a949bd3a41e7098f4535" + integrity sha512-2mJ5lXYgPD0WSAV91EV31BtJKJH3z1omOKFGVwqfNjqPhkv0ChjD80iTaErBKAgu8gj9L/1MH2bBIQN45AfkMQ== dependencies: - "@theia/core" "1.34.0" - "@theia/editor" "1.34.0" - "@theia/filesystem" "1.34.0" - "@theia/markers" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" + "@theia/editor" "1.39.0-next.20+7012fd29f" + "@theia/filesystem" "1.39.0-next.20+7012fd29f" + "@theia/markers" "1.39.0-next.20+7012fd29f" "@theia/monaco-editor-core" "1.72.3" - "@theia/outline-view" "1.34.0" + "@theia/outline-view" "1.39.0-next.20+7012fd29f" fast-plist "^0.1.2" idb "^4.0.5" jsonc-parser "^2.2.0" vscode-oniguruma "1.6.1" vscode-textmate "^7.0.3" -"@theia/navigator@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.34.0.tgz#bcc1d31767d82848b8f6a7251ac4eaed8a9af44e" - integrity sha512-YvogHk8l1rRmc+6O2gMY47em8302JC4Y6SPcs9X6kukc/oNy9uXAaTu6aKQVXZBuNXo4f1fZ2RkfjsaTjeXSHA== +"@theia/native-webpack-plugin@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/native-webpack-plugin/-/native-webpack-plugin-1.39.0-next.20.tgz#fcc1e801f76b0de3bb37120a91adc372f8b54562" + integrity sha512-0IuJdVn1kG+wdM+WS3FygGavUWusbX1EU/yEaBIcTVZlFfiz0ZR4q9dXOUQt8IWQRZAqkL6q5GBkAiZbGmFgSA== + dependencies: + temp "^0.9.1" + webpack "^5.76.0" + +"@theia/navigator@1.39.0-next.20": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.39.0-next.20.tgz#256398170f82f23eace69777adb66925f9f519b0" + integrity sha512-9O5dNAO4xC/r3urxMmilDYWRme/OQSDhzv6nnN491L85oyK/Sn3JKbYSIe1AGtD1PZOBhKujdDC4id1NbxH5ng== dependencies: - "@theia/core" "1.34.0" - "@theia/filesystem" "1.34.0" - "@theia/workspace" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" + "@theia/filesystem" "1.39.0-next.20+7012fd29f" + "@theia/workspace" "1.39.0-next.20+7012fd29f" minimatch "^5.1.0" -"@theia/outline-view@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.34.0.tgz#9bed91e7c13ce39588858c5dd86bef6739257efe" - integrity sha512-PnnZSRI9UbKgWisc6KrjjEVMTF9fNBTD+PHCvLsUtIQWk/Zkhg0ox0UKll6EKyhzL2QhedPDgELs3UsrOesqwA== +"@theia/outline-view@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.39.0-next.20.tgz#51695687f85cab56f37f6b6e1346623720abaa2a" + integrity sha512-gCEZAqUb5ZMBCC0PjHa8DEOn+3J6rnHtJiqDPViWe7UceSo2H8/H4rweN8WAi20eHMojGdH0DCo/dmnbKFrAqg== dependencies: - "@theia/core" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" -"@theia/ovsx-client@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.34.0.tgz#6b8253f32f3ab4e5dc45059fcac94bc7117b0b8b" - integrity sha512-A2zr4P9NZsybl5BS75sBcfZS2H05NWcssHqEnuclbqJrSi8GvisoyKhtCJm76VJjF5Lwq1RiW/uhhpv9RxSPFw== +"@theia/ovsx-client@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.39.0-next.20.tgz#59cb7e5dc360103ff30761d5f9a4e06060aa2014" + integrity sha512-Dpys4tBxJBx637ZznZcqJ2V46lzYcY2R0qebOZK9rABJ0JJ+ekhyabpAlwLry893+bXXJNsF6h6DFc22mB9xSw== dependencies: - "@theia/request" "1.34.0" + "@theia/request" "1.39.0-next.20+7012fd29f" semver "^5.4.1" -"@theia/preferences@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.34.0.tgz#6ccfdf131e4a851662b9c62013278f65655fff9f" - integrity sha512-K6Lzldq/GZYQWqfUtcTYSTLjLjKCMH4W+TfofRKtTIwns3mxIUywDpF+9oJQnbY74oA7beMFHFEMljkYgtPuwQ== +"@theia/preferences@1.39.0-next.20": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.39.0-next.20.tgz#ba4d5d7d9adb41c746652c01f748bda6b7026c13" + integrity sha512-/G2NM7/6w6V6+CTmS7OEx6F5GX1ouFpPSUjOaYusRg+2uX0KjnbBG3KgvvKOEGJEStGQx7xk65UXVFigFmdGLA== dependencies: - "@theia/core" "1.34.0" - "@theia/editor" "1.34.0" - "@theia/filesystem" "1.34.0" - "@theia/monaco" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" + "@theia/editor" "1.39.0-next.20+7012fd29f" + "@theia/filesystem" "1.39.0-next.20+7012fd29f" + "@theia/monaco" "1.39.0-next.20+7012fd29f" "@theia/monaco-editor-core" "1.72.3" - "@theia/userstorage" "1.34.0" - "@theia/workspace" "1.34.0" + "@theia/userstorage" "1.39.0-next.20+7012fd29f" + "@theia/workspace" "1.39.0-next.20+7012fd29f" async-mutex "^0.3.1" + fast-deep-equal "^3.1.3" jsonc-parser "^2.2.0" p-debounce "^2.1.0" -"@theia/process@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.34.0.tgz#5a4dd240d87a9d40a8a0dc3026d06a3fc64d9d33" - integrity sha512-7crws2IiDvc00dE15aGu9TpDGobX8IsQziCn34Q7uZI71vdlVSKUgaok5iRZcwCxYXweVAJKgl107KViQK+Zog== +"@theia/process@1.39.0-next.20", "@theia/process@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.39.0-next.20.tgz#87953ca570f9f380f0e196efe15d68eeec4b5375" + integrity sha512-mp3I5Fd02V+dDVZ35XQUj4BjRfPQhdG6kM8qJorrC2Gh4VlQAnrmkspApf58/kD+M614m0ZzX4fbsRZgbRGHXg== dependencies: - "@theia/core" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" node-pty "0.11.0-beta17" string-argv "^0.1.1" -"@theia/request@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/request/-/request-1.34.0.tgz#2f05a4852214429a9cbb2f8dd37bb480c0d5c862" - integrity sha512-dwpd/by43rJoExPyoORwB1DTJvaCTIn6UZEhsejQneYqsRGuQ80oPLr3ntY0VdrTuEE6L31llBP7gC/xGCjpxA== +"@theia/request@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/request/-/request-1.39.0-next.20.tgz#51317bf11677a3b4e800b5a9fb784316e27a741f" + integrity sha512-zAtRksAYlJt6c/no1IIIltBaHyrk5Tq8W6TRXk6HXVvsAlHyh45uvy9FXawSChg4YuHIaaA30xHCxqKqYMBPTQ== dependencies: http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" -"@theia/terminal@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.34.0.tgz#995c7ed820da8718d82a45f03a3c84c0dcfe4fa9" - integrity sha512-/8oW3L8GAUcgb7r7eY1ca5b8IcrJBVBbQ7zcDVGEAlyA0INZUW2o/RjG59/dEoHV7wcccWYur2Gyzo9ZfrsBRA== - dependencies: - "@theia/core" "1.34.0" - "@theia/editor" "1.34.0" - "@theia/filesystem" "1.34.0" - "@theia/process" "1.34.0" - "@theia/variable-resolver" "1.34.0" - "@theia/workspace" "1.34.0" +"@theia/terminal@1.39.0-next.20": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.39.0-next.20.tgz#f24cb3edecd9d2952be0a95e72b784483b61ec72" + integrity sha512-zcDuUS29FXAr3dpStx4la1XF/fpNWVgtnmwGsNmDPwPEFo/iDCARbqHtKbCDMLto9+cfhMf5DWD0dJQq+K5G8A== + dependencies: + "@theia/core" "1.39.0-next.20+7012fd29f" + "@theia/editor" "1.39.0-next.20+7012fd29f" + "@theia/filesystem" "1.39.0-next.20+7012fd29f" + "@theia/process" "1.39.0-next.20+7012fd29f" + "@theia/variable-resolver" "1.39.0-next.20+7012fd29f" + "@theia/workspace" "1.39.0-next.20+7012fd29f" xterm "^4.16.0" xterm-addon-fit "^0.5.0" xterm-addon-search "^0.8.2" -"@theia/userstorage@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.34.0.tgz#dd3bab55675a7a646a804efc848ec2df29015b32" - integrity sha512-YaLexq7L7dY5MgBy6aRjGaN6pVLvPKw3GIbhcHEL8cSK3Ng+UTxtDbBv6KP2vyuDPHLkUxC+FfsJbdlznfctgw== +"@theia/userstorage@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.39.0-next.20.tgz#08d1fdacd0095863f32c17552a1a4ed5dbf5496e" + integrity sha512-Q3zmXXKaBgL6xwGijnKH0S9RcfDU6HG4t/gd1GyhgavH+PJDIxlp1Xq2iKhM4agUB+/ehKj+ygHGheNqVMnGXw== dependencies: - "@theia/core" "1.34.0" - "@theia/filesystem" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" + "@theia/filesystem" "1.39.0-next.20+7012fd29f" -"@theia/variable-resolver@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.34.0.tgz#a95b2a21f3120457b8eb1e2ac4cbb5e6ec4fe67a" - integrity sha512-ow/k9eq7+KkhkqhpNA0nze1WHEAOYTH+jyQaz8JK50Cthqyoleu0kU20bKC6u3ul+TeRaU7CYALiGeyzWDVo+A== +"@theia/variable-resolver@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.39.0-next.20.tgz#0794384d8f7994f4c10acce502e52c78615e531f" + integrity sha512-0IiACAHt7CkiLN67kzKO5wbxtGl1xje0Hk4/mR5NX9yJ2jR+k1IYNprlwB6wzfriIszRUI5Llx/gzzaePqJQzA== dependencies: - "@theia/core" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" -"@theia/workspace@1.34.0": - version "1.34.0" - resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.34.0.tgz#c222f35646480ced63fb1fb86c520a8c378b2d29" - integrity sha512-LLUTr/953Rwoq3sKcrR1LClxbdLCjFij6VuVmqF3+2+UorTGNVQAim8JGXDbBWnsYlFQAt7ZRz4sV1MhokTD/Q== +"@theia/workspace@1.39.0-next.20", "@theia/workspace@1.39.0-next.20+7012fd29f": + version "1.39.0-next.20" + resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.39.0-next.20.tgz#e20cd3eab9954c1a2c848d0a75aab54dbc6c6e74" + integrity sha512-L9JGhMPlABwg83g0rWFJKGPyGdvltdbXyrGfyhtBHreC4Rtb1sZbPZgMGpZmuSYSsk1yAmHbRcd7I9zyB4eYbg== dependencies: - "@theia/core" "1.34.0" - "@theia/filesystem" "1.34.0" - "@theia/variable-resolver" "1.34.0" + "@theia/core" "1.39.0-next.20+7012fd29f" + "@theia/filesystem" "1.39.0-next.20+7012fd29f" + "@theia/variable-resolver" "1.39.0-next.20+7012fd29f" jsonc-parser "^2.2.0" valid-filename "^2.0.1" @@ -2182,11 +2209,6 @@ "@types/node" "*" "@types/responselike" "^1.0.0" -"@types/caseless@*": - version "0.12.2" - resolved "https://registry.yarnpkg.com/@types/caseless/-/caseless-0.12.2.tgz#f65d3d6389e01eeb458bd54dc8f52b95a9463bc8" - integrity sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w== - "@types/chai@^4.2.7", "@types/chai@^4.3.4": version "4.3.4" resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.4.tgz#e913e8175db8307d78b4e8fa690408ba6b65dee4" @@ -2244,10 +2266,10 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.0.tgz#5fb2e536c1ae9bf35366eed879e827fa59ca41c2" integrity sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ== -"@types/estree@^0.0.51": - version "0.0.51" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40" - integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ== +"@types/estree@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" + integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== "@types/events@*": version "3.0.0" @@ -2347,11 +2369,6 @@ resolved "https://registry.yarnpkg.com/@types/mdurl/-/mdurl-1.0.2.tgz#e2ce9d83a613bacf284c7be7d491945e39e1f8e9" integrity sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA== -"@types/mime-types@^2.1.0": - version "2.1.1" - resolved "https://registry.yarnpkg.com/@types/mime-types/-/mime-types-2.1.1.tgz#d9ba43490fa3a3df958759adf69396c3532cf2c1" - integrity sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw== - "@types/mime@*": version "3.0.1" resolved "https://registry.yarnpkg.com/@types/mime/-/mime-3.0.1.tgz#5f8f2bca0a5863cb69bc0b0acd88c96cb1d4ae10" @@ -2412,13 +2429,6 @@ resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w== -"@types/puppeteer@^2.0.0": - version "2.1.8" - resolved "https://registry.yarnpkg.com/@types/puppeteer/-/puppeteer-2.1.8.tgz#c880b35b7d34ef85806deca7032d959ec5af8498" - integrity sha512-sFyFD1yIlBwg8jpCbmi4ngecMI6Uw6iEKyUUglFXOiaZQHTvE8oftAWKK7E5sac1Uce+7uR5iVKWDLKDxmjcSA== - dependencies: - "@types/node" "*" - "@types/qs@*": version "6.9.7" resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb" @@ -2445,16 +2455,6 @@ "@types/scheduler" "*" csstype "^3.0.2" -"@types/request@^2.0.3": - version "2.48.8" - resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.8.tgz#0b90fde3b655ab50976cb8c5ac00faca22f5a82c" - integrity sha512-whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ== - dependencies: - "@types/caseless" "*" - "@types/node" "*" - "@types/tough-cookie" "*" - form-data "^2.5.0" - "@types/responselike@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29" @@ -2532,7 +2532,7 @@ dependencies: "@types/node" "*" -"@types/tough-cookie@*", "@types/tough-cookie@^4.0.0": +"@types/tough-cookie@^4.0.0": version "4.0.2" resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.2.tgz#6286b4c7228d58ab7866d19716f3696e03a09397" integrity sha512-Q5vtl1W5ue16D+nIaW8JWebSSraJVlK+EthKn7e7UcD4KWsaSJ8BqGPXNaPghgtcn/fhvrN17Tv8ksUsQpiplw== @@ -2572,6 +2572,13 @@ dependencies: "@types/yargs-parser" "*" +"@types/yauzl@^2.9.1": + version "2.10.0" + resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.10.0.tgz#b3248295276cf8c6f153ebe6a9aba0c988cb2599" + integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw== + dependencies: + "@types/node" "*" + "@typescript-eslint/eslint-plugin@^5.45.0": version "5.55.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.55.0.tgz#bc2400c3a23305e8c9a9c04aa40933868aaaeb47" @@ -2680,125 +2687,125 @@ resolved "https://registry.yarnpkg.com/@vscode/codicons/-/codicons-0.0.32.tgz#9e27de90d509c69762b073719ba3bf46c3cd2530" integrity sha512-3lgSTWhAzzWN/EPURoY4ZDBEA80OPmnaknNujA3qnI4Iu7AONWd9xF3iE4L+4prIe8E3TUnLQ4pxoaFTEEZNwg== -"@webassemblyjs/ast@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7" - integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw== +"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" + integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== dependencies: - "@webassemblyjs/helper-numbers" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" + "@webassemblyjs/helper-numbers" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" -"@webassemblyjs/floating-point-hex-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f" - integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ== +"@webassemblyjs/floating-point-hex-parser@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" + integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== -"@webassemblyjs/helper-api-error@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16" - integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg== +"@webassemblyjs/helper-api-error@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" + integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== -"@webassemblyjs/helper-buffer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5" - integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA== +"@webassemblyjs/helper-buffer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" + integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== -"@webassemblyjs/helper-numbers@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae" - integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ== +"@webassemblyjs/helper-numbers@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" + integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== dependencies: - "@webassemblyjs/floating-point-hex-parser" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" + "@webassemblyjs/floating-point-hex-parser" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" "@xtuc/long" "4.2.2" -"@webassemblyjs/helper-wasm-bytecode@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1" - integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q== +"@webassemblyjs/helper-wasm-bytecode@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" + integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== -"@webassemblyjs/helper-wasm-section@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a" - integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg== +"@webassemblyjs/helper-wasm-section@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" + integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" -"@webassemblyjs/ieee754@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614" - integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ== +"@webassemblyjs/ieee754@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" + integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== dependencies: "@xtuc/ieee754" "^1.2.0" -"@webassemblyjs/leb128@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5" - integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw== +"@webassemblyjs/leb128@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" + integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== dependencies: "@xtuc/long" "4.2.2" -"@webassemblyjs/utf8@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff" - integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ== - -"@webassemblyjs/wasm-edit@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6" - integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/helper-wasm-section" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-opt" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - "@webassemblyjs/wast-printer" "1.11.1" - -"@webassemblyjs/wasm-gen@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76" - integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wasm-opt@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2" - integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-buffer" "1.11.1" - "@webassemblyjs/wasm-gen" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" - -"@webassemblyjs/wasm-parser@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199" - integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA== - dependencies: - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/helper-api-error" "1.11.1" - "@webassemblyjs/helper-wasm-bytecode" "1.11.1" - "@webassemblyjs/ieee754" "1.11.1" - "@webassemblyjs/leb128" "1.11.1" - "@webassemblyjs/utf8" "1.11.1" - -"@webassemblyjs/wast-printer@1.11.1": - version "1.11.1" - resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0" - integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg== - dependencies: - "@webassemblyjs/ast" "1.11.1" +"@webassemblyjs/utf8@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" + integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== + +"@webassemblyjs/wasm-edit@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" + integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/helper-wasm-section" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-opt" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + "@webassemblyjs/wast-printer" "1.11.6" + +"@webassemblyjs/wasm-gen@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" + integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + +"@webassemblyjs/wasm-opt@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" + integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-buffer" "1.11.6" + "@webassemblyjs/wasm-gen" "1.11.6" + "@webassemblyjs/wasm-parser" "1.11.6" + +"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" + integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== + dependencies: + "@webassemblyjs/ast" "1.11.6" + "@webassemblyjs/helper-api-error" "1.11.6" + "@webassemblyjs/helper-wasm-bytecode" "1.11.6" + "@webassemblyjs/ieee754" "1.11.6" + "@webassemblyjs/leb128" "1.11.6" + "@webassemblyjs/utf8" "1.11.6" + +"@webassemblyjs/wast-printer@1.11.6": + version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" + integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== + dependencies: + "@webassemblyjs/ast" "1.11.6" "@xtuc/long" "4.2.2" "@webpack-cli/configtest@^1.0.3": @@ -2874,10 +2881,10 @@ accepts@~1.3.4, accepts@~1.3.8: mime-types "~2.1.34" negotiator "0.6.3" -acorn-import-assertions@^1.7.6: - version "1.8.0" - resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9" - integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw== +acorn-import-assertions@^1.9.0: + version "1.9.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" + integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== acorn-jsx@^5.3.2: version "5.3.2" @@ -2889,21 +2896,21 @@ acorn-walk@^8.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== -acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1, acorn@^8.8.0: +acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.0: version "8.8.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.8.2.tgz#1b2f25db02af965399b9776b0c2c391276d37c4a" integrity sha512-xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw== +acorn@^8.8.2: + version "8.10.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== + add-stream@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa" integrity sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ== -agent-base@5: - version "5.1.1" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c" - integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g== - agent-base@6, agent-base@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77" @@ -2947,7 +2954,7 @@ ajv-keywords@^5.0.0: 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: +ajv@^6.10.0, 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== @@ -3150,18 +3157,6 @@ asap@^2.0.0: resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46" integrity sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA== -asn1@~0.2.3: - version "0.2.6" - resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d" - integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ== - dependencies: - safer-buffer "~2.1.0" - -assert-plus@1.0.0, assert-plus@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" - integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw== - assertion-error@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/assertion-error/-/assertion-error-1.1.0.tgz#e60b6b0e8f301bd97e5375215bda406c85118c0b" @@ -3182,11 +3177,6 @@ astral-regex@^2.0.0: resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== -async-limiter@~1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" - integrity sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ== - async-mutex@^0.3.1: version "0.3.2" resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.3.2.tgz#1485eda5bda1b0ec7c8df1ac2e815757ad1831df" @@ -3194,6 +3184,13 @@ async-mutex@^0.3.1: dependencies: tslib "^2.3.1" +async-mutex@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/async-mutex/-/async-mutex-0.4.0.tgz#ae8048cd4d04ace94347507504b3cf15e631c25f" + integrity sha512-eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA== + dependencies: + tslib "^2.4.0" + async@^3.2.3: version "3.2.4" resolved "https://registry.yarnpkg.com/async/-/async-3.2.4.tgz#2d22e00f8cddeb5fde5dd33522b56d1cf569a81c" @@ -3214,26 +3211,16 @@ autocompleter@5.1.0: resolved "https://registry.yarnpkg.com/autocompleter/-/autocompleter-5.1.0.tgz#da80488ddf1f1d89b0a8f5d36cab24439de18ab8" integrity sha512-xFZla6guwywqFJutoi5xrhAmaKw4/TU8CcLuNep/3OtiUfpNXtgzuBkkXJ6ysJIfG6MEEXFtUBg3PREN6HUVyw== -autocompleter@^5.1.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/autocompleter/-/autocompleter-5.2.0.tgz#9ed3df262614fd557bf4d5bf67ab13cdee008203" - integrity sha512-CMYgI+r7RGZFaT0SvXcyBn1hb/Ne6XbjXimWQPc16LcwZgUGFBHg/Pv8honrwkTZE4DbfrD/MzqlG+Bn2u+1ng== +autocompleter@^7.0.1: + version "7.1.0" + resolved "https://registry.yarnpkg.com/autocompleter/-/autocompleter-7.1.0.tgz#f8ff1428ec976eddc3eb8df7a2842c287d9b2bf5" + integrity sha512-uCToOnq7eAD/GJAteDbYuQ7ksDtrYWOy5CIAq43wh0dT+5frMpPlyD9tp+y5fz8KIcsP+zR2MjzoTAdW5aJESw== available-typed-arrays@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz#92f95616501069d07d10edb2fc37d3e1c65123b7" integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw== -aws-sign2@~0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" - integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA== - -aws4@^1.8.0: - version "1.12.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.12.0.tgz#ce1c9d143389679e253b314241ea9aa5cec980d3" - integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg== - axios-cookiejar-support@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/axios-cookiejar-support/-/axios-cookiejar-support-1.0.1.tgz#7b32af7d932508546c68b1fc5ba8f562884162e1" @@ -3312,13 +3299,6 @@ base64id@2.0.0, base64id@~2.0.0: resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6" integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog== -bcrypt-pbkdf@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" - integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w== - dependencies: - tweetnacl "^0.14.3" - before-after-hook@^2.2.0: version "2.2.3" resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c" @@ -3740,6 +3720,13 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== +chromium-bidi@0.4.7: + version "0.4.7" + resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.4.7.tgz#4c022c2b0fb1d1c9b571fadf373042160e71d236" + integrity sha512-6+mJuFXwTMU6I3vYLs6IL8A1DyQTPjCfIL971X0aMPVGRbGnNfl6i6Cl0NMbxi2bRYLGESt9T2ZIMRM5PAEcIQ== + dependencies: + mitt "3.0.0" + ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -3879,7 +3866,7 @@ columnify@1.6.0: strip-ansi "^6.0.1" wcwidth "^1.0.0" -combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6: +combined-stream@^1.0.8: version "1.0.8" resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f" integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg== @@ -3927,7 +3914,7 @@ concat-map@0.0.1: resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg== -concat-stream@^1.5.2, concat-stream@^1.6.2: +concat-stream@^1.5.2: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw== @@ -4101,11 +4088,6 @@ core-js-compat@^3.25.1: dependencies: browserslist "^4.21.5" -core-util-is@1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" - integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ== - core-util-is@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" @@ -4130,31 +4112,29 @@ cosmiconfig@7.0.0: path-type "^4.0.0" yaml "^1.10.0" -cp-file@^6.1.0: - version "6.2.0" - resolved "https://registry.yarnpkg.com/cp-file/-/cp-file-6.2.0.tgz#40d5ea4a1def2a9acdd07ba5c0b0246ef73dc10d" - integrity sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA== +cosmiconfig@8.1.3: + version "8.1.3" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.1.3.tgz#0e614a118fcc2d9e5afc2f87d53cd09931015689" + integrity sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw== dependencies: - graceful-fs "^4.1.2" - make-dir "^2.0.0" - nested-error-stacks "^2.0.0" - pify "^4.0.1" - safe-buffer "^5.0.1" + import-fresh "^3.2.1" + js-yaml "^4.1.0" + parse-json "^5.0.0" + path-type "^4.0.0" create-require@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== -cross-spawn-async@^2.1.1: - version "2.2.5" - resolved "https://registry.yarnpkg.com/cross-spawn-async/-/cross-spawn-async-2.2.5.tgz#845ff0c0834a3ded9d160daca6d390906bb288cc" - integrity sha512-snteb3aVrxYYOX9e8BabYFK9WhCDhTlw1YQktfTthBogxri4/2r9U2nQc0ffY73ZAxezDc+U8gvHAeU1wy1ubQ== +cross-fetch@3.1.5: + version "3.1.5" + resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.1.5.tgz#e1389f44d9e7ba767907f7af8454787952ab534f" + integrity sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw== dependencies: - lru-cache "^4.0.0" - which "^1.2.8" + node-fetch "2.6.7" -cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: +cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== @@ -4192,19 +4172,12 @@ dargs@^7.0.0: resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" integrity sha512-2iy1EkLdlBzQGvbweYRFxmFath8+K7+AKB0TlhHWkNuH+TmovaMH/Wp7V7R4u7f4SnX3OgLsU9t1NI9ioDnUpg== -dashdash@^1.12.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" - integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g== - dependencies: - assert-plus "^1.0.0" - dateformat@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -debug@2.6.9, debug@^2.6.9: +debug@2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== @@ -4412,6 +4385,11 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== +devtools-protocol@0.0.1107588: + version "0.0.1107588" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1107588.tgz#f8cac707840b97cc30b029359341bcbbb0ad8ffa" + integrity sha512-yIR+pG9x65Xko7bErCUSQaDLrO/P1p3JUzEk7JCU4DowPcGHkTGUGQapcfcLc4qj0UaALwZ+cr0riFgiqpixcg== + dezalgo@^1.0.0: version "1.0.4" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.4.tgz#751235260469084c132157dfa857f386d4c33d81" @@ -4514,14 +4492,6 @@ duplexer@^0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -ecc-jsbn@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9" - integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw== - dependencies: - jsbn "~0.1.0" - safer-buffer "^2.1.0" - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -4620,10 +4590,10 @@ engine.io@~6.4.1: engine.io-parser "~5.0.3" ws "~8.11.0" -enhanced-resolve@^5.10.0: - version "5.12.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz#300e1c90228f5b570c4d35babf263f6da7155634" - integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ== +enhanced-resolve@^5.15.0: + version "5.15.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" + integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -4709,10 +4679,10 @@ es-abstract@^1.19.0, es-abstract@^1.20.4: unbox-primitive "^1.0.2" which-typed-array "^1.1.9" -es-module-lexer@^0.9.0: - version "0.9.3" - resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19" - integrity sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ== +es-module-lexer@^1.2.1: + version "1.3.0" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.0.tgz#6be9c9e0b4543a60cd166ff6f8b4e9dae0b0c16f" + integrity sha512-vZK7T0N2CBmBOixhmjdqx2gWVbFZ4DXZ/NyRMZVlJXPa7CyFS+/a4QQsDGDQy9ZfEzxFuNEsMLeQJnKP2p5/JA== es-set-tostringtag@^2.0.1: version "2.0.1" @@ -4980,16 +4950,20 @@ execa@5.0.0: signal-exit "^3.0.3" strip-final-newline "^2.0.0" -execa@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.2.2.tgz#e2ead472c2c31aad6f73f1ac956eef45e12320cb" - integrity sha512-zmBGzLd3nhA/NB9P7VLoceAO6vyYPftvl809Vjwe5U2fYI9tYWbeKqP3wZlAw9WS+znnkogf/bhSU+Gcn2NbkQ== +execa@^2.0.1: + version "2.1.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-2.1.0.tgz#e5d3ecd837d2a60ec50f3da78fd39767747bbe99" + integrity sha512-Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw== dependencies: - cross-spawn-async "^2.1.1" - npm-run-path "^1.0.0" - object-assign "^4.0.1" - path-key "^1.0.0" - strip-eof "^1.0.0" + cross-spawn "^7.0.0" + get-stream "^5.0.0" + is-stream "^2.0.0" + merge-stream "^2.0.0" + npm-run-path "^3.0.0" + onetime "^5.1.0" + p-finally "^2.0.0" + signal-exit "^3.0.2" + strip-final-newline "^2.0.0" execa@^5.0.0: version "5.1.1" @@ -5048,11 +5022,6 @@ express@^4.16.3: utils-merge "1.0.1" vary "~1.1.2" -extend@~3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa" - integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g== - external-editor@^3.0.3: version "3.1.0" resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495" @@ -5062,25 +5031,16 @@ external-editor@^3.0.3: iconv-lite "^0.4.24" tmp "^0.0.33" -extract-zip@^1.6.6: - version "1.7.0" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.7.0.tgz#556cc3ae9df7f452c493a0cfb51cc30277940927" - integrity sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA== +extract-zip@2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a" + integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg== dependencies: - concat-stream "^1.6.2" - debug "^2.6.9" - mkdirp "^0.5.4" + debug "^4.1.1" + get-stream "^5.1.0" yauzl "^2.10.0" - -extsprintf@1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05" - integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g== - -extsprintf@^1.2.0: - version "1.4.1" - resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07" - integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA== + optionalDependencies: + "@types/yauzl" "^2.9.1" fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: version "3.1.3" @@ -5162,7 +5122,7 @@ file-icons-js@~1.0.3: resolved "https://registry.yarnpkg.com/file-icons-js/-/file-icons-js-1.0.3.tgz#d0765dc1d86aba4b2d7664a39e4ef7af9f12c5af" integrity sha512-n4zoKEpMaAxBTUB7wtgrFBa4dM3b7mBLLA1VI/Q5Cdk/k2UA8S8oaxvnECp3QOzg0Dn+KKRzfIHF7qSdRkA65Q== -file-saver@^2.0.2: +file-saver@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38" integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA== @@ -5286,20 +5246,6 @@ for-each@^0.3.3: dependencies: is-callable "^1.1.3" -forever-agent@~0.6.1: - version "0.6.1" - resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" - integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw== - -form-data@^2.5.0: - version "2.5.1" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.5.1.tgz#f2cbec57b5e59e23716e128fe44d4e5dd23895f4" - integrity sha512-m21N3WOmEEURgk6B9GLOE4RuWOFf28Lhh9qGYeNlGq4VDXUlJy2th2slBNU8Gp8EzloYZOibZJ7t5ecIrFSjVA== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - form-data@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" @@ -5318,15 +5264,6 @@ form-data@^4.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -form-data@~2.3.2: - version "2.3.3" - resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" - integrity sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ== - dependencies: - asynckit "^0.4.0" - combined-stream "^1.0.6" - mime-types "^2.1.12" - forwarded@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" @@ -5520,7 +5457,7 @@ get-stream@^2.2.0: object-assign "^4.0.1" pinkie-promise "^2.0.0" -get-stream@^5.1.0: +get-stream@^5.0.0, get-stream@^5.1.0: version "5.2.0" resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3" integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA== @@ -5540,13 +5477,6 @@ get-symbol-description@^1.0.0: call-bind "^1.0.2" get-intrinsic "^1.1.1" -getpass@^0.1.1: - version "0.1.7" - resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa" - integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng== - dependencies: - assert-plus "^1.0.0" - git-raw-commits@^2.0.8: version "2.0.11" resolved "https://registry.yarnpkg.com/git-raw-commits/-/git-raw-commits-2.0.11.tgz#bc3576638071d18655e1cc60d7f524920008d723" @@ -5773,19 +5703,6 @@ handlebars@^4.7.7: optionalDependencies: uglify-js "^3.1.4" -har-schema@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" - integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q== - -har-validator@~5.1.3: - version "5.1.5" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz#1f0803b9f8cb20c0fa13822df1ecddb36bde1efd" - integrity sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w== - dependencies: - ajv "^6.12.3" - har-schema "^2.0.0" - hard-rejection@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/hard-rejection/-/hard-rejection-2.1.0.tgz#1c6eda5c1685c63942766d79bb40ae773cecd883" @@ -5898,15 +5815,6 @@ http-proxy-agent@^5.0.0: agent-base "6" debug "4" -http-signature@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" - integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ== - dependencies: - assert-plus "^1.0.0" - jsprim "^1.2.2" - sshpk "^1.7.0" - http-status-codes@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/http-status-codes/-/http-status-codes-1.4.0.tgz#6e4c15d16ff3a9e2df03b89f3a55e1aae05fb477" @@ -5920,15 +5828,7 @@ http2-wrapper@^1.0.0-beta.5.2: quick-lru "^5.1.1" resolve-alpn "^1.0.0" -https-proxy-agent@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b" - integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg== - dependencies: - agent-base "5" - debug "4" - -https-proxy-agent@^5.0.0: +https-proxy-agent@5.0.1, https-proxy-agent@^5.0.0: version "5.0.1" resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz#c59ef224a04fe8b754f3db0063a25ea30d0005d6" integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA== @@ -6106,10 +6006,10 @@ interpret@^2.2.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== -inversify@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/inversify/-/inversify-5.1.1.tgz#6fbd668c591337404e005a1946bfe0d802c08730" - integrity sha512-j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ== +inversify@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/inversify/-/inversify-6.0.1.tgz#b20d35425d5d8c5cd156120237aad0008d969f02" + integrity sha512-B3ex30927698TJENHR++8FfEaJGqoWOgI6ZY5Ht/nLUsFCwHn6akbwtnUAPCgUepAnTpe2qHxhDNjoKLyz6rgQ== ip@^2.0.0: version "2.0.0" @@ -6355,11 +6255,6 @@ is-typed-array@^1.1.10, is-typed-array@^1.1.9: gopd "^1.0.1" has-tostringtag "^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 sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA== - is-unicode-supported@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7" @@ -6404,11 +6299,6 @@ isobject@^3.0.1: resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df" integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg== -isstream@~0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" - integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g== - jake@^10.8.5: version "10.8.5" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46" @@ -6453,11 +6343,6 @@ js-yaml@^3.10.0: argparse "^1.0.7" esprima "^4.0.0" -jsbn@~0.1.0: - version "0.1.1" - resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" - integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg== - jschardet@^2.1.1: version "2.3.0" resolved "https://registry.yarnpkg.com/jschardet/-/jschardet-2.3.0.tgz#06e2636e16c8ada36feebbdc08aa34e6a9b3ff75" @@ -6498,11 +6383,6 @@ json-schema-traverse@^1.0.0: resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== -json-schema@0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5" - integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA== - json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" @@ -6513,7 +6393,7 @@ json-stringify-nice@^1.1.4: resolved "https://registry.yarnpkg.com/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz#2c937962b80181d3f317dd39aa323e14f5a60a67" integrity sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw== -json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: +json-stringify-safe@^5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA== @@ -6561,16 +6441,6 @@ jsonparse@^1.2.0, jsonparse@^1.3.1: resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280" integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg== -jsprim@^1.2.2: - version "1.4.2" - resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-1.4.2.tgz#712c65533a15c878ba59e9ed5f0e26d5b77c5feb" - integrity sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw== - dependencies: - assert-plus "1.0.0" - extsprintf "1.3.0" - json-schema "0.4.0" - verror "1.10.0" - just-diff-apply@^5.2.0: version "5.5.0" resolved "https://registry.yarnpkg.com/just-diff-apply/-/just-diff-apply-5.5.0.tgz#771c2ca9fa69f3d2b54e7c3f5c1dfcbcc47f9f0f" @@ -6857,7 +6727,7 @@ lodash.throttle@^4.1.1: resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" integrity sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ== -lodash@^4.17.15, lodash@^4.17.21: +lodash@4.17.21, lodash@^4.17.15, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -6899,14 +6769,6 @@ lowercase-keys@^2.0.0: resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479" integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA== -lru-cache@^4.0.0: - version "4.1.5" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd" - integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g== - dependencies: - pseudomap "^1.0.2" - yallist "^2.1.2" - lru-cache@^5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920" @@ -6935,7 +6797,7 @@ lzma-native@^8.0.5: node-gyp-build "^4.2.1" readable-stream "^3.6.0" -make-dir@3.1.0, make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0: +make-dir@3.1.0, make-dir@^3.0.2, make-dir@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f" integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw== @@ -6949,7 +6811,7 @@ make-dir@^1.0.0: dependencies: pify "^3.0.0" -make-dir@^2.0.0, make-dir@^2.1.0: +make-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5" integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA== @@ -7072,7 +6934,7 @@ mime-db@1.52.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@^2.1.25, mime-types@^2.1.27, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34: +mime-types@^2.1.12, mime-types@^2.1.27, mime-types@~2.1.24, mime-types@~2.1.34: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -7084,11 +6946,6 @@ mime@1.6.0, mime@^1.4.1: resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== -mime@^2.0.3: - version "2.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367" - integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg== - mimic-fn@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" @@ -7230,6 +7087,11 @@ minizlib@^2.1.1, minizlib@^2.1.2: minipass "^3.0.0" yallist "^4.0.0" +mitt@3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/mitt/-/mitt-3.0.0.tgz#69ef9bd5c80ff6f57473e8d89326d01c414be0bd" + integrity sha512-7dX2/10ITVyqh4aOSVI9gdape+t9l2/8QxHrFmUXu4EEUpdlxl6RudZUPZoc+zuY2hk1j7XxVroIVIan/pD/SQ== + mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" @@ -7306,14 +7168,12 @@ mount-point@^3.0.0: pify "^2.3.0" pinkie-promise "^2.0.1" -move-file@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/move-file/-/move-file-1.2.0.tgz#789f92d276c62511d214b1b285aa16e015c2f2fc" - integrity sha512-USHrRmxzGowUWAGBbJPdFjHzEqtxDU03pLHY0Rfqgtnq+q8FOIs8wvkkf+Udmg77SJKs47y9sI0jJvQeYsmiCA== +move-file@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/move-file/-/move-file-2.1.0.tgz#3bec9d34fbe4832df6865f112cda4492b56e8507" + integrity sha512-i9qLW6gqboJ5Ht8bauZi7KlTnQ3QFpBCvMvFfEcHADKgHGeJ9BZMO7SFCTwHPV9Qa0du9DYY1Yx3oqlGt30nXA== dependencies: - cp-file "^6.1.0" - make-dir "^3.0.0" - path-exists "^3.0.0" + path-exists "^4.0.0" ms@2.0.0: version "2.0.0" @@ -7436,11 +7296,6 @@ neo-async@^2.6.0, neo-async@^2.6.2: resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw== -nested-error-stacks@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/nested-error-stacks/-/nested-error-stacks-2.1.1.tgz#26c8a3cee6cc05fbcf1e333cd2fc3e003326c0b5" - integrity sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw== - nise@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/nise/-/nise-5.1.4.tgz#491ce7e7307d4ec546f5a659b2efe94a18b4bbc0" @@ -7523,6 +7378,13 @@ node-gyp@^9.0.0: tar "^6.1.2" which "^2.0.2" +node-loader@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/node-loader/-/node-loader-2.0.0.tgz#9109a6d828703fd3e0aa03c1baec12a798071562" + integrity sha512-I5VN34NO4/5UYJaUBtkrODPWxbobrE4hgDqPrjB25yPkonFhCmZ146vTH+Zg417E9Iwoh1l/MbRs1apc5J295Q== + dependencies: + loader-utils "^2.0.0" + 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" @@ -7700,12 +7562,12 @@ npm-registry-fetch@^13.0.0, npm-registry-fetch@^13.0.1: npm-package-arg "^9.0.1" proc-log "^2.0.0" -npm-run-path@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-1.0.0.tgz#f5c32bf595fe81ae927daec52e82f8b000ac3c8f" - integrity sha512-PrGAi1SLlqNvKN5uGBjIgnrTb8fl0Jz0a3JJmeMcGnIBh7UE9Gc4zsAMlwDajOMg2b1OgP6UPvoLUboTmMZPFA== +npm-run-path@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-3.1.0.tgz#7f91be317f6a466efed3c9f2980ad8a4ee8b0fa5" + integrity sha512-Dbl4A/VfiVGLgQv29URL9xshU8XDY1GeLy+fsaZ1AA8JDSfjvr5P5+pzRbWqRSBxk6/DW7MIh8lTM/PaGnP2kg== dependencies: - path-key "^1.0.0" + path-key "^3.0.0" npm-run-path@^4.0.1: version "4.0.1" @@ -7797,11 +7659,6 @@ nx@15.8.7, "nx@>=15.5.2 < 16": "@nrwl/nx-win32-arm64-msvc" "15.8.7" "@nrwl/nx-win32-x64-msvc" "15.8.7" -oauth-sign@~0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" - integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== - object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" @@ -7918,6 +7775,11 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" integrity sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow== +p-finally@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-2.0.1.tgz#bd6fcaa9c559a096b680806f4d657b3f0f240561" + integrity sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw== + p-limit@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" @@ -7972,13 +7834,6 @@ p-map@4.0.0, p-map@^4.0.0: dependencies: aggregate-error "^3.0.0" -p-map@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d" - integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ== - dependencies: - aggregate-error "^3.0.0" - p-pipe@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-3.1.0.tgz#48b57c922aa2e1af6a6404cb7c6bf0eb9cc8e60e" @@ -8009,7 +7864,7 @@ p-try@^1.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" integrity sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww== -p-try@^2.0.0, p-try@^2.2.0: +p-try@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== @@ -8148,11 +8003,6 @@ path-is-absolute@^1.0.0: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg== -path-key@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/path-key/-/path-key-1.0.0.tgz#5d53d578019646c0d68800db4e146e6bdc2ac7af" - integrity sha512-T3hWy7tyXlk3QvPFnT+o2tmXRzU4GkitkUWLp/WZ0S/FXd7XMx176tRurgTvHTNMJOQzTcesHNpBqetH86mQ9g== - path-key@^3.0.0, path-key@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" @@ -8214,11 +8064,6 @@ perfect-scrollbar@^1.3.0, perfect-scrollbar@^1.5.0: resolved "https://registry.yarnpkg.com/perfect-scrollbar/-/perfect-scrollbar-1.5.5.tgz#41a211a2fb52a7191eff301432134ea47052b27f" integrity sha512-dzalfutyP3e/FOpdlhVryN4AJ5XDVauVWxybSkLZmakFE2sS3y3pc4JnSprw8tGmHvkaG5Edr5T7LBTZ+WWU2g== -performance-now@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" - integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow== - picocolors@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" @@ -8234,7 +8079,7 @@ pify@5.0.0, pify@^5.0.0: resolved "https://registry.yarnpkg.com/pify/-/pify-5.0.0.tgz#1f5eca3f5e87ebec28cc6d54a0e4aaf00acc127f" integrity sha512-eW/gHNMlxdSP6dmG6uJip6FXN0EQBwm2clYYd8Wul42Cwu/DK8HEftzsapcNdYe2MfLiIwZqsDk2RDEsTE79hA== -pify@^2.2.0, pify@^2.3.0: +pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog== @@ -8383,7 +8228,7 @@ process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== -progress@^2.0.1, progress@^2.0.3: +progress@2.0.3, progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== @@ -8445,7 +8290,7 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" -proxy-from-env@^1.0.0, proxy-from-env@^1.1.0: +proxy-from-env@1.1.0, proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== @@ -8455,12 +8300,7 @@ prr@~1.0.1: resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw== -pseudomap@^1.0.2: - version "1.0.2" - resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" - integrity sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ== - -psl@^1.1.28, psl@^1.1.33: +psl@^1.1.33: version "1.9.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.9.0.tgz#d0df2a137f00794565fcaf3b2c00cd09f8d5a5a7" integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag== @@ -8486,7 +8326,24 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.0.tgz#f67fa67c94da8f4d0cfff981aee4118064199b8f" integrity sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA== -puppeteer-to-istanbul@^1.2.2: +puppeteer-core@19.11.1, puppeteer-core@^19.7.2: + version "19.11.1" + resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.11.1.tgz#4c63d7a0a6cd268ff054ebcac315b646eee32667" + integrity sha512-qcuC2Uf0Fwdj9wNtaTZ2OvYRraXpAK+puwwVW8ofOhOgLPZyz1c68tsorfIZyCUOpyBisjr+xByu7BMbEYMepA== + dependencies: + "@puppeteer/browsers" "0.5.0" + chromium-bidi "0.4.7" + cross-fetch "3.1.5" + debug "4.3.4" + devtools-protocol "0.0.1107588" + extract-zip "2.0.1" + https-proxy-agent "5.0.1" + proxy-from-env "1.1.0" + tar-fs "2.1.1" + unbzip2-stream "1.4.3" + ws "8.13.0" + +puppeteer-to-istanbul@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/puppeteer-to-istanbul/-/puppeteer-to-istanbul-1.4.0.tgz#451dced6f42652448f55cf0bc780b35512c8d1b0" integrity sha512-dzW8u/PMqMZppvoXCFod8IkCTI2JL0yP2YUBbaALnX+iJJ6gqjk77fIoK9MqnMqRZAcoa81GLFfZExakWg/Q4Q== @@ -8496,21 +8353,17 @@ puppeteer-to-istanbul@^1.2.2: v8-to-istanbul "^1.2.1" yargs "^15.3.1" -puppeteer@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-2.1.1.tgz#ccde47c2a688f131883b50f2d697bd25189da27e" - integrity sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg== +puppeteer@^19.7.2: + version "19.11.1" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.11.1.tgz#bb75d518e87b0b4f6ef9bad1ea7e9d1cdcd18a5d" + integrity sha512-39olGaX2djYUdhaQQHDZ0T0GwEp+5f9UB9HmEP0qHfdQHIq0xGQZuAZ5TLnJIc/88SrPLpEflPC+xUqOTv3c5g== dependencies: - "@types/mime-types" "^2.1.0" - debug "^4.1.0" - extract-zip "^1.6.6" - https-proxy-agent "^4.0.0" - mime "^2.0.3" - mime-types "^2.1.25" - progress "^2.0.1" - proxy-from-env "^1.0.0" - rimraf "^2.6.1" - ws "^6.1.0" + "@puppeteer/browsers" "0.5.0" + cosmiconfig "8.1.3" + https-proxy-agent "5.0.1" + progress "2.0.3" + proxy-from-env "1.1.0" + puppeteer-core "19.11.1" q@^1.5.1: version "1.5.1" @@ -8531,11 +8384,6 @@ qs@^6.9.4: dependencies: side-channel "^1.0.4" -qs@~6.5.2: - version "6.5.3" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" - integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== - querystringify@^2.1.1: version "2.2.0" resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6" @@ -8844,32 +8692,6 @@ regjsparser@^0.9.1: dependencies: jsesc "~0.5.0" -request@^2.82.0: - version "2.88.2" - resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" - integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw== - dependencies: - aws-sign2 "~0.7.0" - aws4 "^1.8.0" - caseless "~0.12.0" - combined-stream "~1.0.6" - extend "~3.0.2" - forever-agent "~0.6.1" - form-data "~2.3.2" - har-validator "~5.1.3" - http-signature "~1.2.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.19" - oauth-sign "~0.9.0" - performance-now "^2.1.0" - qs "~6.5.2" - safe-buffer "^5.1.2" - tough-cookie "~2.5.0" - tunnel-agent "^0.6.0" - uuid "^3.3.2" - require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" @@ -9010,7 +8832,7 @@ rxjs@^7.5.5: dependencies: tslib "^2.1.0" -safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0: +safe-buffer@5.2.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== @@ -9029,7 +8851,7 @@ safe-regex-test@^1.0.0: get-intrinsic "^1.1.3" is-regex "^1.1.4" -"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -9050,7 +8872,7 @@ schema-utils@^2.6.5: ajv "^6.12.4" ajv-keywords "^3.5.2" -schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: +schema-utils@^3.0.0, schema-utils@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281" integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw== @@ -9059,6 +8881,15 @@ 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@^3.2.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" + integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== + dependencies: + "@types/json-schema" "^7.0.8" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + schema-utils@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7" @@ -9260,7 +9091,7 @@ smart-buffer@^4.2.0: resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae" integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg== -snabbdom@^3.0.3: +snabbdom@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/snabbdom/-/snabbdom-3.5.1.tgz#25f80ef15b194baea703d9d5441892e369de18e1" integrity sha512-wHMNIOjkm/YNE5EM3RCbr/+DVgPg6AqQAX1eOxO46zYNvCXjKP5Y865tqQj3EXnaMBjkxmQA5jFuDpDK/dbfiA== @@ -9413,43 +9244,27 @@ sprintf-js@~1.0.2: resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g== -sprotty-protocol@0.13.0-next.f4445dd.342, sprotty-protocol@0.13.0-next.f4445dd.342+f4445dd: - version "0.13.0-next.f4445dd.342" - resolved "https://registry.yarnpkg.com/sprotty-protocol/-/sprotty-protocol-0.13.0-next.f4445dd.342.tgz#79e39a3427202d59173f61f3f03429dfdec7ab9c" - integrity sha512-6cNoZrvay1Gk3uk6NqlmraBy68dskvhuDKDiUlpxbzFQ/ZVO4MKY2D41S5AXzjDyOtYQO6tZjlPrNCjmj5Kvrg== +sprotty-protocol@0.14.0-next.02bbac0.26, sprotty-protocol@0.14.0-next.02bbac0.26+02bbac0: + version "0.14.0-next.02bbac0.26" + resolved "https://registry.yarnpkg.com/sprotty-protocol/-/sprotty-protocol-0.14.0-next.02bbac0.26.tgz#e9bf147aa8e5c8e05f4392339573ee03fa0b3d7f" + integrity sha512-a8gbAKjRAIhCV+kM5+E96na7WgWwlqWU/jxhv23w4aLbkurs1gNR6uAF4sm0ahyhXnFxSl7KMUyYJG5km7Iyug== sprotty-theia@0.13.0-next.9cbedec: version "0.13.0-next.9cbedec" resolved "https://registry.yarnpkg.com/sprotty-theia/-/sprotty-theia-0.13.0-next.9cbedec.tgz#f56f6be917a9b9f75264375e5c25fd064f39cbb5" integrity sha512-ouxLqGfNHyHD6XRLKOwTJLYJkaklBHP7qJNL4HlxK7Y1DH77QtN5G5Y5Kuu/v733lLufOzgT5XznIr2WL2IF/g== -sprotty@0.13.0-next.f4445dd.342: - version "0.13.0-next.f4445dd.342" - resolved "https://registry.yarnpkg.com/sprotty/-/sprotty-0.13.0-next.f4445dd.342.tgz#053fc2863109bc56f32ab6582a9c8ce46dc10cbd" - integrity sha512-OdaNjgaITsQz71w+omc9ZSP3TJ/66vlVdWkVg+zGPQ1spAmS/iXvYhizax7OuP5J+GsjQemCDw9ZWH8lTnbgrw== +sprotty@0.14.0-next.02bbac0.26: + version "0.14.0-next.02bbac0.26" + resolved "https://registry.yarnpkg.com/sprotty/-/sprotty-0.14.0-next.02bbac0.26.tgz#0177e9c31e129fba5a61a358145c7f1861cee28a" + integrity sha512-xNheZO66EOrqh6Hh6wt2HB8KvDv5s34hNR6hhQmrE2A+ZziRmDdW116Q/67ZK4mJ0UEsScaLmfNbzjZnwo+mWg== dependencies: - autocompleter "^5.1.0" - file-saver "^2.0.2" - inversify "^5.1.1" - snabbdom "^3.0.3" - sprotty-protocol "0.13.0-next.f4445dd.342+f4445dd" + autocompleter "^7.0.1" + file-saver "^2.0.5" + snabbdom "^3.5.1" + sprotty-protocol "0.14.0-next.02bbac0.26+02bbac0" tinyqueue "^2.0.3" -sshpk@^1.7.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5" - integrity sha512-/9HIEs1ZXGhSPE8X6Ccm7Nam1z8KcoCqPdI7ecm1N33EzAetWahvQWVqLZtaZQ+IDKX4IyA2o0gBzqIMkAagHQ== - dependencies: - asn1 "~0.2.3" - assert-plus "^1.0.0" - bcrypt-pbkdf "^1.0.0" - dashdash "^1.12.0" - ecc-jsbn "~0.1.1" - getpass "^0.1.1" - jsbn "~0.1.0" - safer-buffer "^2.0.2" - tweetnacl "~0.14.0" - ssri@9.0.1, ssri@^9.0.0: version "9.0.1" resolved "https://registry.yarnpkg.com/ssri/-/ssri-9.0.1.tgz#544d4c357a8d7b71a19700074b6883fcb4eae057" @@ -9570,11 +9385,6 @@ strip-dirs@^2.0.0: dependencies: is-natural-number "^4.0.1" -strip-eof@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" - integrity sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q== - strip-final-newline@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" @@ -9652,6 +9462,16 @@ tapable@^2.1.1, tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== +tar-fs@2.1.1, tar-fs@^2.0.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" + integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== + dependencies: + chownr "^1.1.1" + mkdirp-classic "^0.5.2" + pump "^3.0.0" + tar-stream "^2.1.4" + tar-fs@^1.16.2: version "1.16.3" resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-1.16.3.tgz#966a628841da2c4010406a82167cbd5e0c72d509" @@ -9662,16 +9482,6 @@ tar-fs@^1.16.2: pump "^1.0.0" tar-stream "^1.1.2" -tar-fs@^2.0.0: - version "2.1.1" - resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784" - integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng== - dependencies: - chownr "^1.1.1" - mkdirp-classic "^0.5.2" - pump "^3.0.0" - tar-stream "^2.1.4" - tar-stream@^1.1.2, tar-stream@^1.5.2: version "1.6.2" resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555" @@ -9733,24 +9543,24 @@ temp@^0.9.1: mkdirp "^0.5.1" rimraf "~2.6.2" -terser-webpack-plugin@^5.1.3: - version "5.3.7" - resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz#ef760632d24991760f339fe9290deb936ad1ffc7" - integrity sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw== +terser-webpack-plugin@^5.3.7: + version "5.3.9" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" + integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== dependencies: "@jridgewell/trace-mapping" "^0.3.17" jest-worker "^27.4.5" schema-utils "^3.1.1" serialize-javascript "^6.0.1" - terser "^5.16.5" + terser "^5.16.8" -terser@^5.16.5: - version "5.16.6" - resolved "https://registry.yarnpkg.com/terser/-/terser-5.16.6.tgz#f6c7a14a378ee0630fbe3ac8d1f41b4681109533" - integrity sha512-IBZ+ZQIA9sMaXmRZCUMDjNH0D5AQQfdn4WUjHL0+1lF4TP1IHRJbrhb6fNaXWikrYQTSkb7SLxkeXAiy1p7mbg== +terser@^5.16.8: + version "5.19.2" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.2.tgz#bdb8017a9a4a8de4663a7983f45c506534f9234e" + integrity sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA== dependencies: - "@jridgewell/source-map" "^0.3.2" - acorn "^8.5.0" + "@jridgewell/source-map" "^0.3.3" + acorn "^8.8.2" commander "^2.20.0" source-map-support "~0.5.20" @@ -9835,33 +9645,24 @@ tough-cookie@^4.0.0: universalify "^0.2.0" url-parse "^1.5.3" -tough-cookie@~2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2" - integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g== - dependencies: - psl "^1.1.28" - punycode "^2.1.1" - tr46@~0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== -trash@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/trash/-/trash-6.1.1.tgz#8fb863421b31f32571f2650b53534934d5e63025" - integrity sha512-4i56lCmz2RG6WZN018hf4L75L5HboaFuKkHx3wDG/ihevI99e0OgFyl8w6G4ioqBm62V4EJqCy5xw3vQSNXU8A== +trash@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/trash/-/trash-7.2.0.tgz#c5ad0c9b13d7e7cad0b4187b3cfe38cd8b39abe2" + integrity sha512-3bR8Z5aWO8b9qybS6skBoaavH/hX9Onb1RrdIIhJxv9VpH3aBtpbKuAX4rIh/0xpDZ7K4ga36wONk/okbhjTlA== dependencies: - "@stroncium/procfs" "^1.0.0" + "@stroncium/procfs" "^1.2.1" globby "^7.1.1" is-path-inside "^3.0.2" - make-dir "^3.0.0" - move-file "^1.1.0" - p-map "^3.0.0" - p-try "^2.2.0" - uuid "^3.3.2" - xdg-trashdir "^2.1.1" + make-dir "^3.1.0" + move-file "^2.0.0" + p-map "^4.0.0" + uuid "^8.3.2" + xdg-trashdir "^3.1.0" "traverse@>=0.3.0 <0.4": version "0.3.9" @@ -9945,11 +9746,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tweetnacl@^0.14.3, tweetnacl@~0.14.0: - version "0.14.5" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" - integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA== - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -10058,7 +9854,7 @@ unbox-primitive@^1.0.2: has-symbols "^1.0.3" which-boxed-primitive "^1.0.2" -unbzip2-stream@^1.0.9: +unbzip2-stream@1.4.3, unbzip2-stream@^1.0.9: version "1.4.3" resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7" integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg== @@ -10198,11 +9994,6 @@ uuid@8.3.2, uuid@^8.0.0, uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== -uuid@^3.3.2: - version "3.4.0" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" - integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== - v8-compile-cache-lib@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf" @@ -10252,21 +10043,7 @@ vary@^1, vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== -verror@1.10.0: - version "1.10.0" - resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400" - integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw== - dependencies: - assert-plus "^1.0.0" - core-util-is "1.0.2" - extsprintf "^1.2.0" - -vscode-jsonrpc@8.0.2: - version "8.0.2" - resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.0.2.tgz#f239ed2cd6004021b6550af9fd9d3e47eee3cac9" - integrity sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ== - -vscode-jsonrpc@8.1.0: +vscode-jsonrpc@8.1.0, vscode-jsonrpc@^8.0.2: version "8.1.0" resolved "https://registry.yarnpkg.com/vscode-jsonrpc/-/vscode-jsonrpc-8.1.0.tgz#cb9989c65e219e18533cc38e767611272d274c94" integrity sha512-6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw== @@ -10304,13 +10081,6 @@ vscode-uri@^2.1.1: resolved "https://registry.yarnpkg.com/vscode-uri/-/vscode-uri-2.1.2.tgz#c8d40de93eb57af31f3c715dd650e2ca2c096f1c" integrity sha512-8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A== -vscode-ws-jsonrpc@^2.0.1: - version "2.0.2" - resolved "https://registry.yarnpkg.com/vscode-ws-jsonrpc/-/vscode-ws-jsonrpc-2.0.2.tgz#6bad2ecd654e6789eefaa6ad490d3e20dbdece86" - integrity sha512-gIOGdaWwKYwwqohgeRC8AtqqHSNghK8wA3oVcBi7UMAdZnRSAf8n4/Svtd+JHqGiIguYdNa/sC0s4IW3ZDF7mA== - dependencies: - vscode-jsonrpc "8.0.2" - walk-up-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/walk-up-path/-/walk-up-path-1.0.0.tgz#d4745e893dd5fd0dbb58dd0a4c6a33d9c9fec53e" @@ -10368,22 +10138,22 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@^5.48.0: - version "5.76.2" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.76.2.tgz#6f80d1c1d1e3bf704db571b2504a0461fac80230" - integrity sha512-Th05ggRm23rVzEOlX8y67NkYCHa9nTNcwHPBhdg+lKG+mtiW7XgggjAeeLnADAe7mLjJ6LUNfgHAuRRh+Z6J7w== +webpack@^5.76.0: + version "5.88.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e" + integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ== dependencies: "@types/eslint-scope" "^3.7.3" - "@types/estree" "^0.0.51" - "@webassemblyjs/ast" "1.11.1" - "@webassemblyjs/wasm-edit" "1.11.1" - "@webassemblyjs/wasm-parser" "1.11.1" + "@types/estree" "^1.0.0" + "@webassemblyjs/ast" "^1.11.5" + "@webassemblyjs/wasm-edit" "^1.11.5" + "@webassemblyjs/wasm-parser" "^1.11.5" acorn "^8.7.1" - acorn-import-assertions "^1.7.6" + acorn-import-assertions "^1.9.0" browserslist "^4.14.5" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.10.0" - es-module-lexer "^0.9.0" + enhanced-resolve "^5.15.0" + es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" glob-to-regexp "^0.4.1" @@ -10392,9 +10162,9 @@ webpack@^5.48.0: loader-runner "^4.2.0" mime-types "^2.1.27" neo-async "^2.6.2" - schema-utils "^3.1.0" + schema-utils "^3.2.0" tapable "^2.1.1" - terser-webpack-plugin "^5.1.3" + terser-webpack-plugin "^5.3.7" watchpack "^2.4.0" webpack-sources "^3.2.3" @@ -10439,13 +10209,6 @@ which-typed-array@^1.1.9: has-tostringtag "^1.0.0" is-typed-array "^1.1.10" -which@^1.2.8: - version "1.3.1" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" - integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== - dependencies: - isexe "^2.0.0" - which@^2.0.1, which@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" @@ -10569,12 +10332,10 @@ write-pkg@4.0.0: type-fest "^0.4.1" write-json-file "^3.2.0" -ws@^6.1.0: - version "6.2.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e" - integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw== - dependencies: - async-limiter "~1.0.0" +ws@8.13.0: + version "8.13.0" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.13.0.tgz#9a9fb92f93cf41512a0735c8f4dd09b8a1211cd0" + integrity sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA== ws@^7.1.2: version "7.5.9" @@ -10586,23 +10347,20 @@ ws@~8.11.0: resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== -xdg-basedir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-2.0.0.tgz#edbc903cc385fc04523d966a335504b5504d1bd2" - integrity sha512-NF1pPn594TaRSUO/HARoB4jK8I+rWgcpVlpQCK6/6o5PHyLUt2CSiDrpUZbQ6rROck+W2EwF8mBJcTs+W98J9w== - dependencies: - os-homedir "^1.0.0" +xdg-basedir@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" + integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q== -xdg-trashdir@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/xdg-trashdir/-/xdg-trashdir-2.1.1.tgz#59a60aaf8e6f9240c1daed9a0944b2f514c27d8e" - integrity sha512-KcVhPaOu2ZurYNHSRTf1+ZHORkTZGCQ+u0JHN17QixRISJq4pXOnjt/lQcehvtHL5QAKhSzKgyjrcNnPdkPBHA== +xdg-trashdir@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/xdg-trashdir/-/xdg-trashdir-3.1.0.tgz#7294262d5793eb5488c2f529fba883ec32a24ea0" + integrity sha512-N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ== dependencies: - "@sindresorhus/df" "^2.1.0" + "@sindresorhus/df" "^3.1.1" mount-point "^3.0.0" - pify "^2.2.0" user-home "^2.0.0" - xdg-basedir "^2.0.0" + xdg-basedir "^4.0.0" xml@^1.0.1: version "1.0.1" @@ -10644,11 +10402,6 @@ y18n@^5.0.5: resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55" integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA== -yallist@^2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" - integrity sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A== - yallist@^3.0.2: version "3.1.1" resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd" @@ -10710,6 +10463,19 @@ yargs@16.2.0, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" +yargs@17.7.1, yargs@^17.0.1, yargs@^17.6.2: + version "17.7.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" + integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== + dependencies: + cliui "^8.0.1" + escalade "^3.1.1" + get-caller-file "^2.0.5" + require-directory "^2.1.1" + string-width "^4.2.3" + y18n "^5.0.5" + yargs-parser "^21.1.1" + yargs@^15.3.1: version "15.4.1" resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" @@ -10727,19 +10493,6 @@ yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.2" -yargs@^17.0.1, yargs@^17.6.2: - version "17.7.1" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.1.tgz#34a77645201d1a8fc5213ace787c220eabbd0967" - integrity sha512-cwiTb08Xuv5fqF4AovYacTFNxk62th7LKJ6BL9IGUpTJrWoU7/7WdQGTP2SjKf1dUNBGzDd28p/Yfs/GI6JrLw== - dependencies: - cliui "^8.0.1" - escalade "^3.1.1" - get-caller-file "^2.0.5" - require-directory "^2.1.1" - string-width "^4.2.3" - y18n "^5.0.5" - yargs-parser "^21.1.1" - yauzl@^2.10.0, yauzl@^2.4.2: version "2.10.0" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" diff --git a/open-bpmn.glsp-server/pom.xml b/open-bpmn.glsp-server/pom.xml index 163efc04..0f7af74c 100644 --- a/open-bpmn.glsp-server/pom.xml +++ b/open-bpmn.glsp-server/pom.xml @@ -9,16 +9,6 @@ Open BPMN - Server The Open BPMN Server Project - - UTF-8 - 11 - - eclipse-plugin - org.imixs.bpmn.glsp.server.launch.BPMN2ServerLauncher - - - 1.1.0.RC03 - @@ -27,57 +17,22 @@ maven-model 3.3.9 - org.eclipse.glsp org.eclipse.glsp.server ${glsp-server-version} - + org.apache.logging.log4j log4j-core 2.17.1 - - - - org.eclipse.glsp - org.eclipse.glsp.server.websocket - ${glsp-server-version} - - - - org.eclipse.elk - org.eclipse.elk.alg.layered - 0.7.1 - - - - com.google.guava - guava - - - - - - javax.json - javax.json-api - 1.1 - org.glassfish javax.json 1.1 - org.imixs.bpmn open-bpmn.metamodel @@ -163,23 +118,34 @@ org.openbpmn.glsp.BPMNServerLauncher - + + true + + + + + jakarta.websocket:jakarta.websocket-api + javax.websocket:javax.websocket-api + log4j:log4j + + *:* - META-INF/INDEX.LIST - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - META-INF/LICENSE - META-INF/NOTICE - META-INF/DEPENDENCIES META-INF/MANIFEST.MF + META-INF/DEPENDENCIES + META-INF/ECLIPSE_* + META-INF/LICENSE* + META-INF/services/javax.servlet.ServletContainerInitializer + META-INF/services/jakarta.servlet.ServletContainerInitializer* + META-INF/services/org.eclipse.jetty.webapp.Configuration* + META-INF/services/org.eclipse.elk.core.data.ILayoutMetaDataProvider* + META-INF/versions/9/module-info.class + META-INF/NOTICE* .options .api_description - plugin.properties *.profile *.html about.* @@ -188,12 +154,17 @@ modeling32.png systembundle.properties profile.list + module-info.class + plugin.properties **/*._trace **/*.g **/*.tokens **/*.mwe2 **/*.xtext **/*.xtextbin + META-INF/*.SF + META-INF/*.RSA + META-INF/*.INF @@ -214,4 +185,5 @@ + diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/extensions/BPMNCreateExtensionHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/extensions/BPMNCreateExtensionHandler.java index 3d53c5b6..870156b9 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/extensions/BPMNCreateExtensionHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/extensions/BPMNCreateExtensionHandler.java @@ -22,6 +22,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.emf.common.command.Command; import org.eclipse.glsp.graph.GModelElement; import org.eclipse.glsp.server.actions.ActionDispatcher; import org.eclipse.glsp.server.actions.SelectAction; @@ -92,12 +93,15 @@ public List getHandledElementTypeIds() { return extensionIds; } + @Override + public Optional createCommand(final CreateNodeOperation operation) { + return commandOf(() -> executeOperation(operation)); + } /** * We expect that the EventDefintion was dropped on a Event. See * {@link BPMNDiagramConfiguration} method getShapeTypeHints */ - @Override - public void executeOperation(final CreateNodeOperation operation) { + protected void executeOperation(final CreateNodeOperation operation) { String elementID = null; // now we add this extension directly into the BPMN element of the source // model diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramModule.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramModule.java index 71d38b0c..9d475dba 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramModule.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramModule.java @@ -28,8 +28,8 @@ import org.eclipse.glsp.server.features.directediting.ContextEditValidator; import org.eclipse.glsp.server.features.toolpalette.ToolPaletteItemProvider; import org.eclipse.glsp.server.features.validation.ModelValidator; +import org.eclipse.glsp.server.gmodel.GModelCutOperationHandler; import org.eclipse.glsp.server.model.GModelState; -import org.eclipse.glsp.server.operations.CutOperationHandler; import org.eclipse.glsp.server.operations.OperationHandler; import org.openbpmn.extensions.BPMNCreateExtensionHandler; import org.openbpmn.extensions.BPMNElementExtension; @@ -132,14 +132,15 @@ protected void configureActionHandlers(final MultiBinding binding // protected void configureClientActions(final MultiBinding binding) { // } + @Override - protected void configureOperationHandlers(final MultiBinding binding) { + protected void configureOperationHandlers(final MultiBinding> binding) { super.configureOperationHandlers(binding); // Inline Edit binding.add(BPMNApplyEditLabelOperationHandler.class); - binding.add(CutOperationHandler.class); + binding.add(GModelCutOperationHandler.class); // binding.add(DeleteOperationHandler.class); // binding.add(LayoutOperationHandler.class); diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNServerLauncher.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNServerLauncher.java index 294de5b2..1b3d33b6 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNServerLauncher.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNServerLauncher.java @@ -45,7 +45,7 @@ public static void main(final String[] args) { ServerModule serverModule = new ServerModule().configureDiagramModule(new BPMNDiagramModule()); GLSPServerLauncher launcher = new SocketGLSPServerLauncher(serverModule); launcher.start("localhost", port); - } catch (ParseException | IOException e) { + } catch (ParseException e) { e.printStackTrace(); } } diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNEdgeOperationHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNEdgeOperationHandler.java index fbbd7e48..dbf4eec5 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNEdgeOperationHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNEdgeOperationHandler.java @@ -17,10 +17,9 @@ import java.util.List; +import org.eclipse.glsp.server.gmodel.GModelCreateOperationHandler; import org.eclipse.glsp.server.model.GModelState; -import org.eclipse.glsp.server.operations.AbstractCreateOperationHandler; import org.eclipse.glsp.server.operations.CreateEdgeOperation; -import org.eclipse.glsp.server.operations.CreateEdgeOperationHandler; import com.google.common.collect.Lists; import com.google.inject.Inject; @@ -32,8 +31,7 @@ * @author rsoika * */ -public abstract class CreateBPMNEdgeOperationHandler extends AbstractCreateOperationHandler - implements CreateEdgeOperationHandler { +public abstract class CreateBPMNEdgeOperationHandler extends GModelCreateOperationHandler { @Inject protected GModelState modelState; diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNNodeOperationHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNNodeOperationHandler.java index 2c8dc16f..d7c45c96 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNNodeOperationHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/CreateBPMNNodeOperationHandler.java @@ -21,16 +21,14 @@ import org.eclipse.glsp.graph.GCompartment; import org.eclipse.glsp.graph.GModelElement; import org.eclipse.glsp.graph.GPoint; -import org.eclipse.glsp.server.operations.AbstractCreateOperationHandler; +import org.eclipse.glsp.server.gmodel.GModelCreateOperationHandler; import org.eclipse.glsp.server.operations.CreateNodeOperation; -import org.eclipse.glsp.server.operations.CreateNodeOperationHandler; import org.openbpmn.bpmn.elements.BPMNProcess; import org.openbpmn.bpmn.elements.Participant; import org.openbpmn.bpmn.exceptions.BPMNInvalidTypeException; import org.openbpmn.glsp.bpmn.PoolGNode; import org.openbpmn.glsp.model.BPMNGModelState; import org.openbpmn.glsp.utils.BPMNGModelUtil; -import org.openbpmn.glsp.utils.GridSnapper; import org.openbpmn.glsp.utils.ModelTypes; import com.google.common.collect.Lists; @@ -43,8 +41,7 @@ * @author rsoika AbstractGModelCreateNodeOperationHandler * AbstractCreateOperationHandler */ -public abstract class CreateBPMNNodeOperationHandler extends AbstractCreateOperationHandler - implements CreateNodeOperationHandler { +public abstract class CreateBPMNNodeOperationHandler extends GModelCreateOperationHandler { @Inject protected BPMNGModelState modelState; @@ -64,10 +61,10 @@ public CreateBPMNNodeOperationHandler(final List handledElementTypeIds) /** * Snap default position to gird 10x10px */ - @Override - public Optional getLocation(final CreateNodeOperation operation) { - return GridSnapper.snap(operation.getLocation()); - } + // @Override + // public Optional getLocation(final CreateNodeOperation operation) { + // return GridSnapper.snap(operation.getLocation()); + // } /** * Helper method resolves the containing BPMNProcess for a CreateNodeOperation. diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateDataObjectHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateDataObjectHandler.java index d370c42d..de8a1e04 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateDataObjectHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateDataObjectHandler.java @@ -20,6 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.emf.common.command.Command; import org.eclipse.glsp.graph.GPoint; import org.eclipse.glsp.server.actions.ActionDispatcher; import org.eclipse.glsp.server.actions.SelectAction; @@ -67,7 +68,13 @@ public BPMNCreateDataObjectHandler() { super(BPMNTypes.DATAOBJECT); } + @Override + public Optional createCommand(final CreateNodeOperation operation) { + return commandOf(() -> executeOperation(operation)); + } + + // @Override protected void executeOperation(final CreateNodeOperation operation) { elementTypeId = operation.getElementTypeId(); @@ -106,6 +113,7 @@ protected void executeOperation(final CreateNodeOperation operation) { actionDispatcher.dispatchAfterNextUpdate(new SelectAction(List.of(dataObjectID))); } + @Override public String getLabel() { int nodeCounter = GModelUtil.generateId(BpmnPackage.Literals.DATA_OBJECT_GNODE, elementTypeId, modelState); diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateMessageHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateMessageHandler.java index 57e567e2..f662c8d6 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateMessageHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateMessageHandler.java @@ -20,6 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.emf.common.command.Command; import org.eclipse.glsp.graph.GPoint; import org.eclipse.glsp.server.actions.ActionDispatcher; import org.eclipse.glsp.server.actions.SelectAction; @@ -67,6 +68,10 @@ public BPMNCreateMessageHandler() { } @Override + public Optional createCommand(final CreateNodeOperation operation) { + return commandOf(() -> executeOperation(operation)); + } + protected void executeOperation(final CreateNodeOperation operation) { elementTypeId = operation.getElementTypeId(); diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateTextAnnotationHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateTextAnnotationHandler.java index 93f89305..8c3a9d29 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateTextAnnotationHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/data/BPMNCreateTextAnnotationHandler.java @@ -20,6 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.emf.common.command.Command; import org.eclipse.glsp.graph.GPoint; import org.eclipse.glsp.server.actions.ActionDispatcher; import org.eclipse.glsp.server.actions.SelectAction; @@ -63,6 +64,10 @@ public BPMNCreateTextAnnotationHandler() { } @Override + public Optional createCommand(final CreateNodeOperation operation) { + return commandOf(() -> executeOperation(operation)); + } + protected void executeOperation(final CreateNodeOperation operation) { // now we add this task into the source model diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/edge/BPMNGEdgeCreateHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/edge/BPMNGEdgeCreateHandler.java index c45be7bf..1f4f5403 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/edge/BPMNGEdgeCreateHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/edge/BPMNGEdgeCreateHandler.java @@ -18,6 +18,7 @@ import java.util.Optional; import java.util.logging.Logger; +import org.eclipse.emf.common.command.Command; import org.eclipse.glsp.server.actions.ActionDispatcher; import org.eclipse.glsp.server.operations.CreateEdgeOperation; import org.openbpmn.bpmn.BPMNModel; @@ -52,11 +53,15 @@ public BPMNGEdgeCreateHandler() { this.label = "Sequence Flow"; } + @Override + public Optional createCommand(final CreateEdgeOperation operation) { + return commandOf(() -> executeOperation(operation)); + } + /** * Adds a new BPMNEdge to the diagram. Depending on the type a SequenceFlow, * MessageFlow or Association is crated. */ - @Override protected void executeOperation(final CreateEdgeOperation operation) { if (operation.getSourceElementId() == null || operation.getTargetElementId() == null) { throw new IllegalArgumentException("Incomplete create connection action"); diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/event/BPMNCreateEventDefinitionHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/event/BPMNCreateEventDefinitionHandler.java index 6c6cbfbc..266573d7 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/event/BPMNCreateEventDefinitionHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/event/BPMNCreateEventDefinitionHandler.java @@ -20,6 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.emf.common.command.Command; import org.eclipse.glsp.graph.GModelElement; import org.eclipse.glsp.server.actions.ActionDispatcher; import org.eclipse.glsp.server.actions.SelectAction; @@ -59,11 +60,15 @@ public BPMNCreateEventDefinitionHandler() { super(BPMNTypes.BPMN_EVENT_DEFINITIONS); } + @Override + public Optional createCommand(final CreateNodeOperation operation) { + return commandOf(() -> executeOperation(operation)); + } + /** * We expect that the EventDefintion was dropped on a Event. See * {@link BPMNDiagramConfiguration} method getShapeTypeHints */ - @Override public void executeOperation(final CreateNodeOperation operation) { String eventID = null; String elementTypeId = operation.getElementTypeId(); diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/event/BPMNCreateEventHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/event/BPMNCreateEventHandler.java index 5168d33b..6beb144f 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/event/BPMNCreateEventHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/event/BPMNCreateEventHandler.java @@ -20,6 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.emf.common.command.Command; import org.eclipse.glsp.graph.GModelElement; import org.eclipse.glsp.graph.GPoint; import org.eclipse.glsp.server.actions.ActionDispatcher; @@ -77,7 +78,12 @@ public BPMNCreateEventHandler() { super(BPMNTypes.BPMN_EVENTS); } + @Override + public Optional createCommand(final CreateNodeOperation operation) { + return commandOf(() -> executeOperation(operation)); + } + public void executeOperation(final CreateNodeOperation operation) { BPMNElementNode containerElement = null; elementTypeId = operation.getElementTypeId(); diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/gateway/BPMNCreateGatewayHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/gateway/BPMNCreateGatewayHandler.java index 6a5fce6f..e1deeefd 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/gateway/BPMNCreateGatewayHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/gateway/BPMNCreateGatewayHandler.java @@ -20,6 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.emf.common.command.Command; import org.eclipse.glsp.graph.GPoint; import org.eclipse.glsp.server.actions.ActionDispatcher; import org.eclipse.glsp.server.actions.SelectAction; @@ -64,8 +65,11 @@ public class BPMNCreateGatewayHandler extends CreateBPMNNodeOperationHandler { public BPMNCreateGatewayHandler() { super(BPMNTypes.BPMN_GATEWAYS); } - @Override + public Optional createCommand(final CreateNodeOperation operation) { + return commandOf(() -> executeOperation(operation)); + } + public void executeOperation(final CreateNodeOperation operation) { elementTypeId = operation.getElementTypeId(); // now we add a new gateway into the source model diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/pool/CreateLaneHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/pool/CreateLaneHandler.java index f2385c68..752fe6e7 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/pool/CreateLaneHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/pool/CreateLaneHandler.java @@ -16,9 +16,11 @@ package org.openbpmn.glsp.elements.pool; import java.util.List; +import java.util.Optional; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.emf.common.command.Command; import org.eclipse.glsp.server.actions.ActionDispatcher; import org.eclipse.glsp.server.actions.SelectAction; import org.eclipse.glsp.server.operations.CreateNodeOperation; @@ -57,6 +59,10 @@ public CreateLaneHandler() { } @Override + public Optional createCommand(final CreateNodeOperation operation) { + return commandOf(() -> executeOperation(operation)); + } + public void executeOperation(final CreateNodeOperation operation) { logger.debug("===== > created lane...."); elementTypeId = operation.getElementTypeId(); diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/pool/CreatePoolHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/pool/CreatePoolHandler.java index f063df15..aae68b5d 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/pool/CreatePoolHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/pool/CreatePoolHandler.java @@ -19,6 +19,7 @@ import java.util.Optional; import java.util.logging.Logger; +import org.eclipse.emf.common.command.Command; import org.eclipse.glsp.graph.GPoint; import org.eclipse.glsp.server.actions.ActionDispatcher; import org.eclipse.glsp.server.actions.SelectAction; @@ -56,6 +57,10 @@ public CreatePoolHandler() { } @Override + public Optional createCommand(final CreateNodeOperation operation) { + return commandOf(() -> executeOperation(operation)); + } + public void executeOperation(final CreateNodeOperation operation) { elementTypeId = operation.getElementTypeId(); // now we add a new participant into the source model diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/task/BPMNCreateTaskHandler.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/task/BPMNCreateTaskHandler.java index d8581d1a..00a7131b 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/task/BPMNCreateTaskHandler.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/elements/task/BPMNCreateTaskHandler.java @@ -20,6 +20,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; +import org.eclipse.emf.common.command.Command; import org.eclipse.glsp.graph.GPoint; import org.eclipse.glsp.server.actions.ActionDispatcher; import org.eclipse.glsp.server.actions.SelectAction; @@ -67,6 +68,10 @@ public BPMNCreateTaskHandler() { } @Override + public Optional createCommand(final CreateNodeOperation operation) { + return commandOf(() -> executeOperation(operation)); + } + protected void executeOperation(final CreateNodeOperation operation) { elementTypeId = operation.getElementTypeId(); diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNGModelFactory.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNGModelFactory.java index c5107c24..45dabb20 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNGModelFactory.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNGModelFactory.java @@ -27,8 +27,6 @@ import java.util.Map; import java.util.Set; -import javax.inject.Inject; - import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.eclipse.emf.common.util.EList; @@ -96,6 +94,8 @@ import org.w3c.dom.Element; import org.w3c.dom.Node; +import com.google.inject.Inject; + /** * The BPMNGModelFactory is responsible to produce a graph model from the BPMN * Meta model. diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/provider/BPMNToolPaletteItemProvider.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/provider/BPMNToolPaletteItemProvider.java index ba2f5673..faef14f7 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/provider/BPMNToolPaletteItemProvider.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/provider/BPMNToolPaletteItemProvider.java @@ -16,19 +16,14 @@ package org.openbpmn.glsp.provider; import java.util.ArrayList; -import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.stream.Collectors; import org.eclipse.glsp.server.actions.TriggerEdgeCreationAction; -import org.eclipse.glsp.server.actions.TriggerElementCreationAction; import org.eclipse.glsp.server.actions.TriggerNodeCreationAction; import org.eclipse.glsp.server.features.toolpalette.PaletteItem; import org.eclipse.glsp.server.features.toolpalette.ToolPaletteItemProvider; -import org.eclipse.glsp.server.operations.CreateOperation; -import org.eclipse.glsp.server.operations.CreateOperationHandler; import org.eclipse.glsp.server.operations.OperationHandlerRegistry; import org.openbpmn.bpmn.BPMNNS; import org.openbpmn.bpmn.BPMNTypes; @@ -340,24 +335,27 @@ protected List createPaletteExtensions() { return result; } - /** - * Create a default palette group for a given CreateOperation type - * - * @param handlers - * @param operationClass - * @return - */ - protected List createPaletteItems(final List handlers, - final Class operationClass) { - return handlers.stream().filter(h -> operationClass.isAssignableFrom(h.getHandledOperationType())) - .flatMap( - handler -> handler.getTriggerActions().stream() - .map(action -> create(action, handler.getLabel()))) - .sorted(Comparator.comparing(PaletteItem::getLabel)).collect(Collectors.toList()); - } - - protected PaletteItem create(final TriggerElementCreationAction action, final String label) { - return new PaletteItem("palette-item" + counter++, label, action); - } + // /** + // * Create a default palette group for a given CreateOperation type + // * + // * @param handlers + // * @param operationClass + // * @return + // */ + // protected List createPaletteItems(final + // List handlers, + // final Class operationClass) { + // return handlers.stream().filter(h -> + // operationClass.isAssignableFrom(h.getHandledOperationType())) + // .flatMap( + // handler -> handler.getTriggerActions().stream() + // .map(action -> create(action, handler.getLabel()))) + // .sorted(Comparator.comparing(PaletteItem::getLabel)).collect(Collectors.toList()); + // } + +// protected PaletteItem create(final TriggerElementCreationAction action, final +// String label) { +// return new PaletteItem("palette-item" + counter++, label, action); +// } } diff --git a/pom.xml b/pom.xml index f04f808c..c796dfb6 100644 --- a/pom.xml +++ b/pom.xml @@ -72,7 +72,22 @@ terms of the Eclipse Public License v. 2.0 https://github.com/imixs/open-bpmn/issues + + UTF-8 + 11 + 11 + 11 + 11 + jar + org.imixs.bpmn.glsp.server.launch.BPMN2ServerLauncher + + + 1.1.0.RC10 + [30.1-jre,) + [0.8.1,) + 3.0.0-M5 + @@ -129,6 +144,8 @@ terms of the Eclipse Public License v. 2.0 maven-jxr-plugin 3.0.0 + +