Update java-emf-theia to 2.2.1

eclipse-glsp · Jul 22, 2024 · 3b2ba59 · 3b2ba59
1 parent 7deea0c
commit 3b2ba59
Show file tree

Hide file tree

Showing 20 changed files with 3,616 additions and 3,709 deletions.
diff --git a/project-templates/java-emf-theia/glsp-client/.vscode/launch.json b/project-templates/java-emf-theia/glsp-client/.vscode/launch.json
@@ -41,7 +41,7 @@
         "--port=3000",
         "--no-cluster",
         "--TASKLIST_GLSP=5007",
-        "--debug",
+        "--glspDebug",
         "--app-project-path=${workspaceRoot}/tasklist-browser-app",
         "--root-dir=${workspaceRoot}/workspace"
       ],

diff --git a/project-templates/java-emf-theia/glsp-client/.vscode/settings.json b/project-templates/java-emf-theia/glsp-client/.vscode/settings.json
@@ -6,8 +6,8 @@
 {
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.organizeImports": true,
-    "source.fixAll.eslint": true
+    "source.organizeImports": "always",
+    "source.fixAll.eslint": "always"
   },
   "eslint.validate": ["javascript", "typescript"],
   "search.exclude": {

diff --git a/project-templates/java-emf-theia/glsp-client/README.md b/project-templates/java-emf-theia/glsp-client/README.md
@@ -7,6 +7,10 @@ It is based on the `TaskList` example diagram language.
 
 For more detailed instructions and information please confer to the [README](../README.md) in the parent directory.
 
+## Theia Version compatibility
+
+This project template is compatible with Theia `>=1.49.1`.
+
 ## Building
 
 To build all GLSP client packages simply execute the following in the `glsp-client` directory:

diff --git a/project-templates/java-emf-theia/glsp-client/lerna.json b/project-templates/java-emf-theia/glsp-client/lerna.json
@@ -1,10 +1,9 @@
 {
-  "version": "2.0.0",
-  "useWorkspaces": "true",
+  "version": "2.2.1",
   "npmClient": "yarn",
   "command": {
     "run": {
       "stream": true
     }
   }
-}
+}
diff --git a/project-templates/java-emf-theia/glsp-client/package.json b/project-templates/java-emf-theia/glsp-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parent",
-  "version": "1.0.0",
+  "version": "2.2.1",
   "private": true,
   "homepage": "https://www.eclipse.org/glsp/",
   "bugs": "https://github.com/eclipse-glsp/glsp/issues",
