GLSP-1320: Update to latest glsp dev config

.github/PULL_REQUEST_TEMPLATE.md

@@ -25,5 +25,5 @@ to learn how to report vulnerabilities.
 
 <!-- Please check, when if it applies to your change. -->
 
-- [ ] This PR should be mentioned in the changelog
-- [ ] This PR introduces a breaking change (if yes, provide more details below for the changelog and the migration guide)
+-   [ ] This PR should be mentioned in the changelog
+-   [ ] This PR introduces a breaking change (if yes, provide more details below for the changelog and the migration guide)

.vscode/settings.json

@@ -6,8 +6,8 @@
 {
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": "explicit",
-    "source.organizeImports": "explicit"
+    "source.fixAll.eslint": "always",
+    "source.organizeImports": "always"
   },
   "eslint.validate": ["javascript", "typescript"],
   "search.exclude": {

examples/workflow-glsp/package.json

@@ -30,13 +30,12 @@
   "files": [
     "lib",
     "src",
-    "build",
-    "css",
-    "scripts"
+    "css"
   ],
   "scripts": {
     "build": "tsc -b",
     "clean": "rimraf *.tsbuildinfo  lib",
+    "generate:index": "glsp generateIndex src -f",
     "lint": "eslint --ext .ts,.tsx ./src",
     "watch": "tsc -w"
   },

examples/workflow-glsp/src/direct-task-editing/index.ts

@@ -0,0 +1,17 @@
+/********************************************************************************
+ * Copyright (c) 2024 EclipseSource and others.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v. 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0.
+ *
+ * This Source Code may also be made available under the following Secondary
+ * Licenses when the conditions for such availability set forth in the Eclipse
+ * Public License v. 2.0 are satisfied: GNU General Public License, version 2
+ * with the GNU Classpath Exception which is available at
+ * https://www.gnu.org/software/classpath/license.html.
+ *
+ * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+ ********************************************************************************/
+export * from './di.config';
+export * from './direct-task-editor';

examples/workflow-glsp/src/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-2024 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
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from './direct-task-editing/direct-task-editor';
+export * from './direct-task-editing';
 export * from './model';
 export * from './workflow-diagram-module';
 export * from './workflow-views';

examples/workflow-standalone/css/diagram.css

@@ -82,4 +82,4 @@ polygon.sprotty-node {
 
 .projection-scroll-bar {
     background-color: #555555;
-}
+}

package.json

@@ -14,23 +14,28 @@
     "check:pr": "yarn all && yarn check:headers",
     "clean": "lerna run clean && rimraf coverage .nyc_output",
     "compile": "tsc -b",
+    "generate:index": "lerna run generate:index && yarn lint:fix",
     "lint": "eslint --ext .ts,.tsx .",
-    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
+    "lint:ci": "yarn lint --output-file eslint_report.json --format json",
+    "lint:fix": " yarn lint --fix",
     "prepare": "yarn build",
     "publish:latest": "lerna publish from-git --no-git-reset --no-git-tag-version --no-push",
     "publish:next": "lerna publish preminor --exact --canary --preid next --dist-tag next --no-git-reset --no-git-tag-version --no-push --ignore-scripts --yes",
     "publish:prepare": "lerna version --ignore-scripts --yes --no-push",
     "standalone": "yarn --cwd ./examples/workflow-standalone",
     "start:exampleServer": "yarn standalone start:exampleServer",
-    "test": "lerna run test",
-    "test:ci": "lerna run test:ci",
+    "test": "lerna run test --no-bail",
+    "test:ci": "lerna run test:ci --no-bail",
     "test:coverage": "lerna run test:coverage",
     "test:coverage:ci": "yarn glsp coverageReport .",
-    "upgrade:next": "yarn upgrade -p \"@eclipse-glsp.*|sprotty.*\" --next ",
+    "upgrade:next": "glsp updateNext",
     "watch": "concurrently --kill-others -n tsc,standalone -c red,yellow \"tsc -b -w --preserveWatchOutput\" \"yarn -s standalone watch:bundle\""
   },
