Update java-emf-eclipse to 2.2.1

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

Hide file tree

Showing 24 changed files with 2,124 additions and 2,667 deletions.
diff --git a/project-templates/java-emf-eclipse/glsp-client/.vscode/settings.json b/project-templates/java-emf-eclipse/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-eclipse/glsp-client/lerna.json b/project-templates/java-emf-eclipse/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-eclipse/glsp-client/package.json b/project-templates/java-emf-eclipse/glsp-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parent",
-  "version": "2.0.0",
+  "version": "2.2.1",
   "private": true,
   "homepage": "https://www.eclipse.org/glsp/",
   "bugs": "https://github.com/eclipse-glsp/glsp/issues",
@@ -24,23 +24,23 @@
     "tasklist-eclipse"
   ],
   "scripts": {
-    "all": "yarn install && yarn lint",
-    "build": "lerna run build",
+    "all": "yarn clean && yarn install && yarn lint",
+    "build": "yarn compile && yarn eclipse bundle",
     "clean": "lerna run clean",
-    "copyClient": "copyfiles -f ./tasklist-eclipse//app/* ../glsp-server/org.eclipse.glsp.example.javaemf.editor/diagram",
-    "lint": "lerna run lint",
-    "lint:ci": "lerna run lint:ci",
-    "prepare": "lerna run prepare && yarn copyClient",
-    "watch": "lerna run --parallel watch"
-  },
-  "resolutions": {
-    "string-width": "4.2.3"
+    "compile": "tsc -b",
+    "copyClient": "copyfiles -f ./tasklist-eclipse/app/* ../glsp-server/org.eclipse.glsp.example.javaemf.editor/diagram",
+    "eclipse": "yarn --cwd tasklist-eclipse",
+    "lint": "eslint --ext .ts,.tsx .",
+    "lint:ci": "yarn lint --output-file eslint_report.json --format json",
+    "prepare": "yarn build && yarn copyClient",
+    "watch": "concurrently --kill-others -n tsc,app -c red,yellow \"tsc -b -w --preserveWatchOutput\" \"yarn -s eclipse watch:bundle\""
   },
   "devDependencies": {
-    "@eclipse-glsp/config": "2.0.0",
+    "@eclipse-glsp/config": "2.2.1",
+    "concurrently": "^8.2.2",
     "copyfiles": "^2.4.1",
-    "lerna": "^6.6.2",
-    "typescript": "^5.2.2"
+    "lerna": "8.1.7",
+    "typescript": "5.5.3"
   },
   "engines": {
     "node": ">=16.11.0",

diff --git a/project-templates/java-emf-eclipse/glsp-client/tasklist-eclipse/package.json b/project-templates/java-emf-eclipse/glsp-client/tasklist-eclipse/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tasklist-eclipse",
-  "version": "2.0.0",
+  "version": "2.2.1",
   "private": "true",
   "description": "GLSP-frontend code for the EMF model TaskList Eclipse integration",
   "keywords": [
@@ -32,17 +32,16 @@
     "src"
   ],
   "scripts": {
-    "build": "tsc && webpack",
+    "build": "tsc- b && yarn bundle",
+    "bundle": "webpack",
     "clean": "rimraf lib tsconfig.tsbuildinfo app/bundle.js app/bundle.js.map",
     "lint": "eslint --ext .ts,.tsx ./src",
-    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
-    "prepare": "yarn clean && yarn build",
-    "watch": "tsc -w"
+    "watch": "tsc -w",
+    "watch:bundle": "webpack --watch"
   },
   "dependencies": {
-    "@eclipse-glsp/ide": "2.0.0",
-    "tasklist-glsp": "2.0.0",
-    "inversify":"^6.0.1"
+    "@eclipse-glsp/ide": "2.2.1",
+    "tasklist-glsp": "2.2.1"
   },
   "devDependencies": {
     "@vscode/codicons": "^0.0.25",

diff --git a/project-templates/java-emf-eclipse/glsp-client/tasklist-eclipse/tsconfig.json b/project-templates/java-emf-eclipse/glsp-client/tasklist-eclipse/tsconfig.json
@@ -1,11 +1,17 @@
 {
-  "extends": "@eclipse-glsp/ts-config/tsconfig.json",
+  "extends": "@eclipse-glsp/ts-config/",
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "lib",
+    "composite": true,
     "reactNamespace": "JSX",
     "skipLibCheck": true,
     "types": []
   },
-  "include": ["src"]
+  "include": ["src"],
+  "references": [
+    {
+      "path": "../tasklist-glsp"
+    }
+  ]
 }
diff --git a/project-templates/java-emf-eclipse/glsp-client/tasklist-glsp/package.json b/project-templates/java-emf-eclipse/glsp-client/tasklist-glsp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tasklist-glsp",
-  "version": "2.0.0",
+  "version": "2.2.1",
   "private": "true",
   "description": "GLSP sprotty diagrams for the EMF model TaskList DSL",
   "keywords": [
@@ -36,14 +36,9 @@
     "build": "tsc",
     "clean": "rimraf lib tsconfig.tsbuildinfo",
     "lint": "eslint --ext .ts,.tsx ./src",
-    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
-    "prepare": "yarn clean && yarn build",
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/client": "2.0.0"
-  },
-  "devDependencies": {
-    "rimraf": "^2.6.1"
+    "@eclipse-glsp/client": "2.2.1"
   }
 }
diff --git a/project-templates/java-emf-eclipse/glsp-client/tasklist-glsp/tsconfig.json b/project-templates/java-emf-eclipse/glsp-client/tasklist-glsp/tsconfig.json
@@ -4,6 +4,7 @@
     "rootDir": "src",
     "outDir": "lib",
     "reactNamespace": "JSX",
+    "composite": true,
     "skipLibCheck": true,
     "types": []
   },

diff --git a/project-templates/java-emf-eclipse/glsp-client/tsconfig.json b/project-templates/java-emf-eclipse/glsp-client/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "@eclipse-glsp/ts-config",
+  "include": [],
+  "compilerOptions": {
+    "composite": true
+  },
+  "references": [
+    {
+      "path": "./tasklist-eclipse"
+    },
+    {
+      "path": "./tasklist-glsp"
+    }
+  ]
+}