diff --git a/.vscode/launch.json b/.vscode/launch.json index f0a39f97..af0c30b4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -13,27 +13,23 @@ "args": [ "--port", "5007" - ], - "vmArgs": [ - "--add-opens", - "java.base/java.util=ALL-UNNAMED", - ], - "console": "internalConsole", - "internalConsoleOptions": "openOnSessionStart" + ] }, { "type": "node", + "runtimeVersion": "18.11.0", "request": "launch", - "name": "Launch Workflow Theia Backend (External GLSP Server)", + "name": "Launch Theia Frontentd (External GLSP Server)", "program": "${workspaceRoot}/open-bpmn.glsp-client/open-bpmn-app/src-gen/backend/main.js", "args": [ - "--loglevel=debug", + "--hostname=localhost", + "--GLSP_PORT=5007", "--port=3000", "--no-cluster", - "--WF_GLSP=5007", + "--loglevel=debug", "--debug", - "--app-project-path=${workspaceRoot}/open-bpmn.glsp-client/open-bpmn-app", - "--root-dir=${workspaceRoot}/open-bpmn.glsp-client/workspace" + "--root-dir=${workspaceRoot}/open-bpmn.glsp-client/workspace", + "--app-project-path=${workspaceRoot}/open-bpmn.glsp-client/open-bpmn-app" ], "env": { "NODE_ENV": "development" @@ -41,7 +37,6 @@ "sourceMaps": true, "outFiles": [ "${workspaceRoot}/open-bpmn.glsp-client/node_modules/@theia/*/lib/**/*.js", - "${workspaceRoot}/open-bpmn.glsp-client/node_modules/@eclipse-glsp/*/lib/**/*.js", "${workspaceRoot}/open-bpmn.glsp-client/open-bpmn-app/lib/**/*.js", "${workspaceRoot}/open-bpmn.glsp-client/open-bpmn-theia/lib/**/*.js", "${workspaceRoot}/open-bpmn.glsp-client/open-bpmn-glsp/lib/**/*.js", diff --git a/README.md b/README.md index a33905f5..ba47520f 100644 --- a/README.md +++ b/README.md @@ -99,14 +99,20 @@ You will find more details in the [Client Section](./open-bpmn.glsp-client/READM ### NodeJS -We use nodejs on Linux Debian during development. To manage version of nodejs in debian see: https://phoenixnap.com/kb/update-node-js-version +For development the JavaScript tools [Node.js](https://nodejs.org/en/about) and [yarn](https://yarnpkg.com/) need to be installed in the correct version. +Using the Node Version Manager (NVM) you can easily manage multiple versions of Node.js on a single machine. It’s an essential tool for development with Node.js as it allows you to switch between different versions of Node.js without having to go through the hassle of installing or uninstalling Node.js manually each time. +To use nvm in Debian 12 run: -For development with Eclipse Theia the expected version is ">=10.11.0 <17". For that reason we tested with following version 16.11.0. You can list all current versions [here](https://nodejs.org/en/download/releases/). + $ sudo apt install build-essential libssl-dev + $ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/master/install.sh | bash -In case you have install npm you can install a specific nodejs version with: +Now you can install a specific version of Node.js using the nvm install command, followed by the version number. For example, to install Node.js 18, you would type: - $ sudo n 16.11.0 + $ nvm install 18 -To install typescript run: +You can list all available version with: + + $ nvm ls-remote + +We currently are using 18.17.1 for development. - $ sudo npm install -g typescript 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 index 5bfc57a4..1d585ef2 100644 --- 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 @@ -36,6 +36,7 @@ const ignoredResources = new Set(); if (process.platform !== 'win32') { ignoredResources.add('@vscode/windows-ca-certs'); + ignoredResources.add('@vscode/windows-ca-certs/build/Release/crypt32.node'); } const nativePlugin = new NativeWebpackPlugin({ @@ -98,7 +99,7 @@ const config = { ] }, plugins: [ - // Some native dependencies (bindings, @vscode/ripgrep) need special code replacements + // Some native dependencies need special handling nativePlugin, // Optional node dependencies can be safely ignored new webpack.IgnorePlugin({ @@ -118,6 +119,24 @@ const config = { }) ] }, + ignoreWarnings: [ + // Some packages do not have source maps, that's ok + /Failed to parse source map/, + // Some packages use dynamic requires, we can safely ignore them (they are handled by the native webpack plugin) + /require function is used in a way in which dependencies cannot be statically extracted/, { + module: /yargs/ + }, { + module: /node-pty/ + }, { + module: /require-main-filename/ + }, { + module: /ws/ + }, { + module: /express/ + }, { + module: /cross-spawn/ + } + ] }; module.exports = { diff --git a/open-bpmn.glsp-client/open-bpmn-app/package.json b/open-bpmn.glsp-client/open-bpmn-app/package.json index a1cc931c..494d24b0 100644 --- a/open-bpmn.glsp-client/open-bpmn-app/package.json +++ b/open-bpmn.glsp-client/open-bpmn-app/package.json @@ -12,20 +12,20 @@ }, "dependencies": { "@open-bpmn/open-bpmn-theia": "1.2.0", - "@theia/core": "1.39.0", - "@theia/editor": "1.39.0", - "@theia/filesystem": "1.39.0", - "@theia/markers": "1.39.0", - "@theia/messages": "1.39.0", - "@theia/monaco": "1.39.0", - "@theia/navigator": "1.39.0", - "@theia/preferences": "1.39.0", - "@theia/process": "1.39.0", - "@theia/terminal": "1.39.0", - "@theia/workspace": "1.39.0" + "@theia/core": "1.43.1", + "@theia/editor": "1.43.1", + "@theia/filesystem": "1.43.1", + "@theia/markers": "1.43.1", + "@theia/messages": "1.43.1", + "@theia/monaco": "1.43.1", + "@theia/navigator": "1.43.1", + "@theia/preferences": "1.43.1", + "@theia/process": "1.43.1", + "@theia/terminal": "1.43.1", + "@theia/workspace": "1.43.1" }, "devDependencies": { - "@theia/cli": "1.39.0" + "@theia/cli": "1.43.1" }, "theia": { "target": "browser" 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 9d9de2e0..59bc37e9 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 @@ -9,9 +9,9 @@ BackendApplicationConfigProvider.set({ const serverModule = require('./server'); const serverAddress = main.start(serverModule()); -serverAddress.then(({ port, address }) => { +serverAddress.then(({ port, address, family }) => { if (process && process.send) { - process.send({ port, address }); + process.send({ port, address, family }); } }); 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 8986e955..27f19712 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 @@ -24,35 +24,37 @@ function defaultServeStatic(app) { } function load(raw) { - return Promise.resolve(raw.default).then( - module => container.load(module) + return Promise.resolve(raw).then( + module => container.load(module.default) ); } -function start(port, host, argv = process.argv) { +async function start(port, host, argv = process.argv) { if (!container.isBound(BackendApplicationServer)) { container.bind(BackendApplicationServer).toConstantValue({ configure: defaultServeStatic }); } - return container.get(CliManager).initializeCli(argv).then(() => { - return container.get(BackendApplication).start(port, host); - }); + await container.get(CliManager).initializeCli(argv); + return container.get(BackendApplication).start(port, host); } -module.exports = (port, host, argv) => Promise.resolve() - .then(function () { return Promise.resolve(require('@theia/core/lib/node/i18n/i18n-backend-module')).then(load) }) - .then(function () { return Promise.resolve(require('@theia/core/lib/node/hosting/backend-hosting-module')).then(load) }) - .then(function () { return Promise.resolve(require('@theia/core/lib/node/request/backend-request-module')).then(load) }) - .then(function () { return Promise.resolve(require('@theia/filesystem/lib/node/filesystem-backend-module')).then(load) }) - .then(function () { return Promise.resolve(require('@theia/filesystem/lib/node/download/file-download-backend-module')).then(load) }) - .then(function () { return Promise.resolve(require('@theia/workspace/lib/node/workspace-backend-module')).then(load) }) - .then(function () { return Promise.resolve(require('@eclipse-glsp/theia-integration/lib/node/theia-integration-backend-module')).then(load) }) - .then(function () { return Promise.resolve(require('@open-bpmn/open-bpmn-theia/lib/node/bpmn-backend-module')).then(load) }) - .then(function () { return Promise.resolve(require('@theia/process/lib/common/process-common-module')).then(load) }) - .then(function () { return Promise.resolve(require('@theia/process/lib/node/process-backend-module')).then(load) }) - .then(function () { return Promise.resolve(require('@theia/terminal/lib/node/terminal-backend-module')).then(load) }) - .then(() => start(port, host, argv)).catch(error => { +module.exports = async (port, host, argv) => { + try { + await load(require('@theia/core/lib/node/i18n/i18n-backend-module')); + await load(require('@theia/core/lib/node/hosting/backend-hosting-module')); + await load(require('@theia/core/lib/node/request/backend-request-module')); + await load(require('@theia/filesystem/lib/node/filesystem-backend-module')); + await load(require('@theia/filesystem/lib/node/download/file-download-backend-module')); + await load(require('@theia/workspace/lib/node/workspace-backend-module')); + await load(require('@eclipse-glsp/theia-integration/lib/node/theia-integration-backend-module')); + await load(require('@open-bpmn/open-bpmn-theia/lib/node/bpmn-backend-module')); + await load(require('@theia/process/lib/common/process-common-module')); + await load(require('@theia/process/lib/node/process-backend-module')); + await load(require('@theia/terminal/lib/node/terminal-backend-module')); + return await start(port, host, argv); + } catch (error) { console.error('Failed to start the backend application:'); console.error(error); process.exitCode = 1; throw error; - }); + } +} 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 703e1636..34a42680 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 @@ -13,7 +13,8 @@ FrontendApplicationConfigProvider.set({ }, "defaultIconTheme": "theia-file-icons", "electron": { - "windowOptions": {} + "windowOptions": {}, + "showWindowEarly": true }, "defaultLocale": "", "validatePreferencesSchema": true @@ -26,57 +27,72 @@ self.MonacoEnvironment = { } } -const preloader = require('@theia/core/lib/browser/preloader'); +function load(container, jsModule) { + return Promise.resolve(jsModule) + .then(containerModule => container.load(containerModule.default)); +} -// We need to fetch some data from the backend before the frontend starts (nls, os) -module.exports = preloader.preload().then(() => { - const { FrontendApplication } = require('@theia/core/lib/browser'); - const { frontendApplicationModule } = require('@theia/core/lib/browser/frontend-application-module'); +async function preload(parent) { + const container = new Container(); + container.parent = parent; + try { + await load(container, import('@theia/core/lib/browser/preload/preload-module')); + const { Preloader } = require('@theia/core/lib/browser/preload/preloader'); + const preloader = container.get(Preloader); + await preloader.initialize(); + } catch (reason) { + console.error('Failed to run preload scripts.'); + if (reason) { + console.error(reason); + } + } +} + +module.exports = (async () => { const { messagingFrontendModule } = require('@theia/core/lib/browser/messaging/messaging-frontend-module'); + const container = new Container(); + container.load(messagingFrontendModule); + await preload(container); + const { FrontendApplication } = require('@theia/core/lib/browser'); + const { frontendApplicationModule } = require('@theia/core/lib/browser/frontend-application-module'); const { loggerFrontendModule } = require('@theia/core/lib/browser/logger-frontend-module'); - const container = new Container(); container.load(frontendApplicationModule); - container.load(messagingFrontendModule); container.load(loggerFrontendModule); - return Promise.resolve() - .then(function () { return import('@theia/core/lib/browser/i18n/i18n-frontend-module').then(load) }) - .then(function () { return import('@theia/core/lib/browser/menu/browser-menu-module').then(load) }) - .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/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('@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) }) - .then(function () { return import('@theia/userstorage/lib/browser/user-storage-frontend-module').then(load) }) - .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(start).catch(reason => { - console.error('Failed to start the frontend application.'); - if (reason) { - console.error(reason); - } - }); - - function load(jsModule) { - return Promise.resolve(jsModule.default) - .then(containerModule => container.load(containerModule)); + try { + await load(container, import('@theia/core/lib/browser/i18n/i18n-frontend-module')); + await load(container, import('@theia/core/lib/browser/menu/browser-menu-module')); + await load(container, import('@theia/core/lib/browser/window/browser-window-module')); + await load(container, import('@theia/core/lib/browser/keyboard/browser-keyboard-module')); + await load(container, import('@theia/core/lib/browser/request/browser-request-module')); + await load(container, import('@theia/filesystem/lib/browser/filesystem-frontend-module')); + await load(container, import('@theia/filesystem/lib/browser/download/file-download-frontend-module')); + await load(container, import('@theia/filesystem/lib/browser/file-dialog/file-dialog-module')); + await load(container, import('@theia/messages/lib/browser/messages-frontend-module')); + await load(container, import('@theia/variable-resolver/lib/browser/variable-resolver-frontend-module')); + await load(container, import('@theia/editor/lib/browser/editor-frontend-module')); + await load(container, import('@theia/workspace/lib/browser/workspace-frontend-module')); + await load(container, import('@theia/markers/lib/browser/problem/problem-frontend-module')); + await load(container, import('@theia/outline-view/lib/browser/outline-view-frontend-module')); + await load(container, import('@theia/monaco/lib/browser/monaco-frontend-module')); + await load(container, import('@eclipse-glsp/theia-integration/lib/browser/theia-integration-frontend-module')); + await load(container, import('@open-bpmn/open-bpmn-theia/lib/browser/bpmn-frontend-module')); + await load(container, import('@theia/navigator/lib/browser/navigator-frontend-module')); + await load(container, import('@theia/userstorage/lib/browser/user-storage-frontend-module')); + await load(container, import('@theia/preferences/lib/browser/preference-frontend-module')); + await load(container, import('@theia/process/lib/common/process-common-module')); + await load(container, import('@theia/terminal/lib/browser/terminal-frontend-module')); + await start(); + } catch (reason) { + console.error('Failed to start the frontend application.'); + if (reason) { + console.error(reason); + } } function start() { (window['theia'] = window['theia'] || {}).container = container; return container.get(FrontendApplication).start(); } -}); +})(); diff --git a/open-bpmn.glsp-client/open-bpmn-app/src-gen/frontend/secondary-index.js b/open-bpmn.glsp-client/open-bpmn-app/src-gen/frontend/secondary-index.js index 4698129b..190dd547 100644 --- a/open-bpmn.glsp-client/open-bpmn-app/src-gen/frontend/secondary-index.js +++ b/open-bpmn.glsp-client/open-bpmn-app/src-gen/frontend/secondary-index.js @@ -2,12 +2,9 @@ require('reflect-metadata'); const { Container } = require('inversify'); -const preloader = require('@theia/core/lib/browser/preloader'); - module.exports = Promise.resolve().then(() => { const { frontendApplicationModule } = require('@theia/core/lib/browser/frontend-application-module'); const container = new Container(); container.load(frontendApplicationModule); - container.load(require('@theia/terminal/lib/browser/terminal-frontend-module').default); }); diff --git a/open-bpmn.glsp-client/open-bpmn-glsp/src/bpmn-select-listeners.tsx b/open-bpmn.glsp-client/open-bpmn-glsp/src/bpmn-select-listeners.tsx index 134bab0c..fd54cc02 100644 --- a/open-bpmn.glsp-client/open-bpmn-glsp/src/bpmn-select-listeners.tsx +++ b/open-bpmn.glsp-client/open-bpmn-glsp/src/bpmn-select-listeners.tsx @@ -15,10 +15,10 @@ ********************************************************************************/ import { ActionDispatcher, + GLSPActionDispatcher, GModelRoot, ISelectionListener, SelectAction, - TYPES, filter, getElements, hasArgs @@ -39,12 +39,38 @@ import { inject, injectable } from 'inversify'; * This selectionListener selects additional associated BoundaryEvents and BPMNLabels. * This allows to move both independent Nodes (TaskNode and BoundaryEvent, GNode and GLabel) */ + +/** + * This is a workarround for + * + * https://github.com/eclipse-glsp/glsp/discussions/1169#discussioncomment-7704089 + * https://github.com/eclipse-glsp/glsp/discussions/1160#discussioncomment-7701447 + * + */ +export const ActionDispatcherFactory = Symbol("ActionDispatcherFactory"); + + + @injectable() export class BPMNLabelNodeSelectionListener implements ISelectionListener { - @inject(TYPES.IActionDispatcher) - protected actionDispatcher: ActionDispatcher; - selectionChanged(root: Readonly, selectedElements: string[]): void { + /* + * WORKAROUND START + */ + @inject(ActionDispatcherFactory) + protected actionDispatcherFactory: () => GLSPActionDispatcher; + private _actionDispatcher: GLSPActionDispatcher | undefined; + get actionDispatcher(): ActionDispatcher { + if (!this._actionDispatcher) { + this._actionDispatcher = this.actionDispatcherFactory(); + } + return this._actionDispatcher; + } + /* + * WORKAROUND END + */ + + selectionChanged(root: Readonly, selectedElements: string[]) { const additionalSelection: string[] = ['']; // We are interested in Tasks with BoundaryEvents ... const selectedTaskNodes = getElements(root.index, selectedElements, isTaskNode); @@ -72,11 +98,23 @@ export class BPMNLabelNodeSelectionListener implements ISelectionListener { additionalSelection.push(l); }); } + + // finally dispatch the additional elementIDs... + //this.actionDispatcher.dispatch(SelectAction.create({ selectedElementsIDs: additionalSelection })); + this.updateSelectionData(additionalSelection); + } + + + async updateSelectionData(additionalSelection: string[]): Promise { + // do something this.actionDispatcher.dispatch(SelectAction.create({ selectedElementsIDs: additionalSelection })); + return additionalSelection; } } + + /** * This selectionListener reacts on multiple selection. In case the selection list contains * a Pool or a Lane, these elements are removed from the selection. This is to support @@ -85,8 +123,25 @@ export class BPMNLabelNodeSelectionListener implements ISelectionListener { */ @injectable() export class BPMNMultiNodeSelectionListener implements ISelectionListener { - @inject(TYPES.IActionDispatcher) - protected actionDispatcher: ActionDispatcher; + // @inject(TYPES.IActionDispatcher) + // protected actionDispatcher: ActionDispatcher; + + /* + * WORKAROUND START + */ + @inject(ActionDispatcherFactory) + protected actionDispatcherFactory: () => GLSPActionDispatcher; + private _actionDispatcher: GLSPActionDispatcher | undefined; + get actionDispatcher(): ActionDispatcher { + if (!this._actionDispatcher) { + this._actionDispatcher = this.actionDispatcherFactory(); + } + return this._actionDispatcher; + } + /* + * WORKAROUND END + */ + selectionChanged(root: Readonly, selectedElements: string[]): void { // react only if more than one element is selected @@ -115,6 +170,15 @@ export class BPMNMultiNodeSelectionListener implements ISelectionListener { return !containerIDs.includes(element); }); // finally dispatch the updated selected and unselected IDs... - this.actionDispatcher.dispatch(SelectAction.create({ selectedElementsIDs: selectedElements, deselectedElementsIDs: containerIDs })); + // this.actionDispatcher.dispatch(SelectAction.create({ selectedElementsIDs: selectedElements, deselectedElementsIDs: containerIDs })); + this.updateSelectionData(selectedElements, containerIDs); + } + + + + async updateSelectionData(addSelectIDs: string[], deselectIDs: string[]): Promise { + // do something + this.actionDispatcher.dispatch(SelectAction.create({ selectedElementsIDs: addSelectIDs, deselectedElementsIDs: deselectIDs })); + return addSelectIDs; } } 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 30dc24cf..c2594e14 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 @@ -21,6 +21,7 @@ import { DiamondNodeView, GCompartment, GCompartmentView, + GLSPActionDispatcher, GLabel, GLabelView, LogLevel, @@ -73,27 +74,49 @@ import { } from './bpmn-helperlines'; import { BPMNEdgeView } from './bpmn-routing-views'; import { + ActionDispatcherFactory, BPMNLabelNodeSelectionListener, BPMNMultiNodeSelectionListener } from './bpmn-select-listeners'; import { - BPMNPropertiesMouseListener, BPMNPropertyModule + BPMNPropertiesMouseListener, + BPMNPropertyModule } from '@open-bpmn/open-bpmn-properties'; + + + + + const bpmnDiagramModule = new ContainerModule((bind, unbind, isBound, rebind) => { const context = { bind, unbind, isBound, rebind }; + /** + * WORKAROUND START + * + * This is a workarround for + * + * https://github.com/eclipse-glsp/glsp/discussions/1169#discussioncomment-7704089 + * https://github.com/eclipse-glsp/glsp/discussions/1160#discussioncomment-7701447 + * + */ + bind(ActionDispatcherFactory).toFactory( + ctx => () => ctx.container.get(TYPES.IActionDispatcher) + ); + /* WORKARROUND END */ + rebind(TYPES.ILogger).to(ConsoleLogger).inSingletonScope(); rebind(TYPES.LogLevel).toConstantValue(LogLevel.warn); bind(TYPES.ISnapper).to(BPMNElementSnapper); // We do not whant a reveal action in BPMN - // bind(TYPES.ICommandPaletteActionProvider).to(RevealNamedElementActionProvider); + // ???? bind(TYPES.ICommandPaletteActionProvider).to(RevealNamedElementActionProvider); bind(TYPES.IContextMenuItemProvider).to(DeleteElementContextMenuItemProvider); // bind new SelectionListener for BPMNLabels and BoundaryEvents + // PROBLEMBEREICH bind(TYPES.ISelectionListener).to(BPMNLabelNodeSelectionListener); bind(TYPES.ISelectionListener).to(BPMNMultiNodeSelectionListener); bind(TYPES.MouseListener).to(BPMNPropertiesMouseListener); 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 42f6af51..899d1eba 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,23 +15,22 @@ ********************************************************************************/ import { AbstractUIExtension, + ActionDispatcher, EditorContextService, - EnableDefaultToolsAction, - EnableToolPaletteAction, - EnableToolsAction, GLSPActionDispatcher, GModelElement, GModelRoot, IActionHandler, ICommand, + IDiagramStartup, ISelectionListener, + MaybePromise, MouseListener, - SelectionService, - SetUIExtensionVisibilityAction, - TYPES, + SelectAction, + //SelectionService, hasArgs } from '@eclipse-glsp/client'; -import { Action, RequestContextActions, SetContextActions } from '@eclipse-glsp/protocol'; +import { Action } from '@eclipse-glsp/protocol'; import { JsonForms } from '@jsonforms/react'; import { vanillaCells, vanillaRenderers } from '@jsonforms/vanilla-renderers'; import { isBPMNEdge, isBPMNNode, isBoundaryEvent } from '@open-bpmn/open-bpmn-model'; @@ -42,20 +41,59 @@ import { codiconCSSClasses } from 'sprotty/lib/utils/codicon'; import { SelectItemComboRendererEntry, SelectItemRendererEntry } from './SelectItemControl'; import { TextFileEditorRendererEntry } from './TextFileEditorControl'; + + + +/** + * This is a workarround for + * + * https://github.com/eclipse-glsp/glsp/discussions/1169#discussioncomment-7704089 + * https://github.com/eclipse-glsp/glsp/discussions/1160#discussioncomment-7701447 + * + */ +export const ActionDispatcherFactory = Symbol("ActionDispatcherFactory"); + + + + // eslint-disable-next-line @typescript-eslint/explicit-function-return-type @injectable() -export class BPMNPropertyPanel extends AbstractUIExtension implements ISelectionListener, IActionHandler { +export class BPMNPropertyPanel extends AbstractUIExtension implements ISelectionListener, IActionHandler, IDiagramStartup { static readonly ID = 'bpmn-property-panel'; - @inject(TYPES.IActionDispatcher) - protected readonly actionDispatcher: GLSPActionDispatcher; + // @inject(TYPES.IActionDispatcher) + // protected readonly actionDispatcher: GLSPActionDispatcher; + + // @inject(TYPES.IActionDispatcher) + // protected actionDispatcher: ActionDispatcher; + + /* + * WORKAROUND START + */ + + @inject(ActionDispatcherFactory) + protected actionDispatcherFactory: () => GLSPActionDispatcher; + private _actionDispatcher: GLSPActionDispatcher | undefined; + get actionDispatcher(): ActionDispatcher { + if (!this._actionDispatcher) { + this._actionDispatcher = this.actionDispatcherFactory(); + } + return this._actionDispatcher; + } + + /* + * WORKAROUND END + */ + + + @inject(EditorContextService) protected readonly editorContext: EditorContextService; - @inject(SelectionService) - protected selectionService: SelectionService; + // @inject(SelectionService) + // protected selectionService: SelectionService; protected bodyDiv: HTMLElement; protected headerDiv: HTMLElement; @@ -70,11 +108,6 @@ export class BPMNPropertyPanel extends AbstractUIExtension implements ISelection currentY: number; headerTitle: HTMLElement; - // @postConstruct() - // postConstruct(): void { - // this.selectionService.register(this); - // } - id(): string { return BPMNPropertyPanel.ID; } @@ -82,10 +115,20 @@ export class BPMNPropertyPanel extends AbstractUIExtension implements ISelection return BPMNPropertyPanel.ID; } + /** + * This method is called during the {@link DiagramLoader.load} process. + * We use this hook to activate UI extensions on startup. + * Execution order is derived by the `rank` property of the service. If not present, the {@link Ranked.DEFAULT_RANK} will be assumed. + * + */ + postModelInitialization(): MaybePromise { + this.show(this.editorContext.modelRoot); + } + /* * Initialize the elements of property panel */ - protected initializeContents(_containerElement: HTMLElement): void { + protected override initializeContents(_containerElement: HTMLElement): void { this.createHeader(); this.createBody(); } @@ -200,8 +243,8 @@ export class BPMNPropertyPanel extends AbstractUIExtension implements ISelection protected onClickResizePanel(button: HTMLElement, toolId?: string) { return (_ev: MouseEvent) => { if (!this.editorContext.isReadonly) { - const action = toolId ? EnableToolsAction.create([toolId]) : EnableDefaultToolsAction.create(); - this.actionDispatcher.dispatch(action); + //const action = toolId ? EnableToolsAction.create([toolId]) : EnableDefaultToolsAction.create(); + //this.actionDispatcher.dispatch(action); if (toolId === 'TOOL_COMMAND_MAXIMIZE') { this.containerElement.style.height = '50%'; } @@ -209,11 +252,15 @@ export class BPMNPropertyPanel extends AbstractUIExtension implements ISelection this.containerElement.style.height = '28px'; } // restore the default actions in the diagram panel (like move elements) - this.actionDispatcher.dispatch(EnableDefaultToolsAction.create()); + // this.actionDispatcher.dispatch(EnableDefaultToolsAction.create()); + console.log(' ... Wir senden kein EnableDefaultToolsAction.creat !!'); } }; } + + + /* * We react on different event actions. * @@ -229,24 +276,29 @@ export class BPMNPropertyPanel extends AbstractUIExtension implements ISelection */ handle(action: Action): ICommand | Action | void { // check enable state - if (!this.bodyDiv && action.kind === EnableToolPaletteAction.KIND) { - const requestAction = RequestContextActions.create({ - // contextId: ToolPalette.ID, - contextId: BPMNPropertyPanel.ID, - editorContext: { - selectedElementIds: [] - } - }); - this.actionDispatcher.requestUntil(requestAction).then(response => { - if (SetContextActions.is(response)) { - this.actionDispatcher.dispatch( - SetUIExtensionVisibilityAction.create({ - extensionId: BPMNPropertyPanel.ID, - visible: !this.editorContext.isReadonly - }) - ); - } - }); + // if (!this.bodyDiv && action.kind === EnableToolPaletteAction.KIND) { + // const requestAction = RequestContextActions.create({ + // // contextId: ToolPalette.ID, + // contextId: BPMNPropertyPanel.ID, + // editorContext: { + // selectedElementIds: [] + // } + // }); + // this.actionDispatcher.requestUntil(requestAction).then(response => { + // if (SetContextActions.is(response)) { + // this.actionDispatcher.dispatch( + // SetUIExtensionVisibilityAction.create({ + // extensionId: BPMNPropertyPanel.ID, + // visible: !this.editorContext.isReadonly + // }) + // ); + // } + // }); + // } + + if (!this.bodyDiv) { + console.log('PropertyPanel not initalized!'); + return; } // Toggle the property panel. Action is triggered by context menu @@ -335,6 +387,14 @@ export class BPMNPropertyPanel extends AbstractUIExtension implements ISelection } } + + + async updateSelectionData(additionalSelection: string[]): Promise { + // do something + this.actionDispatcher.dispatch(SelectAction.create({ selectedElementsIDs: additionalSelection })); + return additionalSelection; + } + /** * This helper method is responsible to refresh teh property panel. * The method loads the element from the root model context and updates @@ -442,9 +502,14 @@ export class BPMNPropertyPanel extends AbstractUIExtension implements ISelection } // figure out the active category this.updateLastCategory(); - const newJsonData = JSON.stringify(_newData.data); - const action = new BPMNApplyPropertiesUpdateOperation(this.selectedElementId, newJsonData, this.lastCategory); - this.actionDispatcher.dispatch(action); + + // Woorkaround disable for hte moment... + //const newJsonData = JSON.stringify(_newData.data); + // const action = new BPMNApplyPropertiesUpdateOperation(this.selectedElementId, newJsonData, this.lastCategory); + + + // this.actionDispatcher.dispatch(action); + console.log('.... wir sendne keine BPMNApplyPropertiesUpdateOperation !'); } /** diff --git a/open-bpmn.glsp-client/open-bpmn-properties/src/index.ts b/open-bpmn.glsp-client/open-bpmn-properties/src/index.ts index 66c31e6c..e685c60c 100644 --- a/open-bpmn.glsp-client/open-bpmn-properties/src/index.ts +++ b/open-bpmn.glsp-client/open-bpmn-properties/src/index.ts @@ -13,17 +13,45 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 ********************************************************************************/ -import { EnableToolPaletteAction, TYPES } from '@eclipse-glsp/client'; -import { ContainerModule } from 'inversify'; +import { EnableToolPaletteAction, FeatureModule, GLSPActionDispatcher, TYPES } from '@eclipse-glsp/client'; +//import { ContainerModule } from 'inversify'; import { configureActionHandler } from 'sprotty'; -import { BPMNPropertyPanel, BPMNPropertyPanelToggleAction, BPMNPropertyPanelUpdateAction } from './bpmn-property-panel'; +import { ActionDispatcherFactory, BPMNPropertyPanel, BPMNPropertyPanelToggleAction, BPMNPropertyPanelUpdateAction } from './bpmn-property-panel'; + + // css styles import '../css/bpmn-properties.css'; import '../css/jsonforms-theia.css'; -export const BPMNPropertyModule = new ContainerModule((bind, _unbind, isBound, rebind) => { +// export const BPMNPropertyModule = new ContainerModule((bind, _unbind, isBound, rebind) => { +// bind(BPMNPropertyPanel).toSelf().inSingletonScope(); +// bind(TYPES.IUIExtension).toService(BPMNPropertyPanel); +// configureActionHandler({ bind, isBound }, EnableToolPaletteAction.KIND, BPMNPropertyPanel); +// configureActionHandler({ bind, isBound }, BPMNPropertyPanelToggleAction.KIND, BPMNPropertyPanel); +// configureActionHandler({ bind, isBound }, BPMNPropertyPanelUpdateAction.KIND, BPMNPropertyPanel); +// }); +export const BPMNPropertyModule = new FeatureModule((bind, _unbind, isBound, _isBound) => { bind(BPMNPropertyPanel).toSelf().inSingletonScope(); bind(TYPES.IUIExtension).toService(BPMNPropertyPanel); + bind(TYPES.IDiagramStartup).toService(BPMNPropertyPanel); + bind(TYPES.ISelectionListener).to(BPMNPropertyPanel); + + + /** + * WORKAROUND START + * + * This is a workarround for + * + * https://github.com/eclipse-glsp/glsp/discussions/1169#discussioncomment-7704089 + * https://github.com/eclipse-glsp/glsp/discussions/1160#discussioncomment-7701447 + * + */ + bind(ActionDispatcherFactory).toFactory( + ctx => () => ctx.container.get(TYPES.IActionDispatcher) + ); + /* WORKARROUND END */ + + configureActionHandler({ bind, isBound }, EnableToolPaletteAction.KIND, BPMNPropertyPanel); configureActionHandler({ bind, isBound }, BPMNPropertyPanelToggleAction.KIND, BPMNPropertyPanel); configureActionHandler({ bind, isBound }, BPMNPropertyPanelUpdateAction.KIND, BPMNPropertyPanel); diff --git a/open-bpmn.glsp-client/open-bpmn-theia/package.json b/open-bpmn.glsp-client/open-bpmn-theia/package.json index 9f7cf7ae..3bcf5b03 100644 --- a/open-bpmn.glsp-client/open-bpmn-theia/package.json +++ b/open-bpmn.glsp-client/open-bpmn-theia/package.json @@ -23,19 +23,18 @@ ], "files": [ "lib", - "src", - "server" + "src" ], "dependencies": { "@open-bpmn/open-bpmn-glsp": "1.2.0", "@eclipse-glsp/theia-integration": "2.0.0" }, "scripts": { - "build": "tsc -b", + "prepare": "yarn clean && yarn build", "clean": "rimraf lib tsconfig.tsbuildinfo", + "build": "tsc", "lint": "eslint --ext .ts,.tsx ./src", "lint:ci": "yarn lint -o eslint.xml -f checkstyle", - "prepare": "yarn clean && yarn build", "watch": "tsc -w" }, "theiaExtensions": [ 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 934e8821..7acfeca4 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 @@ -20,14 +20,14 @@ import { BPMNLanguage } from '../common/bpmn-language'; import { BPMNGLSPClientContribution } from './bpmn-glsp-client-contribution'; import { BPMNPropertiesCommandContribution, BPMNPropertiesMenuContribution } from './bpmn-property-commands'; 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 0d5df483..0048d366 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 @@ -15,13 +15,11 @@ ********************************************************************************/ import { Args, MaybePromise } from '@eclipse-glsp/client'; -import { BaseGLSPClientContribution } from '@eclipse-glsp/theia-integration/lib/browser'; +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 BPMNInitializeOptions { timestamp: Date; message: string; @@ -41,5 +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; + } +} \ No newline at end of file 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 8d44af3c..dfaaedb9 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 @@ -24,8 +24,7 @@ import { BPMNLanguage } from '../../common/bpmn-language'; export class BPMNDiagramConfiguration extends GLSPDiagramConfiguration { diagramType: string = BPMNLanguage.diagramType; - configureContainer(container: Container, ...containerConfiguration: ContainerConfiguration): void { + override configureContainer(container: Container, ...containerConfiguration: ContainerConfiguration): void { initializeBPMNDiagramContainer(container, ...containerConfiguration); - //return container; } } 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 c527c633..9926d4f7 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 @@ -16,9 +16,9 @@ import { GLSPDiagramLanguage } from '@eclipse-glsp/theia-integration/lib/common'; export const BPMNLanguage: GLSPDiagramLanguage = { - contributionId: 'Bpmn', + contributionId: 'OpenBPMN', label: 'BPMN 2.0 diagram', diagramType: 'bpmn-diagram', - fileExtensions: ['.bpmn','.bpmn2'], - iconClass: 'codicon codicon-type-hierarchy-sub' + fileExtensions: ['.bpmn', '.bpmn2'], + iconClass: 'codicon codicon-split-vertical' }; diff --git a/open-bpmn.glsp-client/open-bpmn-theia/src/node/bpmn-backend-module.ts b/open-bpmn.glsp-client/open-bpmn-theia/src/node/bpmn-backend-module.ts index 745d5639..1b0ab5bc 100644 --- a/open-bpmn.glsp-client/open-bpmn-theia/src/node/bpmn-backend-module.ts +++ b/open-bpmn.glsp-client/open-bpmn-theia/src/node/bpmn-backend-module.ts @@ -28,15 +28,29 @@ * * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 ********************************************************************************/ +import { bindAsService } from '@eclipse-glsp/protocol'; import { GLSPServerContribution } from '@eclipse-glsp/theia-integration/lib/node'; import { ContainerModule } from '@theia/core/shared/inversify'; import { BPMNGLSPSocketServerContribution } from './bpmn-glsp-server-contribution'; -// export default new ContainerModule(bind => { -// bindAsService(bind, GLSPServerContribution, BPMNGLSPSocketServerContribution); -// }); - export default new ContainerModule(bind => { - bind(BPMNGLSPSocketServerContribution).toSelf().inSingletonScope(); - bind(GLSPServerContribution).toService(BPMNGLSPSocketServerContribution); -}); \ No newline at end of file + if (isDirectWebSocketConnection()) { + return; + } + bindAsService(bind, GLSPServerContribution, BPMNGLSPSocketServerContribution); + // bind(BPMNGLSPSocketServerContribution).toSelf().inSingletonScope(); + // bind(GLSPServerContribution).toService(BPMNGLSPSocketServerContribution); +}); + + +const directWebSocketArg = '--directWebSocket'; +/** + * Utility function to parse if the frontend should connect directly to a running GLSP WebSocket Server instance + * and skip the binding of the backend contribution. + * i.e. if the {@link directWebSocketArg `--directWebSocket`} argument has been passed. + * @returns `true` if the {@link directWebSocketArg `--directWebSocket`} argument has been set. + */ +function isDirectWebSocketConnection(): boolean { + const args = process.argv.filter(a => a.toLowerCase().startsWith(directWebSocketArg.toLowerCase())); + return args.length > 0; +} diff --git a/open-bpmn.glsp-client/open-bpmn-theia/src/node/bpmn-glsp-server-contribution.ts b/open-bpmn.glsp-client/open-bpmn-theia/src/node/bpmn-glsp-server-contribution.ts index cc3f08f3..33d33380 100644 --- a/open-bpmn.glsp-client/open-bpmn-theia/src/node/bpmn-glsp-server-contribution.ts +++ b/open-bpmn.glsp-client/open-bpmn-theia/src/node/bpmn-glsp-server-contribution.ts @@ -22,10 +22,8 @@ import { injectable } from '@theia/core/shared/inversify'; import { join, resolve } from 'path'; import { BPMNLanguage } from '../common/bpmn-language'; -export const DEFAULT_PORT = 5007; -//export const DEFAULT_PORT = 0; +export const DEFAULT_PORT = 0; export const PORT_ARG_KEY = 'GLSP_PORT'; -//export const WEBSOCKET_PATH_ARG_KEY = 'PATH_PATH'; export const LOG_DIR = join(__dirname, '..', '..', 'logs'); const JAR_FILE = resolve( join(__dirname, '..', '..', '..', '..', 'open-bpmn.glsp-server', 'target', 'open-bpmn.server-1.2.0-SNAPSHOT-glsp.jar') @@ -35,7 +33,6 @@ const JAR_FILE = resolve( export class BPMNGLSPSocketServerContribution extends GLSPSocketServerContribution { readonly id = BPMNLanguage.contributionId; - //Java Server createContributionOptions(): Partial { return { executable: JAR_FILE, @@ -46,7 +43,6 @@ export class BPMNGLSPSocketServerContribution extends GLSPSocketServerContributi }; } - // createContributionOptions(): Partial { // return { // executable: JAR_FILE, @@ -57,16 +53,4 @@ export class BPMNGLSPSocketServerContribution extends GLSPSocketServerContributi // } // }; // } - - // NodeJS Sever (??) - // createContributionOptions(): Partial { - // return { - // executable: JAR_FILE, - // additionalArgs: ['--no-consoleLog', '--fileLog', 'true', '--logDir', LOG_DIR], - // socketConnectionOptions: { - // port: getPort(PORT_ARG_KEY, DEFAULT_PORT), - // //path: getWebSocketPath(WEBSOCKET_PATH_ARG_KEY) - // } - // }; - // } } diff --git a/open-bpmn.glsp-client/package.json b/open-bpmn.glsp-client/package.json index 9eb055b2..db1081c4 100644 --- a/open-bpmn.glsp-client/package.json +++ b/open-bpmn.glsp-client/package.json @@ -27,23 +27,28 @@ "open-bpmn-app" ], "scripts": { - "build": "yarn install:only && lerna run build", - "install:only": "yarn install --ignore-scripts", - "lint": "yarn install:only && lerna run lint --", + "all": "yarn install && yarn lint", + "build": "lerna run build", + "clean": "lerna run clean", + "lint": "lerna run lint", + "lint:ci": "lerna run lint:ci", "prepare": "lerna run prepare", "rebuild:browser": "theia rebuild:browser", "start": "yarn rebuild:browser && yarn --cwd open-bpmn-app start", "start:external": "yarn rebuild:browser && yarn --cwd open-bpmn-app start:external", "watch": "lerna run --parallel watch" }, + "resolutions": { + "string-width": "4.2.3" + }, "devDependencies": { "@eclipse-glsp/config": "2.0.0", "rimraf": "^2.6.1", - "lerna": "^6.1.0", - "typescript": "^4.9.3" + "lerna": "^6.6.1", + "typescript": "^5.2.2" }, "engines": { - "node": ">=14.18.0", + "node": ">=16.11.0", "yarn": ">=1.7.0 <2.x.x" } } \ No newline at end of file diff --git a/open-bpmn.glsp-client/workspace/demo.bpmn b/open-bpmn.glsp-client/workspace/demo.bpmn index aa7cb813..f5a6aa88 100644 --- a/open-bpmn.glsp-client/workspace/demo.bpmn +++ b/open-bpmn.glsp-client/workspace/demo.bpmn @@ -121,7 +121,7 @@ - + @@ -156,8 +156,9 @@ - - + + + diff --git a/open-bpmn.glsp-client/workspace/workflow.wf b/open-bpmn.glsp-client/workspace/workflow.wf new file mode 100644 index 00000000..14059533 --- /dev/null +++ b/open-bpmn.glsp-client/workspace/workflow.wf @@ -0,0 +1,730 @@ +{ + "id": "sprotty", + "children": [ + { + "name": "Push", + "taskType": "manual", + "id": "task0", + "cssClasses": [ + "task", + "manual" + ], + "children": [ + { + "id": "task0_icon", + "type": "icon", + "position": { + "x": 5.0, + "y": 5.0 + }, + "size": { + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "task0_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 31.921875, + "height": 16.0 + }, + "text": "Push", + "alignment": { + "x": 15.9609375, + "y": 13.0 + } + } + ], + "type": "task:manual", + "position": { + "x": 70.0, + "y": 140.0 + }, + "size": { + "width": 72.921875, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "paddingRight": 10.0, + "prefWidth": 72.921875, + "prefHeight": 30.0 + }, + "args": { + "radiusBottomLeft": 5.0, + "radiusTopLeft": 5.0, + "radiusTopRight": 5.0, + "radiusBottomRight": 5.0 + } + }, + { + "name": "ChkWt", + "taskType": "automated", + "id": "task0_automated", + "cssClasses": [ + "task", + "automated" + ], + "children": [ + { + "id": "task0_automated_icon", + "type": "icon", + "position": { + "x": 5.0, + "y": 5.0 + }, + "size": { + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "task0_automated_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 42.1103515625, + "height": 16.0 + }, + "text": "ChkWt", + "alignment": { + "x": 21.0, + "y": 13.0 + } + } + ], + "type": "task:automated", + "position": { + "x": 220.0, + "y": 90.0 + }, + "size": { + "width": 83.1103515625, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 75.6103515625, + "paddingRight": 10.0, + "prefHeight": 30.0 + }, + "args": { + "radiusBottomLeft": 5.0, + "radiusTopLeft": 5.0, + "radiusTopRight": 5.0, + "radiusBottomRight": 5.0 + } + }, + { + "nodeType": "mergeNode", + "id": "activityNode1", + "type": "activityNode:merge", + "position": { + "x": 500.0, + "y": 90.0 + }, + "size": { + "width": 32.0, + "height": 32.0 + }, + "layoutOptions": { + "minHeight": 32.0, + "resizeContainer": false + } + }, + { + "nodeType": "decisionNode", + "id": "activityNode2", + "type": "activityNode:decision", + "position": { + "x": 330.0, + "y": 190.0 + }, + "size": { + "width": 32.0, + "height": 32.0 + }, + "layoutOptions": { + "minWidth": 32.0, + "minHeight": 32.0 + } + }, + { + "nodeType": "mergeNode", + "id": "activityNode4", + "type": "activityNode:merge", + "position": { + "x": 500.0, + "y": 190.0 + }, + "size": { + "width": 32.0, + "height": 32.0 + }, + "layoutOptions": { + "minHeight": 32.0, + "resizeContainer": false + } + }, + { + "nodeType": "decisionNode", + "id": "b00fc494-0fa4-4448-8bf9-162c2c0865e4", + "type": "activityNode:decision", + "position": { + "x": 330.0, + "y": 90.0 + }, + "size": { + "width": 32.0, + "height": 32.0 + }, + "layoutOptions": { + "minWidth": 32.0, + "minHeight": 32.0 + } + }, + { + "nodeType": "forkNode", + "id": "bb2709f5-0ff0-4438-8853-b7e934b506d7", + "cssClasses": [ + "forkOrJoin" + ], + "type": "activityNode:fork", + "position": { + "x": 170.0, + "y": 130.0 + }, + "size": { + "width": 10.0, + "height": 50.0 + } + }, + { + "id": "d34c37e0-e45e-4cfe-a76f-0e9274ed8e60", + "type": "edge", + "sourceId": "task0", + "targetId": "bb2709f5-0ff0-4438-8853-b7e934b506d7" + }, + { + "nodeType": "joinNode", + "id": "bd94e44e-19f9-446e-89d4-97ca1a63c17b", + "cssClasses": [ + "forkOrJoin" + ], + "type": "activityNode:join", + "position": { + "x": 560.0, + "y": 130.0 + }, + "size": { + "width": 10.0, + "height": 50.0 + } + }, + { + "id": "7296b4a8-55c6-4c61-bddb-deacae77efa6", + "type": "edge", + "sourceId": "activityNode1", + "targetId": "bd94e44e-19f9-446e-89d4-97ca1a63c17b" + }, + { + "id": "0471cae4-c754-4e89-8337-96ed1546dd02", + "type": "edge", + "sourceId": "activityNode4", + "targetId": "bd94e44e-19f9-446e-89d4-97ca1a63c17b" + }, + { + "name": "WtOK", + "taskType": "automated", + "id": "e47d5eba-612d-4c43-9aba-2c5502ff4f04", + "cssClasses": [ + "task", + "automated" + ], + "children": [ + { + "id": "e47d5eba-612d-4c43-9aba-2c5502ff4f04_icon", + "type": "icon", + "position": { + "x": 5.0, + "y": 5.0 + }, + "size": { + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "e47d5eba-612d-4c43-9aba-2c5502ff4f04_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 37.9931640625, + "height": 16.0 + }, + "text": "WtOK", + "alignment": { + "x": 18.671875, + "y": 13.0 + } + } + ], + "type": "task:automated", + "position": { + "x": 390.0, + "y": 120.0 + }, + "size": { + "width": 78.9931640625, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 71.4931640625, + "paddingRight": 10.0, + "prefHeight": 30.0 + }, + "args": { + "radiusBottomLeft": 5.0, + "radiusTopLeft": 5.0, + "radiusTopRight": 5.0, + "radiusBottomRight": 5.0 + } + }, + { + "id": "2317f24a-034e-4352-8857-d361dc8f5ed7", + "cssClasses": [ + "medium" + ], + "type": "edge:weighted", + "sourceId": "b00fc494-0fa4-4448-8bf9-162c2c0865e4", + "targetId": "e47d5eba-612d-4c43-9aba-2c5502ff4f04" + }, + { + "id": "0a57ab51-c0b6-4a51-b42e-0192bf3767dc", + "type": "edge", + "sourceId": "bb2709f5-0ff0-4438-8853-b7e934b506d7", + "targetId": "task0_automated", + "args": { + "edgePadding": 10.0 + } + }, + { + "id": "7a5d6bc3-c61e-4baa-8556-6015f33269c7", + "type": "edge", + "sourceId": "task0_automated", + "targetId": "b00fc494-0fa4-4448-8bf9-162c2c0865e4", + "args": { + "edgePadding": 10.0 + } + }, + { + "name": "RflWt", + "taskType": "manual", + "id": "a63cfd87-da7c-4846-912b-29040b776bfb", + "cssClasses": [ + "task", + "manual" + ], + "children": [ + { + "id": "54f08126-6041-44ce-9d8b-e7a549e48f91", + "type": "icon", + "position": { + "x": 5.0, + "y": 5.0 + }, + "size": { + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "6e007d62-d441-4b08-8815-ad59de3b2ca8", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 34.32421875, + "height": 16.0 + }, + "text": "RflWt", + "alignment": { + "x": 17.109375, + "y": 13.0 + } + } + ], + "type": "task:manual", + "position": { + "x": 390.0, + "y": 70.0 + }, + "size": { + "width": 75.32421875, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 67.82421875, + "paddingRight": 10.0, + "prefHeight": 30.0 + }, + "args": { + "radiusBottomLeft": 5.0, + "radiusTopLeft": 5.0, + "radiusTopRight": 5.0, + "radiusBottomRight": 5.0 + } + }, + { + "id": "9bb443d7-44f3-4192-8dd8-1a2782593373", + "cssClasses": [ + "medium" + ], + "type": "edge:weighted", + "sourceId": "b00fc494-0fa4-4448-8bf9-162c2c0865e4", + "targetId": "a63cfd87-da7c-4846-912b-29040b776bfb" + }, + { + "id": "a36985a7-3e61-499c-9bdb-5be2b00cb75c", + "type": "edge", + "sourceId": "a63cfd87-da7c-4846-912b-29040b776bfb", + "targetId": "activityNode1", + "args": { + "edgePadding": 10.0 + } + }, + { + "id": "8880cd08-8d90-4408-acd4-6eae218b1650", + "type": "edge", + "sourceId": "e47d5eba-612d-4c43-9aba-2c5502ff4f04", + "targetId": "activityNode1", + "args": { + "edgePadding": 10.0 + } + }, + { + "name": "Brew", + "taskType": "automated", + "id": "7afd430b-5031-4082-8190-7e755c57cde9", + "cssClasses": [ + "task", + "automated" + ], + "children": [ + { + "id": "7afd430b-5031-4082-8190-7e755c57cde9_icon", + "type": "icon", + "position": { + "x": 5.0, + "y": 5.0 + }, + "size": { + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "7afd430b-5031-4082-8190-7e755c57cde9_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 31.90625, + "height": 16.0 + }, + "text": "Brew", + "alignment": { + "x": 15.953125, + "y": 13.0 + } + } + ], + "type": "task:automated", + "position": { + "x": 600.0, + "y": 140.0 + }, + "size": { + "width": 72.90625, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 72.90625, + "paddingRight": 10.0, + "prefHeight": 30.0 + }, + "args": { + "radiusBottomLeft": 5.0, + "radiusTopLeft": 5.0, + "radiusTopRight": 5.0, + "radiusBottomRight": 5.0 + } + }, + { + "id": "81efd1ef-ae19-4ea6-a20b-20857b1c6552", + "type": "edge", + "sourceId": "bd94e44e-19f9-446e-89d4-97ca1a63c17b", + "targetId": "7afd430b-5031-4082-8190-7e755c57cde9", + "args": { + "edgePadding": 10.0 + } + }, + { + "name": "ChkTp", + "taskType": "automated", + "id": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17", + "cssClasses": [ + "task", + "automated" + ], + "children": [ + { + "id": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17_icon", + "type": "icon", + "position": { + "x": 5.0, + "y": 5.0 + }, + "size": { + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 41.4482421875, + "height": 16.0 + }, + "text": "ChkTp", + "alignment": { + "x": 20.6171875, + "y": 13.0 + } + } + ], + "type": "task:automated", + "position": { + "x": 220.0, + "y": 190.0 + }, + "size": { + "width": 82.4482421875, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 74.9482421875, + "paddingRight": 10.0, + "prefHeight": 30.0 + }, + "args": { + "radiusBottomLeft": 5.0, + "radiusTopLeft": 5.0, + "radiusTopRight": 5.0, + "radiusBottomRight": 5.0 + } + }, + { + "id": "189aecf6-6043-4915-9f3e-7b2da8fd0d9c", + "type": "edge", + "sourceId": "bb2709f5-0ff0-4438-8853-b7e934b506d7", + "targetId": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17", + "args": { + "edgePadding": 10.0 + } + }, + { + "id": "69e45ef0-9c74-41da-a3ab-0a5669f83f96", + "type": "edge", + "sourceId": "6c26f0a4-4354-45fa-9d9f-bc2b48adee17", + "targetId": "activityNode2", + "args": { + "edgePadding": 10.0 + } + }, + { + "name": "KeepTp", + "taskType": "automated", + "id": "4b06ed95-c9be-47df-9941-98099259be4a", + "cssClasses": [ + "task", + "automated" + ], + "children": [ + { + "id": "4b06ed95-c9be-47df-9941-98099259be4a_icon", + "type": "icon", + "position": { + "x": 5.0, + "y": 5.0 + }, + "size": { + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "4b06ed95-c9be-47df-9941-98099259be4a_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 49.248046875, + "height": 16.0 + }, + "text": "KeepTp", + "alignment": { + "x": 24.5234375, + "y": 13.0 + } + } + ], + "type": "task:automated", + "position": { + "x": 390.0, + "y": 170.0 + }, + "size": { + "width": 90.248046875, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 82.748046875, + "paddingRight": 10.0, + "prefHeight": 30.0 + }, + "args": { + "radiusBottomLeft": 5.0, + "radiusTopLeft": 5.0, + "radiusTopRight": 5.0, + "radiusBottomRight": 5.0 + } + }, + { + "name": "PreHeat", + "taskType": "automated", + "id": "80d1792f-9c7e-41c0-8eca-eeb0509397b6", + "cssClasses": [ + "task", + "automated" + ], + "children": [ + { + "id": "80d1792f-9c7e-41c0-8eca-eeb0509397b6_icon", + "type": "icon", + "position": { + "x": 5.0, + "y": 5.0 + }, + "size": { + "width": 25.0, + "height": 20.0 + } + }, + { + "id": "80d1792f-9c7e-41c0-8eca-eeb0509397b6_classname", + "type": "label:heading", + "position": { + "x": 31.0, + "y": 7.0 + }, + "size": { + "width": 51.46875, + "height": 16.0 + }, + "text": "PreHeat", + "alignment": { + "x": 25.6796875, + "y": 13.0 + } + } + ], + "type": "task:automated", + "position": { + "x": 390.0, + "y": 220.0 + }, + "size": { + "width": 92.46875, + "height": 30.0 + }, + "layout": "hbox", + "layoutOptions": { + "prefWidth": 84.96875, + "paddingRight": 10.0, + "prefHeight": 30.0 + }, + "args": { + "radiusBottomLeft": 5.0, + "radiusTopLeft": 5.0, + "radiusTopRight": 5.0, + "radiusBottomRight": 5.0 + } + }, + { + "id": "d04afaf8-0894-4284-b844-22b255893107", + "cssClasses": [ + "medium" + ], + "type": "edge:weighted", + "sourceId": "activityNode2", + "targetId": "4b06ed95-c9be-47df-9941-98099259be4a" + }, + { + "id": "b9ef468f-2aaf-41b9-b408-29e2d08e490e", + "cssClasses": [ + "medium" + ], + "type": "edge:weighted", + "sourceId": "activityNode2", + "targetId": "80d1792f-9c7e-41c0-8eca-eeb0509397b6" + }, + { + "id": "58657bcf-6d32-4e7d-b73a-f84fd8d7158b", + "type": "edge", + "sourceId": "4b06ed95-c9be-47df-9941-98099259be4a", + "targetId": "activityNode4", + "args": { + "edgePadding": 10.0 + } + }, + { + "id": "39a75477-facf-4960-b0bb-1989be7fb57f", + "type": "edge", + "sourceId": "80d1792f-9c7e-41c0-8eca-eeb0509397b6", + "targetId": "activityNode4", + "args": { + "edgePadding": 10.0 + } + } + ], + "type": "graph", + "revision": 10 +} \ No newline at end of file diff --git a/open-bpmn.glsp-client/yarn.lock b/open-bpmn.glsp-client/yarn.lock index 136c2a0b..5545937b 100644 --- a/open-bpmn.glsp-client/yarn.lock +++ b/open-bpmn.glsp-client/yarn.lock @@ -1305,35 +1305,35 @@ dependencies: cross-spawn "^7.0.1" -"@msgpackr-extract/msgpackr-extract-darwin-arm64@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-3.0.2.tgz#44d752c1a2dc113f15f781b7cc4f53a307e3fa38" - integrity sha512-9bfjwDxIDWmmOKusUcqdS4Rw+SETlp9Dy39Xui9BEGEk19dDwH0jhipwFzEff/pFg95NKymc6TOTbRKcWeRqyQ== +"@msgpackr-extract/msgpackr-extract-darwin-arm64@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-arm64/-/msgpackr-extract-darwin-arm64-2.2.0.tgz#901c5937e1441572ea23e631fe6deca68482fe76" + integrity sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ== -"@msgpackr-extract/msgpackr-extract-darwin-x64@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-3.0.2.tgz#f954f34355712212a8e06c465bc06c40852c6bb3" - integrity sha512-lwriRAHm1Yg4iDf23Oxm9n/t5Zpw1lVnxYU3HnJPTi2lJRkKTrps1KVgvL6m7WvmhYVt/FIsssWay+k45QHeuw== +"@msgpackr-extract/msgpackr-extract-darwin-x64@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-darwin-x64/-/msgpackr-extract-darwin-x64-2.2.0.tgz#fb877fe6bae3c4d3cea29786737840e2ae689066" + integrity sha512-vq0tT8sjZsy4JdSqmadWVw6f66UXqUCabLmUVHZwUFzMgtgoIIQjT4VVRHKvlof3P/dMCkbMJ5hB1oJ9OWHaaw== -"@msgpackr-extract/msgpackr-extract-linux-arm64@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-3.0.2.tgz#45c63037f045c2b15c44f80f0393fa24f9655367" - integrity sha512-FU20Bo66/f7He9Fp9sP2zaJ1Q8L9uLPZQDub/WlUip78JlPeMbVL8546HbZfcW9LNciEXc8d+tThSJjSC+tmsg== +"@msgpackr-extract/msgpackr-extract-linux-arm64@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm64/-/msgpackr-extract-linux-arm64-2.2.0.tgz#986179c38b10ac41fbdaf7d036c825cbc72855d9" + integrity sha512-hlxxLdRmPyq16QCutUtP8Tm6RDWcyaLsRssaHROatgnkOxdleMTgetf9JsdncL8vLh7FVy/RN9i3XR5dnb9cRA== -"@msgpackr-extract/msgpackr-extract-linux-arm@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-3.0.2.tgz#35707efeafe6d22b3f373caf9e8775e8920d1399" - integrity sha512-MOI9Dlfrpi2Cuc7i5dXdxPbFIgbDBGgKR5F2yWEa6FVEtSWncfVNKW5AKjImAQ6CZlBK9tympdsZJ2xThBiWWA== +"@msgpackr-extract/msgpackr-extract-linux-arm@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-arm/-/msgpackr-extract-linux-arm-2.2.0.tgz#15f2c6fe9e0adc06c21af7e95f484ff4880d79ce" + integrity sha512-SaJ3Qq4lX9Syd2xEo9u3qPxi/OB+5JO/ngJKK97XDpa1C587H9EWYO6KD8995DAjSinWvdHKRrCOXVUC5fvGOg== -"@msgpackr-extract/msgpackr-extract-linux-x64@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-3.0.2.tgz#091b1218b66c341f532611477ef89e83f25fae4f" - integrity sha512-gsWNDCklNy7Ajk0vBBf9jEx04RUxuDQfBse918Ww+Qb9HCPoGzS+XJTLe96iN3BVK7grnLiYghP/M4L8VsaHeA== +"@msgpackr-extract/msgpackr-extract-linux-x64@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-linux-x64/-/msgpackr-extract-linux-x64-2.2.0.tgz#30cae5c9a202f3e1fa1deb3191b18ffcb2f239a2" + integrity sha512-94y5PJrSOqUNcFKmOl7z319FelCLAE0rz/jPCWS+UtdMZvpa4jrQd+cJPQCLp2Fes1yAW/YUQj/Di6YVT3c3Iw== -"@msgpackr-extract/msgpackr-extract-win32-x64@3.0.2": - version "3.0.2" - resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-3.0.2.tgz#0f164b726869f71da3c594171df5ebc1c4b0a407" - integrity sha512-O+6Gs8UeDbyFpbSh2CPEz/UOrrdWPTBYNblZK5CxxLisYt4kGX3Sc+czffFonyjiGSq3jWLwJS/CCJc7tBr4sQ== +"@msgpackr-extract/msgpackr-extract-win32-x64@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@msgpackr-extract/msgpackr-extract-win32-x64/-/msgpackr-extract-win32-x64-2.2.0.tgz#016d855b6bc459fd908095811f6826e45dd4ba64" + integrity sha512-XrC0JzsqQSvOyM3t04FMLO6z5gCuhPE6k4FXuLK5xf52ZbdvcFe1yBmo7meCew9B8G2f0T9iu9t3kfTYRYROgA== "@nodelib/fs.scandir@2.1.5": version "2.1.5" @@ -1852,20 +1852,6 @@ picocolors "^1.0.0" tslib "^2.6.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" - "@sigstore/bundle@^1.1.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@sigstore/bundle/-/bundle-1.1.0.tgz#17f8d813b09348b16eeed66a8cf1c3d6bd3d04f1" @@ -1934,20 +1920,20 @@ dependencies: defer-to-connect "^2.0.0" -"@theia/application-manager@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.39.0.tgz#5a6ffd959754d17f47c125029ac4f76ba0ab3377" - integrity sha512-XgZQLRyr1Ty/xyiD2HvaL3+DeF6R/yXfgu85tTOD0wKVjRqSqI/5iSv0EBspdJUCxuVDrmQT4jBnRsXTDhixvA== +"@theia/application-manager@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/application-manager/-/application-manager-1.43.1.tgz#9d56f1400ae52128a51f2db6baa3c8a28790592c" + integrity sha512-QP2im55+95ZRmqjBGS1gDhkLpMQX1u6VEUnnw+Yeehgq32fAQeYNdNxtwPL3hnGvcFBMbhUjJF8YjMA0qQGN0A== 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.39.0" - "@theia/ffmpeg" "1.39.0" - "@theia/native-webpack-plugin" "1.39.0" + "@theia/application-package" "1.43.1" + "@theia/ffmpeg" "1.43.1" + "@theia/native-webpack-plugin" "1.43.1" "@types/fs-extra" "^4.0.2" - "@types/semver" "^7.3.8" + "@types/semver" "^7.5.0" babel-loader "^8.2.2" buffer "^6.0.3" compression-webpack-plugin "^9.0.0" @@ -1961,7 +1947,7 @@ node-abi "*" node-loader "^2.0.0" path-browserify "^1.0.1" - semver "^7.3.5" + semver "^7.5.4" setimmediate "^1.0.5" source-map "^0.6.1" source-map-loader "^2.0.1" @@ -1974,38 +1960,38 @@ worker-loader "^3.0.8" yargs "^15.3.1" -"@theia/application-package@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.39.0.tgz#e8ec34d47c059ea8215f24e8cf8b8ad7d1445c6d" - integrity sha512-5IP9DavsspA3wUo0P0Cds1ESFtJGl+7LCZnMwCl06xVJYyrii7IQ7CDy8FmG0iDZF0bFDwOwTnRgI61YqAjx3g== +"@theia/application-package@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/application-package/-/application-package-1.43.1.tgz#4937b62bca16f5c07e17712caed3b8206ce653e4" + integrity sha512-R/f3nwVxgsBvdCEjY/tocTMCFwf3OqZzPxIoTnfAbnanmzwbRk0yzXBkca5K9N5RGcNlKTWhQTSTQIX2/8y+gQ== dependencies: - "@theia/request" "1.39.0" + "@theia/request" "1.43.1" "@types/fs-extra" "^4.0.2" - "@types/semver" "^5.4.0" + "@types/semver" "^7.5.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" resolve-package-path "^4.0.3" - semver "^5.4.1" + semver "^7.5.4" write-json-file "^2.2.0" -"@theia/cli@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.39.0.tgz#7a304f7e622206dbe5b846431bfa8c582c8d4121" - integrity sha512-gYZY16dr+49hO0r1WqwHYkxR/rJ75NUtaqUa6QyO/And4QjTMvZCC1u3RAg6yLWR5NyLdd7hhRtzb8fb9kWcOA== - dependencies: - "@theia/application-manager" "1.39.0" - "@theia/application-package" "1.39.0" - "@theia/ffmpeg" "1.39.0" - "@theia/localization-manager" "1.39.0" - "@theia/ovsx-client" "1.39.0" - "@theia/request" "1.39.0" +"@theia/cli@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/cli/-/cli-1.43.1.tgz#5ada469289f4ad0aab8b0c927a631ca2a6a8a150" + integrity sha512-LqtHGAOkxGPb1c/RyV8OgMBynZSuYura7QhIMYxp4B53+1gG//aR9QK2Gut1sKP1ZLqmFzWaBAJzsb6ugLJWaQ== + dependencies: + "@theia/application-manager" "1.43.1" + "@theia/application-package" "1.43.1" + "@theia/ffmpeg" "1.43.1" + "@theia/localization-manager" "1.43.1" + "@theia/ovsx-client" "1.43.1" + "@theia/request" "1.43.1" "@types/chai" "^4.2.7" "@types/mocha" "^10.0.0" "@types/node-fetch" "^2.5.7" - chai "^4.2.0" + chai "^4.3.10" chalk "4.0.0" decompress "^4.2.1" escape-string-regexp "4.0.0" @@ -2013,16 +1999,16 @@ limiter "^2.1.0" log-update "^4.0.0" mocha "^10.1.0" - puppeteer "^19.7.2" - puppeteer-core "^19.7.2" - puppeteer-to-istanbul "^1.4.0" + 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.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.39.0.tgz#34bf07edce5e4e90ef0578acca46e51ce07450fc" - integrity sha512-EmvIpp3mKGSFO50iOm3hOa66WlyHigFOGyq1N4nVibzb82/T065LZDof8NTLXl50cMr6H3ZFhBC32TTGf4ircw== +"@theia/core@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/core/-/core-1.43.1.tgz#5fd24c68b156f6b133e74e1adbd21fd08be03a7e" + integrity sha512-aqnXVFsqvitLPYBCdgvABLQLmIrNbG7sM6ludhK94lo/QpLSVOEFKTkIv0hfaqiYVovaPIeGwVe3rOUjJcfZeQ== dependencies: "@babel/runtime" "^7.10.0" "@phosphor/algorithm" "1" @@ -2035,8 +2021,8 @@ "@phosphor/signaling" "1" "@phosphor/virtualdom" "1" "@phosphor/widgets" "1" - "@theia/application-package" "1.39.0" - "@theia/request" "1.39.0" + "@theia/application-package" "1.43.1" + "@theia/request" "1.43.1" "@types/body-parser" "^1.16.4" "@types/cookie" "^0.3.3" "@types/dompurify" "^2.2.2" @@ -2049,7 +2035,7 @@ "@types/react-dom" "^18.0.6" "@types/route-parser" "^0.1.1" "@types/safer-buffer" "^2.1.0" - "@types/ws" "^5.1.2" + "@types/ws" "^8.5.5" "@types/yargs" "^15" "@vscode/codicons" "*" ajv "^6.5.3" @@ -2074,7 +2060,7 @@ lodash.debounce "^4.0.8" lodash.throttle "^4.1.1" markdown-it "^12.3.2" - msgpackr "^1.6.1" + msgpackr "1.6.1" nsfw "^2.2.4" p-debounce "^2.1.0" perfect-scrollbar "^1.3.0" @@ -2090,31 +2076,31 @@ uuid "^8.3.2" vscode-languageserver-protocol "^3.17.2" vscode-uri "^2.1.1" - ws "^7.1.2" + ws "^8.14.1" yargs "^15.3.1" -"@theia/editor@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.39.0.tgz#ef083070b254a03dd2899975b455abbcc5dbac66" - integrity sha512-CX/Ttl48H0ZKfNq+am/lSYwzDk+y+Ok6nmgqlZ39OpwrHH6z57VvKX+GpRSFBsT8IxWRRlscx2hoBW0yURRVlQ== +"@theia/editor@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/editor/-/editor-1.43.1.tgz#bbd6180b956146fb2eb43c014f3dffb5fe9fb142" + integrity sha512-bOJGm9l2db6u9UdvoDgGXUkP0NRsDiSI9in+Y1rxl2rPXnVJD5Y2CJVwj4UkROhltPEcX60iaXxrWpcTIIgzAg== dependencies: - "@theia/core" "1.39.0" - "@theia/variable-resolver" "1.39.0" + "@theia/core" "1.43.1" + "@theia/variable-resolver" "1.43.1" -"@theia/ffmpeg@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/ffmpeg/-/ffmpeg-1.39.0.tgz#0b82b0aa876018286fed3a71dbcf9fcc56ad1c83" - integrity sha512-TegG0fsEuvHbqLVr+NbkSsb/PzCXBM1RdowJhtkvTfSqZRW5dIWwA0KcojrPR5In+67Nv+BC+7kQAIlh4DXyPg== +"@theia/ffmpeg@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/ffmpeg/-/ffmpeg-1.43.1.tgz#9c7d13a76176620e13fe9dc02a8fc2ac2596eecc" + integrity sha512-WhI3LKtcikGTmZhcE91Fh2/BXW1hjFGGt7i/uwo20HUvR6LfhCWhMeJK9BtvA9LB4tujzkhBKo6ZcunXaT1i+g== dependencies: "@electron/get" "^2.0.0" unzipper "^0.9.11" -"@theia/filesystem@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.39.0.tgz#e031d4b6e8eb6a43422844e32c1e64e2a301e70b" - integrity sha512-dhS/xMqeJ1rjmznw2v3BYt28U/ETAhrjw3DeWDSheNalIobTXEc3oCUpSgameNHDVrehpA47cYGwOTymHYfcrg== +"@theia/filesystem@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/filesystem/-/filesystem-1.43.1.tgz#a5dd4aa890bdf1e02eee2286621e7fa292d7ff24" + integrity sha512-VBCWI/bCK/ppTBxbnl7+NK7B5QuVuRHVZ/rthIsN87VTHEtKxgdSivvIYk+UYUAQ3pF4SMD5HKNRgX8E44LsSA== dependencies: - "@theia/core" "1.39.0" + "@theia/core" "1.43.1" "@types/body-parser" "^1.17.0" "@types/multer" "^1.4.7" "@types/rimraf" "^2.0.2" @@ -2126,15 +2112,16 @@ minimatch "^5.1.0" multer "1.4.4-lts.1" rimraf "^2.6.2" + stat-mode "^1.0.0" tar-fs "^1.16.2" trash "^7.2.0" uuid "^8.0.0" vscode-languageserver-textdocument "^1.0.1" -"@theia/localization-manager@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/localization-manager/-/localization-manager-1.39.0.tgz#4752b49b93f0de2c6e9aa8e121e5cf251ba7d021" - integrity sha512-RlUBmInrIhigd24kxpF8qeLcswA2QiWMXDqgQkOG6ZYfZ86aMpka6xBn6s32ijOpUwmhU7VOkFm0Zxf0DwBhEg== +"@theia/localization-manager@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/localization-manager/-/localization-manager-1.43.1.tgz#2f5af45f7b7bfdde61ca656a6a950a8ad9223bff" + integrity sha512-gnBT3fnd0rcU+4NhtmA0PbBmwyES8P8dccgtzRVVw3cUa5e6EsU7yctSzOm7SHWbQcTk6tn3XYMhIEkb0a1LxQ== dependencies: "@types/bent" "^7.0.1" "@types/fs-extra" "^4.0.2" @@ -2145,21 +2132,21 @@ glob "^7.2.0" typescript "~4.5.5" -"@theia/markers@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.39.0.tgz#b196d4f275e98c1ee6465c195e433068bb749048" - integrity sha512-Eu87s02CjmBLO615wUvN8CTRltjbHVwYTT+hs9y+pVXjhlhfpswM4P9MQxIOx8XDSoL2D00VasIybwdq3hHQGQ== +"@theia/markers@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/markers/-/markers-1.43.1.tgz#5cf6e246331ee41bff23fd38d7f0629aaa91efa4" + integrity sha512-8CCgCXqU1X96gQsSKtuhZfPcLGlqk90SBr+h+l/D1Fg847l2Ug2JzUJyAXeW8k5/NHLVD46DS45UkEb3ySBtHA== dependencies: - "@theia/core" "1.39.0" - "@theia/filesystem" "1.39.0" - "@theia/workspace" "1.39.0" + "@theia/core" "1.43.1" + "@theia/filesystem" "1.43.1" + "@theia/workspace" "1.43.1" -"@theia/messages@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.39.0.tgz#6845a448227abf6eb71f5f3a29a7fde1d1e595f0" - integrity sha512-FAUeNjssuH1Xf/uGPs6f0XJijBULflAy5iJXL5qDkZQkH+cWLJsy+1QrsRN5nxg8Cw6HUDt96Oe8DMwsYkdqRQ== +"@theia/messages@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/messages/-/messages-1.43.1.tgz#87f3bd3173419173e670046ee8f28fe7b9fd7ea4" + integrity sha512-XWHpUnaJh9XLJk3n4a6moxFMBHbyTMQ0gTgSTjdeAoVMBPpwUsUiS29IjXao+DEh5IGJX/A7kw1i+R18mERYxA== dependencies: - "@theia/core" "1.39.0" + "@theia/core" "1.43.1" react-perfect-scrollbar "^1.5.3" ts-md5 "^1.2.2" @@ -2168,128 +2155,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.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.39.0.tgz#b1943d4d94022969c3401711a45f08b497520625" - integrity sha512-fbEC27l7H0D8D968J6i+wn5wFMsmbGQpYOt/fPGdda7cCxxYlb7vy3krYbDn8EvHRMEF+2OCVydcOF41u81RxA== +"@theia/monaco@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/monaco/-/monaco-1.43.1.tgz#e721d0412d931bd7ab2e1c42dcbb71dad17a529d" + integrity sha512-X+izMwmEXMYagl83xc+0fiaXzbzXStY9l+HCEFGwfFLK+zkxcmQ4GbfYQ8LVe0J+zjsflP61NU5WOb0P8M7LlA== dependencies: - "@theia/core" "1.39.0" - "@theia/editor" "1.39.0" - "@theia/filesystem" "1.39.0" - "@theia/markers" "1.39.0" + "@theia/core" "1.43.1" + "@theia/editor" "1.43.1" + "@theia/filesystem" "1.43.1" + "@theia/markers" "1.43.1" "@theia/monaco-editor-core" "1.72.3" - "@theia/outline-view" "1.39.0" + "@theia/outline-view" "1.43.1" + "@theia/workspace" "1.43.1" fast-plist "^0.1.2" idb "^4.0.5" jsonc-parser "^2.2.0" vscode-oniguruma "1.6.1" - vscode-textmate "^7.0.3" + vscode-textmate "^9.0.0" -"@theia/native-webpack-plugin@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/native-webpack-plugin/-/native-webpack-plugin-1.39.0.tgz#3945a414d567d39448a6853feab97a637c3f1927" - integrity sha512-SOm8bBHjkHtKfocoA5pfz7b3c07SUVQWpd9JQnxDVETsVnBE64T/sEVtuR/JWMHSH5I+Znx4mQ47/vmsBNLGQQ== +"@theia/native-webpack-plugin@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/native-webpack-plugin/-/native-webpack-plugin-1.43.1.tgz#17437cef037a4432a08640b859ede7631c756be9" + integrity sha512-hLcC1Z2l9g5nh64mmhXIV3zW7Pzdz4JrjgbdiNe6XvXqsfunREsSVQBhkebyGYu2g7flqB5lD6kCXe3fcIdbdQ== dependencies: - temp "^0.9.1" webpack "^5.76.0" -"@theia/navigator@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.39.0.tgz#b76a6cf72d691576a385905499e673e39f41ef9a" - integrity sha512-4AET4BOrEdZ/kmADL0n8hm6iTy0rA7QaqwkNJfSNxW1fNkLmnfZ4zkAGb7G7z7NEAiT8x6+HkiOKxcRqm1F/jA== +"@theia/navigator@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/navigator/-/navigator-1.43.1.tgz#55d314959dd0615e711a942ffbd1b28de470f945" + integrity sha512-2uVJ2NdYvHvI/3qsgIGrr27kQFReBoKoxg+b31ywqVuTtYPYlNNcxUvvP5PZLlJ3ljESBmXNXnu9CAwkKu4D/A== dependencies: - "@theia/core" "1.39.0" - "@theia/filesystem" "1.39.0" - "@theia/workspace" "1.39.0" + "@theia/core" "1.43.1" + "@theia/filesystem" "1.43.1" + "@theia/workspace" "1.43.1" minimatch "^5.1.0" -"@theia/outline-view@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.39.0.tgz#1b4a9032730164f646dbd0d7a8b4d94b38a6d9bc" - integrity sha512-zFwxWsJmSFUxnZyC+NwWcq1P7XOOLl0or30jSZGXgIvLVBVL/5QT8Uiaxi750SpAPCl4S1zfGYYXaGWqcj2YCg== +"@theia/outline-view@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/outline-view/-/outline-view-1.43.1.tgz#cb77e05461b73a9fa5ee0006b21d1c80b3723287" + integrity sha512-XWRrlKXIhhpBMNwrpZEBb2hP+OaufOnztihYOMamnfHvXMXrQLiwq31uPKnQATgr1SV27kAXHiK51OF1QmUGnA== dependencies: - "@theia/core" "1.39.0" + "@theia/core" "1.43.1" -"@theia/ovsx-client@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.39.0.tgz#4dd3929c7ee05687fd9655a6f37ea6039c943d69" - integrity sha512-vfIAHbt66D0sbujQrQxg0KbIBU0nXexVwluHhpn9m28fgkRA+4lvNvAu0iIHu2OTWniO4CJvBzOyiALbSG10rQ== +"@theia/ovsx-client@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/ovsx-client/-/ovsx-client-1.43.1.tgz#c91c84bae2cc79bf1d86b32b44b3a898b5273e0a" + integrity sha512-T7vMRDJN6Pkokw6yOAY3nAIHgcsBaQZgqhJdwT/oJgBk9NkEwTBQH21iq015eh14cqUx55+f6YCcXxEo1+38uw== dependencies: - "@theia/request" "1.39.0" - semver "^5.4.1" + "@theia/request" "1.43.1" + semver "^7.5.4" -"@theia/preferences@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.39.0.tgz#4c7228fc646b85c5b9f8ede448820d4f312cc3b5" - integrity sha512-abO0EwpmyOD0DBRk1ReXF7jLd7aDjx5Und9tLbggrZs4dDpNsIvED5axwkA+mRTlq3gdnnVRCbBqP5HZQ3LxFA== +"@theia/preferences@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/preferences/-/preferences-1.43.1.tgz#42df05fd23d099d880c89b76a2a20a9402363272" + integrity sha512-50siy+4lIl4Us7pEsGHTe65+i2dy8bR0f6vfRrg0He6rQmw+DMlBQ1Java6rUG1Nds8v13oxZGgpkudaJZP0Mw== dependencies: - "@theia/core" "1.39.0" - "@theia/editor" "1.39.0" - "@theia/filesystem" "1.39.0" - "@theia/monaco" "1.39.0" + "@theia/core" "1.43.1" + "@theia/editor" "1.43.1" + "@theia/filesystem" "1.43.1" + "@theia/monaco" "1.43.1" "@theia/monaco-editor-core" "1.72.3" - "@theia/userstorage" "1.39.0" - "@theia/workspace" "1.39.0" + "@theia/userstorage" "1.43.1" + "@theia/workspace" "1.43.1" async-mutex "^0.3.1" fast-deep-equal "^3.1.3" jsonc-parser "^2.2.0" p-debounce "^2.1.0" -"@theia/process@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.39.0.tgz#5b0d4fb5ade9f8d550aab998d794a8645de0a141" - integrity sha512-Jm/pSNDshT09sS6GqQzRYQv7wArE7m31h7UoRksIsgVQM3xNmFOM080hkNhvvM3rTj6yGAVux5qfFZSXqBiAsg== +"@theia/process@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/process/-/process-1.43.1.tgz#0879fc4abf5269632d326becb444601d7ed53e26" + integrity sha512-Ylyhx3ZMN5Rjk8Y4JSkZJLiATe3TleWdlveHg5zZ7ZJDAWlLdeszTtiGrJ1VDiip0tUQFrsVAzh8SxT8aVvD3w== dependencies: - "@theia/core" "1.39.0" + "@theia/core" "1.43.1" node-pty "0.11.0-beta17" string-argv "^0.1.1" -"@theia/request@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/request/-/request-1.39.0.tgz#961fcfa5912232d26958a7de55e93c959a8c0a74" - integrity sha512-kDfys8mVIgbVNCdgx/rDm1harEmhO3I1gNfJE49ysS1mfyKqKifpthtnEZRQha0za9hHyUG+eVIbx2Xhf4vBIg== +"@theia/request@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/request/-/request-1.43.1.tgz#4aab28c29d0ccb7b19b8428bb6082da0d9939b71" + integrity sha512-Q8HZ2BuKD4iur7fUvRZI7c1o/wbrpyV49x8lz37n+0vmCzK+9DfyhFV8YPaOL7Dj7QXiKGzoVt/PCHSXBwb3ZQ== dependencies: http-proxy-agent "^5.0.0" https-proxy-agent "^5.0.0" -"@theia/terminal@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.39.0.tgz#5ed6cebe70bfa25be2a447923b31d1118f1bc541" - integrity sha512-a33ziDuLx+hF/3GvICvGTMBTdwQr96iUsiqBBDBNwIXoCIvG5Q33Pds0xNyH34Ik8XXRLSSWgyTiGK2eM6qreQ== - dependencies: - "@theia/core" "1.39.0" - "@theia/editor" "1.39.0" - "@theia/filesystem" "1.39.0" - "@theia/process" "1.39.0" - "@theia/variable-resolver" "1.39.0" - "@theia/workspace" "1.39.0" +"@theia/terminal@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/terminal/-/terminal-1.43.1.tgz#a00c2ef53993de17fdbf6612b411fd73df333923" + integrity sha512-BtCrx0Hh7tb7/dJdCKKYuco0n4hZht/vSeVhOT7K5JW2BUvcx73aQCQC2amaU/P9lkH9vLQ9G+JstYPDVpSfyw== + dependencies: + "@theia/core" "1.43.1" + "@theia/editor" "1.43.1" + "@theia/filesystem" "1.43.1" + "@theia/process" "1.43.1" + "@theia/variable-resolver" "1.43.1" + "@theia/workspace" "1.43.1" xterm "^4.16.0" xterm-addon-fit "^0.5.0" xterm-addon-search "^0.8.2" -"@theia/userstorage@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.39.0.tgz#774d4a9f9f29ce4f092cd1e3493cd879cdb2f732" - integrity sha512-2zuXUQpakhjZY5VS5I1v4kO05TP6yK7tsgKSQWblddQIK9sO/IlfwdEbIjbrWpyPcFZuQzaCL+TCuWz1ryFfzQ== +"@theia/userstorage@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/userstorage/-/userstorage-1.43.1.tgz#273ee06f636933f222221b00d0292f1ec0d7fb48" + integrity sha512-PYfKgDqz8dkY2Vy85qnn76+s89qCwDWMpDO7W7zfEmE+mv28dzcx+ueghYUeEQutuAzU7vAToeWmqxdBv98dyA== dependencies: - "@theia/core" "1.39.0" - "@theia/filesystem" "1.39.0" + "@theia/core" "1.43.1" + "@theia/filesystem" "1.43.1" -"@theia/variable-resolver@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.39.0.tgz#89463838476ab912ad9e1c6ccb8ce33b35f149dd" - integrity sha512-7JUMayOJekDcQbVGs2K1XhmDb+zlGL1n1bSwVC1K9/MxPlrcmoevEvMz36qboP+J6ym/S3kNchrth9lo0uxO9A== +"@theia/variable-resolver@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.43.1.tgz#b800987959001c8655e7f58efd19f4f28412a8dd" + integrity sha512-Gdlb8CwIJcqkM27C02ENymC5zbrvHLgdEtF9OWDIJbtwHd/2DGxzByjkX3T4E66MFL6g71+Mas9CDWx1gxs8sQ== dependencies: - "@theia/core" "1.39.0" + "@theia/core" "1.43.1" -"@theia/workspace@1.39.0": - version "1.39.0" - resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.39.0.tgz#bb29c466141b5584f3ae078cf658d5547950a4c9" - integrity sha512-3/mFMvgdkKj8+DPaWUGD0vQlFFlx7k6WKp5nAtOXz2DZSAb/wXlqH+ex0MgPtJZyCccg+YdVeoWW19Gpp6YWOA== +"@theia/workspace@1.43.1": + version "1.43.1" + resolved "https://registry.yarnpkg.com/@theia/workspace/-/workspace-1.43.1.tgz#48aad949784b515432d384456a28b8b6e78075ec" + integrity sha512-jpn0VpJZD4bZcwzOPbRJlzp2TyJePsA0cEsLjoq7La03iCYUJs3EfjFKZ265v3dPihKqmOTg72yIzSQ/6GFHeQ== dependencies: - "@theia/core" "1.39.0" - "@theia/filesystem" "1.39.0" - "@theia/variable-resolver" "1.39.0" + "@theia/core" "1.43.1" + "@theia/filesystem" "1.43.1" + "@theia/variable-resolver" "1.43.1" jsonc-parser "^2.2.0" valid-filename "^2.0.1" @@ -2337,9 +2324,9 @@ "@types/responselike" "^1.0.0" "@types/chai@^4.2.7": - version "4.3.10" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.10.tgz#2ad2959d1767edee5b0e4efb1a0cd2b500747317" - integrity sha512-of+ICnbqjmFCiixUnqRulbylyXQrPqIGf/B3Jax1wIF3DvSheysQxAWvqHhZiW3IQrycvokcLcFQlveGp+vyNg== + version "4.3.11" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.11.tgz#e95050bf79a932cb7305dd130254ccdf9bde671c" + integrity sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ== "@types/connect@*": version "3.4.38" @@ -2359,9 +2346,9 @@ integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q== "@types/cors@^2.8.12": - version "2.8.16" - resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.16.tgz#a24bf65acd216c078890ca6ceb91e672adb158e7" - integrity sha512-Trx5or1Nyg1Fq138PCuWqoApzvoSLWzZ25ORBiHMbbUT42g578lH1GT4TwYDbiUOLFuDsCkfLneT2105fsFWGg== + version "2.8.17" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.17.tgz#5d718a5e494a8166f569d986794e49c48b216b2b" + integrity sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA== dependencies: "@types/node" "*" @@ -2393,11 +2380,6 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4" integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw== -"@types/events@*": - version "3.0.3" - resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.3.tgz#a8ef894305af28d1fc6d2dfdfc98e899591ea529" - integrity sha512-trOc4AAUThEz9hapPtSd7wf5tiQKvTtu5b371UxXdTuqzIh0ArcRspRP0i0Viu+LXstIQ1z96t1nsPxT9ol01g== - "@types/express-serve-static-core@^4.17.33": version "4.17.41" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.41.tgz#5077defa630c2e8d28aa9ffc2c01c157c305bef6" @@ -2480,9 +2462,9 @@ "@types/lodash" "*" "@types/lodash@*": - version "4.14.201" - resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.201.tgz#76f47cb63124e806824b6c18463daf3e1d480239" - integrity sha512-y9euML0cim1JrykNxADLfaG0FgD1g/yTHwUs/Jg9ZIU7WKj2/4IW9Lbb1WZbvck78W/lfGXFfe+u2EGfIJXdLQ== + version "4.14.202" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.202.tgz#f09dbd2fb082d507178b2f2a5c7e74bd72ff98f8" + integrity sha512-OvlIYQK9tNneDlS0VN54LLd5uiPCBOp7gS5Z0f1mjoJYBrtStzgmJBxONW3U6OZqdtNzZPmn9BS/7WI7BFFcFQ== "@types/markdown-it@^12.2.3": version "12.2.3" @@ -2523,14 +2505,14 @@ integrity sha512-hov8bUuiLiyFPGyFPE1lwWhmzYbirOXQNNo40+y3zow8aFVTeyn3VWL0VFFfdNddA8S4Vf0Tc062rzyNr7Paag== "@types/mocha@^10.0.0": - version "10.0.4" - resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.4.tgz#b5331955ebca216604691fd4fcd2dbdc2bd559a4" - integrity sha512-xKU7bUjiFTIttpWaIZ9qvgg+22O1nmbA+HRxdlR+u6TWsGfmFdXrheJoK4fFxrHNVIOBDvDNKZG+LYBpMHpX3w== + version "10.0.6" + resolved "https://registry.yarnpkg.com/@types/mocha/-/mocha-10.0.6.tgz#818551d39113081048bdddbef96701b4e8bb9d1b" + integrity sha512-dJvrYWxP/UcXm36Qn36fxhUKu8A/xMRXVT2cliFF1Z7UA9liG5Psj3ezNSZw+5puH2czDXRLcXQxf8JbJt0ejg== "@types/multer@^1.4.7": - version "1.4.10" - resolved "https://registry.yarnpkg.com/@types/multer/-/multer-1.4.10.tgz#6bca159aaaf40ec130e99831a08e3d0ed54be611" - integrity sha512-6l9mYMhUe8wbnz/67YIjc7ZJyQNZoKq7fRXVf7nMdgWgalD0KyzJ2ywI7hoATUSXSbTu9q2HBiEwzy0tNN1v2w== + version "1.4.11" + resolved "https://registry.yarnpkg.com/@types/multer/-/multer-1.4.11.tgz#c70792670513b4af1159a2b60bf48cc932af55c5" + integrity sha512-svK240gr6LVWvv3YGyhLlA+6LRRWA4mnGIU7RcNmgjBYFl6665wcXrRfxGp5tEPVHUNm5FMcmq7too9bxCwX/w== dependencies: "@types/express" "*" @@ -2543,9 +2525,9 @@ form-data "^4.0.0" "@types/node@*", "@types/node@>=10.0.0": - version "20.9.2" - resolved "https://registry.yarnpkg.com/@types/node/-/node-20.9.2.tgz#002815c8e87fe0c9369121c78b52e800fadc0ac6" - integrity sha512-WHZXKFCEyIUJzAwh3NyyTHYSR35SevJ6mZ1nWwJafKtiQbqRTIKSRcw3Ma3acqgsent3RRDqeVwpHntMk+9irg== + version "20.10.0" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.0.tgz#16ddf9c0a72b832ec4fcce35b8249cf149214617" + integrity sha512-D0WfRmU9TQ8I9PFx9Yc+EBHw+vSpIub4IDvQivcp26PtPrdMGAq5SDcpXEo/epqa/DXotVpekHiLNTg3iaKXBQ== dependencies: undici-types "~5.26.4" @@ -2560,9 +2542,9 @@ integrity sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw== "@types/prop-types@*": - version "15.7.10" - resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.10.tgz#892afc9332c4d62a5ea7e897fe48ed2085bbb08a" - integrity sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A== + version "15.7.11" + resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.11.tgz#2596fb352ee96a1379c657734d4b913a613ad563" + integrity sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng== "@types/qs@*": version "6.9.10" @@ -2575,16 +2557,16 @@ integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ== "@types/react-dom@^18.0.6": - version "18.2.15" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.15.tgz#921af67f9ee023ac37ea84b1bc0cc40b898ea522" - integrity sha512-HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg== + version "18.2.17" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-18.2.17.tgz#375c55fab4ae671bd98448dcfa153268d01d6f64" + integrity sha512-rvrT/M7Df5eykWFxn6MYt5Pem/Dbyc1N8Y0S9Mrkw2WFCRiqUgw9P7ul2NpwsXCSM1DVdENzdG9J5SreqfAIWg== dependencies: "@types/react" "*" "@types/react@*", "@types/react@^18.0.15": - version "18.2.37" - resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.37.tgz#0f03af69e463c0f19a356c2660dbca5d19c44cae" - integrity sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw== + version "18.2.38" + resolved "https://registry.yarnpkg.com/@types/react/-/react-18.2.38.tgz#3605ca41d3daff2c434e0b98d79a2469d4c2dd52" + integrity sha512-cBBXHzuPtQK6wNthuVMV6IjHAFkdl/FOPFIlkd81/Cd1+IqkHu/A+w4g43kaQQoYHik/ruaQBDL72HyCy1vuMw== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2618,19 +2600,14 @@ "@types/node" "*" "@types/scheduler@*": - version "0.16.6" - resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.6.tgz#eb26db6780c513de59bee0b869ef289ad3068711" - integrity sha512-Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA== - -"@types/semver@^5.4.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-5.5.0.tgz#146c2a29ee7d3bae4bf2fcb274636e264c813c45" - integrity sha512-41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ== + version "0.16.8" + resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.8.tgz#ce5ace04cfeabe7ef87c0091e50752e36707deff" + integrity sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A== -"@types/semver@^7.3.8", "@types/semver@^7.5.0": - version "7.5.5" - resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.5.tgz#deed5ab7019756c9c90ea86139106b0346223f35" - integrity sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg== +"@types/semver@^7.5.0": + version "7.5.6" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" + integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== "@types/send@*": version "0.17.4" @@ -2670,9 +2647,9 @@ integrity sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA== "@types/trusted-types@*": - version "2.0.6" - resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.6.tgz#d12451beaeb9c3838f12024580dc500b7e88b0ad" - integrity sha512-HYtNooPvUY9WAVRBr4u+4Qa9fYD1ze2IUlAD3HoA6oehn1taGwBx3Oa52U4mTslTS+GAExKpaFu39Y5xUEwfjg== + version "2.0.7" + resolved "https://registry.yarnpkg.com/@types/trusted-types/-/trusted-types-2.0.7.tgz#baccb07a970b91707df3a3e8ba6896c57ead2d11" + integrity sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw== "@types/uuid@^7.0.3": version "7.0.8" @@ -2684,12 +2661,11 @@ resolved "https://registry.yarnpkg.com/@types/write-json-file/-/write-json-file-2.2.1.tgz#74155aaccbb0d532be21f9d66bebc4ea875a5a62" integrity sha512-JdO/UpPm9RrtQBNVcZdt3M7j3mHO/kXaea9LBGx3UgWJd1f9BkIWP7jObLBG6ZtRyqp7KzLFEsaPhWcidVittA== -"@types/ws@^5.1.2": - version "5.1.2" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-5.1.2.tgz#f02d3b1cd46db7686734f3ce83bdf46c49decd64" - integrity sha512-NkTXUKTYdXdnPE2aUUbGOXE1XfMK527SCvU/9bj86kyFF6kZ9ZnOQ3mK5jADn98Y2vEUD/7wKDgZa7Qst2wYOg== +"@types/ws@^8.5.5": + version "8.5.10" + resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.10.tgz#4acfb517970853fa6574a3a6886791d04a396787" + integrity sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A== dependencies: - "@types/events" "*" "@types/node" "*" "@types/yargs-parser@*": @@ -2698,9 +2674,9 @@ integrity sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ== "@types/yargs@^15": - version "15.0.18" - resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.18.tgz#b7dda4339f4dde367ffe99650e18967108cea321" - integrity sha512-DDi2KmvAnNsT/EvU8jp1UR7pOJojBtJ3GLZ/uw1MUq4VbbESppPWoHUY4h0OB4BbEbGJiyEsmUcuZDZtoR+ZwQ== + version "15.0.19" + resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.19.tgz#328fb89e46109ecbdb70c295d96ff2f46dfd01b9" + integrity sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA== dependencies: "@types/yargs-parser" "*" @@ -3477,9 +3453,9 @@ bent@^7.1.0: is-stream "^2.0.0" big-integer@^1.6.17, big-integer@^1.6.44: - version "1.6.51" - resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.51.tgz#0df92a5d9880560d3ff2d5fd20245c889d130686" - integrity sha512-GPEid2Y9QU1Exl1rpO9B2IPJGHPSupF5GnVIP0blYvNOMer2bTvSWs1jGOUg04hTmu67nmLsQ9TBo1puaotBHg== + version "1.6.52" + resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.52.tgz#60a887f3047614a8e1bffe5d7173490a97dc8c85" + integrity sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg== big.js@^5.2.2: version "5.2.2" @@ -3812,16 +3788,16 @@ camelcase@^6.0.0: integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA== caniuse-lite@^1.0.30001541: - version "1.0.30001563" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001563.tgz#aa68a64188903e98f36eb9c56e48fba0c1fe2a32" - integrity sha512-na2WUmOxnwIZtwnFI2CZ/3er0wdNzU7hN+cPYz/z2ajHThnkWjNBOpEPP4n+4r2WPM847JaMotaJE3bnfzjyKw== + version "1.0.30001564" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001564.tgz#eaa8bbc58c0cbccdcb7b41186df39dd2ba591889" + integrity sha512-DqAOf+rhof+6GVx1y+xzbFPeOumfQnhYzVnZD6LAXijR77yPtm9mfOcqOnT3mpnJiZVT+kwLAFnRlZcIz+c6bg== caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw== -chai@^4.2.0: +chai@^4.3.10: version "4.3.10" resolved "https://registry.yarnpkg.com/chai/-/chai-4.3.10.tgz#d784cec635e3b7e2ffb66446a63b4e33bd390384" integrity sha512-0UXG04VuVbruMUYbJ6JctvH0YnC/4q3/AkT18q4NaITo91CUm0liMS9VqzT9vZhVQ/1eqPanMWjBM+Juhfb/9g== @@ -3916,10 +3892,10 @@ 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== +chromium-bidi@0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/chromium-bidi/-/chromium-bidi-0.4.4.tgz#44f25d4fa5d2f3debc3fc3948d0657194cac4407" + integrity sha512-4BX5cSaponuvVT1+SbLYTOAgDoVtX/Khoc9UsbFJ/AsPVUeFAM3RiIDFI6XFhLYMi9WmVJqh1ZH+dRpNKkKwiQ== dependencies: mitt "3.0.0" @@ -3951,9 +3927,9 @@ cli-spinners@2.6.1: integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g== cli-spinners@^2.5.0: - version "2.9.1" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.1.tgz#9c0b9dad69a6d47cbb4333c14319b060ed395a35" - integrity sha512-jHgecW0pxkonBJdrKsqxgRX9AcG+u/5k0Q7WPDfi8AogLAdwxEkyYYNWwZ5GvVFoFx2uiY1eNcSK00fh+1+FyQ== + version "2.9.2" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41" + integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg== cli-width@^3.0.0: version "3.0.0" @@ -4025,11 +4001,6 @@ cmd-shim@^6.0.0: resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-6.0.2.tgz#435fd9e5c95340e61715e19f90209ed6fcd9e0a4" integrity sha512-+FFYbB0YLaAkhkcrjkyNLYDiOsFSfRjwjY19LXk/psmMx1z00xlCv7hhQoTGXXIKi+YXHL/iiFo8NqMVQX9nOw== -code-point-at@^1.0.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" - integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA== - color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" @@ -4318,10 +4289,10 @@ cosmiconfig@7.0.0: path-type "^4.0.0" yaml "^1.10.0" -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== +cosmiconfig@8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-8.0.0.tgz#e9feae014eab580f858f8a0288f38997a7bebe97" + integrity sha512-da1EafcpH6b/TD8vDRaWV7xFINlHlF6zKsGwS1TsuVJTZRkquaS5HTMq7uq6h31619QjbsYl21gVDOm32KM1vQ== dependencies: import-fresh "^3.2.1" js-yaml "^4.1.0" @@ -4643,10 +4614,10 @@ 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== +devtools-protocol@0.0.1094867: + version "0.0.1094867" + resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.1094867.tgz#2ab93908e9376bd85d4e0604aa2651258f13e374" + integrity sha512-pmMDBKiRVjh0uKK6CT1WqZmM3hBVSgD+N2MrgyV1uNizAZMw4tx6i/RTc+/uCsKSCmg0xXx7arCP/OFcIwTsiQ== diff@5.0.0: version "5.0.0" @@ -4727,11 +4698,6 @@ duplexer@^0.1.1: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== -eastasianwidth@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb" - integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA== - ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" @@ -4765,20 +4731,15 @@ electron-rebuild@^3.2.7: yargs "^17.0.1" electron-to-chromium@^1.4.535: - version "1.4.589" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.589.tgz#3fc83c284ed8f1f58e0cb3c664c8ebcb4d0b42fb" - integrity sha512-zF6y5v/YfoFIgwf2dDfAqVlPPsyQeWNpEWXbAlDUS8Ax4Z2VoiiZpAPC0Jm9hXEkJm2vIZpwB6rc4KnLTQffbQ== + version "1.4.594" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.594.tgz#f69f207fba80735a44a988df42f3f439115d0515" + integrity sha512-xT1HVAu5xFn7bDfkjGQi9dNpMqGchUkebwf1GL7cZN32NSwwlHRPMSDJ1KN6HkS0bWUtndbSQZqvpQftKG2uFQ== emoji-regex@^8.0.0: version "8.0.0" resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== -emoji-regex@^9.2.2: - version "9.2.2" - resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.2.2.tgz#840c8803b0d8047f4ff0cf963176b32d4ef3ed72" - integrity sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg== - emojis-list@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78" @@ -6482,13 +6443,6 @@ is-extglob@^2.1.1: resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ== -is-fullwidth-code-point@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" - integrity sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw== - dependencies: - number-is-nan "^1.0.0" - is-fullwidth-code-point@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" @@ -6887,7 +6841,7 @@ kind-of@^6.0.2, kind-of@^6.0.3: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -lerna@^6.1.0: +lerna@^6.6.1: version "6.6.2" resolved "https://registry.yarnpkg.com/lerna/-/lerna-6.6.2.tgz#ad921f913aca4e7307123a598768b6f15ca5804f" integrity sha512-W4qrGhcdutkRdHEaDf9eqp7u4JvI+1TwFy5woX6OI8WPe4PYBdxuILAsvhp614fUG41rKSGDKlOh+AWzdSidTg== @@ -7193,9 +7147,9 @@ lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== "lru-cache@^9.1.1 || ^10.0.0": - version "10.0.3" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.0.3.tgz#b40014d7d2d16d94130b87297a04a1f24874ae7c" - integrity sha512-B7gr+F6MkqB3uzINHXNctGieGsRTMwIBgxkp0yq/5BwcuDzD4A8wQpHQW6vDAm1uKSLQghmRdD9sKqf2vJ1cEg== + version "10.1.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484" + integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag== lzma-native@^8.0.5: version "8.0.6" @@ -7653,26 +7607,26 @@ ms@2.1.3, ms@^2.0.0, ms@^2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== -msgpackr-extract@^3.0.2: - version "3.0.2" - resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-3.0.2.tgz#e05ec1bb4453ddf020551bcd5daaf0092a2c279d" - integrity sha512-SdzXp4kD/Qf8agZ9+iTu6eql0m3kWm1A2y1hkpTeVNENutaB0BwHlSvAIaMxwntmRUAUjon2V4L8Z/njd0Ct8A== +msgpackr-extract@^2.0.2: + version "2.2.0" + resolved "https://registry.yarnpkg.com/msgpackr-extract/-/msgpackr-extract-2.2.0.tgz#4bb749b58d9764cfdc0d91c7977a007b08e8f262" + integrity sha512-0YcvWSv7ZOGl9Od6Y5iJ3XnPww8O7WLcpYMDwX+PAA/uXLDtyw94PJv9GLQV/nnp3cWlDhMoyKZIQLrx33sWog== dependencies: - node-gyp-build-optional-packages "5.0.7" + node-gyp-build-optional-packages "5.0.3" optionalDependencies: - "@msgpackr-extract/msgpackr-extract-darwin-arm64" "3.0.2" - "@msgpackr-extract/msgpackr-extract-darwin-x64" "3.0.2" - "@msgpackr-extract/msgpackr-extract-linux-arm" "3.0.2" - "@msgpackr-extract/msgpackr-extract-linux-arm64" "3.0.2" - "@msgpackr-extract/msgpackr-extract-linux-x64" "3.0.2" - "@msgpackr-extract/msgpackr-extract-win32-x64" "3.0.2" - -msgpackr@^1.6.1: - version "1.9.9" - resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.9.9.tgz#ec71e37beb8729280847f683cb0a340eb35ce70f" - integrity sha512-sbn6mioS2w0lq1O6PpGtsv6Gy8roWM+o3o4Sqjd6DudrL/nOugY+KyJUimoWzHnf9OkO0T6broHFnYE/R05t9A== + "@msgpackr-extract/msgpackr-extract-darwin-arm64" "2.2.0" + "@msgpackr-extract/msgpackr-extract-darwin-x64" "2.2.0" + "@msgpackr-extract/msgpackr-extract-linux-arm" "2.2.0" + "@msgpackr-extract/msgpackr-extract-linux-arm64" "2.2.0" + "@msgpackr-extract/msgpackr-extract-linux-x64" "2.2.0" + "@msgpackr-extract/msgpackr-extract-win32-x64" "2.2.0" + +msgpackr@1.6.1: + version "1.6.1" + resolved "https://registry.yarnpkg.com/msgpackr/-/msgpackr-1.6.1.tgz#4f3c94d6a5b819b838ffc736eddaf60eba436d20" + integrity sha512-Je+xBEfdjtvA4bKaOv8iRhjC8qX2oJwpYH4f7JrG4uMVJVmnmkAT4pjKdbztKprGj3iwjcxPzb5umVZ02Qq3tA== optionalDependencies: - msgpackr-extract "^3.0.2" + msgpackr-extract "^2.0.2" multer@1.4.4-lts.1: version "1.4.4-lts.1" @@ -7799,15 +7753,15 @@ node-fetch@^2.6.7: dependencies: whatwg-url "^5.0.0" -node-gyp-build-optional-packages@5.0.7: - version "5.0.7" - resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.7.tgz#5d2632bbde0ab2f6e22f1bbac2199b07244ae0b3" - integrity sha512-YlCCc6Wffkx0kHkmam79GKvDQ6x+QZkMjFGrIMxgFNILFvGSbCp2fCBC55pGTT9gVaz8Na5CLmxt/urtzRv36w== +node-gyp-build-optional-packages@5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz#92a89d400352c44ad3975010368072b41ad66c17" + integrity sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA== node-gyp-build@^4.2.1, node-gyp-build@^4.3.0: - version "4.7.0" - resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.7.0.tgz#749f0033590b2a89ac8edb5e0775f95f5ae86d15" - integrity sha512-PbZERfeFdrHQOOXiAKOY0VPbykZy90ndPKk0d+CFDegTKmWp1VgOTz2xACVbr1BjCWxrQp68CXtvNsveFhqDJg== + version "4.7.1" + resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.7.1.tgz#cd7d2eb48e594874053150a9418ac85af83ca8f7" + integrity sha512-wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg== node-gyp@^9.0.0: version "9.4.1" @@ -8103,11 +8057,6 @@ nsfw@^2.2.4: dependencies: node-addon-api "^5.0.0" -number-is-nan@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d" - integrity sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ== - nx@15.9.7, "nx@>=15.5.2 < 16": version "15.9.7" resolved "https://registry.yarnpkg.com/nx/-/nx-15.9.7.tgz#f0e713cedb8637a517d9c4795c99afec4959a1b6" @@ -8889,24 +8838,24 @@ punycode@^2.1.0, punycode@^2.1.1: resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== -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== +puppeteer-core@19.7.2: + version "19.7.2" + resolved "https://registry.yarnpkg.com/puppeteer-core/-/puppeteer-core-19.7.2.tgz#deee9ef915829b6a1d1a3a008625c29eeb251161" + integrity sha512-PvI+fXqgP0uGJxkyZcX51bnzjFA73MODZOAv0fSD35yR7tvbqwtMV3/Y+hxQ0AMMwzxkEebP6c7po/muqxJvmQ== dependencies: - "@puppeteer/browsers" "0.5.0" - chromium-bidi "0.4.7" + chromium-bidi "0.4.4" cross-fetch "3.1.5" debug "4.3.4" - devtools-protocol "0.0.1107588" + devtools-protocol "0.0.1094867" extract-zip "2.0.1" https-proxy-agent "5.0.1" proxy-from-env "1.1.0" + rimraf "3.0.2" tar-fs "2.1.1" unbzip2-stream "1.4.3" - ws "8.13.0" + ws "8.11.0" -puppeteer-to-istanbul@^1.4.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== @@ -8916,17 +8865,16 @@ puppeteer-to-istanbul@^1.4.0: v8-to-istanbul "^1.2.1" yargs "^15.3.1" -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== +puppeteer@19.7.2: + version "19.7.2" + resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-19.7.2.tgz#1b3ce99a093cc2f8f84dfb06f066d0757ea79d4b" + integrity sha512-4Lm7Qpe/LU95Svirei/jDLDvR5oMrl9BPGd7HMY5+Q28n+BhvKuW97gKkR+1LlI86bO8J3g8rG/Ll5kv9J1nlQ== dependencies: - "@puppeteer/browsers" "0.5.0" - cosmiconfig "8.1.3" + cosmiconfig "8.0.0" https-proxy-agent "5.0.1" progress "2.0.3" proxy-from-env "1.1.0" - puppeteer-core "19.11.1" + puppeteer-core "19.7.2" q@^1.5.1: version "1.5.1" @@ -9369,7 +9317,7 @@ rimraf@2, rimraf@^2.6.1, rimraf@^2.6.2: dependencies: glob "^7.1.3" -rimraf@^3.0.0, rimraf@^3.0.2: +rimraf@3.0.2, rimraf@^3.0.0, rimraf@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== @@ -9935,6 +9883,11 @@ ssri@^10.0.0, ssri@^10.0.1: dependencies: minipass "^7.0.3" +stat-mode@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-1.0.0.tgz#68b55cb61ea639ff57136f36b216a291800d1465" + integrity sha512-jH9EhtKIjuXZ2cWxmXS8ZP80XyC3iasQxMDV8jzhNJpfDb7VbQLVW4Wvsxz9QZvzV+G4YoSfBUVKDOyxLzi/sg== + statuses@2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63" @@ -9958,7 +9911,7 @@ string-replace-loader@^3.1.0: loader-utils "^2.0.0" schema-utils "^3.0.0" -"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, string-width@^1.0.1, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3, string-width@^5.0.1, string-width@^5.1.2: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -9967,24 +9920,6 @@ string-replace-loader@^3.1.0: is-fullwidth-code-point "^3.0.0" strip-ansi "^6.0.1" -string-width@^1.0.1: - version "1.0.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3" - integrity sha512-0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw== - dependencies: - code-point-at "^1.0.0" - is-fullwidth-code-point "^1.0.0" - strip-ansi "^3.0.0" - -string-width@^5.0.1, string-width@^5.1.2: - version "5.1.2" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-5.1.2.tgz#14f8daec6d81e7221d2a357e668cab73bdbca794" - integrity sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA== - dependencies: - eastasianwidth "^0.2.0" - emoji-regex "^9.2.2" - strip-ansi "^7.0.1" - string.prototype.trim@^1.2.8: version "1.2.8" resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz#f9ac6f8af4bd55ddfa8895e6aea92a96395393bd" @@ -10033,7 +9968,7 @@ string_decoder@~1.1.1: dependencies: ansi-regex "^5.0.1" -strip-ansi@^3.0.0, strip-ansi@^3.0.1: +strip-ansi@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf" integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg== @@ -10558,11 +10493,16 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -"typescript@^3 || ^4", typescript@^4.9.3: +"typescript@^3 || ^4": version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g== +typescript@^5.2.2: + version "5.3.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.2.tgz#00d1c7c1c46928c5845c1ee8d0cc2791031d4c43" + integrity sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ== + typescript@~4.5.5: version "4.5.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3" @@ -10852,10 +10792,10 @@ vscode-oniguruma@1.6.1: resolved "https://registry.yarnpkg.com/vscode-oniguruma/-/vscode-oniguruma-1.6.1.tgz#2bf4dfcfe3dd2e56eb549a3068c8ee39e6c30ce5" integrity sha512-vc4WhSIaVpgJ0jJIejjYxPvURJavX6QG41vu0mGhqywMkQqulezEqEQ3cO3gc8GvcOpX6ycmKGqRoROEMBNXTQ== -vscode-textmate@^7.0.3: - version "7.0.4" - resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-7.0.4.tgz#a30df59ce573e998e4e2ffbca5ab82d57bc3126f" - integrity sha512-9hJp0xL7HW1Q5OgGe03NACo7yiCTMEk3WU/rtKXUbncLtdg6rVVNJnHwD88UhbIYU2KoxY0Dih0x+kIsmUKn2A== +vscode-textmate@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/vscode-textmate/-/vscode-textmate-9.0.0.tgz#313c6c8792b0507aef35aeb81b6b370b37c44d6c" + integrity sha512-Cl65diFGxz7gpwbav10HqiY/eVYTO1sjQpmRmV991Bj7wAoOAjGQ97PpQcXorDE2Uc4hnGWLY17xme+5t6MlSg== vscode-uri@^2.1.1: version "2.1.2" @@ -11124,21 +11064,16 @@ write-pkg@4.0.0: type-fest "^0.4.1" write-json-file "^3.2.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" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" - integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== - -ws@~8.11.0: +ws@8.11.0, ws@~8.11.0: version "8.11.0" resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143" integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg== +ws@^8.14.1: + version "8.14.2" + resolved "https://registry.yarnpkg.com/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f" + integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g== + xdg-basedir@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13" @@ -11250,19 +11185,6 @@ yargs@16.2.0, yargs@^16.2.0: y18n "^5.0.5" yargs-parser "^20.2.2" -yargs@17.7.1: - 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" diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramConfiguration.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramConfiguration.java index aeab5b82..53aea6ae 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramConfiguration.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/BPMNDiagramConfiguration.java @@ -452,19 +452,6 @@ public ServerLayoutKind getLayoutKind() { return ServerLayoutKind.MANUAL; } - /** - * Boolean flag to specific whether the diagram implementation expects the - * client to provide layout information for certain diagram element. Default is - * 'true'. - * - * @return Boolean flag to indicate whether the client needs to be involved in - * the layout process. - */ - @Override - public boolean needsClientLayout() { - return true; - } - @Override public boolean animatedUpdate() { return false; diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/launch/BPMNCLIParserOld.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/launch/BPMNCLIParserOld.java deleted file mode 100644 index a55cb3be..00000000 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/launch/BPMNCLIParserOld.java +++ /dev/null @@ -1,54 +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 - * https://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 - ********************************************************************************/ -package org.openbpmn.glsp.launch; - -import org.apache.commons.cli.Options; -import org.apache.commons.cli.ParseException; -import org.apache.logging.log4j.Level; -import org.eclipse.glsp.server.launch.DefaultCLIParser; - -public class BPMNCLIParserOld extends DefaultCLIParser { - public static final String OPTION_WEBSOCKET = "websocket"; - public static final String OPTION_JETTY_LOG_LEVEL = "jettyLogLevel"; - - public static final class BPMNLaunchOptions { - public static final Level WEBSOCKET_LOG_LEVEL = Level.INFO; - } - - public BPMNCLIParserOld(final String[] args, final String processName) - throws ParseException { - super(args, BPMNCLIParserOld.getDefaultOptions(), processName); - } - - public boolean isWebsocket() { - return hasOption(OPTION_WEBSOCKET); - } - - public Level parseWebsocketLogLevel() { - String levelArg = parseOption(OPTION_JETTY_LOG_LEVEL, BPMNLaunchOptions.WEBSOCKET_LOG_LEVEL.toString()); - return Level.toLevel(levelArg, BPMNLaunchOptions.WEBSOCKET_LOG_LEVEL); - } - - public static Options getDefaultOptions() { - Options options = DefaultCLIParser.getDefaultOptions(); - options.addOption("w", OPTION_WEBSOCKET, false, - "Use websocket launcher instead of default launcher."); - options.addOption("j", OPTION_JETTY_LOG_LEVEL, true, - "Set the log level for the Jetty websocket server. [default='INFO']"); - return options; - } - -} diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/launch/BPMNServerLauncher.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/launch/BPMNServerLauncher.java index 3d9b21d8..2198ecc6 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/launch/BPMNServerLauncher.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/launch/BPMNServerLauncher.java @@ -21,7 +21,6 @@ import org.eclipse.glsp.server.launch.GLSPServerLauncher; import org.eclipse.glsp.server.launch.SocketGLSPServerLauncher; import org.eclipse.glsp.server.utils.LaunchUtil; -//import org.openbpmn.glsp.BPMNDiagramModule; import org.openbpmn.glsp.BPMNDiagramModule; public final class BPMNServerLauncher { @@ -29,7 +28,7 @@ private BPMNServerLauncher() { } public static void main(final String[] args) { - String processName = "open-bpmn.server-X.X.X-glsp.jar"; + String processName = "OpenBPMNServer"; try { DefaultCLIParser parser = new DefaultCLIParser(args, processName); LaunchUtil.configure(parser); @@ -40,22 +39,9 @@ public static void main(final String[] args) { GLSPServerLauncher launcher = new SocketGLSPServerLauncher(bpmnServerModule); launcher.start("localhost", port); - // BPMNCLIParserOld parser = new BPMNCLIParserOld(args, processName); - // int port = parser.parsePort(); - // String host = parser.parseHostname(); - // ServerModule bpmnServerModule = new BPMNServerModule() - // .configureDiagramModule(new BPMNDiagramModule()); - - // GLSPServerLauncher launcher = parser.isWebsocket() - // ? new WebsocketServerLauncher(bpmnServerModule, "/bpmn", - // parser.parseWebsocketLogLevel()) - // : new SocketGLSPServerLauncher(bpmnServerModule); - - // launcher.start(host, port, parser); } catch (ParseException ex) { ex.printStackTrace(); - System.out.println(); - LaunchUtil.printHelp(processName, BPMNCLIParserOld.getDefaultOptions()); + LaunchUtil.printHelp(processName, DefaultCLIParser.getDefaultOptions()); } } } diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/launch/BPMNServerModuleOld.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/launch/BPMNServerModuleOld.java deleted file mode 100644 index 56afb3ae..00000000 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/launch/BPMNServerModuleOld.java +++ /dev/null @@ -1,28 +0,0 @@ -/******************************************************************************** - * Copyright (c) 2023 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 - * https://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 - ********************************************************************************/ -package org.openbpmn.glsp.launch; - -import org.eclipse.glsp.server.di.ServerModule; -import org.eclipse.glsp.server.protocol.GLSPServer; -import org.openbpmn.glsp.BPMNGLSPServer; - -public class BPMNServerModuleOld extends ServerModule { - - @Override - protected Class bindGLSPServer() { - return BPMNGLSPServer.class; - } -} diff --git a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNSourceModelStorage.java b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNSourceModelStorage.java index 3beb06ee..cb365fca 100644 --- a/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNSourceModelStorage.java +++ b/open-bpmn.glsp-server/src/main/java/org/openbpmn/glsp/model/BPMNSourceModelStorage.java @@ -74,12 +74,11 @@ public class BPMNSourceModelStorage implements SourceModelStorage { public void loadSourceModel(final RequestModelAction action) { Map options = action.getOptions(); - boolean bNeedsClientLayout = Boolean.parseBoolean(options.get("needsClientLayout")); final File file = getSourceFile(modelState); logger.debug("loadSourceModel from : " + file); String diagramType = options.get("diagramType"); - if (bNeedsClientLayout && file != null && BPMNDiagramConfiguration.DIAGRAM_TYPE.equals(diagramType)) { + if (file != null && BPMNDiagramConfiguration.DIAGRAM_TYPE.equals(diagramType)) { BPMNModel model; try { model = BPMNModelFactory.read(file);