@@ -25,24 +25,25 @@
     "tasklist-browser-app"
   ],
   "scripts": {
-    "all": "yarn install && yarn lint",
-    "build": "lerna run build",
+    "all": "yyarn clean && yarn install && yarn lint",
+    "browser": " yarn --cwd tasklist-browser-app",
+    "build": "yarn compile && yarn browser bundle",
+    "check:theia-version": "theia check:theia-version",
     "clean": "lerna run clean",
-    "lint": "lerna run lint",
-    "lint:ci": "lerna run lint:ci",
-    "prepare": "lerna run prepare",
+    "compile": "tsc -b",
+    "lint": "eslint --ext .ts,.tsx .",
+    "lint:ci": "yarn lint --output-file eslint_report.json --format json",
+    "prepare": "yarn build && yarn check:theia-version",
     "rebuild:browser": "theia rebuild:browser",
-    "start": "yarn rebuild:browser && yarn --cwd tasklist-browser-app start",
-    "start:external": "yarn rebuild:browser && yarn --cwd tasklist-browser-app start:external",
-    "watch": "lerna run --parallel watch"
-  },
-  "resolutions": {
-    "string-width": "4.2.3"
+    "start": "yarn browser start",
+    "start:external": "yarn browser start:external",
+    "watch": "concurrently --kill-others -n tsc,browser -c red,yellow,green \"tsc -b -w --preserveWatchOutput\" \"yarn -s browser watch\""
   },
   "devDependencies": {
-    "@eclipse-glsp/config": "2.0.0",
-    "lerna": "^6.6.2",
-    "typescript": "^5.2.2"
+    "@eclipse-glsp/config": "2.2.1",
+    "concurrently": "^8.2.2",
+    "lerna": "8.1.7",
+    "typescript": "^5.5.3"
   },
   "engines": {
     "node": ">=16.11.0",

diff --git a/project-templates/java-emf-theia/glsp-client/tasklist-browser-app/package.json b/project-templates/java-emf-theia/glsp-client/tasklist-browser-app/package.json
@@ -1,31 +1,30 @@
 {
   "name": "tasklist-browser-app",
-  "version": "1.0.0",
+  "version": "2.2.1",
   "private": true,
   "scripts": {
-    "build": "theia build --mode development",
-    "prepare": "yarn build",
+    "bundle": "theia build --mode development",
     "start": "theia start --TASKLIST_GLSP=5007 --root-dir=../workspace",
-    "start:external": "theia start --TASKLIST_GLSP=5007 --root-dir=../workspace --debug",
+    "start:external": "theia start --TASKLIST_GLSP=5007 --root-dir=../workspace --glspDebug",
     "watch": "theia build --watch --mode development"
   },
   "dependencies": {
-    "@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/output": "1.43.1",
-    "@theia/preferences": "1.43.1",
-    "@theia/process": "1.43.1",
-    "@theia/terminal": "1.43.1",
-    "@theia/workspace": "1.43.1",
-    "tasklist-theia": "2.0.0"
+    "@theia/core": "1.49.1",
+    "@theia/editor": "1.49.1",
+    "@theia/filesystem": "1.49.1",
+    "@theia/markers": "1.49.1",
+    "@theia/messages": "1.49.1",
+    "@theia/monaco": "1.49.1",
+    "@theia/navigator": "1.49.1",
+    "@theia/output": "1.49.1",
+    "@theia/preferences": "1.49.1",
+    "@theia/process": "1.49.1",
+    "@theia/terminal": "1.49.1",
+    "@theia/workspace": "1.49.1",
+    "tasklist-theia": "2.2.1"
   },
   "devDependencies": {
-    "@theia/cli": "1.43.1"
+    "@theia/cli": "1.49.1"
   },
   "theia": {
     "target": "browser"

diff --git a/project-templates/java-emf-theia/glsp-client/tasklist-glsp/package.json b/project-templates/java-emf-theia/glsp-client/tasklist-glsp/package.json
@@ -1,49 +1,45 @@
 {
-  "private": "true",
   "name": "tasklist-glsp",
-  "version": "2.0.0",
+  "version": "2.2.1",
+  "private": "true",
   "description": "GLSP sprotty diagrams for the EMF model TaskList DSL",
-  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR MIT)",
   "keywords": [
     "glsp",
     "tasklist",
     "diagram"
   ],
-  "author": {
-    "name": "Eclipse GLSP"
-  },
   "homepage": "https://www.eclipse.org/glsp/",
+  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
   "repository": {
     "type": "git",
     "url": "https://github.com/eclipse-glsp/glsp-examples.git"
   },
-  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
+  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR MIT)",
+  "author": {
+    "name": "Eclipse GLSP"
+  },
   "contributors": [
     {
       "name": "Eclipse GLSP Project",
       "email": "[email protected]",
       "url": "https://projects.eclipse.org/projects/ecd.glsp"
     }
   ],
+  "main": "lib/index",
+  "types": "lib/index",
   "files": [
     "lib",
     "src",
     "css"
   ],
-  "dependencies": {
-    "@eclipse-glsp/client": "2.0.0"
-  },
-  "devDependencies": {
-    "rimraf": "^2.6.1"
-  },
   "scripts": {
-    "prepare": "yarn clean && yarn build",
+    "build": "tsc -b",
     "clean": "rimraf lib tsconfig.tsbuildinfo",
-    "build": "tsc",
     "lint": "eslint --ext .ts,.tsx ./src",
-    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
     "watch": "tsc -w"
   },
-  "main": "lib/index",
-  "types": "lib/index"
+  "dependencies": {
+    "@eclipse-glsp/client": "2.2.1",
+    "balloon-css": "^0.5.0"
+  }
 }
diff --git a/project-templates/java-emf-theia/glsp-client/tasklist-glsp/tsconfig.json b/project-templates/java-emf-theia/glsp-client/tasklist-glsp/tsconfig.json
@@ -5,6 +5,7 @@
     "outDir": "lib",
     "reactNamespace": "JSX",
     "skipLibCheck": true,
+    "composite": true,
     "types": []
   },
   "include": ["src"]

