Skip to content

Commit

Permalink
GLSP-1179 Switch to composite ts build
Browse files Browse the repository at this point in the history
+ update to lates dev package & new update script
Part of eclipse-glsp/glsp#1179
  • Loading branch information
tortmayr committed Apr 15, 2024
1 parent f4af64d commit 8ce9f08
Show file tree
Hide file tree
Showing 5 changed files with 794 additions and 91 deletions.
11 changes: 4 additions & 7 deletions .vscode/settings.json
Expand Up @@ -6,13 +6,10 @@
{
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true,
"source.organizeImports": true
"source.fixAll.eslint": "explicit",
"source.organizeImports": "explicit"
},
"eslint.validate": [
"javascript",
"typescript"
],
"eslint.validate": ["javascript", "typescript"],
"search.exclude": {
"**/node_modules": true,
"**/lib": true
Expand Down Expand Up @@ -52,4 +49,4 @@
"ul_multi": 3
}
}
}
}
2 changes: 1 addition & 1 deletion examples/workflow-server/tsconfig.json
Expand Up @@ -7,7 +7,7 @@
"esModuleInterop": true,
"resolveJsonModule": true
},
"include": ["src"],
"include": ["src", "src/**/*.json"],
"references": [
{
"path": "../../packages/server"
Expand Down
10 changes: 6 additions & 4 deletions package.json
Expand Up @@ -14,8 +14,9 @@
"check:pr": "yarn all && yarn check:headers",
"clean": "lerna run clean && rimraf coverage .nyc_output",
"compile": "tsc -b",
"lint": "eslint --ext .ts,.tsx",
"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",
Expand All @@ -24,9 +25,10 @@
"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": "next",
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Expand Up @@ -2,7 +2,8 @@
"extends": "@eclipse-glsp/ts-config/mocha",
"include": [],
"compilerOptions": {
"composite": true
"composite": true,
"resolveJsonModule": true
},
"references": [
{
Expand Down

0 comments on commit 8ce9f08

Please sign in to comment.