From b0750c4ad76cfca1b05c29372c141964fc5b0be4 Mon Sep 17 00:00:00 2001 From: Vit Gottwald Date: Tue, 28 Jan 2025 17:07:52 +0100 Subject: [PATCH] Cleanup npm scripts and tooling configs Signed-off-by: Vit Gottwald --- .env_sample | 4 + .github/workflows/ci.yml | 2 +- .gitignore | 2 + .vscode/launch.json | 11 +- package.json | 46 +++--- packages/language/package.json | 7 +- .../language/src/parser/pli-token-builder.ts | 2 +- packages/language/tsconfig.test.json | 6 +- packages/vscode-extension/esbuild.mjs | 8 +- packages/vscode-extension/package.json | 9 +- packages/vscode-extension/tsconfig.json | 4 +- pnpm-lock.yaml | 149 ------------------ tsconfig.build.json | 24 +-- tsconfig.json | 6 +- vitest.config.ts | 14 +- 15 files changed, 76 insertions(+), 218 deletions(-) create mode 100644 .env_sample diff --git a/.env_sample b/.env_sample new file mode 100644 index 0000000..6edb98f --- /dev/null +++ b/.env_sample @@ -0,0 +1,4 @@ +# Make your own copy to .env which is .gitignore(d) + +# Stop the language server at initial breakpoint +DEBUG_BREAK="true" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2dfb110..d6444cd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: - name: Build monorepo shell: bash run: | - pnpm install + pnpm install --frozen-lockfile pnpm build - name: Test monorepo if: success() || failure() diff --git a/.gitignore b/.gitignore index 091a1bf..821a305 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,8 @@ node_modules/ dist/ out/ +.DS_Store +.env **/src/generated **/syntaxes/pli.merged.json *.tsbuildinfo diff --git a/.vscode/launch.json b/.vscode/launch.json index 5e7dbe5..3074b5a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -18,9 +18,7 @@ "${workspaceFolder}/packages/language/out/**/*", "${workspaceFolder}/packages/vscode-extension/out/**/*" ], - "env": { - // "DEBUG_BREAK": "true" - } + "envFile": "${workspaceFolder}/.env" }, { "name": "Run Web Extension", @@ -87,5 +85,12 @@ "smartStep": true, "console": "integratedTerminal" } + ], + "compounds": [ + { + "name": "Extension + Language Server", + "configurations": ["Run Extension", "Attach to Language Server"], + "stopAll": true + } ] } diff --git a/package.json b/package.json index ee8e89f..a48170e 100644 --- a/package.json +++ b/package.json @@ -1,24 +1,26 @@ { - "name": "pli-workspace", - "description": "Base workspace package", - "version": "0.0.1", - "type": "module", - "private": true, - "scripts": { - "watch": "tsc -b tsconfig.build.json --watch", - "build": "pnpm langium:generate && tsc -b tsconfig.build.json && pnpm --dir packages/vscode-extension build && node ./scripts/merge-tmlanguage.mjs", - "build:clean": "pnpm clean && pnpm build", - "langium:generate": "pnpm --dir packages/language langium:generate", - "langium:watch": "pnpm --dir packages/language langium:watch", - "test": "vitest" - }, - "devDependencies": { - "@types/node": "^18.19.70", - "deepmerge": "^1.5.2", - "langium": "~3.2.1", - "prettier": "^3.4.2", - "shx": "~0.3.4", - "typescript": "~5.4.5", - "vitest": "^1.6.0" - } + "name": "pli-workspace", + "description": "Base workspace package", + "version": "0.0.1", + "type": "module", + "private": true, + "scripts": { + "clean": "pnpm --dir packages/language clean; pnpm --dir packages/vscode-extension clean", + "generate": "pnpm --dir packages/language langium:generate", + "compile": "tsc -b tsconfig.build.json", + "bundle": "pnpm --dir packages/vscode-extension esbuild:bundle", + "merge": "node ./scripts/merge-tmlanguage.mjs", + "build": "pnpm clean && pnpm generate && pnpm compile && pnpm bundle && pnpm merge", + "test": "vitest", + "pretty": "prettier -w '**/*.ts'" + }, + "devDependencies": { + "@types/node": "^18.19.70", + "deepmerge": "^1.5.2", + "langium": "~3.2.1", + "prettier": "^3.4.2", + "shx": "~0.3.4", + "typescript": "~5.4.5", + "vitest": "^1.6.0" + } } diff --git a/packages/language/package.json b/packages/language/package.json index 8a24ebc..d2bf6c7 100644 --- a/packages/language/package.json +++ b/packages/language/package.json @@ -26,11 +26,8 @@ } }, "scripts": { - "clean": "shx rm -fr *.tsbuildinfo out", - "build": "echo 'No build step'", - "build:clean": "npm run clean && npm run build", - "langium:generate": "langium generate", - "langium:watch": "langium generate --watch" + "clean": "shx rm -fr *.tsbuildinfo out src/generated", + "langium:generate": "langium generate" }, "dependencies": { "chevrotain": "^11.0.3", diff --git a/packages/language/src/parser/pli-token-builder.ts b/packages/language/src/parser/pli-token-builder.ts index 9be7276..3e8558f 100644 --- a/packages/language/src/parser/pli-token-builder.ts +++ b/packages/language/src/parser/pli-token-builder.ts @@ -57,7 +57,7 @@ export class PliTokenBuilder extends DefaultTokenBuilder { } }); const execFragment = tokens.find((e) => e.name === "ExecFragment")!; - execFragment.START_CHARS_HINT = ["S", "C"]; + execFragment.START_CHARS_HINT = ["S", "C"]; // (S)QL, (C)ICS return tokens; } } diff --git a/packages/language/tsconfig.test.json b/packages/language/tsconfig.test.json index 58e5132..84e18a5 100644 --- a/packages/language/tsconfig.test.json +++ b/packages/language/tsconfig.test.json @@ -1,8 +1,8 @@ { - "extends": "./tsconfig.src.json", + "extends": "../../tsconfig.json", "compilerOptions": { - "noEmit": true, - "rootDir": "test" + "rootDir": "test", + "noEmit": true }, "references": [ { diff --git a/packages/vscode-extension/esbuild.mjs b/packages/vscode-extension/esbuild.mjs index 3f31fd8..5f34787 100644 --- a/packages/vscode-extension/esbuild.mjs +++ b/packages/vscode-extension/esbuild.mjs @@ -44,7 +44,7 @@ const nodeCtx = await esbuild.context({ entryPoints: ["src/extension/main.ts", "src/language/main.ts"], outdir: "out", bundle: true, - target: "ES2017", + target: "ESNext", // VSCode's extension host is still using cjs, so we need to transform the code format: "cjs", // To prevent confusing node, we explicitly use the `.cjs` extension @@ -54,7 +54,7 @@ const nodeCtx = await esbuild.context({ loader: { ".ts": "ts" }, external: ["vscode"], platform: "node", - sourcemap: !minify, + sourcemap: true, minify, plugins, }); @@ -67,12 +67,12 @@ const browserCtx = await esbuild.context({ ], outdir: "out", bundle: true, - target: "ES2017", + target: "ESNext", format: "cjs", loader: { ".ts": "ts" }, external: ["vscode"], platform: "browser", - sourcemap: !minify, + sourcemap: true, minify, plugins, }); diff --git a/packages/vscode-extension/package.json b/packages/vscode-extension/package.json index 8f92c21..c525c62 100644 --- a/packages/vscode-extension/package.json +++ b/packages/vscode-extension/package.json @@ -45,12 +45,10 @@ "main": "./out/extension/main.cjs", "browser": "./out/extension/main-browser.js", "scripts": { - "clean": "shx rm -fr *.tsbuildinfo out", - "vscode:prepublish": "npm run build && node esbuild.mjs --minify", + "clean": "shx rm -fr *.tsbuildinfo out syntaxes/pli.merged.json", + "vscode:prepublish": "node esbuild.mjs --minify", "package": "vsce package", - "build": "tsc -b tsconfig.json && node esbuild.mjs", - "build:clean": "npm run clean && npm run build", - "watch": "concurrently -n tsc,esbuild -c blue,yellow \"tsc -b tsconfig.json --watch\" \"node esbuild.mjs --watch\"" + "esbuild:bundle": "node esbuild.mjs" }, "vsce": { "dependencies": false @@ -64,7 +62,6 @@ "devDependencies": { "@types/vscode": "~1.67.0", "@vscode/vsce": "^3.0.0", - "concurrently": "~8.2.1", "esbuild": "~0.21.5" } } diff --git a/packages/vscode-extension/tsconfig.json b/packages/vscode-extension/tsconfig.json index 6cd84af..89705be 100644 --- a/packages/vscode-extension/tsconfig.json +++ b/packages/vscode-extension/tsconfig.json @@ -1,9 +1,9 @@ { "extends": "../../tsconfig.json", "compilerOptions": { - "noEmit": true, "rootDir": ".", - "lib": ["DOM", "ES2022"] + "noEmit": true, + "lib": ["DOM", "ESNext"] }, "references": [ { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0a75dda..1b128a2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -70,9 +70,6 @@ importers: '@vscode/vsce': specifier: ^3.0.0 version: 3.2.1 - concurrently: - specifier: ~8.2.1 - version: 8.2.2 esbuild: specifier: ~0.21.5 version: 0.21.5 @@ -123,10 +120,6 @@ packages: resolution: {integrity: sha512-gVPW8YLz92ZeCibQH2QUw96odJoiM3k/ZPH3f2HxptozmH6+OnyyvKXo/Egg39HAM230akarQKHf0W74UHlh0Q==} engines: {node: '>=16'} - '@babel/runtime@7.26.0': - resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==} - engines: {node: '>=6.9.0'} - '@chevrotain/cst-dts-gen@11.0.3': resolution: {integrity: sha512-BvIKpRLeS/8UbfxXxgC33xOumsacaeCKAjAeLyOn7Pcp95HiRbrpl14S+9vaZLolnbssPIUuiUd8IvgkRyt6NQ==} @@ -558,10 +551,6 @@ packages: resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} engines: {node: '>=4'} - chalk@4.1.2: - resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} - engines: {node: '>=10'} - chalk@5.3.0: resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==} engines: {node: ^12.17.0 || ^14.13 || >=16.0.0} @@ -587,10 +576,6 @@ packages: chownr@1.1.4: resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==} - cliui@8.0.1: - resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==} - engines: {node: '>=12'} - cockatiel@3.2.1: resolution: {integrity: sha512-gfrHV6ZPkquExvMh9IOkKsBzNDk6sDuZ6DdBGUBkvFnTCqCxzpuq48RySgP0AnaqQkw2zynOFj9yly6T1Q2G5Q==} engines: {node: '>=16'} @@ -623,11 +608,6 @@ packages: concat-map@0.0.1: resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==} - concurrently@8.2.2: - resolution: {integrity: sha512-1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==} - engines: {node: ^14.13.0 || >=16.0.0} - hasBin: true - confbox@0.1.8: resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==} @@ -642,10 +622,6 @@ packages: resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==} engines: {node: '>= 6'} - date-fns@2.30.0: - resolution: {integrity: sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==} - engines: {node: '>=0.11'} - debug@4.4.0: resolution: {integrity: sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==} engines: {node: '>=6.0'} @@ -739,10 +715,6 @@ packages: engines: {node: '>=12'} hasBin: true - escalade@3.2.0: - resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} - engines: {node: '>=6'} - escape-string-regexp@1.0.5: resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} engines: {node: '>=0.8.0'} @@ -791,10 +763,6 @@ packages: function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} - get-caller-file@2.0.5: - resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} - engines: {node: 6.* || 8.* || >= 10.*} - get-func-name@2.0.2: resolution: {integrity: sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==} @@ -828,10 +796,6 @@ packages: resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} engines: {node: '>=4'} - has-flag@4.0.0: - resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} - engines: {node: '>=8'} - has-property-descriptors@1.0.2: resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==} @@ -1219,13 +1183,6 @@ packages: resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==} engines: {node: '>= 0.10'} - regenerator-runtime@0.14.1: - resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==} - - require-directory@2.1.1: - resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==} - engines: {node: '>=0.10.0'} - resolve@1.22.10: resolution: {integrity: sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==} engines: {node: '>= 0.4'} @@ -1236,9 +1193,6 @@ packages: engines: {node: '>=18.0.0', npm: '>=8.0.0'} hasBin: true - rxjs@7.8.1: - resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==} - safe-buffer@5.2.1: resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==} @@ -1269,9 +1223,6 @@ packages: resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==} engines: {node: '>=8'} - shell-quote@1.8.1: - resolution: {integrity: sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==} - shelljs@0.8.5: resolution: {integrity: sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==} engines: {node: '>=4'} @@ -1303,9 +1254,6 @@ packages: resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==} engines: {node: '>=0.10.0'} - spawn-command@0.0.2: - resolution: {integrity: sha512-zC8zGoGkmc8J9ndvml8Xksr1Amk9qBujgbF0JAIWO7kXr43w0h/0GJNM/Vustixu+YE8N/MTrQ7N31FvHUACxQ==} - stackback@0.0.2: resolution: {integrity: sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==} @@ -1350,14 +1298,6 @@ packages: resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} engines: {node: '>=4'} - supports-color@7.2.0: - resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} - engines: {node: '>=8'} - - supports-color@8.1.1: - resolution: {integrity: sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==} - engines: {node: '>=10'} - supports-preserve-symlinks-flag@1.0.0: resolution: {integrity: sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==} engines: {node: '>= 0.4'} @@ -1384,10 +1324,6 @@ packages: resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==} engines: {node: '>=14.14'} - tree-kill@1.2.2: - resolution: {integrity: sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==} - hasBin: true - tslib@2.8.0: resolution: {integrity: sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==} @@ -1562,21 +1498,9 @@ packages: resolution: {integrity: sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==} engines: {node: '>=4.0'} - y18n@5.0.8: - resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} - engines: {node: '>=10'} - yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} - yargs-parser@21.1.1: - resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==} - engines: {node: '>=12'} - - yargs@17.7.2: - resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==} - engines: {node: '>=12'} - yauzl@2.10.0: resolution: {integrity: sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==} @@ -1668,10 +1592,6 @@ snapshots: jsonwebtoken: 9.0.2 uuid: 8.3.2 - '@babel/runtime@7.26.0': - dependencies: - regenerator-runtime: 0.14.1 - '@chevrotain/cst-dts-gen@11.0.3': dependencies: '@chevrotain/gast': 11.0.3 @@ -2037,11 +1957,6 @@ snapshots: escape-string-regexp: 1.0.5 supports-color: 5.5.0 - chalk@4.1.2: - dependencies: - ansi-styles: 4.3.0 - supports-color: 7.2.0 - chalk@5.3.0: {} check-error@1.0.3: @@ -2088,12 +2003,6 @@ snapshots: chownr@1.1.4: optional: true - cliui@8.0.1: - dependencies: - string-width: 4.2.3 - strip-ansi: 6.0.1 - wrap-ansi: 7.0.0 - cockatiel@3.2.1: {} color-convert@1.9.3: @@ -2118,18 +2027,6 @@ snapshots: concat-map@0.0.1: {} - concurrently@8.2.2: - dependencies: - chalk: 4.1.2 - date-fns: 2.30.0 - lodash: 4.17.21 - rxjs: 7.8.1 - shell-quote: 1.8.1 - spawn-command: 0.0.2 - supports-color: 8.1.1 - tree-kill: 1.2.2 - yargs: 17.7.2 - confbox@0.1.8: {} cross-spawn@7.0.6: @@ -2148,10 +2045,6 @@ snapshots: css-what@6.1.0: {} - date-fns@2.30.0: - dependencies: - '@babel/runtime': 7.26.0 - debug@4.4.0: dependencies: ms: 2.1.3 @@ -2257,8 +2150,6 @@ snapshots: '@esbuild/win32-ia32': 0.21.5 '@esbuild/win32-x64': 0.21.5 - escalade@3.2.0: {} - escape-string-regexp@1.0.5: {} estree-walker@3.0.3: @@ -2313,8 +2204,6 @@ snapshots: function-bind@1.1.2: {} - get-caller-file@2.0.5: {} - get-func-name@2.0.2: {} get-intrinsic@1.2.4: @@ -2356,8 +2245,6 @@ snapshots: has-flag@3.0.0: {} - has-flag@4.0.0: {} - has-property-descriptors@1.0.2: dependencies: es-define-property: 1.0.0 @@ -2777,10 +2664,6 @@ snapshots: dependencies: resolve: 1.22.10 - regenerator-runtime@0.14.1: {} - - require-directory@2.1.1: {} - resolve@1.22.10: dependencies: is-core-module: 2.16.1 @@ -2812,10 +2695,6 @@ snapshots: '@rollup/rollup-win32-x64-msvc': 4.30.1 fsevents: 2.3.3 - rxjs@7.8.1: - dependencies: - tslib: 2.8.0 - safe-buffer@5.2.1: {} safer-buffer@2.1.2: {} @@ -2841,8 +2720,6 @@ snapshots: shebang-regex@3.0.0: {} - shell-quote@1.8.1: {} - shelljs@0.8.5: dependencies: glob: 7.2.3 @@ -2877,8 +2754,6 @@ snapshots: source-map-js@1.2.1: {} - spawn-command@0.0.2: {} - stackback@0.0.2: {} std-env@3.8.0: {} @@ -2923,14 +2798,6 @@ snapshots: dependencies: has-flag: 3.0.0 - supports-color@7.2.0: - dependencies: - has-flag: 4.0.0 - - supports-color@8.1.1: - dependencies: - has-flag: 4.0.0 - supports-preserve-symlinks-flag@1.0.0: {} tar-fs@2.1.1: @@ -2958,8 +2825,6 @@ snapshots: tmp@0.2.3: {} - tree-kill@1.2.2: {} - tslib@2.8.0: {} tunnel-agent@0.6.0: @@ -3118,22 +2983,8 @@ snapshots: xmlbuilder@11.0.1: {} - y18n@5.0.8: {} - yallist@4.0.0: {} - yargs-parser@21.1.1: {} - - yargs@17.7.2: - dependencies: - cliui: 8.0.1 - escalade: 3.2.0 - get-caller-file: 2.0.5 - require-directory: 2.1.1 - string-width: 4.2.3 - y18n: 5.0.8 - yargs-parser: 21.1.1 - yauzl@2.10.0: dependencies: buffer-crc32: 0.2.13 diff --git a/tsconfig.build.json b/tsconfig.build.json index 6fd5dd7..1b77434 100644 --- a/tsconfig.build.json +++ b/tsconfig.build.json @@ -1,14 +1,14 @@ { - "files": [], - "references": [ - { - "path": "./packages/language/tsconfig.src.json" - }, - { - "path": "./packages/language/tsconfig.test.json" - }, - { - "path": "./packages/vscode-extension/tsconfig.json" - } - ] + "files": [], + "references": [ + { + "path": "./packages/language/tsconfig.src.json" + }, + { + "path": "./packages/language/tsconfig.test.json" + }, + { + "path": "./packages/vscode-extension/tsconfig.json" + } + ] } diff --git a/tsconfig.json b/tsconfig.json index a423856..f7d5129 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,9 +1,9 @@ { "compilerOptions": { - "target": "ES2020", - "module": "ES2022", + "target": "ESNext", + "module": "Preserve", "moduleResolution": "Bundler", - "lib": ["ES2022"], + "lib": ["ESNext"], "sourceMap": true, "strict": true, "noUnusedLocals": true, diff --git a/vitest.config.ts b/vitest.config.ts index c972344..8b1f88f 100644 --- a/vitest.config.ts +++ b/vitest.config.ts @@ -13,13 +13,13 @@ * For a detailed explanation regarding each configuration property and type check, visit: * https://vitest.dev/config/ */ -import { defineConfig } from 'vitest/config'; +import { defineConfig } from "vitest/config"; export default defineConfig({ - test: { - deps: { - interopDefault: true - }, - include: ['packages/**/test/**/*.test.ts'] - } + test: { + deps: { + interopDefault: true, + }, + include: ["packages/**/test/**/*.test.ts"], + }, });