+  "resolutions": {
+    "snabbdom": "~3.5.1"
+  },
   "devDependencies": {
-    "@eclipse-glsp/dev": "~2.0.0",
+    "@eclipse-glsp/dev": "next",
     "@types/lodash": "4.14.191",
     "@types/node": "16.x",
     "concurrently": "^8.2.2",

packages/client/css/command-palette.css

@@ -16,7 +16,9 @@
 
 .command-palette {
     transition: opacity 0.3s linear;
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    box-shadow:
+        0 4px 8px 0 rgba(0, 0, 0, 0.2),
+        0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
 
 .command-palette-suggestions {
@@ -25,7 +27,9 @@
     overflow: auto;
     box-sizing: border-box;
     border: 1px solid rgba(60, 60, 60, 0.6);
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    box-shadow:
+        0 4px 8px 0 rgba(0, 0, 0, 0.2),
+        0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
 
 .command-palette-suggestions .icon {

packages/client/css/key-shortcut.css

@@ -30,7 +30,9 @@
     z-index: 9999;
     width: 400px;
     max-height: 512px;
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    box-shadow:
+        0 4px 8px 0 rgba(0, 0, 0, 0.2),
+        0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
 
 .keyboard-shortcuts-menu h3 {
@@ -45,7 +47,9 @@
     background-color: #e4e1e1;
     border: 1px solid #ccc;
     border-radius: 3px;
-    box-shadow: 0 1px 0 rgba(0, 0, 0, 0.2), inset 0 0 0 1px rgba(255, 255, 255, 0.5);
+    box-shadow:
+        0 1px 0 rgba(0, 0, 0, 0.2),
+        inset 0 0 0 1px rgba(255, 255, 255, 0.5);
     color: #333;
     display: inline-block;
     font-size: 0.85em;

packages/client/css/keyboard-tool-palette.css

@@ -39,7 +39,9 @@
     color: black;
     text-align: center;
 
-    font: bold 0.8rem Arial, sans-serif;
+    font:
+        bold 0.8rem Arial,
+        sans-serif;
     line-height: 0.5rem;
 }
 

packages/client/css/keyboard.css

@@ -46,5 +46,7 @@
     color: black;
     text-align: center;
 
-    font: bold 1.3rem Arial, sans-serif;
+    font:
+        bold 1.3rem Arial,
+        sans-serif;
 }

packages/client/css/tool-palette.css

@@ -47,7 +47,9 @@
     text-align: left;
     background: #cccccc;
     border: 1px solid rgba(60, 60, 60, 0.6);
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    box-shadow:
+        0 4px 8px 0 rgba(0, 0, 0, 0.2),
+        0 6px 20px 0 rgba(0, 0, 0, 0.19);
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -88,7 +90,9 @@
 .palette-body {
     background: rgba(100, 100, 100, 0.2);
     border: 1px solid rgba(60, 60, 60, 0.6);
-    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19);
+    box-shadow:
+        0 4px 8px 0 rgba(0, 0, 0, 0.2),
+        0 6px 20px 0 rgba(0, 0, 0, 0.19);
 }
 
 .tool-group {

packages/client/package.json

@@ -38,6 +38,7 @@
   "scripts": {
     "build": "tsc -b",
     "clean": "rimraf lib *.tsbuildinfo  coverage .nyc_output",
+    "generate:index": "glsp generateIndex src -f",
     "lint": "eslint --ext .ts,.tsx ./src",
     "test": "mocha --config ../../.mocharc \"./src/**/*.spec.?(ts|tsx)\"",
     "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter",

packages/client/src/base/feedback/index.ts

@@ -18,4 +18,3 @@ export * from './feedback-action-dispatcher';
 export * from './feedback-command';
 export * from './set-model-command';
 export * from './update-model-command';
-

packages/client/src/base/tool-manager/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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
@@ -13,5 +13,5 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from './tool-manager';
 export * from './tool';
+export * from './tool-manager';

packages/client/src/default-modules.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2021-2023 EclipseSource and others.
+ * Copyright (c) 2021-2024 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

packages/client/src/features/accessibility/key-shortcut/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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
@@ -13,6 +13,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from './accessible-key-shortcut-tool';
 export * from './accessible-key-shortcut';
+export * from './accessible-key-shortcut-tool';
 export * from './di.config';

packages/client/src/features/accessibility/keyboard-grid/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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
@@ -15,6 +15,6 @@
  ********************************************************************************/
 export * from './action';
 export * from './constants';
-export * from './keyboard-grid-search-palette';
 export * from './keyboard-grid';
+export * from './keyboard-grid-search-palette';
 export * from './keyboard-node-grid';

packages/client/src/features/accessibility/keyboard-pointer/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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
@@ -15,7 +15,7 @@
  ********************************************************************************/
 export * from './actions';
 export * from './constants';
+export * from './keyboard-pointer';
 export * from './keyboard-pointer-listener';
 export * from './keyboard-pointer-module';
 export * from './keyboard-pointer-position';
-export * from './keyboard-pointer';

packages/client/src/features/accessibility/keyboard-pointer/keyboard-pointer-listener.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 Business Informatics Group (TU Wien) and others.
+ * Copyright (c) 2023-2024 Business Informatics Group (TU Wien) 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
@@ -31,7 +31,10 @@ export class KeyboardPointerKeyboardListener {
         return this.keyboardPointer.getPosition;
     }
 
-    constructor(protected readonly keyboardPointer: KeyboardPointer, protected readonly actionDispatcher: IActionDispatcher) {}
+    constructor(
+        protected readonly keyboardPointer: KeyboardPointer,
+        protected readonly actionDispatcher: IActionDispatcher
+    ) {}
 
     keyDown(event: KeyboardEvent): void {
         this.moveIfArrows(event);

packages/client/src/features/accessibility/keyboard-tool-palette/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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
@@ -13,5 +13,5 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from './keyboard-tool-palette-module';
 export * from './keyboard-tool-palette';
+export * from './keyboard-tool-palette-module';

packages/client/src/features/accessibility/search/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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
@@ -13,6 +13,6 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from './search-palette-module';
 export * from './search-palette';
+export * from './search-palette-module';
 export * from './search-tool';

packages/client/src/features/command-palette/command-palette-module.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2019-2023 EclipseSource and others.
+ * Copyright (c) 2019-2024 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

packages/client/src/features/command-palette/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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

packages/client/src/features/helper-lines/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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
@@ -14,8 +14,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
 export * from './helper-line-feedback';
-export * from './helper-line-manager-default';
 export * from './helper-line-manager';
+export * from './helper-line-manager-default';
 export * from './helper-line-module';
 export * from './model';
 export * from './view';

packages/client/src/features/hover/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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
@@ -13,5 +13,5 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
  ********************************************************************************/
-export * from './hover-module';
 export * from './hover';
+export * from './hover-module';

packages/client/src/features/index.ts

@@ -1,5 +1,5 @@
 /********************************************************************************
- * Copyright (c) 2023 EclipseSource and others.
+ * Copyright (c) 2023-2024 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
@@ -26,6 +26,7 @@ export * from './helper-lines';
 export * from './hints';
 export * from './hover';
 export * from './label-edit';
+export * from './label-edit-ui';
 export * from './layout';
 export * from './navigation';
 export * from './reconnect';