GLSP-1179 Switch to composite ts build (#79)

+ update to lates dev package & new update script Part of eclipse-glsp/glsp#1179
eclipse-glsp · Apr 17, 2024 · 38f8bb5 · 38f8bb5
1 parent 9634f64
commit 38f8bb5
Show file tree

Hide file tree

Showing 14 changed files with 857 additions and 117 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,7 @@
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",
       "env": {
-        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.eslint.json"
+        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.json"
       }
     },
     {
@@ -26,7 +26,7 @@
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",
       "env": {
-        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.eslint.json"
+        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.json"
       }
     },
     {
@@ -42,7 +42,7 @@
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",
       "env": {
-        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.eslint.json"
+        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.json"
       }
     },
     {
@@ -58,7 +58,7 @@
       "console": "integratedTerminal",
       "internalConsoleOptions": "neverOpen",
       "env": {
-        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.eslint.json"
+        "TS_NODE_PROJECT": "${workspaceFolder}/tsconfig.json"
       }
     },
     {

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -6,13 +6,10 @@
 {
   "editor.formatOnSave": true,
   "editor.codeActionsOnSave": {
-    "source.fixAll.eslint": true,
-    "source.organizeImports": true
+    "source.fixAll.eslint": "always",
+    "source.organizeImports": "always"
   },
-  "eslint.validate": [
-    "javascript",
-    "typescript"
-  ],
+  "eslint.validate": ["javascript", "typescript"],
   "search.exclude": {
     "**/node_modules": true,
     "**/lib": true
@@ -52,4 +49,4 @@
       "ul_multi": 3
     }
   }
-}
+}
diff --git a/examples/workflow-server-bundled/README.md b/examples/workflow-server-bundled/README.md
@@ -1,7 +1,7 @@
 # Eclipse GLSP - Workflow Example Server (bundled)
 
 Provides a bundled version of the Workflow example server for node. This example server is used as dev example in GLSP projects.
-Note that this package provides the bundled file. If you are looking for the unbundled source code with type definitons check out
+Note that this package provides the bundled file. If you are looking for the unbundled source code with type definitions check out
 [`@eclipse-glsp-examples/workflow-server`](https://www.npmjs.com/package/@eclipse-glsp-examples/workflow-server).
 
 ## Workflow Diagram Example

diff --git a/examples/workflow-server/package.json b/examples/workflow-server/package.json
@@ -49,11 +49,10 @@
     "build": "tsc -b && yarn bundle",
     "bundle": "webpack",
     "bundle:browser": "webpack --env target=webworker ",
-    "clean": "rimraf lib tsconfig.tsbuildinfo bundle",
+    "clean": "rimraf lib *.tsbuildinfo",
     "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 -w"
   },
   "dependencies": {
     "@eclipse-glsp/layout-elk": "2.2.0-next",

diff --git a/examples/workflow-server/tsconfig.json b/examples/workflow-server/tsconfig.json
@@ -3,8 +3,17 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "lib",
+    "composite": true,
     "esModuleInterop": true,
     "resolveJsonModule": true
   },
-  "include": ["src"]
+  "include": ["src", "src/**/*.json"],
+  "references": [
+    {
+      "path": "../../packages/server"
+    },
+    {
+      "path": "../../packages/layout-elk"
+    }
+  ]
 }
diff --git a/package.json b/package.json
@@ -8,13 +8,15 @@
   ],
   "scripts": {
     "all": "yarn install && yarn lint && yarn test",
-    "build": "lerna run build",
+    "build": "yarn compile && yarn bundle",
+    "bundle": "yarn --cwd examples/workflow-server bundle",
     "check:headers": "glsp checkHeaders . -t lastCommit",
     "check:pr": "yarn all && yarn check:headers",
     "clean": "lerna run clean && rimraf coverage .nyc_output",
-    "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 -o eslint.xml -f checkstyle",
+    "prepare": " yarn compile && yarn bundle",
     "publish:latest": "lerna publish from-git --no-git-reset --no-git-tag-version --no-verify-access --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",
@@ -23,13 +25,15 @@
     "test": "lerna run test",
     "test:ci": "lerna run test:ci",
     "test:coverage": "lerna run test:coverage",
-    "test:coverage:ci": "yarn glsp coverageReport .",
-    "upgrade:next": "yarn upgrade -p '@eclipse-glsp/protocol'",
-    "watch": "lerna run --parallel watch"
+    "test:coverage:ci": "glsp coverageReport .",
+    "upgrade:next": "glsp updateNext",
+    "watch": "concurrently --kill-others -n tsc,bundle -c red,yellow \"tsc -b -w --preserveWatchOutput\" \"yarn -s watch:bundle\"",
+    "watch:bundle": "yarn --cwd examples/workflow-server watch:bundle"
   },
   "devDependencies": {
-    "@eclipse-glsp/dev": "2.0.0",
+    "@eclipse-glsp/dev": "next",
     "@types/node": "16.x",
+    "concurrently": "^8.2.2",
     "lerna": "^7.0.0",
     "typescript": "^5.0.4"
   },

