From e697a65f01b9b5b7da376aa1451e3efa12078756 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 10 Nov 2023 10:09:10 +0100 Subject: [PATCH 1/3] Replace rimraf with shx --- package.json | 2 +- packages/generator-sprotty/package.json | 2 +- packages/sprotty-elk/package.json | 2 +- packages/sprotty-protocol/package.json | 2 +- packages/sprotty/package.json | 2 +- yarn.lock | 19 ++++++++++--------- 6 files changed, 15 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 2521857..6a6b2ae 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,8 @@ "eslint-plugin-no-null": "^1.0.2", "lerna": "^7.3.0", "reflect-metadata": "^0.1.13", - "rimraf": "^5.0.5", "semver": "^7.5.4", + "shx": "^0.3.4", "typescript": "~5.2.2", "@vitest/coverage-v8": "~0.34.6", "vitest": "~0.34.6" diff --git a/packages/generator-sprotty/package.json b/packages/generator-sprotty/package.json index da61647..c8263f6 100644 --- a/packages/generator-sprotty/package.json +++ b/packages/generator-sprotty/package.json @@ -38,7 +38,7 @@ "yeoman-test": "^7.4.0" }, "scripts": { - "clean": "rimraf app", + "clean": "shx rm -fr app", "build": "tsc --skipLibCheck", "watch": "tsc --watch --skipLibCheck", "run": "yo sprotty", diff --git a/packages/sprotty-elk/package.json b/packages/sprotty-elk/package.json index 89d4f98..076e53d 100644 --- a/packages/sprotty-elk/package.json +++ b/packages/sprotty-elk/package.json @@ -28,7 +28,7 @@ "inversify": "^6.0.1" }, "scripts": { - "clean": "rimraf lib artifacts tsconfig.tsbuildinfo", + "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" diff --git a/packages/sprotty-protocol/package.json b/packages/sprotty-protocol/package.json index c6f23fc..619f76b 100644 --- a/packages/sprotty-protocol/package.json +++ b/packages/sprotty-protocol/package.json @@ -23,7 +23,7 @@ }, "scripts": { - "clean": "rimraf lib artifacts tsconfig.tsbuildinfo", + "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" diff --git a/packages/sprotty/package.json b/packages/sprotty/package.json index 415aa57..b53b51c 100644 --- a/packages/sprotty/package.json +++ b/packages/sprotty/package.json @@ -37,7 +37,7 @@ "snabbdom-to-html": "^7.1.0" }, "scripts": { - "clean": "rimraf lib artifacts tsconfig.tsbuildinfo", + "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" diff --git a/yarn.lock b/yarn.lock index 9446abe..0c4935d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3138,7 +3138,7 @@ glob@7.1.4: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^10.2.2, glob@^10.3.7: +glob@^10.2.2: version "10.3.10" resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== @@ -4269,7 +4269,7 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -5403,13 +5403,6 @@ rimraf@^4.4.1: dependencies: glob "^9.2.0" -rimraf@^5.0.5: - version "5.0.5" - resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-5.0.5.tgz#9be65d2d6e683447d2e9013da2bf451139a61ccf" - integrity sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A== - dependencies: - glob "^10.3.7" - rollup@^3.27.1: version "3.29.4" resolved "https://registry.yarnpkg.com/rollup/-/rollup-3.29.4.tgz#4d70c0f9834146df8705bfb69a9a19c9e1109981" @@ -5565,6 +5558,14 @@ shelljs@^0.8.5: interpret "^1.0.0" rechoir "^0.6.2" +shx@^0.3.4: + version "0.3.4" + resolved "https://registry.yarnpkg.com/shx/-/shx-0.3.4.tgz#74289230b4b663979167f94e1935901406e40f02" + integrity sha512-N6A9MLVqjxZYcVn8hLmtneQWIJtp8IKzMP4eMnx+nqkvXoqinUPCbUFLp2UcWTEIUONhlk0ewxr/jaVGlc+J+g== + dependencies: + minimist "^1.2.3" + shelljs "^0.8.5" + side-channel@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf" From 651504d235ab10f7b74068f825d5227edf4d6398 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 10 Nov 2023 17:04:54 +0100 Subject: [PATCH 2/3] 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 39202c7..1931c3f 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 588d0c6..78b9a45 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 c8263f6..63cfdb2 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 98f2c48..0b9245f 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 076e53d..d9a79e6 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 5c828ac..312d2b8 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 619f76b..71b73ed 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 070f9ce..2def59a 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 b53b51c..10735f9 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 5ff721b..b1c1e97 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 994e028..71d2caf 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", From ae23ec0bea3e7b8cc29765a10a0d22fb18fbe7ab Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Mon, 13 Nov 2023 13:15:41 +0100 Subject: [PATCH 3/3] Implemented review comments --- packages/generator-sprotty/package.json | 5 ++++- packages/sprotty-elk/package.json | 5 ++++- packages/sprotty-protocol/package.json | 5 ++++- packages/sprotty/package.json | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/packages/generator-sprotty/package.json b/packages/generator-sprotty/package.json index 63cfdb2..7ae241c 100644 --- a/packages/generator-sprotty/package.json +++ b/packages/generator-sprotty/package.json @@ -39,8 +39,11 @@ }, "scripts": { "clean": "shx rm -fr app *.tsbuildinfo", + "build": "tsc", + "watch": "tsc --watch", "run": "yo sprotty", - "debug": "npx --node-arg=--inspect yo sprotty" + "debug": "npx --node-arg=--inspect yo sprotty", + "test": "echo \"No tests defined.\"" }, "files": [ "app", diff --git a/packages/sprotty-elk/package.json b/packages/sprotty-elk/package.json index d9a79e6..7e23d8c 100644 --- a/packages/sprotty-elk/package.json +++ b/packages/sprotty-elk/package.json @@ -28,7 +28,10 @@ "inversify": "^6.0.1" }, "scripts": { - "clean": "shx rm -fr lib artifacts *.tsbuildinfo" + "clean": "shx rm -fr lib artifacts *.tsbuildinfo", + "build": "tsc", + "watch": "tsc --watch", + "test": "vitest run --config ../../vite.config.ts" }, "files": [ "lib", diff --git a/packages/sprotty-protocol/package.json b/packages/sprotty-protocol/package.json index 71b73ed..eea52c8 100644 --- a/packages/sprotty-protocol/package.json +++ b/packages/sprotty-protocol/package.json @@ -23,7 +23,10 @@ }, "scripts": { - "clean": "shx rm -fr lib artifacts *.tsbuildinfo" + "clean": "shx rm -fr lib artifacts *.tsbuildinfo", + "build": "tsc", + "watch": "tsc --watch", + "test": "vitest run --config ../../vite.config.ts" }, "files": [ "lib", diff --git a/packages/sprotty/package.json b/packages/sprotty/package.json index 10735f9..3f25bfa 100644 --- a/packages/sprotty/package.json +++ b/packages/sprotty/package.json @@ -37,7 +37,10 @@ "snabbdom-to-html": "^7.1.0" }, "scripts": { - "clean": "shx rm -fr lib artifacts *.tsbuildinfo" + "clean": "shx rm -fr lib artifacts *.tsbuildinfo", + "build": "tsc", + "watch": "tsc --watch", + "test": "vitest run --config ../../vite.config.ts" }, "files": [ "lib",