Skip to content

Commit

Permalink
working refrences based build
Browse files Browse the repository at this point in the history
Signed-off-by: Jonah Iden <jonah.iden@typefox.io>
  • Loading branch information
jonah-iden committed Nov 9, 2023
1 parent 1f651d4 commit 80f841c
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 10 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ coverage/
npm-debug.log
yarn-error.log
.DS_Store
*.tsbuildinfo
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"scripts": {
"prepare": "lerna run prepare",
"clean": "lerna run clean",
"build": "tsc -b tsconfig.build.json",
"build": "tsc --build tsconfig.build.json && yarn --cwd examples build",
"watch": "concurrently -n sprotty,examples -c blue,green, \"yarn --cwd examples watch\" \"tsc -b tsconfig.build.json -w\"",
"lint": "eslint {**/src/**/*.ts,**/src/**/*.tsx}",
"lint:fix": "eslint {**/src/**/*.ts,**/src/**/*.tsx} --fix",
Expand Down
4 changes: 3 additions & 1 deletion packages/generator-sprotty/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "app"
"rootDir": "src",
"outDir": "app",
"composite": true
},
"include": [
"src"
Expand Down
2 changes: 1 addition & 1 deletion packages/sprotty-elk/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"scripts": {
"prepare": "yarn run clean && yarn run build",
"clean": "rimraf lib artifacts",
"clean": "rimraf lib artifacts tsconfig.tsbuildinfo",
"build": "tsc -p ./tsconfig.json",
"test": "vitest run --config ../../vite.config.ts",
"watch": "tsc -w -p ./tsconfig.json"
Expand Down
7 changes: 6 additions & 1 deletion packages/sprotty-elk/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,18 @@
"outDir": "lib",
"types": [
"node"
]
],
"composite": true
},
"include": [
"src"
],
"exclude": [
"**/*.spec.ts",
"**/*.spec.tsx"
],
"references": [
{ "path": "../sprotty-protocol/tsconfig.json"},
{ "path": "../sprotty/tsconfig.json" }
]
}
2 changes: 1 addition & 1 deletion packages/sprotty-protocol/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

"scripts": {
"prepare": "yarn run clean && yarn run build",
"clean": "rimraf lib artifacts",
"clean": "rimraf lib artifacts tsconfig.tsbuildinfo",
"build": "tsc -p ./tsconfig.json",
"test": "vitest run --config ../../vite.config.ts",
"watch": "tsc -w -p ./tsconfig.json"
Expand Down
4 changes: 3 additions & 1 deletion packages/sprotty-protocol/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "lib"
"rootDir": "src",
"outDir": "lib",
"composite": true
},
"include": [
"src"
Expand Down
2 changes: 1 addition & 1 deletion packages/sprotty/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"scripts": {
"prepare": "yarn run clean && yarn run build",
"clean": "rimraf lib artifacts",
"clean": "rimraf lib artifacts tsconfig.tsbuildinfo",
"build": "tsc -p ./tsconfig.json",
"test": "vitest run --config ../../vite.config.ts",
"watch": "tsc -w -p ./tsconfig.json"
Expand Down
7 changes: 6 additions & 1 deletion packages/sprotty/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "lib"
"rootDir": "src",
"outDir": "lib",
"composite": true
},
"include": [
"src"
],
"exclude": [
"**/*.spec.ts",
"**/*.spec.tsx",
],
"references": [
{ "path": "../sprotty-protocol/tsconfig.json" }
]
}
4 changes: 2 additions & 2 deletions tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"files": [],
"references": [
{ "path": "./packages/generator-sprotty/tsconfig.json" },
{ "path": "./packages/sprotty-protocol/tsconfig.json" },
{ "path": "./packages/sprotty/tsconfig.json" },
{ "path": "./packages/sprotty-elk/tsconfig.json" },
{ "path": "./packages/sprotty-protocol/tsconfig.json" },
{ "path": "./packages/generator-sprotty/tsconfig.json" },
]
}

0 comments on commit 80f841c

Please sign in to comment.