diff --git a/project-templates/java-emf-theia/glsp-client/tasklist-theia/package.json b/project-templates/java-emf-theia/glsp-client/tasklist-theia/package.json
@@ -1,21 +1,21 @@
 {
-  "private": "true",
   "name": "tasklist-theia",
-  "version": "2.0.0",
+  "version": "2.2.1",
+  "private": "true",
   "description": "Theia extension for the TaskList GLSP example",
-  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR MIT)",
   "keywords": [
     "theia-extension"
   ],
-  "author": {
-    "name": "Eclipse GLSP"
-  },
   "homepage": "https://www.eclipse.org/glsp/",
+  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
   "repository": {
     "type": "git",
     "url": "https://github.com/eclipse-glsp/glsp-examples.git"
   },
-  "bugs": "https://github.com/eclipse-glsp/glsp/issues",
+  "license": "(EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR MIT)",
+  "author": {
+    "name": "Eclipse GLSP"
+  },
   "contributors": [
     {
       "name": "Eclipse GLSP Project",
@@ -27,21 +27,16 @@
     "lib",
     "src"
   ],
-  "dependencies": {
-    "tasklist-glsp": "2.0.0",
-    "@eclipse-glsp/theia-integration": "2.0.0"
-  },
-  "devDependencies": {
-    "rimraf": "^2.6.1"
-  },
   "scripts": {
-    "prepare": "yarn  clean && yarn build",
+    "build": "tsc -b",
     "clean": "rimraf lib tsconfig.tsbuildinfo",
-    "build": "tsc",
     "lint": "eslint --ext .ts,.tsx ./src",
-    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
     "watch": "tsc -w"
   },
+  "dependencies": {
+    "@eclipse-glsp/theia-integration": "2.2.1",
+    "tasklist-glsp": "2.2.1"
+  },
   "theiaExtensions": [
     {
       "frontend": "lib/browser/frontend-module",

diff --git a/...mf-theia/glsp-client/tasklist-theia/src/browser/diagram/tasklist-diagram-configuration.ts b/...mf-theia/glsp-client/tasklist-theia/src/browser/diagram/tasklist-diagram-configuration.ts
@@ -14,7 +14,7 @@
  *
  * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0 OR MIT
  ********************************************************************************/
-import { ContainerConfiguration } from '@eclipse-glsp/protocol';
+import { ContainerConfiguration } from '@eclipse-glsp/client';
 import { GLSPDiagramConfiguration } from '@eclipse-glsp/theia-integration/lib/browser';
 import { Container, injectable } from '@theia/core/shared/inversify';
 import { initializeTasklistDiagramContainer } from 'tasklist-glsp';

diff --git a/...-templates/java-emf-theia/glsp-client/tasklist-theia/src/node/glsp-server-contribution.ts b/...-templates/java-emf-theia/glsp-client/tasklist-theia/src/node/glsp-server-contribution.ts
@@ -23,7 +23,7 @@ export const DEFAULT_PORT = 0;
 export const PORT_ARG_KEY = 'TASKLIST_GLSP';
 export const LOG_DIR = join(__dirname, '..', '..', 'logs');
 const JAR_FILE = resolve(
-    join(__dirname, '..', '..', '..', '..', 'glsp-server', 'target', 'org.eclipse.glsp.example.javaemf-2.0.0-glsp.jar')
+    join(__dirname, '..', '..', '..', '..', 'glsp-server', 'target', 'org.eclipse.glsp.example.javaemf-2.2.1-glsp.jar')
 );
 
 @injectable()

diff --git a/project-templates/java-emf-theia/glsp-client/tasklist-theia/tsconfig.json b/project-templates/java-emf-theia/glsp-client/tasklist-theia/tsconfig.json
@@ -2,8 +2,14 @@
   "extends": "@eclipse-glsp/ts-config/tsconfig.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "lib"
+    "outDir": "lib",
+    "composite": true
   },
   "include": ["src"],
-  "exclude": ["node_modules"]
+  "exclude": ["node_modules"],
+  "references": [
+    {
+      "path": "../tasklist-glsp"
+    }
+  ]
 }
diff --git a/project-templates/java-emf-theia/glsp-client/tsconfig.json b/project-templates/java-emf-theia/glsp-client/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "@eclipse-glsp/ts-config",
+  "include": [],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "./tasklist-glsp"
+    },
+    {
+      "path": "./tasklist-theia"
+    }
+  ]
+}