diff --git a/README.md b/README.md index 2af9541c2..b29e02ca2 100644 --- a/README.md +++ b/README.md @@ -26,11 +26,13 @@ Click [here](https://www.typefox.io/blog/teaching-the-language-server-protocol-t - [Server processes](#server-processes) - [Verification Example Servers](#verification-example-servers) - [VSCode integration](#vscode-integration) + - [Featured projects](#featured-projects) - [Troubleshooting](#troubleshooting) - [General](#general) - [Dependency issues: monaco-editor / @codingame/monaco-editor-treemended](#dependency-issues-monaco-editor--codingamemonaco-editor-treemended) - [Volta](#volta) - [Vite dev server troubleshooting](#vite-dev-server-troubleshooting) + - [Serve all files required](#serve-all-files-required) - [Bad Polyfills](#bad-polyfills) - [buffer](#buffer) - [monaco-editor-core](#monaco-editor-core) @@ -91,12 +93,12 @@ With v7 we decided to use readily treemended version of monaco-editor called [@c ```yaml "overrides": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0" + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0" }, "resolutions": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0" + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0" } ``` @@ -203,6 +205,11 @@ npm run start:verify:vite You can as well run [vscode tasks](./.vscode/launch.json) to start and debug the server in different modes and the client. +## Featured projects + +- JSONA Editor: [Showcase](https://jsona.github.io/editor/schema) ([GitHub](https://github.com/jsona/editor)) +- monaco-editor-wrapper: [Showcase](https://langium.org/showcase/minilogo/) ([GitHub](https://github.com/TypeFox/monaco-components)) + ## Troubleshooting ### General @@ -216,6 +223,8 @@ Ensure **monaco-editor**, **vscode** and **monaco-languageclient** are imported It is recommended to study this chapter first: [NEW with v7: Treemended monaco-editor](#new-with-v7-treemended-monaco-editor). If you have mutiple, possibly hundreds of compile errors resulting from missing functions deep in `monaco-editor` or `vscode` then it is very likely your `package-lock.json` or `node_modules` are dirty. Remove both and do a fresh `npm install`. Always `npm list monaco-editor` is very useful. If you see different or errornous versions, then this is an indicator something is wrong. +Current observation is: When using npm overrides upgrading them seems to be problematic. Best practices seems to be to remove `package-lock.json` or `node_modules` and do a full re-installation with `npm i` afterwards. + ### Volta There are [Volta](https://volta.sh/) instructions in the `package.json` files. When you have Volta available it will ensure the exactly specified `node` and `npm` versions are used. @@ -232,6 +241,10 @@ resolve: { } ``` +### Serve all files required + + `@codingame/monaco-vscode-api` requires json and other files to be served. In your project's web-server configuration you have to ensure you don't prevent this. + ### Bad Polyfills #### buffer @@ -295,7 +308,7 @@ loader.config({ monaco }); If you use pnpm, you have to add `vscode` / `@codingame/monaco-vscode-api` as direct dependency (see the [following table](#monaco-editor--codingamemonaco-vscode-api-compatibility-table)), otherwise the installation will fail. ```json -"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0" +"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0" ``` ## Monaco-editor / @codingame/monaco-vscode-api compatibility table @@ -306,6 +319,7 @@ The following table describes which version of **monaco-languageclient** and **@ | monaco-languageclient | monaco-vscode-api | monaco-editor-treemended | monaco-editor | release date | comment | | :---- | :---- | :--- | :--- | :--- | :--- | +| 7.1.0 | 1.83.12 | 1.83.12 | 0.44.0 | 2023-11-27 | | | 7.0.2 | 1.83.7 | 1.83.7 | 0.44.0 | 2023-11-02 | | | 7.0.1 | 1.83.5 | 1.83.5 | 0.44.0 | 2023-11-10 | | | 7.0.0 | 1.83.5 | 1.83.5 | 0.44.0 | 2023-11-02 | Introduction of `@codingame/monaco-editor-treemended` | diff --git a/package-lock.json b/package-lock.json index 504be59e8..8f1ca8228 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,18 +13,18 @@ ], "devDependencies": { "@types/vscode": "~1.83.3", - "@typescript-eslint/eslint-plugin": "~6.9.1", - "@typescript-eslint/parser": "~6.9.1", + "@typescript-eslint/eslint-plugin": "~6.12.0", + "@typescript-eslint/parser": "~6.12.0", "editorconfig": "~2.0.0", - "eslint": "~8.52.0", + "eslint": "~8.54.0", "eslint-config-standard": "~17.1.0", "eslint-plugin-header": "~3.1.1", "eslint-plugin-import": "~2.29.0", "eslint-plugin-promise": "~6.1.1", "eslint-plugin-unused-imports": "~3.0.0", "shx": "~0.3.4", - "typescript": "~5.2.2", - "vite": "~4.5.0" + "typescript": "~5.3.2", + "vite": "~5.0.2" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -71,125 +71,172 @@ "integrity": "sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==" }, "node_modules/@codingame/monaco-vscode-configuration-service-override": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-configuration-service-override/-/monaco-vscode-configuration-service-override-1.83.7.tgz", - "integrity": "sha512-nj/UH7FKN4jHgUA+uGbNk2uf51LwMZ7WOPGZdG/8EmK2wbAPB18z0AP/2ik+c0/rigQL6SjjwM7LowOioURuqA==", - "dependencies": { + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-configuration-service-override/-/monaco-vscode-configuration-service-override-1.83.12.tgz", + "integrity": "sha512-qQQn6PHFO6/JXQs/CCbzIrDNUNpDArtJH5AKCodghPlkPdb6cSt8OGZxS0SYyVGjlr7UlOfEMhVLLvw5soqTnw==", + "dependencies": { + "@codingame/monaco-vscode-environment-service-override": "1.83.12", + "@codingame/monaco-vscode-extensions-service-override": "1.83.12", + "@codingame/monaco-vscode-files-service-override": "1.83.12", + "@codingame/monaco-vscode-layout-service-override": "1.83.12", + "@codingame/monaco-vscode-quickaccess-service-override": "1.83.12", "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@codingame/monaco-vscode-editor-service-override": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-editor-service-override/-/monaco-vscode-editor-service-override-1.83.7.tgz", - "integrity": "sha512-/jZeX5ULf10u8/QNjsdDQsZSeARNo3V/blcMnuMvHEJtnEDLnvVM+fAdSMrUwJzfEI0U3DD5H0Hiv/qFuTXrqQ==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-editor-service-override/-/monaco-vscode-editor-service-override-1.83.12.tgz", + "integrity": "sha512-t/8kFvDxhYehczJCEpAOCtpcwpJRc92lRv55WkOsjXE2h8TG55DDokeCC5MHIDjVKVaSxClWEPt8i9dSqaTcMA==", + "dependencies": { + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" + } + }, + "node_modules/@codingame/monaco-vscode-environment-service-override": { + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-environment-service-override/-/monaco-vscode-environment-service-override-1.83.12.tgz", + "integrity": "sha512-lgmkwQv/7c3Vlpz0+/dRx/weYJvapExexKDcWXkNbI5BH/1CKU+pL5LfgyZ4brc9LCLwoRVPhKgAX2NgbJS9Cw==", "dependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" + } + }, + "node_modules/@codingame/monaco-vscode-extensions-service-override": { + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-extensions-service-override/-/monaco-vscode-extensions-service-override-1.83.12.tgz", + "integrity": "sha512-OeqLHYQxD2+ejPXVYpJcWTwigmHk6qaqJsRem3bA1pOLNQIXvIgIkjdl/i4dlZIBJMbCajo4onTrDP95Nec6Ww==", + "dependencies": { + "@codingame/monaco-vscode-files-service-override": "1.83.12", + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12", + "vscode-semver": "npm:semver@=5.5.0" } }, "node_modules/@codingame/monaco-vscode-files-service-override": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-1.83.7.tgz", - "integrity": "sha512-ALF4jmBcIbcyz93OcV+CpOjJIjXyxsPAwx3NZ8Q+F6sqii3rMaDpduzHuqm2V7bhf58g5OhAmv9wFUlJ++oUhw==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-1.83.12.tgz", + "integrity": "sha512-APlbxQKkf5kpFheFjJmeDVGATm2ftVADjNu1Dfj6Gp+axSEAXC2j7DNA3+r9rlTq04XBUGoeKU6T4NzzlmGSFQ==", "dependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@codingame/monaco-vscode-json-default-extension": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-json-default-extension/-/monaco-vscode-json-default-extension-1.83.7.tgz", - "integrity": "sha512-tNIhMZxqvtLIUi72a+p5dYiF7SjpcAOdKTHs/bwtD8G5j1TGyuYp9T69fIr9qeSP0AVyrfTgY0g2eI+hKnfs8g==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-json-default-extension/-/monaco-vscode-json-default-extension-1.83.12.tgz", + "integrity": "sha512-nUG14T2wstesbmJUsudC/BBFmt0evP9SAewroCM0xP2BSyX8+X1K/LMVqn5I6ezb0CQehiEj9mOtnD4al6KNTQ==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@codingame/monaco-vscode-keybindings-service-override": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-keybindings-service-override/-/monaco-vscode-keybindings-service-override-1.83.7.tgz", - "integrity": "sha512-fuD/pnEHd3FvYJi1IV+WV44ttRq3bnOSie9xIODf+VlxEK/jn8uP8w8mBPoB52v8mFmtjE5uz5sdj8VLJ/LyPg==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-keybindings-service-override/-/monaco-vscode-keybindings-service-override-1.83.12.tgz", + "integrity": "sha512-ixQ4hFJv6ikgrW4862pVh6IuYz5HWBcwu12UQl3N3QDlhKcDMhO/OJi7xfHD96FUD2rt8oaZsPp+i6W2oTbZ3Q==", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "1.83.12", "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@codingame/monaco-vscode-language-pack-de": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-de/-/monaco-vscode-language-pack-de-1.83.7.tgz", - "integrity": "sha512-3PwJSp47aY08fNr4O9Wvm4LRX7NRDyYl6lN5AbNIc/eLxZ7r0Q+6Xv3yePM3QndXC/eM9IrPOHdydtLldPnaCA==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-de/-/monaco-vscode-language-pack-de-1.83.12.tgz", + "integrity": "sha512-YnKcrv9Fuy5UAO0ziKc757tYwIs17HfXEiEPMvocMUzifYrGU6cvIDt84CLWZyVpNqoMeMOelxFXDxYdfC2nkQ==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@codingame/monaco-vscode-language-pack-es": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-es/-/monaco-vscode-language-pack-es-1.83.7.tgz", - "integrity": "sha512-TRDFy7pRiPTZqEvA3xGymuEl3qwjGjXAuVe52F9ZufEXyjb+t7+k0ReIb8/T3Uv3qxEms6VEHyun1tcipVWltg==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-es/-/monaco-vscode-language-pack-es-1.83.12.tgz", + "integrity": "sha512-weBml6G04Aq/DKekOEmHQ5quybbfqr5FXuveuCpJEcAijxlox9CfengD2NEROyyQ1anh0ZLbOMgMleIvdAXv0Q==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@codingame/monaco-vscode-language-pack-fr": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-fr/-/monaco-vscode-language-pack-fr-1.83.7.tgz", - "integrity": "sha512-90M1bFreteS1fwZDFrqIhPs0+Kblclz0Td1dWRhWxCqRxgFEttV2Zyz2uy3W3AgYV1VJzttW+3nFkLvqZqIuqA==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-fr/-/monaco-vscode-language-pack-fr-1.83.12.tgz", + "integrity": "sha512-sji4+P1H8We+dTZO5W4lq/t8137zuK5bOE7MWoFIzTrkZl+kM0KlDg/SromMPBobhIktdSx723xqGUryUuwf0w==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@codingame/monaco-vscode-languages-service-override": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-languages-service-override/-/monaco-vscode-languages-service-override-1.83.7.tgz", - "integrity": "sha512-hssTRtIkL8SKe4xQMAj7O3eW++rBwaF0o+ElpxOwAxIVA7jUYuIzAsi0p2gSTyPXDQ+IZ2DuDJAd1PH6merIrA==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-languages-service-override/-/monaco-vscode-languages-service-override-1.83.12.tgz", + "integrity": "sha512-L1l6Y3WJBS1+t4lfkgzYlC34LvOJziq/G+1T3+IwpUlOxi5GS0LNyAyiwHY9m45mauR6OItUztVvVui06MalMQ==", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "1.83.12", "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" + } + }, + "node_modules/@codingame/monaco-vscode-layout-service-override": { + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-layout-service-override/-/monaco-vscode-layout-service-override-1.83.12.tgz", + "integrity": "sha512-7Zx+5JUkHNLI7psE9g3FpV4lWkxB5inZO4AFaUpLsrUNNG9okLlq798px8AIjGhT4ofzNttfs/tlyY1rt/CPow==", + "dependencies": { + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@codingame/monaco-vscode-model-service-override": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-model-service-override/-/monaco-vscode-model-service-override-1.83.7.tgz", - "integrity": "sha512-5UpZzCD6Dld/wu3WtMoDVVaZuRehBmPZfE2McJkuK8GEKUwlsYy8ozzbnT79URtZ1u6pqDn9e3Wkh7ZXboYHWQ==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-model-service-override/-/monaco-vscode-model-service-override-1.83.12.tgz", + "integrity": "sha512-bNXa6ShOivMeaT58rMg/tzVBjscFHWigM03ofQ31f1UKzRSNCUq7BmJSb9Fd4Bh+3MkXIELlAznNHEdoxU+J7Q==", "dependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@codingame/monaco-vscode-python-default-extension": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-python-default-extension/-/monaco-vscode-python-default-extension-1.83.7.tgz", - "integrity": "sha512-rFNeINSUGuQnQgThvOX48E/u7E2HaiJxZ6sW1IdGlZzkDdEapLTwS3lP2TVys+ZZlBYDg34pIkt9mUKcZ/qnNQ==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-python-default-extension/-/monaco-vscode-python-default-extension-1.83.12.tgz", + "integrity": "sha512-KteU4V9F4xhDMwr6PioV2sFj4nGA8aKKpv79A5DhyIXIYSYevU2oNgXBMoimmPGYt9Qf+wttzfXvRSY4dsnjoA==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" + } + }, + "node_modules/@codingame/monaco-vscode-quickaccess-service-override": { + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-quickaccess-service-override/-/monaco-vscode-quickaccess-service-override-1.83.12.tgz", + "integrity": "sha512-NVsAUFHwQqBVXgnq3hIaxtr72SEexQrd9wc/KLPdNIhHrtIHpUlAlIv47P1lNy4BgvBcWd+bXD7t4Dkkhkxqbw==", + "dependencies": { + "monaco-editor": "0.44.0", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@codingame/monaco-vscode-textmate-service-override": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-textmate-service-override/-/monaco-vscode-textmate-service-override-1.83.7.tgz", - "integrity": "sha512-bN9rPIFFaUuTNsHBlTRsthXOiuxdE9tN1UEMOAEZTFU0gZyGmSJxpeI2bxi7B59C6EVMS4dbGZRqSdmwiaSmYg==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-textmate-service-override/-/monaco-vscode-textmate-service-override-1.83.12.tgz", + "integrity": "sha512-dgjz4v4HiC5NJRAZ+zX/ESa59zVOK71H24uQVFn4TqjEs5Pt8KYgfwz5rapRMHLImFp3RGelI0hE6KYdoK/75w==", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "1.83.12", "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12", "vscode-oniguruma": "1.7.0", "vscode-textmate": "9.0.0" } }, "node_modules/@codingame/monaco-vscode-theme-defaults-default-extension": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-defaults-default-extension/-/monaco-vscode-theme-defaults-default-extension-1.83.7.tgz", - "integrity": "sha512-q+nN8kialSlLl5kbf7/+DkLzFTUsv7RSn4xHDAi0c4oktiofqfYhsj8cPYNhFdFOtKPe1wwor6gaUHqO3APmAw==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-defaults-default-extension/-/monaco-vscode-theme-defaults-default-extension-1.83.12.tgz", + "integrity": "sha512-xQyMZBxHV6jlBJiETgMmViTe1yEMNYRhXdkNNegn0mUYKkOJuM6OA9W3MvmITRh9gv52z08OBM3t0nxqkG3B2A==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@codingame/monaco-vscode-theme-service-override": { - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-service-override/-/monaco-vscode-theme-service-override-1.83.7.tgz", - "integrity": "sha512-KP0dBqdSwui2zum5R4AsWSyE7/ZiEEuOldpH+SHmR8+TQl9693Mlbu9CoY1uuevVSYxwQnGB1zwGpwjYCs7drw==", + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-service-override/-/monaco-vscode-theme-service-override-1.83.12.tgz", + "integrity": "sha512-fu4Vjq6rQHa07QYp+ChGIDx1JYLSoi2thBLU/RlaVHTJtaYxf0ZDGPgv/9hbVDtONZJ3E3smDVUrGhAyNknnuA==", "dependencies": { + "@codingame/monaco-vscode-files-service-override": "1.83.12", "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.7" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.12" } }, "node_modules/@cspotcode/source-map-support": { @@ -214,9 +261,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", - "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.8.tgz", + "integrity": "sha512-31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==", "cpu": [ "arm" ], @@ -230,9 +277,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", - "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.8.tgz", + "integrity": "sha512-B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==", "cpu": [ "arm64" ], @@ -246,9 +293,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", - "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.8.tgz", + "integrity": "sha512-rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==", "cpu": [ "x64" ], @@ -262,9 +309,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", - "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.8.tgz", + "integrity": "sha512-RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==", "cpu": [ "arm64" ], @@ -278,9 +325,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", - "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.8.tgz", + "integrity": "sha512-3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==", "cpu": [ "x64" ], @@ -294,9 +341,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", - "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.8.tgz", + "integrity": "sha512-WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==", "cpu": [ "arm64" ], @@ -310,9 +357,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", - "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.8.tgz", + "integrity": "sha512-ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==", "cpu": [ "x64" ], @@ -326,9 +373,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", - "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.8.tgz", + "integrity": "sha512-H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==", "cpu": [ "arm" ], @@ -342,9 +389,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", - "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.8.tgz", + "integrity": "sha512-z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==", "cpu": [ "arm64" ], @@ -358,9 +405,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", - "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.8.tgz", + "integrity": "sha512-1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==", "cpu": [ "ia32" ], @@ -374,9 +421,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", - "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.8.tgz", + "integrity": "sha512-fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==", "cpu": [ "loong64" ], @@ -390,9 +437,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", - "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.8.tgz", + "integrity": "sha512-Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==", "cpu": [ "mips64el" ], @@ -406,9 +453,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", - "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.8.tgz", + "integrity": "sha512-ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==", "cpu": [ "ppc64" ], @@ -422,9 +469,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", - "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.8.tgz", + "integrity": "sha512-T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==", "cpu": [ "riscv64" ], @@ -438,9 +485,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", - "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.8.tgz", + "integrity": "sha512-NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==", "cpu": [ "s390x" ], @@ -454,9 +501,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.8.tgz", + "integrity": "sha512-lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==", "cpu": [ "x64" ], @@ -470,9 +517,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", - "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.8.tgz", + "integrity": "sha512-hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==", "cpu": [ "x64" ], @@ -486,9 +533,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", - "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.8.tgz", + "integrity": "sha512-/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==", "cpu": [ "x64" ], @@ -502,9 +549,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", - "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.8.tgz", + "integrity": "sha512-9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==", "cpu": [ "x64" ], @@ -518,9 +565,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", - "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.8.tgz", + "integrity": "sha512-rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==", "cpu": [ "arm64" ], @@ -534,9 +581,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", - "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.8.tgz", + "integrity": "sha512-AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==", "cpu": [ "ia32" ], @@ -550,9 +597,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", - "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.8.tgz", + "integrity": "sha512-bfZ0cQ1uZs2PqpulNL5j/3w+GDhP36k1K5c38QdQg+Swy51jFZWWeIkteNsufkQxp986wnqRRsb/bHbY1WQ7TA==", "cpu": [ "x64" ], @@ -635,9 +682,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.52.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.52.0.tgz", - "integrity": "sha512-mjZVbpaeMZludF2fsWLD0Z9gCref1Tk4i9+wddjRvpUNqqcndPkBD09N/Mapey0b3jaXbLm2kICwFv2E64QinA==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.54.0.tgz", + "integrity": "sha512-ut5V+D+fOoWPgGGNj83GGjnntO39xDy6DWxO0wb7Jp3DcMX0TfIqdzHF85VTQkerdyGmuuMD9AKAo5KiNlf/AQ==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -800,6 +847,162 @@ "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==", "dev": true }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.6.0.tgz", + "integrity": "sha512-keHkkWAe7OtdALGoutLY3utvthkGF+Y17ws9LYT8pxMBYXaCoH/8dXS2uzo6e8+sEhY7y/zi5RFo22Dy2lFpDw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.6.0.tgz", + "integrity": "sha512-y3Kt+34smKQNWilicPbBz/MXEY7QwDzMFNgwEWeYiOhUt9MTWKjHqe3EVkXwT2fR7izOvHpDWZ0o2IyD9SWX7A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.6.0.tgz", + "integrity": "sha512-oLzzxcUIHltHxOCmaXl+pkIlU+uhSxef5HfntW7RsLh1eHm+vJzjD9Oo4oUKso4YuP4PpbFJNlZjJuOrxo8dPg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.6.0.tgz", + "integrity": "sha512-+ANnmjkcOBaV25n0+M0Bere3roeVAnwlKW65qagtuAfIxXF9YxUneRyAn/RDcIdRa7QrjRNJL3jR7T43ObGe8Q==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.6.0.tgz", + "integrity": "sha512-tBTSIkjSVUyrekddpkAqKOosnj1Fc0ZY0rJL2bIEWPKqlEQk0paORL9pUIlt7lcGJi3LzMIlUGXvtNi1Z6MOCQ==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.6.0.tgz", + "integrity": "sha512-Ed8uJI3kM11de9S0j67wAV07JUNhbAqIrDYhQBrQW42jGopgheyk/cdcshgGO4fW5Wjq97COCY/BHogdGvKVNQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.6.0.tgz", + "integrity": "sha512-mZoNQ/qK4D7SSY8v6kEsAAyDgznzLLuSFCA3aBHZTmf3HP/dW4tNLTtWh9+LfyO0Z1aUn+ecpT7IQ3WtIg3ViQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.6.0.tgz", + "integrity": "sha512-rouezFHpwCqdEXsqAfNsTgSWO0FoZ5hKv5p+TGO5KFhyN/dvYXNMqMolOb8BkyKcPqjYRBeT+Z6V3aM26rPaYg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.6.0.tgz", + "integrity": "sha512-Bbm+fyn3S6u51urfj3YnqBXg5vI2jQPncRRELaucmhBVyZkbWClQ1fEsRmdnCPpQOQfkpg9gZArvtMVkOMsh1w==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.6.0.tgz", + "integrity": "sha512-+MRMcyx9L2kTrTUzYmR61+XVsliMG4odFb5UmqtiT8xOfEicfYAGEuF/D1Pww1+uZkYhBqAHpvju7VN+GnC3ng==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.6.0.tgz", + "integrity": "sha512-rxfeE6K6s/Xl2HGeK6cO8SiQq3k/3BYpw7cfhW5Bk2euXNEpuzi2cc7llxx1si1QgwfjNtdRNTGqdBzGlFZGFw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.6.0.tgz", + "integrity": "sha512-QqmCsydHS172Y0Kc13bkMXvipbJSvzeglBncJG3LsYJSiPlxYACz7MmJBs4A8l1oU+jfhYEIC/+AUSlvjmiX/g==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@tsconfig/node10": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", @@ -921,18 +1124,18 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.18.9", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.9.tgz", - "integrity": "sha512-0f5klcuImLnG4Qreu9hPj/rEfFq6YRc5n2mAjSsH+ec/mJL+3voBH0+8T7o8RpFjH7ovc+TRsL/c7OYIQsPTfQ==", + "version": "18.18.13", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.18.13.tgz", + "integrity": "sha512-vXYZGRrSCreZmq1rEjMRLXJhiy8MrIeVasx+PCVlP414N7CJLHnMf+juVvjdprHyH+XRy3zKZLHeNueOpJCn0g==", "dev": true, "dependencies": { "undici-types": "~5.26.4" } }, "node_modules/@types/prop-types": { - "version": "15.7.10", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.10.tgz", - "integrity": "sha512-mxSnDQxPqsZxmeShFH+uwQ4kO4gcJcGahjjMFeLbKE95IAZiiZyiEepGZjtXJ7hN/yfu0bu9xN2ajcU0JcxX6A==", + "version": "15.7.11", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", + "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==", "dev": true }, "node_modules/@types/qs": { @@ -948,9 +1151,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.37", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.37.tgz", - "integrity": "sha512-RGAYMi2bhRgEXT3f4B92WTohopH6bIXw05FuGlmJEnv/omEn190+QYEIYxIAuIBdKgboYYdVved2p1AxZVQnaw==", + "version": "18.2.38", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.38.tgz", + "integrity": "sha512-cBBXHzuPtQK6wNthuVMV6IjHAFkdl/FOPFIlkd81/Cd1+IqkHu/A+w4g43kaQQoYHik/ruaQBDL72HyCy1vuMw==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -959,24 +1162,24 @@ } }, "node_modules/@types/react-dom": { - "version": "18.2.15", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.15.tgz", - "integrity": "sha512-HWMdW+7r7MR5+PZqJF6YFNSCtjz1T0dsvo/f1BV6HkV+6erD/nA7wd9NM00KVG83zf2nJ7uATPO9ttdIPvi3gg==", + "version": "18.2.17", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.17.tgz", + "integrity": "sha512-rvrT/M7Df5eykWFxn6MYt5Pem/Dbyc1N8Y0S9Mrkw2WFCRiqUgw9P7ul2NpwsXCSM1DVdENzdG9J5SreqfAIWg==", "dev": true, "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { - "version": "0.16.6", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.6.tgz", - "integrity": "sha512-Vlktnchmkylvc9SnwwwozTv04L/e1NykF5vgoQ0XTmI8DD+wxfjQuHuvHS3p0r2jz2x2ghPs2h1FVeDirIteWA==", + "version": "0.16.8", + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", + "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==", "dev": true }, "node_modules/@types/semver": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.5.tgz", - "integrity": "sha512-+d+WYC1BxJ6yVOgUgzK8gWvp5qF8ssV5r4nsDcZWKRWcDQLQ619tvWAxJQYGgBrO1MnLJC7a5GtiYsAoQ47dJg==", + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", + "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", "dev": true }, "node_modules/@types/send": { @@ -1007,25 +1210,25 @@ "dev": true }, "node_modules/@types/ws": { - "version": "8.5.9", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.9.tgz", - "integrity": "sha512-jbdrY0a8lxfdTp/+r7Z4CkycbOFN8WX+IOchLJr3juT/xzbJ8URyTVSJ/hvNdadTgM1mnedb47n+Y31GsFnQlg==", + "version": "8.5.10", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz", + "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==", "dev": true, "dependencies": { "@types/node": "*" } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz", - "integrity": "sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.12.0.tgz", + "integrity": "sha512-XOpZ3IyJUIV1b15M7HVOpgQxPPF7lGXgsfcEIu3yDxFPaf/xZKt7s9QO/pbk7vpWQyVulpJbu4E5LwpZiQo4kA==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.9.1", - "@typescript-eslint/type-utils": "6.9.1", - "@typescript-eslint/utils": "6.9.1", - "@typescript-eslint/visitor-keys": "6.9.1", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/type-utils": "6.12.0", + "@typescript-eslint/utils": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -1051,15 +1254,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.9.1.tgz", - "integrity": "sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.12.0.tgz", + "integrity": "sha512-s8/jNFPKPNRmXEnNXfuo1gemBdVmpQsK1pcu+QIvuNJuhFzGrpD7WjOcvDc/+uEdfzSYpNu7U/+MmbScjoQ6vg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.9.1", - "@typescript-eslint/types": "6.9.1", - "@typescript-eslint/typescript-estree": "6.9.1", - "@typescript-eslint/visitor-keys": "6.9.1", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/typescript-estree": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4" }, "engines": { @@ -1079,13 +1282,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.9.1.tgz", - "integrity": "sha512-38IxvKB6NAne3g/+MyXMs2Cda/Sz+CEpmm+KLGEM8hx/CvnSRuw51i8ukfwB/B/sESdeTGet1NH1Wj7I0YXswg==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.12.0.tgz", + "integrity": "sha512-5gUvjg+XdSj8pcetdL9eXJzQNTl3RD7LgUiYTl8Aabdi8hFkaGSYnaS6BLc0BGNaDH+tVzVwmKtWvu0jLgWVbw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.9.1", - "@typescript-eslint/visitor-keys": "6.9.1" + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -1096,13 +1299,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz", - "integrity": "sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.12.0.tgz", + "integrity": "sha512-WWmRXxhm1X8Wlquj+MhsAG4dU/Blvf1xDgGaYCzfvStP2NwPQh6KBvCDbiOEvaE0filhranjIlK/2fSTVwtBng==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.9.1", - "@typescript-eslint/utils": "6.9.1", + "@typescript-eslint/typescript-estree": "6.12.0", + "@typescript-eslint/utils": "6.12.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -1123,9 +1326,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.9.1.tgz", - "integrity": "sha512-BUGslGOb14zUHOUmDB2FfT6SI1CcZEJYfF3qFwBeUrU6srJfzANonwRYHDpLBuzbq3HaoF2XL2hcr01c8f8OaQ==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.12.0.tgz", + "integrity": "sha512-MA16p/+WxM5JG/F3RTpRIcuOghWO30//VEOvzubM8zuOOBYXsP+IfjoCXXiIfy2Ta8FRh9+IO9QLlaFQUU+10Q==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -1136,13 +1339,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.9.1.tgz", - "integrity": "sha512-U+mUylTHfcqeO7mLWVQ5W/tMLXqVpRv61wm9ZtfE5egz7gtnmqVIw9ryh0mgIlkKk9rZLY3UHygsBSdB9/ftyw==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.12.0.tgz", + "integrity": "sha512-vw9E2P9+3UUWzhgjyyVczLWxZ3GuQNT7QpnIY3o5OMeLO/c8oHljGc8ZpryBMIyympiAAaKgw9e5Hl9dCWFOYw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.9.1", - "@typescript-eslint/visitor-keys": "6.9.1", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/visitor-keys": "6.12.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1163,17 +1366,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.9.1.tgz", - "integrity": "sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.12.0.tgz", + "integrity": "sha512-LywPm8h3tGEbgfyjYnu3dauZ0U7R60m+miXgKcZS8c7QALO9uWJdvNoP+duKTk2XMWc7/Q3d/QiCuLN9X6SWyQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.9.1", - "@typescript-eslint/types": "6.9.1", - "@typescript-eslint/typescript-estree": "6.9.1", + "@typescript-eslint/scope-manager": "6.12.0", + "@typescript-eslint/types": "6.12.0", + "@typescript-eslint/typescript-estree": "6.12.0", "semver": "^7.5.4" }, "engines": { @@ -1188,12 +1391,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.9.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.9.1.tgz", - "integrity": "sha512-MUaPUe/QRLEffARsmNfmpghuQkW436DvESW+h+M52w0coICHRfD6Np9/K6PdACwnrq1HmuLl+cSPZaJmeVPkSw==", + "version": "6.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.12.0.tgz", + "integrity": "sha512-rg3BizTZHF1k3ipn8gfrzDXXSFKyOEB5zxYXInQ6z0hUvmQlhaZQzK+YmHmNViMA9HzW5Q9+bPPt90bU6GQwyw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.9.1", + "@typescript-eslint/types": "6.12.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -1438,6 +1641,7 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==", + "deprecated": "Use your platform's native atob() and btoa() methods instead", "dev": true }, "node_modules/accepts": { @@ -1870,9 +2074,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001562", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001562.tgz", - "integrity": "sha512-kfte3Hym//51EdX4239i+Rmp20EsLIYGdPkERegTgU19hQWCRhsRFGKHTliUlsry53tv17K7n077Kqa0WJU4ng==", + "version": "1.0.30001565", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001565.tgz", + "integrity": "sha512-xrE//a3O7TP0vaJ8ikzkD2c2NgcVUvsEe2IvFTntV4Yd1Z9FVzh+gW+enX96L0psrbaFMcVcH2l90xNuGDWc8w==", "dev": true, "funding": [ { @@ -2225,9 +2429,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.583", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.583.tgz", - "integrity": "sha512-93y1gcONABZ7uqYe/JWDVQP/Pj/sQSunF0HVAPdlg/pfBnOyBMLlQUxWvkqcljJg1+W6cjvPuYD+r1Th9Tn8mA==", + "version": "1.4.594", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.594.tgz", + "integrity": "sha512-xT1HVAu5xFn7bDfkjGQi9dNpMqGchUkebwf1GL7cZN32NSwwlHRPMSDJ1KN6HkS0bWUtndbSQZqvpQftKG2uFQ==", "dev": true, "peer": true }, @@ -2365,9 +2569,9 @@ } }, "node_modules/esbuild": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", - "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", + "version": "0.19.8", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.8.tgz", + "integrity": "sha512-l7iffQpT2OrZfH2rXIp7/FkmaeZM0vxbxN9KfiCwGYuZqzMg/JdvX26R31Zxn/Pxvsrg3Y9N6XTcnknqDyyv4w==", "dev": true, "hasInstallScript": true, "bin": { @@ -2377,28 +2581,28 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.18.20", - "@esbuild/android-arm64": "0.18.20", - "@esbuild/android-x64": "0.18.20", - "@esbuild/darwin-arm64": "0.18.20", - "@esbuild/darwin-x64": "0.18.20", - "@esbuild/freebsd-arm64": "0.18.20", - "@esbuild/freebsd-x64": "0.18.20", - "@esbuild/linux-arm": "0.18.20", - "@esbuild/linux-arm64": "0.18.20", - "@esbuild/linux-ia32": "0.18.20", - "@esbuild/linux-loong64": "0.18.20", - "@esbuild/linux-mips64el": "0.18.20", - "@esbuild/linux-ppc64": "0.18.20", - "@esbuild/linux-riscv64": "0.18.20", - "@esbuild/linux-s390x": "0.18.20", - "@esbuild/linux-x64": "0.18.20", - "@esbuild/netbsd-x64": "0.18.20", - "@esbuild/openbsd-x64": "0.18.20", - "@esbuild/sunos-x64": "0.18.20", - "@esbuild/win32-arm64": "0.18.20", - "@esbuild/win32-ia32": "0.18.20", - "@esbuild/win32-x64": "0.18.20" + "@esbuild/android-arm": "0.19.8", + "@esbuild/android-arm64": "0.19.8", + "@esbuild/android-x64": "0.19.8", + "@esbuild/darwin-arm64": "0.19.8", + "@esbuild/darwin-x64": "0.19.8", + "@esbuild/freebsd-arm64": "0.19.8", + "@esbuild/freebsd-x64": "0.19.8", + "@esbuild/linux-arm": "0.19.8", + "@esbuild/linux-arm64": "0.19.8", + "@esbuild/linux-ia32": "0.19.8", + "@esbuild/linux-loong64": "0.19.8", + "@esbuild/linux-mips64el": "0.19.8", + "@esbuild/linux-ppc64": "0.19.8", + "@esbuild/linux-riscv64": "0.19.8", + "@esbuild/linux-s390x": "0.19.8", + "@esbuild/linux-x64": "0.19.8", + "@esbuild/netbsd-x64": "0.19.8", + "@esbuild/openbsd-x64": "0.19.8", + "@esbuild/sunos-x64": "0.19.8", + "@esbuild/win32-arm64": "0.19.8", + "@esbuild/win32-ia32": "0.19.8", + "@esbuild/win32-x64": "0.19.8" } }, "node_modules/escalade": { @@ -2429,15 +2633,15 @@ } }, "node_modules/eslint": { - "version": "8.52.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.52.0.tgz", - "integrity": "sha512-zh/JHnaixqHZsolRB/w9/02akBk9EPrOs9JwcTP2ek7yL5bVvXuRariiaAjjoJ5DvuwQ1WAE/HsMz+w17YgBCg==", + "version": "8.54.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.54.0.tgz", + "integrity": "sha512-NY0DfAkM8BIZDVl6PgSa1ttZbx3xHgJzSNJKYcQglem6CppHyMhRIQkBVSSMaSRnLhig3jsDbEzOjwCVt4AmmA==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.52.0", + "@eslint/eslintrc": "^2.1.3", + "@eslint/js": "8.54.0", "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", @@ -2483,6 +2687,19 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint-compat-utils": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.1.2.tgz", + "integrity": "sha512-Jia4JDldWnFNIru1Ehx1H5s9/yxiRHY/TimCuUc0jNexew3cF1gI6CYZil1ociakfWO3rRqFjl1mskBblB3RYg==", + "dev": true, + "peer": true, + "engines": { + "node": ">=12" + }, + "peerDependencies": { + "eslint": ">=6.0.0" + } + }, "node_modules/eslint-config-standard": { "version": "17.1.0", "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-17.1.0.tgz", @@ -2559,14 +2776,15 @@ } }, "node_modules/eslint-plugin-es-x": { - "version": "7.3.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.3.0.tgz", - "integrity": "sha512-W9zIs+k00I/I13+Bdkl/zG1MEO07G97XjUSQuH117w620SJ6bHtLUmoMvkGA2oYnI/gNdr+G7BONLyYnFaLLEQ==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.4.0.tgz", + "integrity": "sha512-WJa3RhYzBtl8I37ebY9p76s61UhZyi4KaFOnX2A5r32RPazkXj5yoT6PGnD02dhwzEUj0KwsUdqfKDd/OuvGsw==", "dev": true, "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.1.2", - "@eslint-community/regexpp": "^4.6.0" + "@eslint-community/regexpp": "^4.6.0", + "eslint-compat-utils": "^0.1.2" }, "engines": { "node": "^14.18.0 || >=16.0.0" @@ -3576,9 +3794,9 @@ } }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.0.tgz", + "integrity": "sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg==", "dev": true, "engines": { "node": ">= 4" @@ -4064,9 +4282,9 @@ } }, "node_modules/langium": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/langium/-/langium-2.1.2.tgz", - "integrity": "sha512-1NDUmhm111xs6NLh1DzQ9YPrOhL6JqJryY9igPIGrG0AbKKGmGf3fahAiY1MUChwIYSec6Fvoj+igwKzvGXQog==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/langium/-/langium-2.1.3.tgz", + "integrity": "sha512-/WN1xHoNBg0mi1Jp9ydMFSHIv8Jhq7K+0stNVURdoG4NgZx4/06AfNeeixmmU8X842wBl9gFZJP5O93Ge5Oasw==", "dependencies": { "chevrotain": "~11.0.3", "chevrotain-allstar": "~0.3.0", @@ -4316,9 +4534,9 @@ }, "node_modules/monaco-editor": { "name": "@codingame/monaco-editor-treemended", - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-editor-treemended/-/monaco-editor-treemended-1.83.7.tgz", - "integrity": "sha512-ol1evPNZ2DyR3vrXo8SVyVXurwfuqIz28TXVq5zNsSmfBbfA1iHPqKLW+krrObREXdzsE4JUwELLoqdjvKIrsw==" + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-editor-treemended/-/monaco-editor-treemended-1.83.12.tgz", + "integrity": "sha512-8/td2FL0a+F5hnWEo604CqJuVEAHp7Xmq7aJ6F2LPY+WjVp22c4ZkPM/5xAg5qVAS/V1m04VYdlsalRugM+Nyw==" }, "node_modules/monaco-editor-workers": { "version": "0.44.0", @@ -4866,9 +5084,9 @@ } }, "node_modules/pyright": { - "version": "1.1.336", - "resolved": "https://registry.npmjs.org/pyright/-/pyright-1.1.336.tgz", - "integrity": "sha512-PE/ArjnfS5dKon05zAX2eMzSQmu4ftCITzLqKgFKuwLIRnKJ+l4QGwkCKtYvWoXKm1fWr+TjqYpdRejrYkolyg==", + "version": "1.1.337", + "resolved": "https://registry.npmjs.org/pyright/-/pyright-1.1.337.tgz", + "integrity": "sha512-iZcID/OX5rjiToKCb3DShygOC21Zx8GvSwei+ApyTfK2C2xdRWyV+yJCrUUF75/qVkTZy8ZCDwQc4aYDqD8Scg==", "bin": { "pyright": "index.js", "pyright-langserver": "langserver.index.js" @@ -5092,18 +5310,30 @@ } }, "node_modules/rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.6.0.tgz", + "integrity": "sha512-R8i5Her4oO1LiMQ3jKf7MUglYV/mhQ5g5OKeld5CnkmPdIGo79FDDQYqPhq/PCVuTQVuxsWgIbDy9F+zdHn80w==", "dev": true, "bin": { "rollup": "dist/bin/rollup" }, "engines": { - "node": ">=14.18.0", + "node": ">=18.0.0", "npm": ">=8.0.0" }, "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.6.0", + "@rollup/rollup-android-arm64": "4.6.0", + "@rollup/rollup-darwin-arm64": "4.6.0", + "@rollup/rollup-darwin-x64": "4.6.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.6.0", + "@rollup/rollup-linux-arm64-gnu": "4.6.0", + "@rollup/rollup-linux-arm64-musl": "4.6.0", + "@rollup/rollup-linux-x64-gnu": "4.6.0", + "@rollup/rollup-linux-x64-musl": "4.6.0", + "@rollup/rollup-win32-arm64-msvc": "4.6.0", + "@rollup/rollup-win32-ia32-msvc": "4.6.0", + "@rollup/rollup-win32-x64-msvc": "4.6.0", "fsevents": "~2.3.2" } }, @@ -5913,9 +6143,9 @@ } }, "node_modules/typescript": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.3.2.tgz", + "integrity": "sha512-6l+RyNy7oAHDfxC4FzSJcz9vnjTKxrLpDG5M2Vu4SHRVNg6xzqZp6LYSR9zjqQTu8DU/f5xwxUdADOkbrIX2gQ==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -6041,29 +6271,29 @@ } }, "node_modules/vite": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.0.tgz", - "integrity": "sha512-ulr8rNLA6rkyFAlVWw2q5YJ91v098AFQ2R0PRFwPzREXOUJQPtFUG0t+/ZikhaOCDqFoDhN6/v8Sq0o4araFAw==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.2.tgz", + "integrity": "sha512-6CCq1CAJCNM1ya2ZZA7+jS2KgnhbzvxakmlIjN24cF/PXhRMzpM/z8QgsVJA/Dm5fWUWnVEsmtBoMhmerPxT0g==", "dev": true, "dependencies": { - "esbuild": "^0.18.10", - "postcss": "^8.4.27", - "rollup": "^3.27.1" + "esbuild": "^0.19.3", + "postcss": "^8.4.31", + "rollup": "^4.2.0" }, "bin": { "vite": "bin/vite.js" }, "engines": { - "node": "^14.18.0 || >=16.0.0" + "node": "^18.0.0 || >=20.0.0" }, "funding": { "url": "https://github.com/vitejs/vite?sponsor=1" }, "optionalDependencies": { - "fsevents": "~2.3.2" + "fsevents": "~2.3.3" }, "peerDependencies": { - "@types/node": ">= 14", + "@types/node": "^18.0.0 || >=20.0.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", @@ -6097,11 +6327,17 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.83.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.83.7.tgz", - "integrity": "sha512-Z9eVsVK4rAAC8Pz0L5X+oa0noK8Hd+KbRLSW4oYgmuxVgvQeNtnQ7FU8hOlNtxoDiw1FVZ/5ZGZv5WGDSLx/EQ==", - "dependencies": { - "monaco-editor": "0.44.0" + "version": "1.83.12", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.83.12.tgz", + "integrity": "sha512-10qVCpYhzbxMHKy3/pt2aDd/OzszzzPcIw6eOuGUBElnB9KZhRsN6pbgtWQ29DP+H6N/CqTW0FNzqs/UBVGnSQ==", + "dependencies": { + "@codingame/monaco-vscode-environment-service-override": "1.83.12", + "@codingame/monaco-vscode-extensions-service-override": "1.83.12", + "@codingame/monaco-vscode-files-service-override": "1.83.12", + "@codingame/monaco-vscode-layout-service-override": "1.83.12", + "@codingame/monaco-vscode-quickaccess-service-override": "1.83.12", + "monaco-editor": "0.44.0", + "vscode-semver": "npm:semver@=5.5.0" }, "bin": { "monaco-treemending": "monaco-treemending.js" @@ -6186,6 +6422,15 @@ "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.7.0.tgz", "integrity": "sha512-L9WMGRfrjOhgHSdOYgCt/yRMsXzLDJSL7BPrOZt73gU0iWO4mpqzqQzOz5srxqTvMBaR0XZTSrVWo4j55Rc6cA==" }, + "node_modules/vscode-semver": { + "name": "semver", + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "bin": { + "semver": "bin/semver" + } + }, "node_modules/vscode-textmate": { "version": "9.0.0", "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-9.0.0.tgz", @@ -6519,14 +6764,14 @@ }, "packages/client": { "name": "monaco-languageclient", - "version": "7.0.2", + "version": "7.1.0", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-editor-service-override": "~1.83.7", - "@codingame/monaco-vscode-languages-service-override": "~1.83.7", - "@codingame/monaco-vscode-model-service-override": "~1.83.7", - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0", + "@codingame/monaco-vscode-editor-service-override": "~1.83.12", + "@codingame/monaco-vscode-languages-service-override": "~1.83.12", + "@codingame/monaco-vscode-model-service-override": "~1.83.12", + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0", "vscode-languageclient": "~9.0.1" }, "engines": { @@ -6535,7 +6780,7 @@ }, "peerDependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0" + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0" }, "peerDependenciesMeta": { "monaco-editor": { @@ -6548,32 +6793,32 @@ }, "packages/examples": { "name": "monaco-languageclient-examples", - "version": "7.0.2", + "version": "7.1.0", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-configuration-service-override": "~1.83.7", - "@codingame/monaco-vscode-editor-service-override": "~1.83.7", - "@codingame/monaco-vscode-files-service-override": "~1.83.7", - "@codingame/monaco-vscode-json-default-extension": "~1.83.7", - "@codingame/monaco-vscode-keybindings-service-override": "~1.83.7", - "@codingame/monaco-vscode-language-pack-de": "~1.83.7", - "@codingame/monaco-vscode-language-pack-es": "~1.83.7", - "@codingame/monaco-vscode-language-pack-fr": "~1.83.7", - "@codingame/monaco-vscode-python-default-extension": "~1.83.7", - "@codingame/monaco-vscode-textmate-service-override": "~1.83.7", - "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.7", - "@codingame/monaco-vscode-theme-service-override": "~1.83.7", + "@codingame/monaco-vscode-configuration-service-override": "~1.83.12", + "@codingame/monaco-vscode-editor-service-override": "~1.83.12", + "@codingame/monaco-vscode-files-service-override": "~1.83.12", + "@codingame/monaco-vscode-json-default-extension": "~1.83.12", + "@codingame/monaco-vscode-keybindings-service-override": "~1.83.12", + "@codingame/monaco-vscode-language-pack-de": "~1.83.12", + "@codingame/monaco-vscode-language-pack-es": "~1.83.12", + "@codingame/monaco-vscode-language-pack-fr": "~1.83.12", + "@codingame/monaco-vscode-python-default-extension": "~1.83.12", + "@codingame/monaco-vscode-textmate-service-override": "~1.83.12", + "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.12", + "@codingame/monaco-vscode-theme-service-override": "~1.83.12", "express": "~4.18.2", "langium": "~2.1.0", "langium-statemachine-dsl": "~2.1.0", - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~7.0.2", + "monaco-languageclient": "~7.1.0", "pyright": "~1.1.333", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0", "vscode-json-languageservice": "~5.3.7", "vscode-languageclient": "~9.0.1", "vscode-languageserver": "~9.0.1", @@ -6595,10 +6840,10 @@ "name": "example-client-vite", "version": "0.0.0", "dependencies": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~7.0.2", - "monaco-languageclient-examples": "~7.0.2", + "monaco-languageclient": "~7.1.0", + "monaco-languageclient-examples": "~7.1.0", "vscode-ws-jsonrpc": "~3.1.0" }, "devDependencies": { @@ -6609,10 +6854,10 @@ "name": "example-client-webpack", "version": "0.0.0", "dependencies": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~7.0.2", - "monaco-languageclient-examples": "~7.0.2", + "monaco-languageclient": "~7.1.0", + "monaco-languageclient-examples": "~7.1.0", "vscode-ws-jsonrpc": "~3.1.0" }, "devDependencies": { diff --git a/package.json b/package.json index 2812b1f2d..011fa806f 100644 --- a/package.json +++ b/package.json @@ -3,26 +3,26 @@ "type": "module", "devDependencies": { "@types/vscode": "~1.83.3", - "@typescript-eslint/eslint-plugin": "~6.9.1", - "@typescript-eslint/parser": "~6.9.1", + "@typescript-eslint/eslint-plugin": "~6.12.0", + "@typescript-eslint/parser": "~6.12.0", "editorconfig": "~2.0.0", - "eslint": "~8.52.0", + "eslint": "~8.54.0", "eslint-config-standard": "~17.1.0", "eslint-plugin-header": "~3.1.1", "eslint-plugin-import": "~2.29.0", "eslint-plugin-promise": "~6.1.1", "eslint-plugin-unused-imports": "~3.0.0", "shx": "~0.3.4", - "typescript": "~5.2.2", - "vite": "~4.5.0" + "typescript": "~5.3.2", + "vite": "~5.0.2" }, "overrides": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0" + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0" }, "resolutions": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0" + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0" }, "volta": { "node": "18.18.2", diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index d40420bde..dc71e3b89 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -2,9 +2,13 @@ All notable changes to this npm module are documented in this file. +## [7.1.0] - 2023-11-27 + +- Updated to `monaco-vscode-api@1.83.12`. + ## [7.0.2] - 2023-11-15 -- Updated to `monaco-vscode-api` `1.83.7`. +- Updated to `monaco-vscode-api@1.83.7`. ## [7.0.1] - 2023-11-10 diff --git a/packages/client/package.json b/packages/client/package.json index 606b67142..c60d93561 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient", - "version": "7.0.2", + "version": "7.1.0", "description": "Monaco Language client implementation", "author": { "name": "TypeFox GmbH", @@ -48,16 +48,16 @@ "License.txt" ], "dependencies": { - "@codingame/monaco-vscode-editor-service-override": "~1.83.7", - "@codingame/monaco-vscode-languages-service-override": "~1.83.7", - "@codingame/monaco-vscode-model-service-override": "~1.83.7", - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0", + "@codingame/monaco-vscode-editor-service-override": "~1.83.12", + "@codingame/monaco-vscode-languages-service-override": "~1.83.12", + "@codingame/monaco-vscode-model-service-override": "~1.83.12", + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0", "vscode-languageclient": "~9.0.1" }, "peerDependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0" + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0" }, "peerDependenciesMeta": { "monaco-editor": { @@ -72,8 +72,8 @@ "vscode": "$vscode" }, "resolutions": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0" + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0" }, "scripts": { "clean": "shx rm -fr lib *.tsbuildinfo", diff --git a/packages/client/src/monaco-vscode-api-services.ts b/packages/client/src/monaco-vscode-api-services.ts index c5787bab1..159694f1d 100644 --- a/packages/client/src/monaco-vscode-api-services.ts +++ b/packages/client/src/monaco-vscode-api-services.ts @@ -4,7 +4,7 @@ * ------------------------------------------------------------------------------------------ */ import { editor, Environment } from 'monaco-editor'; -import { ILogService, initialize, LogLevel, StandaloneServices } from 'vscode/services'; +import { ILogService, initialize, IWorkbenchConstructionOptions, StandaloneServices } from 'vscode/services'; import { initialize as initializeVscodeExtensions } from 'vscode/extensions'; import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override'; import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override'; @@ -17,7 +17,7 @@ export interface MonacoEnvironmentEnhanced extends Environment { export type InitializeServiceConfig = { userServices?: editor.IEditorOverrideServices; debugLogging?: boolean; - logLevel?: LogLevel + workspaceConfig?: IWorkbenchConstructionOptions; }; export const wasVscodeApiInitialized = () => { @@ -85,7 +85,6 @@ export const mergeServices = (services: editor.IEditorOverrideServices, override * - model */ export const importAllServices = async (config?: InitializeServiceConfig) => { - const serviceNames: string[] = []; const lc: InitializeServiceConfig = config ?? {}; const userServices: editor.IEditorOverrideServices = lc.userServices ?? {}; @@ -96,23 +95,24 @@ export const importAllServices = async (config?: InitializeServiceConfig) => { mergeServices(mlcDefautServices, userServices); reportServiceLoading(userServices, lc.debugLogging === true); - const haveThemeService = serviceNames.includes('theme') || Object.keys(userServices).includes('themeService'); - const haveTextmateService = serviceNames.includes('textmate') || Object.keys(userServices).includes('textMateTokenizationFeature'); - const haveMarkersService = serviceNames.includes('markers'); - const haveViewsService = serviceNames.includes('views') || Object.keys(userServices).includes('viewsService'); + const haveThemeService = Object.keys(userServices).includes('themeService'); + const haveTextmateService = Object.keys(userServices).includes('textMateTokenizationFeature'); + const haveMarkersService = Object.keys(userServices).includes('markersService'); + const haveViewsService = Object.keys(userServices).includes('viewsService'); // theme requires textmate if (haveThemeService && !haveTextmateService) { - throw new Error('"theme" requires "textmate" service. Please add it to the "userServices".'); + throw new Error('"theme" service requires "textmate" service. Please add it to the "userServices".'); } // markers service requires views service if (haveMarkersService && !haveViewsService) { - throw new Error('"markers" requires "views" service. Please add it to the "userServices".'); + throw new Error('"markers" service requires "views" service. Please add it to the "userServices".'); } await initialize(userServices); - if (lc.logLevel) { - StandaloneServices.get(ILogService).setLevel(lc.logLevel); + const logLevel = lc.workspaceConfig?.developmentOptions?.logLevel; + if (logLevel) { + StandaloneServices.get(ILogService).setLevel(logLevel); } }; diff --git a/packages/examples/CHANGELOG.md b/packages/examples/CHANGELOG.md index c69ab0541..4a433687d 100644 --- a/packages/examples/CHANGELOG.md +++ b/packages/examples/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this npm module are documented in this file. +## [7.1.0] - 2023-11-27 + +- Updated to `monaco-languageclient@7.1.0`. + - Updated usage of configuration service to be in line with `monaco-vscode-api@1.83.12`. + ## [7.0.2] - 2023-11-15 - Updated to `monaco-languageclient@7.0.2`. diff --git a/packages/examples/package.json b/packages/examples/package.json index dfb3f367b..574d628a1 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient-examples", - "version": "7.0.2", + "version": "7.1.0", "description": "Monaco Language client examples", "author": { "name": "TypeFox GmbH", @@ -43,29 +43,29 @@ } }, "dependencies": { - "@codingame/monaco-vscode-configuration-service-override": "~1.83.7", - "@codingame/monaco-vscode-editor-service-override": "~1.83.7", - "@codingame/monaco-vscode-files-service-override": "~1.83.7", - "@codingame/monaco-vscode-json-default-extension": "~1.83.7", - "@codingame/monaco-vscode-keybindings-service-override": "~1.83.7", - "@codingame/monaco-vscode-python-default-extension": "~1.83.7", - "@codingame/monaco-vscode-textmate-service-override": "~1.83.7", - "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.7", - "@codingame/monaco-vscode-theme-service-override": "~1.83.7", - "@codingame/monaco-vscode-language-pack-de": "~1.83.7", - "@codingame/monaco-vscode-language-pack-es": "~1.83.7", - "@codingame/monaco-vscode-language-pack-fr": "~1.83.7", + "@codingame/monaco-vscode-configuration-service-override": "~1.83.12", + "@codingame/monaco-vscode-editor-service-override": "~1.83.12", + "@codingame/monaco-vscode-files-service-override": "~1.83.12", + "@codingame/monaco-vscode-json-default-extension": "~1.83.12", + "@codingame/monaco-vscode-keybindings-service-override": "~1.83.12", + "@codingame/monaco-vscode-python-default-extension": "~1.83.12", + "@codingame/monaco-vscode-textmate-service-override": "~1.83.12", + "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.12", + "@codingame/monaco-vscode-theme-service-override": "~1.83.12", + "@codingame/monaco-vscode-language-pack-de": "~1.83.12", + "@codingame/monaco-vscode-language-pack-es": "~1.83.12", + "@codingame/monaco-vscode-language-pack-fr": "~1.83.12", "express": "~4.18.2", "langium": "~2.1.0", "langium-statemachine-dsl": "~2.1.0", - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~7.0.2", + "monaco-languageclient": "~7.1.0", "pyright": "~1.1.333", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0", "vscode-json-languageservice": "~5.3.7", "vscode-languageclient": "~9.0.1", "vscode-languageserver": "~9.0.1", @@ -87,8 +87,8 @@ "vscode": "$vscode" }, "resolutions": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0" + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0" }, "volta": { "node": "18.18.2", diff --git a/packages/examples/src/common/client-commons.ts b/packages/examples/src/common/client-commons.ts index 240040784..ea5963704 100644 --- a/packages/examples/src/common/client-commons.ts +++ b/packages/examples/src/common/client-commons.ts @@ -89,10 +89,21 @@ export const performInit = async (vscodeApiInit: boolean) => { userServices: { ...getThemeServiceOverride(), ...getTextmateServiceOverride(), - ...getConfigurationServiceOverride(Uri.file('/workspace')), + ...getConfigurationServiceOverride(), ...getKeybindingsServiceOverride() }, - debugLogging: true + debugLogging: true, + workspaceConfig: { + workspaceProvider: { + trusted: true, + workspace: { + workspaceUri: Uri.file('/workspace') + }, + async open() { + return false; + } + } + } }); // register the JSON language with Monaco diff --git a/packages/examples/src/langium/statemachineClient.ts b/packages/examples/src/langium/statemachineClient.ts index 60f9545c9..c857e8e5f 100644 --- a/packages/examples/src/langium/statemachineClient.ts +++ b/packages/examples/src/langium/statemachineClient.ts @@ -14,7 +14,6 @@ import getEditorServiceOverride from '@codingame/monaco-vscode-editor-service-ov import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override'; import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-override'; import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override'; -import { LogLevel } from 'vscode/services'; import '@codingame/monaco-vscode-theme-defaults-default-extension'; import { Uri } from 'vscode'; @@ -28,12 +27,22 @@ export const setupStatemachineClient = async () => { userServices: { ...getThemeServiceOverride(), ...getTextmateServiceOverride(), - ...getConfigurationServiceOverride(Uri.file('/workspace')), + ...getConfigurationServiceOverride(), ...getEditorServiceOverride(useOpenEditorStub), ...getKeybindingsServiceOverride() }, debugLogging: true, - logLevel: LogLevel.Info + workspaceConfig: { + workspaceProvider: { + trusted: true, + workspace: { + workspaceUri: Uri.file('/workspace') + }, + async open() { + return false; + } + } + } }; await initServices(serviceConfig); diff --git a/packages/examples/src/python/client/main.ts b/packages/examples/src/python/client/main.ts index 40155cd59..e967e0bd2 100644 --- a/packages/examples/src/python/client/main.ts +++ b/packages/examples/src/python/client/main.ts @@ -79,11 +79,24 @@ export const startPythonClient = async () => { userServices: { ...getThemeServiceOverride(), ...getTextmateServiceOverride(), - ...getConfigurationServiceOverride(Uri.file('/workspace')), + ...getConfigurationServiceOverride(), ...getKeybindingsServiceOverride() }, debugLogging: true, - logLevel: LogLevel.Debug + workspaceConfig: { + workspaceProvider: { + trusted: true, + workspace: { + workspaceUri: Uri.file('/workspace') + }, + async open() { + return false; + } + }, + developmentOptions: { + logLevel: LogLevel.Debug + } + } }); console.log('Before ready themes'); diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json index 843f8568a..1f688cd61 100644 --- a/packages/verify/pnpm/package.json +++ b/packages/verify/pnpm/package.json @@ -3,9 +3,9 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", - "monaco-languageclient": "~7.0.2", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0" + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", + "monaco-languageclient": "~7.1.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0" }, "devDependencies": { "shx": "~0.3.4" diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index 618c15433..c92613fa1 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -4,10 +4,10 @@ "private": true, "type": "module", "dependencies": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~7.0.2", - "monaco-languageclient-examples": "~7.0.2", + "monaco-languageclient": "~7.1.0", + "monaco-languageclient-examples": "~7.1.0", "vscode-ws-jsonrpc": "~3.1.0" }, "devDependencies": { @@ -17,7 +17,7 @@ "monaco-editor": "$monaco-editor" }, "resolutions": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0" + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0" }, "volta": { "node": "18.18.2", diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index ab9735441..fc94c6ca3 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -4,10 +4,10 @@ "private": true, "type": "module", "dependencies": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~7.0.2", - "monaco-languageclient-examples": "~7.0.2", + "monaco-languageclient": "~7.1.0", + "monaco-languageclient-examples": "~7.1.0", "vscode-ws-jsonrpc": "~3.1.0" }, "devDependencies": { @@ -22,7 +22,7 @@ "monaco-editor": "$monaco-editor" }, "resolutions": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0" + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0" }, "volta": { "node": "18.18.2", diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json index 462c8b5ef..9a3731237 100644 --- a/packages/verify/yarn/package.json +++ b/packages/verify/yarn/package.json @@ -3,14 +3,14 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0", - "monaco-languageclient": "~7.0.2" + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0", + "monaco-languageclient": "~7.1.0" }, "devDependencies": { "shx": "~0.3.4" }, "resolutions": { - "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0" + "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0" }, "scripts": { "clean": "shx rm -fr ./node_modules yarn.lock",