GLSP-1179 Switch to composite ts build

Part of eclipse-glsp/glsp/issues/1179

Author: tortmayr

example/workflow/extension/package.json

@@ -29,15 +29,15 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc -b && yarn bundle",
+    "build": "yarn compile && yarn bundle",
     "bundle": "webpack",
     "bundle:prod": "webpack --config ./webpack.prod.js",
     "clean": "rimraf lib tsconfig.tsbuildinfo dist",
+    "compile": "tsc -b",
     "lint": "eslint --ext .ts,.tsx ./src",
-    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
     "package": "vsce package --yarn",
-    "prepare": "yarn clean && yarn build",
-    "watch": "tsc -w"
+    "watch": "tsc -w",
+    "watch:bundle": "webpack --watch"
   },
   "contributes": {
     "commands": [

example/workflow/extension/tsconfig.json

@@ -1,9 +1,14 @@
 {
   "extends": "@eclipse-glsp/ts-config",
   "compilerOptions": {
+    "composite": true,
     "rootDir": "src",
-    "outDir": "lib",
-    "resolveJsonModule": true
+    "outDir": "lib"
   },
-  "include": ["src", "server", "dist"]
+  "include": ["src", "dist"],
+  "references": [
+    {
+      "path": "../../../packages/vscode-integration"
+    }
+  ]
 }

example/workflow/web-extension/package.json

@@ -30,15 +30,15 @@
     "dist"
   ],
   "scripts": {
-    "build": "tsc -b && yarn bundle",
+    "build": "yarn compile && yarn bundle",
     "bundle": "webpack",
     "bundle:prod": "webpack --config ./webpack.prod.js",
     "clean": "rimraf lib tsconfig.tsbuildinfo ",
+    "compile": "tsc-b",
     "lint": "eslint --ext .ts,.tsx ./src",
-    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
     "package": "vsce package --yarn",
-    "prepare": "yarn clean && yarn build",
-    "watch": "tsc -w"
+    "watch": "tsc -w",
+    "watch:bundle": "webpack --watch"
   },
   "contributes": {
     "commands": [

example/workflow/web-extension/tsconfig.json

@@ -1,9 +1,14 @@
 {
   "extends": "@eclipse-glsp/ts-config",
   "compilerOptions": {
+    "composite": true,
     "rootDir": "src",
-    "outDir": "lib",
-    "resolveJsonModule": true
+    "outDir": "lib"
   },
-  "include": ["src", "dist"]
+  "include": ["src", "dist"],
+  "references": [
+    {
+      "path": "../../../packages/vscode-integration"
+    }
+  ]
 }

example/workflow/webview/package.json

@@ -28,13 +28,12 @@
     }
   ],
   "scripts": {
-    "build": "tsc -b && yarn bundle",
+    "build": "yarn compile && yarn bundle",
     "bundle": "webpack",
     "bundle:prod": "webpack --config ./webpack.prod.js",
     "clean": "rimraf lib tsconfig.tsbuildinfo dist",
+    "compile": "tsc -b",
     "lint": "eslint --ext .ts,.tsx ./src",
-    "lint:ci": "yarn lint -o eslint.xml -f checkstyle",
-    "prepare": "yarn clean && yarn build",
     "watch": "tsc -w"
   },
   "devDependencies": {

example/workflow/webview/tsconfig.json

@@ -1,8 +1,14 @@
 {
   "extends": "@eclipse-glsp/ts-config/tsconfig.json",
   "compilerOptions": {
+    "composite": true,
     "rootDir": "src",
     "outDir": "lib"
   },
-  "include": ["src"]
+  "include": ["src"],
+  "references": [
+    {
+      "path": "../../../packages/vscode-integration-webview"
+    }
+  ]
 }

package.json

@@ -6,27 +6,29 @@
   ],
   "scripts": {
     "all": "yarn install && yarn lint",
-    "build": "lerna run build",
+    "build": "yarn compile && yarn bundle",
     "bundle": " lerna run bundle",
     "bundle:prod": "lerna run bundle:prod",
     "check:headers": "glsp checkHeaders . -t lastCommit",
     "check:pr": "yarn all && yarn check:headers",
     "clean": "lerna run clean && rimraf logs/*.log",
-    "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 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",
     "upgrade:next": "yarn upgrade -p \"@eclipse-glsp.*|sprotty.*\" --next ",
-    "watch": "lerna run --parallel watch",
+    "watch":  "concurrently --kill-others -n tsc,extension,web-extension -c red,yellow.green \"tsc -b -w --preserveWatchOutput\" \"yarn -s workflow watch:bundle\" \"yarn -s workflow:web watch:bundle\"",
     "workflow": "yarn --cwd example/workflow/extension",
     "workflow:web": "yarn --cwd example/workflow/web-extension"
   },
   "devDependencies": {
     "@eclipse-glsp/dev": "2.0.0",
     "@types/node": "16",
     "@types/vscode": "^1.54.0",
+    "concurrently": "^8.2.2",
     "lerna": "^7.0.0",
     "typescript": "^5.0.4"
   },

packages/vscode-integration-webview/package.json

@@ -37,8 +37,6 @@
     "build": "tsc -b",
     "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": {

packages/vscode-integration-webview/tsconfig.json

@@ -1,8 +1,14 @@
 {
   "extends": "@eclipse-glsp/ts-config",
   "compilerOptions": {
+    "composite": true,
     "rootDir": "src",
     "outDir": "lib"
   },
-  "include": ["src"]
+  "include": ["src"],
+  "references": [
+    {
+      "path": "../vscode-integration"
+    }
+  ]
 }

packages/vscode-integration/package.json

@@ -42,8 +42,6 @@
     "build": "tsc -b",
     "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": {