diff --git a/.eslintrc.js b/.eslintrc.js index ed507d73..22ead057 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -10,7 +10,8 @@ module.exports = { parser: '@typescript-eslint/parser', ignorePatterns: [ '**/{node_modules,lib}', - '**/sprotty-local-template/**/*' + '**/sprotty-local-template/**/*', + '**/lib/**/src/**/*' ], parserOptions: { tsconfigRootDir: __dirname, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 6a4eb823..515ddba3 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -3,30 +3,6 @@ // for the documentation about the tasks.json format "version": "2.0.0", "tasks": [ - { - "label": "Build all", - "type": "shell", - "detail": "Build Sprotty and Sprotty examples", - "group": { - "kind": "build", - "isDefault": true - }, - "presentation": { - "echo": false, - "focus": false, - "panel": "shared", - "showReuseMessage": false, - "clear": false - }, - "command": "echo 😎 Finished building Sprotty and Sprotty examples", - "isBackground": true, - "problemMatcher": [], - "dependsOrder": "sequence", - "dependsOn": [ - "Build Sprotty", - "Build Sprotty examples" - ] - }, { "label": "Build Sprotty", "type": "shell", @@ -43,42 +19,6 @@ "$eslint-compact" ] }, - { - "label": "Build Sprotty examples", - "type": "shell", - "command": "yarn --cwd examples build", - "group": "build", - "presentation": { - "focus": false, - "panel": "shared", - "showReuseMessage": false, - "clear": false - }, - "problemMatcher": [ - "$tsc", - "$eslint-compact" - ] - }, - { - "label": "Watch all", - "detail": "Watch Sprotty and Sprotty example", - "type": "shell", - "group": "none", - "presentation": { - "echo": false, - "focus": false, - "panel": "dedicated", - "showReuseMessage": false, - "clear": true - }, - "command": "echo", - "problemMatcher": [], - "dependsOrder": "parallel", - "dependsOn": [ - "Watch Sprotty", - "Watch Sprotty examples" - ] - }, { "label": "Watch Sprotty", "type": "shell", @@ -93,21 +33,6 @@ "problemMatcher": [ "$tsc-watch" ] - }, - { - "label": "Watch Sprotty examples", - "type": "shell", - "command": "yarn examples:watch", - "group": "none", - "presentation": { - "focus": false, - "panel": "dedicated", - "showReuseMessage": false, - "clear": true - }, - "problemMatcher": [ - "$tsc-watch" - ] } ] } \ No newline at end of file diff --git a/examples/package.json b/examples/package.json index 4e097dff..2e7ba103 100644 --- a/examples/package.json +++ b/examples/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "private": "true", "dependencies": { - "@vscode/codicons": "^0.0.33", + "@vscode/codicons": "~0.0.35", "express": "^4.18.2", "inversify": "6.0.1", "reflect-metadata": "^0.1.13", diff --git a/package.json b/package.json index 935c2089..e7899919 100644 --- a/package.json +++ b/package.json @@ -28,9 +28,9 @@ "reflect-metadata": "~0.1.13", "semver": "~7.5.4", "shx": "~0.3.4", - "typescript": "~5.3.2", + "typescript": "~5.3.3", "vite": "~5.0.6", - "vitest": "~1.0.1" + "vitest": "~1.0.2" }, "workspaces": [ "packages/*", diff --git a/packages/sprotty-elk/tsconfig.json b/packages/sprotty-elk/tsconfig.json index a0c8c2a0..65bc6caa 100644 --- a/packages/sprotty-elk/tsconfig.json +++ b/packages/sprotty-elk/tsconfig.json @@ -11,5 +11,9 @@ "exclude": [ "lib", "node_modules" + ], + "references": [ + { "path": "../sprotty-protocol/tsconfig.src.json"}, + { "path": "../sprotty/tsconfig.src.json" } ] } diff --git a/packages/sprotty/tsconfig.json b/packages/sprotty/tsconfig.json index a0c8c2a0..b572ea50 100644 --- a/packages/sprotty/tsconfig.json +++ b/packages/sprotty/tsconfig.json @@ -11,5 +11,8 @@ "exclude": [ "lib", "node_modules" - ] + ], + "references": [ + { "path": "../sprotty-protocol/tsconfig.src.json" } +], } diff --git a/yarn.lock b/yarn.lock index 4a810273..201efc37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1316,53 +1316,53 @@ test-exclude "^6.0.0" v8-to-istanbul "^9.2.0" -"@vitest/expect@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-1.0.1.tgz#5e63902316a3c65948c6e36f284046962601fb88" - integrity sha512-3cdrb/eKD/0tygDX75YscuHEHMUJ70u3UoLSq2eqhWks57AyzvsDQbyn53IhZ0tBN7gA8Jj2VhXiOV2lef7thw== +"@vitest/expect@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@vitest/expect/-/expect-1.0.2.tgz#7fc5ee3fe0e649f5a5e3df1a9744efe0163d1237" + integrity sha512-mAIo/8uddSWkjQMLFcjqZP3WmkwvvN0OtlyZIu33jFnwme3vZds8m8EDMxtj+Uzni2DwtPfHNjJcTM8zTV1f4A== dependencies: - "@vitest/spy" "1.0.1" - "@vitest/utils" "1.0.1" + "@vitest/spy" "1.0.2" + "@vitest/utils" "1.0.2" chai "^4.3.10" -"@vitest/runner@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-1.0.1.tgz#d94cab9e3008dba52f89e811540184334766ab61" - integrity sha512-/+z0vhJ0MfRPT3AyTvAK6m57rzlew/ct8B2a4LMv7NhpPaiI2QLGyOBMB3lcioWdJHjRuLi9aYppfOv0B5aRQA== +"@vitest/runner@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@vitest/runner/-/runner-1.0.2.tgz#aad21c03fdcd1f380564fad37be7d5a2feb2f733" + integrity sha512-ZcHJXPT2kg/9Hc4fNkCbItlsgZSs3m4vQbxB8LCSdzpbG85bExCmSvu6K9lWpMNdoKfAr1Jn0BwS9SWUcGnbTQ== dependencies: - "@vitest/utils" "1.0.1" + "@vitest/utils" "1.0.2" p-limit "^5.0.0" pathe "^1.1.1" -"@vitest/snapshot@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-1.0.1.tgz#9d2a01c64726afa62264175554690e5ce148d4a5" - integrity sha512-wIPtPDGSxEZ+DpNMc94AsybX6LV6uN6sosf5TojyP1m2QbKwiRuLV/5RSsjt1oWViHsTj8mlcwrQQ1zHGO0fMw== +"@vitest/snapshot@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@vitest/snapshot/-/snapshot-1.0.2.tgz#df11b066c9593e3539640a41f38452a6b5889da1" + integrity sha512-9ClDz2/aV5TfWA4reV7XR9p+hE0e7bifhwxlURugj3Fw0YXeTFzHmKCNEHd6wOIFMfthbGGwhlq7TOJ2jDO4/g== dependencies: magic-string "^0.30.5" pathe "^1.1.1" pretty-format "^29.7.0" -"@vitest/spy@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-1.0.1.tgz#d82af1c4d935e08443bf20432ba55afd001ac71f" - integrity sha512-yXwm1uKhBVr/5MhVeSmtNqK+0q2RXIchJt8kokEKdrWLtkPeDgdbZ6SjR1VQGZuNdWL6sSBnLayIyVvcS0qLfA== +"@vitest/spy@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@vitest/spy/-/spy-1.0.2.tgz#c28205427e77e589e3f0e6017f55d1c5b9defee3" + integrity sha512-YlnHmDntp+zNV3QoTVFI5EVHV0AXpiThd7+xnDEbWnD6fw0TH/J4/+3GFPClLimR39h6nA5m0W4Bjm5Edg4A/A== dependencies: tinyspy "^2.2.0" -"@vitest/utils@1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-1.0.1.tgz#ab2bf6de50845649b252a9d263765ab7f16bd6a2" - integrity sha512-MGPCHkzXbbAyscrhwGzh8uP1HPrTYLWaj1WTDtWSGrpe2yJWLRN9mF9ooKawr6NMOg9vTBtg2JqWLfuLC7Dknw== +"@vitest/utils@1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@vitest/utils/-/utils-1.0.2.tgz#fbc483a62d13a02fa4e2b470fbf565fdd616a242" + integrity sha512-GPQkGHAnFAP/+seSbB9pCsj339yRrMgILoI5H2sPevTLCYgBq0VRjF8QSllmnQyvf0EontF6KUIt2t5s2SmqoQ== dependencies: diff-sequences "^29.6.3" loupe "^2.3.7" pretty-format "^29.7.0" -"@vscode/codicons@^0.0.33": - version "0.0.33" - resolved "https://registry.yarnpkg.com/@vscode/codicons/-/codicons-0.0.33.tgz#a56243ab5492801fff04e53c0aab0d18a6521751" - integrity sha512-VdgpnD75swH9hpXjd34VBgQ2w2quK63WljodlUcOoJDPKiV+rPjHrcUc2sjLCNKxhl6oKqmsZgwOWcDAY2GKKQ== +"@vscode/codicons@~0.0.35": + version "0.0.35" + resolved "https://registry.yarnpkg.com/@vscode/codicons/-/codicons-0.0.35.tgz#7424a647f39c6e71c86c1edf12bfc27196c8fba1" + integrity sha512-7iiKdA5wHVYSbO7/Mm0hiHD3i4h+9hKUe1O4hISAe/nHhagMwb2ZbFC8jU6d7Cw+JNT2dWXN2j+WHbkhT5/l2w== "@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": version "1.11.6" @@ -6413,11 +6413,16 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -"typescript@>=3 < 6", typescript@~5.3.2: +"typescript@>=3 < 6": version "5.3.2" resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.2.tgz#00d1c7c1c46928c5845c1ee8d0cc2791031d4c43" integrity sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ== +typescript@~5.3.3: + version "5.3.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37" + integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw== + ufo@^1.3.0: version "1.3.2" resolved "https://registry.yarnpkg.com/ufo/-/ufo-1.3.2.tgz#c7d719d0628a1c80c006d2240e0d169f6e3c0496" @@ -6552,18 +6557,18 @@ vary@~1.1.2: resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg== -vite-node@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-1.0.1.tgz#c16c9df9b5d47b74156a6501c9db5b380d992768" - integrity sha512-Y2Jnz4cr2azsOMMYuVPrQkp3KMnS/0WV8ezZjCy4hU7O5mUHCAVOnFmoEvs1nvix/4mYm74Len8bYRWZJMNP6g== +vite-node@1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/vite-node/-/vite-node-1.0.2.tgz#5e6096e31b851f245ccbd353bf3939130dfd0224" + integrity sha512-h7BbMJf46fLvFW/9Ygo3snkIBEHFh6fHpB4lge98H5quYrDhPFeI3S0LREz328uqPWSnii2yeJXktQ+Pmqk5BQ== dependencies: cac "^6.7.14" debug "^4.3.4" pathe "^1.1.1" picocolors "^1.0.0" - vite "^5.0.0-beta.15 || ^5.0.0" + vite "^5.0.0" -"vite@^5.0.0-beta.15 || ^5.0.0", "vite@^5.0.0-beta.19 || ^5.0.0", vite@~5.0.6: +vite@^5.0.0, vite@~5.0.6: version "5.0.6" resolved "https://registry.yarnpkg.com/vite/-/vite-5.0.6.tgz#f9e13503a4c5ccd67312c67803dec921f3bdea7c" integrity sha512-MD3joyAEBtV7QZPl2JVVUai6zHms3YOmLR+BpMzLlX2Yzjfcc4gTgNi09d/Rua3F4EtC8zdwPU8eQYyib4vVMQ== @@ -6574,16 +6579,16 @@ vite-node@1.0.1: optionalDependencies: fsevents "~2.3.3" -vitest@~1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/vitest/-/vitest-1.0.1.tgz#3ba1307066842bc801084fa384ce0b23941b91f7" - integrity sha512-MHsOj079S28hDsvdDvyD1pRj4dcS51EC5Vbe0xvOYX+WryP8soiK2dm8oULi+oA/8Xa/h6GoJEMTmcmBy5YM+Q== - dependencies: - "@vitest/expect" "1.0.1" - "@vitest/runner" "1.0.1" - "@vitest/snapshot" "1.0.1" - "@vitest/spy" "1.0.1" - "@vitest/utils" "1.0.1" +vitest@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/vitest/-/vitest-1.0.2.tgz#a7c3bf41bd5ef8c1c781c98c84a749d26b31f944" + integrity sha512-F3NVwwpXfRSDnJmyv+ALPwSRVt0zDkRRE18pwUHSUPXAlWQ47rY1dc99ziMW5bBHyqwK2ERjMisLNoef64qk9w== + dependencies: + "@vitest/expect" "1.0.2" + "@vitest/runner" "1.0.2" + "@vitest/snapshot" "1.0.2" + "@vitest/spy" "1.0.2" + "@vitest/utils" "1.0.2" acorn-walk "^8.3.0" cac "^6.7.14" chai "^4.3.10" @@ -6597,8 +6602,8 @@ vitest@~1.0.1: strip-literal "^1.3.0" tinybench "^2.5.1" tinypool "^0.8.1" - vite "^5.0.0-beta.19 || ^5.0.0" - vite-node "1.0.1" + vite "^5.0.0" + vite-node "1.0.2" why-is-node-running "^2.2.2" watchpack@^2.4.0: