From 975fb60f00feb306775ba0e78e248dcfd224de61 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 10 Nov 2023 16:53:07 +0100 Subject: [PATCH] Fix generator-sprotty not deleting *.tsbuildinfo, remove more package level scripts --- examples/package.json | 3 ++- examples/tsconfig.json | 1 + packages/generator-sprotty/package.json | 7 ++----- packages/generator-sprotty/tsconfig.json | 3 +-- packages/sprotty-elk/package.json | 5 +---- packages/sprotty-elk/tsconfig.json | 3 +-- packages/sprotty-protocol/package.json | 5 +---- packages/sprotty-protocol/tsconfig.json | 3 +-- packages/sprotty/package.json | 5 +---- packages/sprotty/tsconfig.json | 3 +-- tsconfig.json | 3 ++- 11 files changed, 14 insertions(+), 27 deletions(-) diff --git a/examples/package.json b/examples/package.json index 39202c7f..1931c3fa 100644 --- a/examples/package.json +++ b/examples/package.json @@ -26,7 +26,8 @@ }, "scripts": { "prepare": "yarn run build", - "build": "webpack && tsc", + "compile": "tsc -b tsconfig.json", + "build": "webpack && npm run compile", "watch": "yarn run watch:browser", "watch:browser": "webpack --watch", "watch:server": "tsc -w", diff --git a/examples/tsconfig.json b/examples/tsconfig.json index 588d0c6a..78b9a45c 100644 --- a/examples/tsconfig.json +++ b/examples/tsconfig.json @@ -5,6 +5,7 @@ "reflect-metadata", "webpack-env" ], + "composite": false, "declaration": false, "declarationMap": false }, diff --git a/packages/generator-sprotty/package.json b/packages/generator-sprotty/package.json index c8263f62..63cfdb21 100644 --- a/packages/generator-sprotty/package.json +++ b/packages/generator-sprotty/package.json @@ -38,12 +38,9 @@ "yeoman-test": "^7.4.0" }, "scripts": { - "clean": "shx rm -fr app", - "build": "tsc --skipLibCheck", - "watch": "tsc --watch --skipLibCheck", + "clean": "shx rm -fr app *.tsbuildinfo", "run": "yo sprotty", - "debug": "npx --node-arg=--inspect yo sprotty", - "test": "echo \"No tests defined.\"" + "debug": "npx --node-arg=--inspect yo sprotty" }, "files": [ "app", diff --git a/packages/generator-sprotty/tsconfig.json b/packages/generator-sprotty/tsconfig.json index 98f2c485..0b9245fc 100644 --- a/packages/generator-sprotty/tsconfig.json +++ b/packages/generator-sprotty/tsconfig.json @@ -2,8 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "rootDir": "src", - "outDir": "app", - "composite": true + "outDir": "app" }, "include": [ "src" diff --git a/packages/sprotty-elk/package.json b/packages/sprotty-elk/package.json index 076e53dc..d9a79e66 100644 --- a/packages/sprotty-elk/package.json +++ b/packages/sprotty-elk/package.json @@ -28,10 +28,7 @@ "inversify": "^6.0.1" }, "scripts": { - "clean": "shx rm -fr lib artifacts *.tsbuildinfo", - "build": "tsc -p ./tsconfig.json", - "test": "vitest run --config ../../vite.config.ts", - "watch": "tsc -w -p ./tsconfig.json" + "clean": "shx rm -fr lib artifacts *.tsbuildinfo" }, "files": [ "lib", diff --git a/packages/sprotty-elk/tsconfig.json b/packages/sprotty-elk/tsconfig.json index 5c828aca..312d2b80 100644 --- a/packages/sprotty-elk/tsconfig.json +++ b/packages/sprotty-elk/tsconfig.json @@ -5,8 +5,7 @@ "outDir": "lib", "types": [ "node" - ], - "composite": true + ] }, "include": [ "src" diff --git a/packages/sprotty-protocol/package.json b/packages/sprotty-protocol/package.json index 619f76ba..71b73ed9 100644 --- a/packages/sprotty-protocol/package.json +++ b/packages/sprotty-protocol/package.json @@ -23,10 +23,7 @@ }, "scripts": { - "clean": "shx rm -fr lib artifacts *.tsbuildinfo", - "build": "tsc -p ./tsconfig.json", - "test": "vitest run --config ../../vite.config.ts", - "watch": "tsc -w -p ./tsconfig.json" + "clean": "shx rm -fr lib artifacts *.tsbuildinfo" }, "files": [ "lib", diff --git a/packages/sprotty-protocol/tsconfig.json b/packages/sprotty-protocol/tsconfig.json index 070f9ce3..2def59a4 100644 --- a/packages/sprotty-protocol/tsconfig.json +++ b/packages/sprotty-protocol/tsconfig.json @@ -2,8 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "rootDir": "src", - "outDir": "lib", - "composite": true + "outDir": "lib" }, "include": [ "src" diff --git a/packages/sprotty/package.json b/packages/sprotty/package.json index b53b51c0..10735f9d 100644 --- a/packages/sprotty/package.json +++ b/packages/sprotty/package.json @@ -37,10 +37,7 @@ "snabbdom-to-html": "^7.1.0" }, "scripts": { - "clean": "shx rm -fr lib artifacts *.tsbuildinfo", - "build": "tsc -p ./tsconfig.json", - "test": "vitest run --config ../../vite.config.ts", - "watch": "tsc -w -p ./tsconfig.json" + "clean": "shx rm -fr lib artifacts *.tsbuildinfo" }, "files": [ "lib", diff --git a/packages/sprotty/tsconfig.json b/packages/sprotty/tsconfig.json index 5ff721b3..b1c1e97d 100644 --- a/packages/sprotty/tsconfig.json +++ b/packages/sprotty/tsconfig.json @@ -2,8 +2,7 @@ "extends": "../../tsconfig.json", "compilerOptions": { "rootDir": "src", - "outDir": "lib", - "composite": true + "outDir": "lib" }, "include": [ "src" diff --git a/tsconfig.json b/tsconfig.json index 994e0284..71d2cafc 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,7 +22,8 @@ "experimentalDecorators": true, "emitDecoratorMetadata": true, "esModuleInterop": true, - "jsx": "react" + "jsx": "react", + "composite": true }, "include": [ "**/src/**/*.ts",