diff --git a/packages/graph/package.json b/packages/graph/package.json
@@ -40,10 +40,8 @@
   ],
   "scripts": {
     "build": "tsc -b",
-    "clean": "rimraf lib tsconfig.tsbuildinfo coverage .nyc_output",
+    "clean": "rimraf lib *.tsbuildinfo coverage .nyc_output",
     "lint": "eslint --ext .ts,.tsx ./src",
-    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
-    "prepare": "yarn clean && yarn build",
     "test": "mocha --config ../../.mocharc \"./src/**/*.spec.?(ts|tsx)\"",
     "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter",
     "test:coverage": "nyc yarn test",

diff --git a/packages/graph/tsconfig.json b/packages/graph/tsconfig.json
@@ -3,6 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "lib",
+    "composite": true,
     "reactNamespace": "JSX"
   },
   "include": ["src"]

diff --git a/packages/layout-elk/package.json b/packages/layout-elk/package.json
@@ -40,10 +40,8 @@
   ],
   "scripts": {
     "build": "tsc -b",
-    "clean": "rimraf lib tsconfig.tsbuildinfo coverage .nyc_output",
+    "clean": "rimraf lib *.tsbuildinfo coverage .nyc_output",
     "lint": "eslint --ext .ts,.tsx ./src",
-    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
-    "prepare": "yarn clean && yarn build",
     "test": "mocha --config ../../.mocharc \"./src/**/*.spec.?(ts|tsx)\"",
     "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter",
     "test:coverage": "nyc yarn test",

diff --git a/packages/layout-elk/tsconfig.json b/packages/layout-elk/tsconfig.json
@@ -4,8 +4,13 @@
     "rootDir": "src",
     "outDir": "lib",
     "reactNamespace": "JSX",
-    "types": ["node", "mocha", "reflect-metadata"]
+    "composite": true
   },
   "exclude": ["**/*.spec.ts"],
-  "include": ["src"]
+  "include": ["src"],
+  "references": [
+    {
+      "path": "../server"
+    }
+  ]
 }
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -49,17 +49,15 @@
   ],
   "scripts": {
     "build": "tsc -b",
-    "clean": "rimraf lib tsconfig.tsbuildinfo coverage .nyc_output",
+    "clean": "rimraf lib *.tsbuildinfo coverage .nyc_output",
     "lint": "eslint --ext .ts,.tsx ./src",
-    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
-    "prepare": "yarn clean && yarn build",
     "test": "mocha --config ../../.mocharc \"./src/**/*.spec.?(ts|tsx)\"",
     "test:ci": "export JUNIT_REPORT_PATH=./report.xml && yarn test --reporter mocha-jenkins-reporter",
     "test:coverage": "nyc yarn test:ci",
     "watch": "tsc -w"
   },
   "dependencies": {
-    "@eclipse-glsp/graph": "^2.2.0-next",
+    "@eclipse-glsp/graph": "2.2.0-next",
     "@eclipse-glsp/protocol": "next",
     "@types/uuid": "8.3.1",
     "commander": "^8.3.0",

diff --git a/packages/server/tsconfig.json b/packages/server/tsconfig.json
@@ -2,8 +2,14 @@
   "extends": "@eclipse-glsp/ts-config/mocha",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "lib"
+    "outDir": "lib",
+    "composite": true
   },
   "exclude": ["**/*.spec.ts", "src/common/test/mock-util.ts"],
-  "include": ["src"]
+  "include": ["src"],
+  "references": [
+    {
+      "path": "../graph"
+    }
+  ]
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "extends": "@eclipse-glsp/ts-config/mocha",
+  "include": [],
+  "compilerOptions": {
+    "composite": true,
+    "resolveJsonModule": true
+  },
+  "references": [
+    {
+      "path": "./packages/graph"
+    },
+    {
+      "path": "./packages/layout-elk"
+    },
+    {
+      "path": "./packages/server"
+    },
+    {
+      "path": "./examples/workflow-server"
+    }
+  ]
+}