From 668bcd3613c561dee12bae07b7d6d981d6e3ee00 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Thu, 14 Mar 2024 22:01:14 +0100 Subject: [PATCH] WIP: Doc update, update versions, update to latest monaco-vscode-api, use monaco-editor as dependency designator --- README.md | 50 +- docs/versions-and-history.md | 10 +- package-lock.json | 611 +++++++++--------- package.json | 2 +- packages/client/package.json | 18 +- packages/examples/package.json | 47 +- packages/examples/src/browser/main.ts | 2 +- .../src/common/example-apps-common.ts | 2 +- .../examples/src/json/client/wrapperWs.ts | 2 +- .../src/langium/statemachine/main-react.tsx | 4 +- .../examples/src/langium/statemachine/main.ts | 4 +- packages/examples/src/ts/wrapperTs.ts | 6 +- packages/vscode-ws-jsonrpc/package.json | 2 +- packages/wrapper-react/package.json | 11 +- packages/wrapper-react/src/index.tsx | 2 +- packages/wrapper/build/buildAllWorkers.mts | 2 +- packages/wrapper/build/vite.editorWorker.ts | 2 +- packages/wrapper/package.json | 34 +- packages/wrapper/src/editorAppBase.ts | 2 +- packages/wrapper/src/editorAppClassic.ts | 2 +- packages/wrapper/src/editorAppExtended.ts | 2 +- packages/wrapper/src/vscode/services.ts | 15 +- packages/wrapper/src/workerFactory.ts | 32 +- packages/wrapper/src/wrapper.ts | 2 +- verify/angular/package.json | 5 +- verify/buildAll.ps1 | 10 +- verify/pnpm/package.json | 5 +- verify/vite/package.json | 5 +- verify/webpack/package.json | 5 +- verify/yarn/package.json | 13 +- 30 files changed, 426 insertions(+), 483 deletions(-) diff --git a/README.md b/README.md index 2ab8e51fa..e6573e643 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,12 @@ [![NPM Version](https://img.shields.io/npm/v/monaco-languageclient.svg)](https://www.npmjs.com/package/monaco-languageclient) [![NPM Download](https://img.shields.io/npm/dt/monaco-languageclient.svg)](https://www.npmjs.com/package/monaco-languageclient) -Repository for [NPM module](https://www.npmjs.com/package/monaco-languageclient) to connect [Monaco editor](https://microsoft.github.io/monaco-editor/) with [language servers](https://microsoft.github.io/language-server-protocol/) and [NPM module](https://www.npmjs.com/package/vscode-ws-jsonrpc) which implements communication between a jsonrpc client and server over WebSocket. +This repository now multiple npm packages under under roof: + +- [monaco-languageclient](https://www.npmjs.com/package/monaco-languageclient) to connect [Monaco editor](https://microsoft.github.io/monaco-editor/) with [language servers](https://microsoft.github.io/language-server-protocol/). +- [vscode-ws-jsonrpc](https://www.npmjs.com/package/vscode-ws-jsonrpc) which implements communication between a jsonrpc client and server over WebSocket. +- [monaco-editor-wrapper](https://www.npmjs.com/package/monaco-editor-wrapper) for building monaco editor application driven by configuration +- [monaco-editor-react](https://www.npmjs.com/package/@typefox/monaco-editor-react) puts a react cloack over `monaco-editor-wrapper` Click [here](https://www.typefox.io/blog/teaching-the-language-server-protocol-to-microsofts-monaco-editor/) for a detail explanation how to connect the Monaco editor to your language server. @@ -14,8 +19,7 @@ Click [here](https://www.typefox.io/blog/teaching-the-language-server-protocol-t - [Getting started](#getting-started) - [Vite dev server](#vite-dev-server) - [Using monaco-languageclient](#using-monaco-languageclient) - - [NEW with v7: Treemended monaco-editor](#new-with-v7-treemended-monaco-editor) - - [Overrides instructions](#overrides-instructions) + - [NEW with v8: Own monaco-editor-api package](#new-with-v8-own-monaco-editor-api-package) - [Using services and extra packages from @codingame/monaco-vscode-api](#using-services-and-extra-packages-from-codingamemonaco-vscode-api) - [textmate and monarch](#textmate-and-monarch) - [Examples Overview](#examples-overview) @@ -61,7 +65,7 @@ npm run build ### Vite dev server -Start the Vite dev server. It serves all client code at [localhost](http://localhost:8080). You can go to the [index.html](http://localhost:8080/index.html) and navigate to all client examples from there. You can edit the client example code directly (TypeScript) and Vite ensures it automatically made available: +Start the Vite dev server. It serves all client code at [localhost](http://localhost:20001). You can go to the [index.html](http://localhost:20001/index.html) and navigate to all client examples from there. You can edit the client example code directly (TypeScript) and Vite ensures it automatically made available: ```shell npm run dev @@ -77,39 +81,15 @@ npm run watch ## Using monaco-languageclient -TODO: Section needs to be overhauled - -### NEW with v7: Treemended monaco-editor - -Since version 2 (see [Important Project Changes](#important-project-changes)) of this library we rely on [@codingame/monaco-vscode-api](https://github.com/CodinGame/monaco-vscode-api) to supply the vscode API. It evolved substantially since then and thesedays allows to use many vscode only services with `monaco-editor`. - -Earlier in 2023 we started to treemend an existing `monaco-editor` dependency via a postinstall script. This adds back monaco-editor code that was removed during bundling/threeshaking (*treemending*). See the detailed explanation [here](https://github.com/CodinGame/monaco-vscode-api#why). But, this introduced multiple problems. - -#### Overrides instructions - -With v7 we decided to use readily treemended version of monaco-editor called [@codingame/monaco-vscode-editor-api](https://www.npmjs.com/package/@codingame/monaco-vscode-editor-api), but this requires to add `overrides` (npm/pnpm) and `resolutions` (yarn) in your project. Setting these ensures that all dependencies to `monaco-editor` and `vscode` are aligned: - -```yaml - "overrides": { - "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.1" - }, - "resolutions": { - "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.1" - } -``` - -In the following table you can see the effect when using `npm list monaco-editor` (here the [angular client example](https://github.com/TypeFox/monaco-languageclient-ng-example.git) was used to demonstrate it): +### NEW with v8: Own monaco-editor-api package -| No overrides | With overrides | -| :---- | :---- | -| ![No overrides](./docs/images/no-overrides.png) | ![With overrides](./docs/images/with-overrides.png) | - -With `overrides` or `resolutions` configured any child depndencies with a another `monaco-editor` version will chnaged to the one you enforce. - -This means some extra-configuration work, but removes the need for any postinstall scripts which lead to multiple package manager problems. It is now also very clear what is used and needed. Please see [Monaco-editor / @codingame/monaco-vscode-api compatibility table](#monaco-editor--codingamemonaco-vscode-api-compatibility-table) for a complete overview. +Since version 2 (see [Important Project Changes](#important-project-changes)) of this library we rely on [@codingame/monaco-vscode-api](https://github.com/CodinGame/monaco-vscode-api) to supply the vscode API. It evolved substantially since then and thesedays allows to use many vscode only services with `monaco-editor`. With v6 and v7 we "treemend" used a "treemended" version of `monaco-editor` which brought back monaco-editor code that was removed during bundling/threeshaking (*treemending*). This left users with the need to define overrides / resolution which was problematic. +Therefore [monaco-vscode-editor-api](https://www.npmjs.com/package/@codingame/monaco-editor-wrapper) is now used and installed as an alias to monaco-editor because it provides the same api as the official monaco-editor. ### Using services and extra packages from @codingame/monaco-vscode-api +**TODO: Continue overhaul here** + The bespoke projects not only supplies the api, but it provides 100+ packages with additional services, default extensions and language packs. By default when initalizing `monaco-languageclient` via the required `initServices` the following services are always loaded: - *languages* and model *services* (always added by `monaco-languagclient`) @@ -336,12 +316,12 @@ 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@~3.1.1" +"vscode": "npm:@codingame/monaco-vscode-api@~3.1.2" ``` ## Monaco-editor / @codingame/monaco-vscode-api compatibility table -[This information has been moved here](./docs/versions-and-history.md#monaco-editor--codingamemonaco-vscode-api-compatibility-table). +Please see [Version information and project History](./docs/versions-and-history.md#monaco-editor--codingamemonaco-vscode-api-compatibility-table) for a complete overview. ## Important Project Changes diff --git a/docs/versions-and-history.md b/docs/versions-and-history.md index dea36a7e5..6eb87ae75 100644 --- a/docs/versions-and-history.md +++ b/docs/versions-and-history.md @@ -2,11 +2,11 @@ ## Monaco-editor / @codingame/monaco-vscode-api compatibility table -The following table describes which version of **monaco-languageclient** and **@codingame/monaco-vscode-api** are compatible with a specific version of **monaco-editor**. The listing starts with version 2.0.0 because **@codingame/monaco-vscode-api** was introduced for the first time. +The following table describes which version of **monaco-languageclient** and **@codingame/monaco-vscode-api** are compatible with a specific version of **monaco-editor** and **vscode**. The listing starts with version 2.0.0 because **@codingame/monaco-vscode-api** was introduced for the first time. -| monaco-languageclient | monaco-vscode-api | monaco-vscode-editor-api | monaco-editor | release date | comment | +| monaco-languageclient | monaco-vscode-api / editor-api | vscode | monaco-editor | release date | comment | | :---- | :---- | :--- | :--- | :--- | :--- | -| 8.0.0 | 2.0.1 | 2.0.1 | 0.45.0 | 2024-02-0x | `@codingame/monaco-vscode-editor-api` replaces `@codingame/monaco-editor-treemended` | +| 8.0.0 | 3.1.2 | 1.87.2 | 0.47.0 | 2024-03-1x | `@codingame/monaco-vscode-editor-api` replaces
`@codingame/monaco-editor-treemended`
`@codingame/monaco-vscode-api` implements its own versioning scheme | | 7.3.0 | 1.85.0 | 1.85.0 | 0.45.0 | 2024-01-04 | | | 7.2.0 | 1.83.16 | 1.83.16 | 0.44.0 | 2023-12-07 | | | 7.1.0 | 1.83.12 | 1.83.12 | 0.44.0 | 2023-11-27 | | @@ -45,9 +45,9 @@ The following table describes which version of **monaco-languageclient** and **@ ## Important Project Changes -### Febuary 2024 (v8.0.0) +### March 2024 (v8.0.0) -`@codingame/monaco-editor-treemended` is replaced by self-standing `@codingame/monaco-vscode-editor-api`. +`@codingame/monaco-editor-treemended` is replaced by self-standing `@codingame/monaco-vscode-editor-api`. All service and editor related functions have been moved from `monaco-languageclient` to `monaco-editor-wrapper` which has been moved into this repository. ### October 2023 (v7.0.0) diff --git a/package-lock.json b/package-lock.json index 249aab453..edd7776a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,7 +14,7 @@ "devDependencies": { "@codingame/esbuild-import-meta-url-plugin": "~1.0.2", "@types/node": "~20.11.27", - "@types/react": "~18.2.65", + "@types/react": "~18.2.66", "@types/react-dom": "~18.2.22", "@types/shelljs": "~0.8.15", "@types/vscode": "~1.87.0", @@ -88,255 +88,231 @@ "import-meta-resolve": "^4.0.0" } }, - "node_modules/@codingame/monaco-vscode-api": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-3.1.1.tgz", - "integrity": "sha512-Tw+8EYlTGLpP4+MOEr9OHmXofmr9FFbh5v18ui8hpnR+1taDDLQIyXXZSU1FW4jC9P/vzns6l4G+rdpy2bRXjg==", - "dependencies": { - "@codingame/monaco-vscode-base-service-override": "3.1.1", - "@codingame/monaco-vscode-environment-service-override": "3.1.1", - "@codingame/monaco-vscode-extensions-service-override": "3.1.1", - "@codingame/monaco-vscode-files-service-override": "3.1.1", - "@codingame/monaco-vscode-host-service-override": "3.1.1", - "@codingame/monaco-vscode-layout-service-override": "3.1.1", - "@codingame/monaco-vscode-quickaccess-service-override": "3.1.1", - "vscode-marked": "npm:marked@=3.0.2", - "vscode-semver": "npm:semver@=5.5.0" - } - }, "node_modules/@codingame/monaco-vscode-base-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-base-service-override/-/monaco-vscode-base-service-override-3.1.1.tgz", - "integrity": "sha512-Q2as13w1lX+ng4LvIH0O01c++7U2GQkqScQh3ThQI86/g96rX8JONmtWKuPojYzT3DkastsaYZ4rrkh68VDZLg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-base-service-override/-/monaco-vscode-base-service-override-3.1.2.tgz", + "integrity": "sha512-7k/hjTfuAKi50phnEJ1qbUeF5SmQInuqYsNj/wUHMR9vGAscEg71MgbmZVzeymYbBtksr7zGDzRyN8Cqdmkzsg==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-configuration-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-configuration-service-override/-/monaco-vscode-configuration-service-override-3.1.1.tgz", - "integrity": "sha512-VuhJfx54eIy6YA0pmjdI1KM5+DwA+TXchJMTCeFAlsnwMVpIJfKUNCveiOdI6A4PN5sFhUgLaHNGWAsOG//ahA==", - "dependencies": { - "@codingame/monaco-vscode-base-service-override": "3.1.1", - "@codingame/monaco-vscode-environment-service-override": "3.1.1", - "@codingame/monaco-vscode-extensions-service-override": "3.1.1", - "@codingame/monaco-vscode-files-service-override": "3.1.1", - "@codingame/monaco-vscode-host-service-override": "3.1.1", - "@codingame/monaco-vscode-layout-service-override": "3.1.1", - "@codingame/monaco-vscode-quickaccess-service-override": "3.1.1", - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-configuration-service-override/-/monaco-vscode-configuration-service-override-3.1.2.tgz", + "integrity": "sha512-CPPjSmqcmHm0XFbN7K9pWzzarWaefIVVYmnM1ooMQmQgrwjD0IkzDi0t1DeZRecSUjkK5mq2Ylmn/U8dDuTi6w==", + "dependencies": { + "@codingame/monaco-vscode-base-service-override": "3.1.2", + "@codingame/monaco-vscode-environment-service-override": "3.1.2", + "@codingame/monaco-vscode-extensions-service-override": "3.1.2", + "@codingame/monaco-vscode-files-service-override": "3.1.2", + "@codingame/monaco-vscode-host-service-override": "3.1.2", + "@codingame/monaco-vscode-layout-service-override": "3.1.2", + "@codingame/monaco-vscode-quickaccess-service-override": "3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2", "vscode-marked": "npm:marked@=3.0.2" } }, - "node_modules/@codingame/monaco-vscode-editor-api": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-editor-api/-/monaco-vscode-editor-api-3.1.1.tgz", - "integrity": "sha512-uC+tSk2WC4GhRCsOMlSuITA1oqZX5edhEFiTaJgFC5+uGoX6x5Q3TGsYFL9Q+zDh0eCyVVbT9uB77XMeo7AL1g==", - "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" - } - }, "node_modules/@codingame/monaco-vscode-editor-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-editor-service-override/-/monaco-vscode-editor-service-override-3.1.1.tgz", - "integrity": "sha512-ktBrA0R+85OuznMIiHFW1qzqEf7uCnZakOV+bW1AdYqQmAfBFbH1XWXiOikzGCQieSAu1GzmaDR4+KiXz4U/sw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-editor-service-override/-/monaco-vscode-editor-service-override-3.1.2.tgz", + "integrity": "sha512-HWiAn9kvittx7CA6mnSkN/ySg5d56Pvb6kf0e7pBswI9m4uCGWhEfp41a6DFbH37NZGOMnFYr2aqly6m+mPJfw==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2", "vscode-marked": "npm:marked@=3.0.2" } }, "node_modules/@codingame/monaco-vscode-environment-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-environment-service-override/-/monaco-vscode-environment-service-override-3.1.1.tgz", - "integrity": "sha512-aJqZKmTetYPYKasNWPKZCKiKVvxtmDBYbJmwImEu2psddpxe5o948EVbnFVdYRydvX49VGMmEd3yv7mw/7ohOg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-environment-service-override/-/monaco-vscode-environment-service-override-3.1.2.tgz", + "integrity": "sha512-ZCv9I6azs0XfMDIO2kS4FKXz/VbJd4Vd2xAJQ16Xpq4GLYTm/9TlezP0kBlE+VYMyfgAdq4QZos8g7jBRAnxFg==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-extensions-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-extensions-service-override/-/monaco-vscode-extensions-service-override-3.1.1.tgz", - "integrity": "sha512-0hXbNQFHUm9cwGMfoG7jL+BFJjJ0JuAkP5sCqbomdHe2tB7hZG+Fk38DYxWHxC3lpgOqcxD4ERBNQ24HBMuPAw==", - "dependencies": { - "@codingame/monaco-vscode-base-service-override": "3.1.1", - "@codingame/monaco-vscode-environment-service-override": "3.1.1", - "@codingame/monaco-vscode-extensions-service-override": "3.1.1", - "@codingame/monaco-vscode-files-service-override": "3.1.1", - "@codingame/monaco-vscode-host-service-override": "3.1.1", - "@codingame/monaco-vscode-layout-service-override": "3.1.1", - "@codingame/monaco-vscode-quickaccess-service-override": "3.1.1", - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-extensions-service-override/-/monaco-vscode-extensions-service-override-3.1.2.tgz", + "integrity": "sha512-HPpzWR+xaAx7t+meSQm7AjxvkiqfZ/OP1oCVtAeitDX321JDmk1Wq6r5Gr9S673aN0zwWPysZQNU6kD6WcZ1SA==", + "dependencies": { + "@codingame/monaco-vscode-base-service-override": "3.1.2", + "@codingame/monaco-vscode-environment-service-override": "3.1.2", + "@codingame/monaco-vscode-extensions-service-override": "3.1.2", + "@codingame/monaco-vscode-files-service-override": "3.1.2", + "@codingame/monaco-vscode-host-service-override": "3.1.2", + "@codingame/monaco-vscode-layout-service-override": "3.1.2", + "@codingame/monaco-vscode-quickaccess-service-override": "3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2", "vscode-marked": "npm:marked@=3.0.2", "vscode-semver": "npm:semver@=5.5.0" } }, "node_modules/@codingame/monaco-vscode-files-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-3.1.1.tgz", - "integrity": "sha512-Hxqd3eWtlMKiRVCoFkLcse4I2KntU0ylnaMxkxDAgP1L8M83AZTsEckeazw/HO6Z8tfNp+F+qJymWocRY7bK8w==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-3.1.2.tgz", + "integrity": "sha512-uyutFa8M4X6VVXYePYKB+kuwARLTJ2x10ATxXJTo1BMW/PyFN1MX24QyORkeFmnlt8COsYocJtr2dF7VcmGnuA==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2", "vscode-marked": "npm:marked@=3.0.2" } }, "node_modules/@codingame/monaco-vscode-groovy-default-extension": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-groovy-default-extension/-/monaco-vscode-groovy-default-extension-3.1.1.tgz", - "integrity": "sha512-UNHa8PlMj/o+M7ZGJboTcs5HwbEZF+Sy8XQcx1iYL0HhoM5sbggEDPMNMgwhO1GUZiOqjWVb00nKGeFAHaiRfg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-groovy-default-extension/-/monaco-vscode-groovy-default-extension-3.1.2.tgz", + "integrity": "sha512-CyU20925YoEBZLAiun91wEfEwgRO3N6ICodfnQR080cYah6FZIS0TCJi0hOR045rJYQ0POnmGAwFuw0tiD4dfw==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-host-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-host-service-override/-/monaco-vscode-host-service-override-3.1.1.tgz", - "integrity": "sha512-qFA1k0H0YwLic5q6JgYiuogotV35CmWhWTbrqp+luksq+q4bTujfgqo9hg7UdjmEXtmxOjxBuTHSZ8JdSRmMGA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-host-service-override/-/monaco-vscode-host-service-override-3.1.2.tgz", + "integrity": "sha512-wtGaj9gCN5GCeVaSJrG425dwvu236E+r0yI99ltsnx4J52P5Nf24hCD6JgqTyAHuVJWl0vNTFHLRHxxLkj0kCw==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-javascript-default-extension": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-javascript-default-extension/-/monaco-vscode-javascript-default-extension-3.1.1.tgz", - "integrity": "sha512-HHPvRenHNcuFVOb7nh9iQ7j5u5rByOuEFf1AyID5EfbDnWFVELV72ilwiVNuF5eNJGKVSYA105ovHJJIMUX0hQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-javascript-default-extension/-/monaco-vscode-javascript-default-extension-3.1.2.tgz", + "integrity": "sha512-ZxX56l0/nAn6yOeBrw7Ww91tNfobsTMZbTnmn4JBoH5uDAXpfwv0TwXd3OzjR6U0ge9VH/kM6G5m2+GoqG+/qQ==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-json-default-extension": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-json-default-extension/-/monaco-vscode-json-default-extension-3.1.1.tgz", - "integrity": "sha512-3VxwdPilUO5wj2FFIFN/VM9A/zZ4fYuR7pYfki3eNmD+B/8r4kVMMngkiSQbxCDCPtriFQp8UUqDdPljmNQi+A==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-json-default-extension/-/monaco-vscode-json-default-extension-3.1.2.tgz", + "integrity": "sha512-rpdJuHgdjFyowRIoW+iR6GUkR5BF0XX9KDcRbRLnA0bujzsrjVLHDJCAPCVTPpdq8++Em+sgOb4R11Ca97qW3w==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-keybindings-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-keybindings-service-override/-/monaco-vscode-keybindings-service-override-3.1.1.tgz", - "integrity": "sha512-wpvn121ndny8kjRVnkLi101MXOx11qRQ1dTcw7Uw0USlPgUhL8If4tj6anqy7j5RHfhhDYLciZn9UN/Q6bcDPg==", - "dependencies": { - "@codingame/monaco-vscode-base-service-override": "3.1.1", - "@codingame/monaco-vscode-environment-service-override": "3.1.1", - "@codingame/monaco-vscode-extensions-service-override": "3.1.1", - "@codingame/monaco-vscode-files-service-override": "3.1.1", - "@codingame/monaco-vscode-host-service-override": "3.1.1", - "@codingame/monaco-vscode-layout-service-override": "3.1.1", - "@codingame/monaco-vscode-quickaccess-service-override": "3.1.1", - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-keybindings-service-override/-/monaco-vscode-keybindings-service-override-3.1.2.tgz", + "integrity": "sha512-V9GUxVVg/eL0hGlDyFvx8d0eLh5dgs3Jj++pNulBEvJIogeoBv4pYn0ME6E/4/QyafpJszw/z1RjZp0lOUTT+w==", + "dependencies": { + "@codingame/monaco-vscode-base-service-override": "3.1.2", + "@codingame/monaco-vscode-environment-service-override": "3.1.2", + "@codingame/monaco-vscode-extensions-service-override": "3.1.2", + "@codingame/monaco-vscode-files-service-override": "3.1.2", + "@codingame/monaco-vscode-host-service-override": "3.1.2", + "@codingame/monaco-vscode-layout-service-override": "3.1.2", + "@codingame/monaco-vscode-quickaccess-service-override": "3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2", "vscode-marked": "npm:marked@=3.0.2" } }, "node_modules/@codingame/monaco-vscode-language-pack-de": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-de/-/monaco-vscode-language-pack-de-3.1.1.tgz", - "integrity": "sha512-mz/YlbP6aEXuWHxqHDguybJaqSrhXtZNPyRPdIJl6dhq1VpE73i/ypM2aepqfbTGsKTFGiZMI43qtlv/IwckSw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-de/-/monaco-vscode-language-pack-de-3.1.2.tgz", + "integrity": "sha512-lt88ey9BJbcv8QajOfXY3h6MSz7QyXQUns4dmjCgwxeS1S4JnB0mk7hD3GQ1vf0dANUe8kPsXXqI2HgoikCyPg==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-language-pack-es": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-es/-/monaco-vscode-language-pack-es-3.1.1.tgz", - "integrity": "sha512-nOQlnhokrvvKHCyjpR7bXOY04oAsdQBiAPhmdy/Ds2iRPXslghM1p4AweLM35OcgIkHQ4Bojx7vXTbOu6QeNeg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-es/-/monaco-vscode-language-pack-es-3.1.2.tgz", + "integrity": "sha512-7mmRY0TwymRpZaMdnH2t/Y+oeIv8xzMXUJTDY5vT3GLSmvaY2aUbnct7OmOOl5M+6IiZxNCFGOpH7fHk87Gm2w==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-language-pack-fr": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-fr/-/monaco-vscode-language-pack-fr-3.1.1.tgz", - "integrity": "sha512-fF6PTLCyHNBE0JFtdgHnRj2E/m6tA/0617RRQslF3aWIJFl1cA5l6y9NB1hAarQPFgI8wmTzT+/sC6ks98SEqQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-fr/-/monaco-vscode-language-pack-fr-3.1.2.tgz", + "integrity": "sha512-H1sDKBIK9YSmUpdhcZpzwglObqZn4LuvhQ74+Th532jmjz5ycm0nhdc9qiXw/0cQxY57KHQ5qnESwf6bGt1sHQ==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-languages-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-languages-service-override/-/monaco-vscode-languages-service-override-3.1.1.tgz", - "integrity": "sha512-TXMwjWPv/+AwzzGbmXDx0w+S9vwJR6wIbMaG73oXMDWcuJGy7q/FFs9MtvJ7u0ihEtzxqV563lLUPZGB9zbpHw==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-languages-service-override/-/monaco-vscode-languages-service-override-3.1.2.tgz", + "integrity": "sha512-7Pui5YL1FNcObd9u27v1I+zndqBnY0/lhaGzUk/XWeKkjZKQHg+4n/jUD028granujb+34YimZYWSGDzguY7ww==", "dependencies": { - "@codingame/monaco-vscode-files-service-override": "3.1.1", - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "@codingame/monaco-vscode-files-service-override": "3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-layout-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-layout-service-override/-/monaco-vscode-layout-service-override-3.1.1.tgz", - "integrity": "sha512-SueE7zH8VYQ0+GFPCsGYyEJHks8hAwU83tWf4JdNK3Hf7dFpNv/NTM1ssP6AHbNhqRFsptGr8JSCGR5SMYvbjQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-layout-service-override/-/monaco-vscode-layout-service-override-3.1.2.tgz", + "integrity": "sha512-fSFEoChjAFIQpDYpetZ3CmbUR/okJVLiqxIxzs/wI5C3scJF7dj7p4WFHPrz79MNhcOWZu8h9wqg+p4c6FZKsw==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2", "vscode-marked": "npm:marked@=3.0.2" } }, "node_modules/@codingame/monaco-vscode-model-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-model-service-override/-/monaco-vscode-model-service-override-3.1.1.tgz", - "integrity": "sha512-Kv/KhIBFM1FYfhA+p6ICb9GoLo/DK9g92MHi3Xp5aFTsN5B2T3M90bmXpzopif/A5Vca9zo6XbisT+plvcn90A==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-model-service-override/-/monaco-vscode-model-service-override-3.1.2.tgz", + "integrity": "sha512-9IqPkJjkFYWGxbadQcOKGS1NttfGbWoTyWRnnBAbL1ecgTac+FhlnNQoI5aXDuzMT0G2nRiY2kJcwwGdgS2ojQ==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-python-default-extension": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-python-default-extension/-/monaco-vscode-python-default-extension-3.1.1.tgz", - "integrity": "sha512-aerZyPAaSSZLpElDkQ364zkn5jVF7iXO1hr1CPzJsU0emW700eKATaYUsc0NSFUTvy9gdlxKj0aPyS3dGr7niQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-python-default-extension/-/monaco-vscode-python-default-extension-3.1.2.tgz", + "integrity": "sha512-s667wUagpGi3Nz5snFooMDJc+iY5fmV+qXBrIomemIti2RONMGIjVESkZkJwo7xx7Xgh3MixSrY8yNYeUAb0WQ==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-quickaccess-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-quickaccess-service-override/-/monaco-vscode-quickaccess-service-override-3.1.1.tgz", - "integrity": "sha512-YmhrlDOzqdwGnA09eEOSlI47EzIODhMBqBmnOQoRthw98GGBxYNOQmVLAJp6/0++G7xmfz1lkzx+RNyW9ni7gA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-quickaccess-service-override/-/monaco-vscode-quickaccess-service-override-3.1.2.tgz", + "integrity": "sha512-5T9nsSqGMFK76jXTRQDlbd4anjN7yFVN6IsdTrtw2cDn74g007BBqvJMRNIbzHdCA/i5rYCGbg+e6/ZrFRY53A==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2", "vscode-marked": "npm:marked@=3.0.2" } }, "node_modules/@codingame/monaco-vscode-textmate-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-textmate-service-override/-/monaco-vscode-textmate-service-override-3.1.1.tgz", - "integrity": "sha512-CaxKsAb5MlWC/TkP3aNBdz1y8e3K4eE8cvbQwj5hN6vY0Q+Zl0u6wbAu+eZtdC3CBTKj8/XsNaixelarARqz8w==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-textmate-service-override/-/monaco-vscode-textmate-service-override-3.1.2.tgz", + "integrity": "sha512-cFTyr9YnMDIrsL0IqWR9G4dmVOEG6A8yuSE6l4C+awQ4aI3Nmyfn7vkBBIc2p6+qmJmVgFPMvTDJ2TNxD08Nhg==", "dependencies": { - "@codingame/monaco-vscode-files-service-override": "3.1.1", - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1", + "@codingame/monaco-vscode-files-service-override": "3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2", "vscode-marked": "npm:marked@=3.0.2", "vscode-oniguruma": "1.7.0", "vscode-textmate": "9.0.0" } }, "node_modules/@codingame/monaco-vscode-theme-defaults-default-extension": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-defaults-default-extension/-/monaco-vscode-theme-defaults-default-extension-3.1.1.tgz", - "integrity": "sha512-EH1oWqtfSxYI71CW20hOmpmJfDbd8aNzDXRtXneriPfKFFOvVv9xoMK/VVaqn/cn1O466M0a1tkg8SDSvOT7Ww==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-defaults-default-extension/-/monaco-vscode-theme-defaults-default-extension-3.1.2.tgz", + "integrity": "sha512-p7+ismD+jZsPc9WTSXLMAn+9lV+Amb/xRm2FfwhXH6Q9HpGlvnYpgMkWLljrLlKyCOGtvUvff7abP8h8gT4aOQ==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-theme-service-override": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-service-override/-/monaco-vscode-theme-service-override-3.1.1.tgz", - "integrity": "sha512-7gqxfimiEFoasRzDPLg/aiH/Xzlx/qFOGygovbu9TYNVqM20pIrks3CKPvQBdCL5luDJjP4CEbrAwwRDZXyaLQ==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-service-override/-/monaco-vscode-theme-service-override-3.1.2.tgz", + "integrity": "sha512-saMt9BQzZtntHq+OsavxPF8476bi6ABvaEKAa0FiZcvhI0RrDBu1+td0yQdUqlHquYDV0RXk4bxgvuVf4dpTWg==", "dependencies": { - "@codingame/monaco-vscode-files-service-override": "3.1.1", - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "@codingame/monaco-vscode-files-service-override": "3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-typescript-basics-default-extension": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-typescript-basics-default-extension/-/monaco-vscode-typescript-basics-default-extension-3.1.1.tgz", - "integrity": "sha512-sAewHTmaloYVUEr+gPulTZJfIE8FeaVxBaVYE8+PjPQOdRUSHjgO/3JKXQn6I6bnaGyqpVCeINBpR8GW5GA+Lg==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-typescript-basics-default-extension/-/monaco-vscode-typescript-basics-default-extension-3.1.2.tgz", + "integrity": "sha512-Po+KMUQdTbKFKLguu20yQrS8UpWYFag92Pe7g40npkm4+leMHamGyu1HpgM/GwXnm+Ny2A98kmedkkUwj89W1Q==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@codingame/monaco-vscode-typescript-language-features-default-extension": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-typescript-language-features-default-extension/-/monaco-vscode-typescript-language-features-default-extension-3.1.1.tgz", - "integrity": "sha512-PtJllZMbAekPhyeFsNR+1dAHXCAs89tS2C6dY9N4SYi7lDUKjjt3u46Vv2miVxWxJ0GG0KIiJ2Ix8OELoyyHww==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-typescript-language-features-default-extension/-/monaco-vscode-typescript-language-features-default-extension-3.1.2.tgz", + "integrity": "sha512-NDDWL0gyoyopF1D4goEDbpAJk6CmbT2emRM9GaVB8/6W7xLQE7inEntrlx3qoNmouwnNqjXDziaBuxRmmaZudA==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" } }, "node_modules/@cspotcode/source-map-support": { @@ -352,9 +328,9 @@ } }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.1.tgz", - "integrity": "sha512-m55cpeupQ2DbuRGQMMZDzbv9J9PgVelPjlcmM5kxHnrBdBx6REaEd7LamYV7Dm8N7rCyR/XwU6rVP8ploKtIkA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", + "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", "cpu": [ "ppc64" ], @@ -367,9 +343,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.1.tgz", - "integrity": "sha512-4j0+G27/2ZXGWR5okcJi7pQYhmkVgb4D7UKwxcqrjhvp5TKWx3cUjgB1CGj1mfdmJBQ9VnUGgUhign+FPF2Zgw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", + "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", "cpu": [ "arm" ], @@ -382,9 +358,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.1.tgz", - "integrity": "sha512-hCnXNF0HM6AjowP+Zou0ZJMWWa1VkD77BXe959zERgGJBBxB+sV+J9f/rcjeg2c5bsukD/n17RKWXGFCO5dD5A==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", + "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", "cpu": [ "arm64" ], @@ -397,9 +373,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.1.tgz", - "integrity": "sha512-MSfZMBoAsnhpS+2yMFYIQUPs8Z19ajwfuaSZx+tSl09xrHZCjbeXXMsUF/0oq7ojxYEpsSo4c0SfjxOYXRbpaA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", + "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", "cpu": [ "x64" ], @@ -412,9 +388,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.1.tgz", - "integrity": "sha512-Ylk6rzgMD8klUklGPzS414UQLa5NPXZD5tf8JmQU8GQrj6BrFA/Ic9tb2zRe1kOZyCbGl+e8VMbDRazCEBqPvA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", + "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", "cpu": [ "arm64" ], @@ -427,9 +403,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.1.tgz", - "integrity": "sha512-pFIfj7U2w5sMp52wTY1XVOdoxw+GDwy9FsK3OFz4BpMAjvZVs0dT1VXs8aQm22nhwoIWUmIRaE+4xow8xfIDZA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", + "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", "cpu": [ "x64" ], @@ -442,9 +418,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.1.tgz", - "integrity": "sha512-UyW1WZvHDuM4xDz0jWun4qtQFauNdXjXOtIy7SYdf7pbxSWWVlqhnR/T2TpX6LX5NI62spt0a3ldIIEkPM6RHw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", + "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", "cpu": [ "arm64" ], @@ -457,9 +433,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.1.tgz", - "integrity": "sha512-itPwCw5C+Jh/c624vcDd9kRCCZVpzpQn8dtwoYIt2TJF3S9xJLiRohnnNrKwREvcZYx0n8sCSbvGH349XkcQeg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", + "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", "cpu": [ "x64" ], @@ -472,9 +448,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.1.tgz", - "integrity": "sha512-LojC28v3+IhIbfQ+Vu4Ut5n3wKcgTu6POKIHN9Wpt0HnfgUGlBuyDDQR4jWZUZFyYLiz4RBBBmfU6sNfn6RhLw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", + "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", "cpu": [ "arm" ], @@ -487,9 +463,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.1.tgz", - "integrity": "sha512-cX8WdlF6Cnvw/DO9/X7XLH2J6CkBnz7Twjpk56cshk9sjYVcuh4sXQBy5bmTwzBjNVZze2yaV1vtcJS04LbN8w==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", + "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", "cpu": [ "arm64" ], @@ -502,9 +478,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.1.tgz", - "integrity": "sha512-4H/sQCy1mnnGkUt/xszaLlYJVTz3W9ep52xEefGtd6yXDQbz/5fZE5dFLUgsPdbUOQANcVUa5iO6g3nyy5BJiw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", + "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", "cpu": [ "ia32" ], @@ -517,9 +493,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.1.tgz", - "integrity": "sha512-c0jgtB+sRHCciVXlyjDcWb2FUuzlGVRwGXgI+3WqKOIuoo8AmZAddzeOHeYLtD+dmtHw3B4Xo9wAUdjlfW5yYA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", + "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", "cpu": [ "loong64" ], @@ -532,9 +508,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.1.tgz", - "integrity": "sha512-TgFyCfIxSujyuqdZKDZ3yTwWiGv+KnlOeXXitCQ+trDODJ+ZtGOzLkSWngynP0HZnTsDyBbPy7GWVXWaEl6lhA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", + "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", "cpu": [ "mips64el" ], @@ -547,9 +523,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.1.tgz", - "integrity": "sha512-b+yuD1IUeL+Y93PmFZDZFIElwbmFfIKLKlYI8M6tRyzE6u7oEP7onGk0vZRh8wfVGC2dZoy0EqX1V8qok4qHaw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", + "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", "cpu": [ "ppc64" ], @@ -562,9 +538,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.1.tgz", - "integrity": "sha512-wpDlpE0oRKZwX+GfomcALcouqjjV8MIX8DyTrxfyCfXxoKQSDm45CZr9fanJ4F6ckD4yDEPT98SrjvLwIqUCgg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", + "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", "cpu": [ "riscv64" ], @@ -577,9 +553,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.1.tgz", - "integrity": "sha512-5BepC2Au80EohQ2dBpyTquqGCES7++p7G+7lXe1bAIvMdXm4YYcEfZtQrP4gaoZ96Wv1Ute61CEHFU7h4FMueQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", + "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", "cpu": [ "s390x" ], @@ -592,9 +568,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.1.tgz", - "integrity": "sha512-5gRPk7pKuaIB+tmH+yKd2aQTRpqlf1E4f/mC+tawIm/CGJemZcHZpp2ic8oD83nKgUPMEd0fNanrnFljiruuyA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", + "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", "cpu": [ "x64" ], @@ -607,9 +583,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.1.tgz", - "integrity": "sha512-4fL68JdrLV2nVW2AaWZBv3XEm3Ae3NZn/7qy2KGAt3dexAgSVT+Hc97JKSZnqezgMlv9x6KV0ZkZY7UO5cNLCg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", + "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", "cpu": [ "x64" ], @@ -622,9 +598,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.1.tgz", - "integrity": "sha512-GhRuXlvRE+twf2ES+8REbeCb/zeikNqwD3+6S5y5/x+DYbAQUNl0HNBs4RQJqrechS4v4MruEr8ZtAin/hK5iw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", + "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", "cpu": [ "x64" ], @@ -637,9 +613,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.1.tgz", - "integrity": "sha512-ZnWEyCM0G1Ex6JtsygvC3KUUrlDXqOihw8RicRuQAzw+c4f1D66YlPNNV3rkjVW90zXVsHwZYWbJh3v+oQFM9Q==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", + "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", "cpu": [ "x64" ], @@ -652,9 +628,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.1.tgz", - "integrity": "sha512-QZ6gXue0vVQY2Oon9WyLFCdSuYbXSoxaZrPuJ4c20j6ICedfsDilNPYfHLlMH7vGfU5DQR0czHLmJvH4Nzis/A==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", + "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", "cpu": [ "arm64" ], @@ -667,9 +643,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.1.tgz", - "integrity": "sha512-HzcJa1NcSWTAU0MJIxOho8JftNp9YALui3o+Ny7hCh0v5f90nprly1U3Sj1Ldj/CvKKdvvFsCRvDkpsEMp4DNw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", + "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", "cpu": [ "ia32" ], @@ -682,9 +658,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.1.tgz", - "integrity": "sha512-0MBh53o6XtI6ctDnRMeQ+xoCN8kD2qI1rY1KgF/xdWQwoFeKou7puvDfV8/Wv4Ctx2rRpET/gGdz3YlNtNACSA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", + "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", "cpu": [ "x64" ], @@ -1447,9 +1423,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.65", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.65.tgz", - "integrity": "sha512-98TsY0aW4jqx/3RqsUXwMDZSWR1Z4CUlJNue8ueS2/wcxZOsz4xmW1X8ieaWVRHcmmQM3R8xVA4XWB3dJnWwDQ==", + "version": "18.2.66", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.66.tgz", + "integrity": "sha512-OYTmMI4UigXeFMF/j4uv0lBBEbongSgptPrHBxqME44h9+yNov+oL6Z3ocJKo0WyXR84sQUNeyIp9MRfckvZpg==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -3529,9 +3505,9 @@ } }, "node_modules/esbuild": { - "version": "0.20.1", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.1.tgz", - "integrity": "sha512-OJwEgrpWm/PCMsLVWXKqvcjme3bHNpOgN7Tb6cQnR5n0TPbQx1/Xrn7rqM+wn17bYeT6MGB5sn1Bh5YiGi70nA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", + "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", "hasInstallScript": true, "bin": { "esbuild": "bin/esbuild" @@ -3540,29 +3516,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.20.1", - "@esbuild/android-arm": "0.20.1", - "@esbuild/android-arm64": "0.20.1", - "@esbuild/android-x64": "0.20.1", - "@esbuild/darwin-arm64": "0.20.1", - "@esbuild/darwin-x64": "0.20.1", - "@esbuild/freebsd-arm64": "0.20.1", - "@esbuild/freebsd-x64": "0.20.1", - "@esbuild/linux-arm": "0.20.1", - "@esbuild/linux-arm64": "0.20.1", - "@esbuild/linux-ia32": "0.20.1", - "@esbuild/linux-loong64": "0.20.1", - "@esbuild/linux-mips64el": "0.20.1", - "@esbuild/linux-ppc64": "0.20.1", - "@esbuild/linux-riscv64": "0.20.1", - "@esbuild/linux-s390x": "0.20.1", - "@esbuild/linux-x64": "0.20.1", - "@esbuild/netbsd-x64": "0.20.1", - "@esbuild/openbsd-x64": "0.20.1", - "@esbuild/sunos-x64": "0.20.1", - "@esbuild/win32-arm64": "0.20.1", - "@esbuild/win32-ia32": "0.20.1", - "@esbuild/win32-x64": "0.20.1" + "@esbuild/aix-ppc64": "0.20.2", + "@esbuild/android-arm": "0.20.2", + "@esbuild/android-arm64": "0.20.2", + "@esbuild/android-x64": "0.20.2", + "@esbuild/darwin-arm64": "0.20.2", + "@esbuild/darwin-x64": "0.20.2", + "@esbuild/freebsd-arm64": "0.20.2", + "@esbuild/freebsd-x64": "0.20.2", + "@esbuild/linux-arm": "0.20.2", + "@esbuild/linux-arm64": "0.20.2", + "@esbuild/linux-ia32": "0.20.2", + "@esbuild/linux-loong64": "0.20.2", + "@esbuild/linux-mips64el": "0.20.2", + "@esbuild/linux-ppc64": "0.20.2", + "@esbuild/linux-riscv64": "0.20.2", + "@esbuild/linux-s390x": "0.20.2", + "@esbuild/linux-x64": "0.20.2", + "@esbuild/netbsd-x64": "0.20.2", + "@esbuild/openbsd-x64": "0.20.2", + "@esbuild/sunos-x64": "0.20.2", + "@esbuild/win32-arm64": "0.20.2", + "@esbuild/win32-ia32": "0.20.2", + "@esbuild/win32-x64": "0.20.2" } }, "node_modules/escalade": { @@ -6033,6 +6009,15 @@ "ufo": "^1.3.2" } }, + "node_modules/monaco-editor": { + "name": "@codingame/monaco-vscode-editor-api", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-editor-api/-/monaco-vscode-editor-api-3.1.2.tgz", + "integrity": "sha512-aHRGGpmhTEilLSYpHhkASI4XT6X0m5T9gfEpY5ZH2Ye6al4Jj93ENcqhXSf/umZZszBYLrsmHV0w+ITsX+U5Tw==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@3.1.2" + } + }, "node_modules/monaco-editor-ms": { "name": "monaco-editor", "version": "0.47.0", @@ -8922,17 +8907,17 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-3.1.1.tgz", - "integrity": "sha512-Tw+8EYlTGLpP4+MOEr9OHmXofmr9FFbh5v18ui8hpnR+1taDDLQIyXXZSU1FW4jC9P/vzns6l4G+rdpy2bRXjg==", - "dependencies": { - "@codingame/monaco-vscode-base-service-override": "3.1.1", - "@codingame/monaco-vscode-environment-service-override": "3.1.1", - "@codingame/monaco-vscode-extensions-service-override": "3.1.1", - "@codingame/monaco-vscode-files-service-override": "3.1.1", - "@codingame/monaco-vscode-host-service-override": "3.1.1", - "@codingame/monaco-vscode-layout-service-override": "3.1.1", - "@codingame/monaco-vscode-quickaccess-service-override": "3.1.1", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-3.1.2.tgz", + "integrity": "sha512-tLuu5odaidamX2WLRd1J98NFXWKx5bva6U/hRKqI7/UuKoNfkMQ225Sk2mrnSlhrjGvC0NH/DaIZ/09xDigP/Q==", + "dependencies": { + "@codingame/monaco-vscode-base-service-override": "3.1.2", + "@codingame/monaco-vscode-environment-service-override": "3.1.2", + "@codingame/monaco-vscode-extensions-service-override": "3.1.2", + "@codingame/monaco-vscode-files-service-override": "3.1.2", + "@codingame/monaco-vscode-host-service-override": "3.1.2", + "@codingame/monaco-vscode-layout-service-override": "3.1.2", + "@codingame/monaco-vscode-quickaccess-service-override": "3.1.2", "vscode-marked": "npm:marked@=3.0.2", "vscode-semver": "npm:semver@=5.5.0" } @@ -9416,11 +9401,13 @@ }, "packages/client": { "name": "monaco-languageclient", - "version": "8.0.0-next.4", + "version": "8.0.0", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-languages-service-override": "~3.1.1", - "@codingame/monaco-vscode-model-service-override": "~3.1.1", + "@codingame/monaco-vscode-languages-service-override": "~3.1.2", + "@codingame/monaco-vscode-model-service-override": "~3.1.2", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2", "vscode-languageclient": "~9.0.1" }, "engines": { @@ -9428,15 +9415,11 @@ "npm": ">=9.0.0" }, "peerDependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1" + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2" }, "peerDependenciesMeta": { - "@codingame/monaco-vscode-api": { - "optional": false - }, - "@codingame/monaco-vscode-editor-api": { + "monaco-editor": { "optional": false }, "vscode": { @@ -9446,42 +9429,41 @@ }, "packages/examples": { "name": "monaco-languageclient-examples", - "version": "8.0.0-next.4", + "version": "8.0.0", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-configuration-service-override": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", - "@codingame/monaco-vscode-editor-service-override": "~3.1.1", - "@codingame/monaco-vscode-files-service-override": "~3.1.1", - "@codingame/monaco-vscode-groovy-default-extension": "~3.1.1", - "@codingame/monaco-vscode-javascript-default-extension": "~3.1.1", - "@codingame/monaco-vscode-json-default-extension": "~3.1.1", - "@codingame/monaco-vscode-keybindings-service-override": "~3.1.1", - "@codingame/monaco-vscode-language-pack-de": "~3.1.1", - "@codingame/monaco-vscode-language-pack-es": "~3.1.1", - "@codingame/monaco-vscode-language-pack-fr": "~3.1.1", - "@codingame/monaco-vscode-python-default-extension": "~3.1.1", - "@codingame/monaco-vscode-textmate-service-override": "~3.1.1", - "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.1.1", - "@codingame/monaco-vscode-theme-service-override": "~3.1.1", - "@codingame/monaco-vscode-typescript-basics-default-extension": "~3.1.1", - "@codingame/monaco-vscode-typescript-language-features-default-extension": "~3.1.1", - "@typefox/monaco-editor-react": "~3.0.0-next.4", + "@codingame/monaco-vscode-configuration-service-override": "~3.1.2", + "@codingame/monaco-vscode-editor-service-override": "~3.1.2", + "@codingame/monaco-vscode-files-service-override": "~3.1.2", + "@codingame/monaco-vscode-groovy-default-extension": "~3.1.2", + "@codingame/monaco-vscode-javascript-default-extension": "~3.1.2", + "@codingame/monaco-vscode-json-default-extension": "~3.1.2", + "@codingame/monaco-vscode-keybindings-service-override": "~3.1.2", + "@codingame/monaco-vscode-language-pack-de": "~3.1.2", + "@codingame/monaco-vscode-language-pack-es": "~3.1.2", + "@codingame/monaco-vscode-language-pack-fr": "~3.1.2", + "@codingame/monaco-vscode-python-default-extension": "~3.1.2", + "@codingame/monaco-vscode-textmate-service-override": "~3.1.2", + "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.1.2", + "@codingame/monaco-vscode-theme-service-override": "~3.1.2", + "@codingame/monaco-vscode-typescript-basics-default-extension": "~3.1.2", + "@codingame/monaco-vscode-typescript-language-features-default-extension": "~3.1.2", + "@typefox/monaco-editor-react": "~3.0.0", "express": "~4.18.3", "langium": "3.0.0", - "monaco-editor-wrapper": "~4.0.0-next.4", - "monaco-languageclient": "~8.0.0-next.4", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "monaco-editor-wrapper": "~4.0.0", + "monaco-languageclient": "~8.0.0", "pyright": "~1.1.354", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2", "vscode-json-languageservice": "~5.3.7", "vscode-languageclient": "~9.0.1", "vscode-languageserver": "~9.0.1", "vscode-uri": "~3.0.8", - "vscode-ws-jsonrpc": "~3.3.0-next.4", + "vscode-ws-jsonrpc": "~3.3.0", "ws": "~8.16.0" }, "devDependencies": { @@ -9540,7 +9522,7 @@ } }, "packages/vscode-ws-jsonrpc": { - "version": "3.3.0-next.4", + "version": "3.3.0", "license": "MIT", "dependencies": { "vscode-jsonrpc": "~8.2.0" @@ -9552,37 +9534,31 @@ }, "packages/wrapper": { "name": "monaco-editor-wrapper", - "version": "4.0.0-next.4", + "version": "4.0.0", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-configuration-service-override": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", - "@codingame/monaco-vscode-editor-service-override": "~3.1.1", - "@codingame/monaco-vscode-textmate-service-override": "~3.1.1", - "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.1.1", - "@codingame/monaco-vscode-theme-service-override": "~3.1.1", - "esbuild": "~0.20.1", - "monaco-languageclient": "~8.0.0-next.4", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1", + "@codingame/monaco-vscode-configuration-service-override": "~3.1.2", + "@codingame/monaco-vscode-editor-service-override": "~3.1.2", + "@codingame/monaco-vscode-textmate-service-override": "~3.1.2", + "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.1.2", + "@codingame/monaco-vscode-theme-service-override": "~3.1.2", + "esbuild": "~0.20.2", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2", "vscode-languageclient": "~9.0.1", "vscode-languageserver-protocol": "~3.17.5", - "vscode-ws-jsonrpc": "~3.3.0-next.4" + "vscode-ws-jsonrpc": "~3.3.0" }, "devDependencies": { "monaco-editor-ms": "npm:monaco-editor@~0.47.0" }, "peerDependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", - "monaco-languageclient": "~8.0.0-next.4", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1" + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "monaco-languageclient": "~8.0.0", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2" }, "peerDependenciesMeta": { - "@codingame/monaco-vscode-api": { - "optional": false - }, - "@codingame/monaco-vscode-editor-api": { + "monaco-editor": { "optional": false }, "monaco-languageclient": { @@ -9595,17 +9571,16 @@ }, "packages/wrapper-react": { "name": "@typefox/monaco-editor-react", - "version": "3.0.0-next.4", + "version": "3.0.0", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", - "monaco-editor-wrapper": "~4.0.0-next.4", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "monaco-editor-wrapper": "~4.0.0", "react": "~18.2.0", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2" }, "peerDependencies": { - "monaco-editor-wrapper": "~4.0.0-next.4" + "monaco-editor-wrapper": "~4.0.0" }, "peerDependenciesMeta": { "monaco-editor-wrapper": { diff --git a/package.json b/package.json index ce20e2028..85a23d6e6 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "devDependencies": { "@codingame/esbuild-import-meta-url-plugin": "~1.0.2", "@types/node": "~20.11.27", - "@types/react": "~18.2.65", + "@types/react": "~18.2.66", "@types/react-dom": "~18.2.22", "@types/shelljs": "~0.8.15", "@types/vscode": "~1.87.0", diff --git a/packages/client/package.json b/packages/client/package.json index 52249adc3..ce3ee32f4 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient", - "version": "8.0.0-next.4", + "version": "8.0.0", "description": "Monaco Language client implementation", "author": { "name": "TypeFox GmbH", @@ -48,20 +48,18 @@ "License.txt" ], "dependencies": { - "@codingame/monaco-vscode-languages-service-override": "~3.1.1", - "@codingame/monaco-vscode-model-service-override": "~3.1.1", + "@codingame/monaco-vscode-languages-service-override": "~3.1.2", + "@codingame/monaco-vscode-model-service-override": "~3.1.2", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2", "vscode-languageclient": "~9.0.1" }, "peerDependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1" + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2" }, "peerDependenciesMeta": { - "@codingame/monaco-vscode-api": { - "optional": false - }, - "@codingame/monaco-vscode-editor-api": { + "monaco-editor": { "optional": false }, "vscode": { diff --git a/packages/examples/package.json b/packages/examples/package.json index 7c70c6552..2833de0c7 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient-examples", - "version": "8.0.0-next.4", + "version": "8.0.0", "description": "Monaco Language client examples", "author": { "name": "TypeFox GmbH", @@ -54,39 +54,38 @@ } }, "dependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", - "@codingame/monaco-vscode-configuration-service-override": "~3.1.1", - "@codingame/monaco-vscode-editor-service-override": "~3.1.1", - "@codingame/monaco-vscode-files-service-override": "~3.1.1", - "@codingame/monaco-vscode-groovy-default-extension": "~3.1.1", - "@codingame/monaco-vscode-json-default-extension": "~3.1.1", - "@codingame/monaco-vscode-keybindings-service-override": "~3.1.1", - "@codingame/monaco-vscode-python-default-extension": "~3.1.1", - "@codingame/monaco-vscode-textmate-service-override": "~3.1.1", - "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.1.1", - "@codingame/monaco-vscode-theme-service-override": "~3.1.1", - "@codingame/monaco-vscode-javascript-default-extension": "~3.1.1", - "@codingame/monaco-vscode-typescript-basics-default-extension": "~3.1.1", - "@codingame/monaco-vscode-typescript-language-features-default-extension": "~3.1.1", - "@codingame/monaco-vscode-language-pack-de": "~3.1.1", - "@codingame/monaco-vscode-language-pack-es": "~3.1.1", - "@codingame/monaco-vscode-language-pack-fr": "~3.1.1", - "@typefox/monaco-editor-react": "~3.0.0-next.4", + "@codingame/monaco-vscode-configuration-service-override": "~3.1.2", + "@codingame/monaco-vscode-editor-service-override": "~3.1.2", + "@codingame/monaco-vscode-files-service-override": "~3.1.2", + "@codingame/monaco-vscode-groovy-default-extension": "~3.1.2", + "@codingame/monaco-vscode-json-default-extension": "~3.1.2", + "@codingame/monaco-vscode-keybindings-service-override": "~3.1.2", + "@codingame/monaco-vscode-python-default-extension": "~3.1.2", + "@codingame/monaco-vscode-textmate-service-override": "~3.1.2", + "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.1.2", + "@codingame/monaco-vscode-theme-service-override": "~3.1.2", + "@codingame/monaco-vscode-javascript-default-extension": "~3.1.2", + "@codingame/monaco-vscode-typescript-basics-default-extension": "~3.1.2", + "@codingame/monaco-vscode-typescript-language-features-default-extension": "~3.1.2", + "@codingame/monaco-vscode-language-pack-de": "~3.1.2", + "@codingame/monaco-vscode-language-pack-es": "~3.1.2", + "@codingame/monaco-vscode-language-pack-fr": "~3.1.2", + "@typefox/monaco-editor-react": "~3.0.0", "express": "~4.18.3", "langium": "3.0.0", - "monaco-languageclient": "~8.0.0-next.4", - "monaco-editor-wrapper": "~4.0.0-next.4", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "monaco-editor-wrapper": "~4.0.0", + "monaco-languageclient": "~8.0.0", "pyright": "~1.1.354", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2", "vscode-json-languageservice": "~5.3.7", "vscode-languageclient": "~9.0.1", "vscode-languageserver": "~9.0.1", "vscode-uri": "~3.0.8", - "vscode-ws-jsonrpc": "~3.3.0-next.4", + "vscode-ws-jsonrpc": "~3.3.0", "ws": "~8.16.0" }, "devDependencies": { diff --git a/packages/examples/src/browser/main.ts b/packages/examples/src/browser/main.ts index 88bb116b7..4d3b24bbf 100644 --- a/packages/examples/src/browser/main.ts +++ b/packages/examples/src/browser/main.ts @@ -12,7 +12,7 @@ import { createConverter as createCodeConverter } from 'vscode-languageclient/li import { createConverter as createProtocolConverter } from 'vscode-languageclient/lib/common/protocolConverter.js'; import { MonacoEditorLanguageClientWrapper, UserConfig } from 'monaco-editor-wrapper'; import { useWorkerFactory } from 'monaco-editor-wrapper/workerFactory'; -import { Uri } from '@codingame/monaco-vscode-editor-api'; +import { Uri } from 'monaco-editor'; export const configureMonacoWorkers = () => { useWorkerFactory({ diff --git a/packages/examples/src/common/example-apps-common.ts b/packages/examples/src/common/example-apps-common.ts index d58477792..ff1af2d28 100644 --- a/packages/examples/src/common/example-apps-common.ts +++ b/packages/examples/src/common/example-apps-common.ts @@ -4,7 +4,7 @@ * ------------------------------------------------------------------------------------------ */ import { ModelUpdate, MonacoEditorLanguageClientWrapper, UserConfig } from 'monaco-editor-wrapper'; -import { languages } from '@codingame/monaco-vscode-editor-api'; +import { languages } from 'monaco-editor'; const wrapper = new MonacoEditorLanguageClientWrapper(); diff --git a/packages/examples/src/json/client/wrapperWs.ts b/packages/examples/src/json/client/wrapperWs.ts index 3ffb290ee..95e687f18 100644 --- a/packages/examples/src/json/client/wrapperWs.ts +++ b/packages/examples/src/json/client/wrapperWs.ts @@ -15,7 +15,7 @@ export const configureMonacoWorkers = () => { useWorkerFactory({ ignoreMapping: true, workerLoaders: { - editorWorkerService: () => new Worker(new URL('@codingame/monaco-vscode-editor-api/esm/vs/editor/editor.worker.js', import.meta.url), { type: 'module' }) + editorWorkerService: () => new Worker(new URL('monaco-editor/esm/vs/editor/editor.worker.js', import.meta.url), { type: 'module' }) } }); }; diff --git a/packages/examples/src/langium/statemachine/main-react.tsx b/packages/examples/src/langium/statemachine/main-react.tsx index 97e22b701..0a20860bb 100644 --- a/packages/examples/src/langium/statemachine/main-react.tsx +++ b/packages/examples/src/langium/statemachine/main-react.tsx @@ -7,7 +7,7 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; import { MonacoEditorReactComp } from '@typefox/monaco-editor-react'; import { createLangiumGlobalConfig } from './config/wrapperStatemachineConfig.js'; -import { loadStatemachinWorkerRegular } from './main.js'; +import { loadStatemachineWorkerRegular } from './main.js'; import { useWorkerFactory } from 'monaco-editor-wrapper/workerFactory'; export const configureMonacoWorkers = () => { @@ -18,7 +18,7 @@ export const configureMonacoWorkers = () => { export const runStatemachineReact = async () => { try { - const langiumGlobalConfig = await createLangiumGlobalConfig(loadStatemachinWorkerRegular()); + const langiumGlobalConfig = await createLangiumGlobalConfig(loadStatemachineWorkerRegular()); const comp = { } // init first worker regularly - const stateMachineWorkerRegular = loadStatemachinWorkerRegular(); + const stateMachineWorkerRegular = loadStatemachineWorkerRegular(); const langiumGlobalConfig = await createLangiumGlobalConfig(stateMachineWorkerRegular); await wrapper.initAndStart(langiumGlobalConfig, document.getElementById('monaco-editor-root')); @@ -66,7 +66,7 @@ export const runStatemachineWrapper = async () => { } }; -export const loadStatemachinWorkerRegular = () => { +export const loadStatemachineWorkerRegular = () => { // Language Server preparation const workerUrl = new URL('./src/langium/statemachine/worker/statemachine-server.ts', window.location.href); console.log(`Langium worker URL: ${workerUrl}`); diff --git a/packages/examples/src/ts/wrapperTs.ts b/packages/examples/src/ts/wrapperTs.ts index 24f4e3cc4..49f7689a6 100644 --- a/packages/examples/src/ts/wrapperTs.ts +++ b/packages/examples/src/ts/wrapperTs.ts @@ -4,7 +4,7 @@ * ------------------------------------------------------------------------------------------ */ import * as vscode from 'vscode'; -import * as monaco from '@codingame/monaco-vscode-editor-api'; +import * as monaco from 'monaco-editor'; import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override'; // only works if wrapper is configured in extended mode @@ -13,8 +13,8 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings- // import '@codingame/monaco-vscode-typescript-language-features-default-extension'; // basic-languages and language only exists if manually copied there -// import '@codingame/monaco-vscode-editor-api/esm/vs/basic-languages/typescript/typescript.contribution.js'; -// import '@codingame/monaco-vscode-editor-api/esm/vs/language/typescript/monaco.contribution.js'; +// import 'monaco-editor/esm/vs/basic-languages/typescript/typescript.contribution.js'; +// import 'monaco-editor/esm/vs/language/typescript/monaco.contribution.js'; import { disposeEditor, getWrapper, startEditor, swapEditors, updateModel } from '../common/example-apps-common.js'; import { UserConfig } from 'monaco-editor-wrapper'; diff --git a/packages/vscode-ws-jsonrpc/package.json b/packages/vscode-ws-jsonrpc/package.json index 802f1e75f..6ce67fce7 100644 --- a/packages/vscode-ws-jsonrpc/package.json +++ b/packages/vscode-ws-jsonrpc/package.json @@ -1,6 +1,6 @@ { "name": "vscode-ws-jsonrpc", - "version": "3.3.0-next.4", + "version": "3.3.0", "description": "VSCode JSON RPC over WebSocket", "author": { "name": "TypeFox GmbH", diff --git a/packages/wrapper-react/package.json b/packages/wrapper-react/package.json index 553ec05bd..38ed31068 100644 --- a/packages/wrapper-react/package.json +++ b/packages/wrapper-react/package.json @@ -1,6 +1,6 @@ { "name": "@typefox/monaco-editor-react", - "version": "3.0.0-next.4", + "version": "3.0.0", "license": "MIT", "description": "React component for Monaco-Editor and Monaco Languageclient", "keywords": [ @@ -50,14 +50,13 @@ "npm": "10.2.4" }, "dependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", - "monaco-editor-wrapper": "~4.0.0-next.4", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "monaco-editor-wrapper": "~4.0.0", "react": "~18.2.0", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2" }, "peerDependencies": { - "monaco-editor-wrapper": "~4.0.0-next.4" + "monaco-editor-wrapper": "~4.0.0" }, "peerDependenciesMeta": { "monaco-editor-wrapper": { diff --git a/packages/wrapper-react/src/index.tsx b/packages/wrapper-react/src/index.tsx index a46410231..562dafb86 100644 --- a/packages/wrapper-react/src/index.tsx +++ b/packages/wrapper-react/src/index.tsx @@ -4,7 +4,7 @@ * ------------------------------------------------------------------------------------------ */ import { EditorAppClassic, EditorAppExtended, MonacoEditorLanguageClientWrapper, UserConfig, WorkerConfigDirect, WorkerConfigOptions } from 'monaco-editor-wrapper'; -import { IDisposable } from '@codingame/monaco-vscode-editor-api'; +import { IDisposable } from 'monaco-editor'; import * as vscode from 'vscode'; import React, { CSSProperties } from 'react'; diff --git a/packages/wrapper/build/buildAllWorkers.mts b/packages/wrapper/build/buildAllWorkers.mts index 6151a3ce3..2a1d9d580 100644 --- a/packages/wrapper/build/buildAllWorkers.mts +++ b/packages/wrapper/build/buildAllWorkers.mts @@ -11,7 +11,7 @@ const format = 'esm' as Format; const promises = [] as Array>; promises.push(bundleWorker( format, - '../../node_modules/@codingame/monaco-vscode-editor-api/esm/vs/editor/editor.worker.js', + '../../node_modules/monaco-editor/esm/vs/editor/editor.worker.js', './dist/workers-esbuild/editorWorker-es.js' )); diff --git a/packages/wrapper/build/vite.editorWorker.ts b/packages/wrapper/build/vite.editorWorker.ts index b87e9b616..136362ad5 100644 --- a/packages/wrapper/build/vite.editorWorker.ts +++ b/packages/wrapper/build/vite.editorWorker.ts @@ -9,7 +9,7 @@ import { defineConfig } from 'vite'; const config = defineConfig({ build: { lib: { - entry: path.resolve(__dirname, '../../../node_modules/@codingame/monaco-vscode-editor-api/esm/vs/editor/editor.worker.js'), + entry: path.resolve(__dirname, '../../../node_modules/monaco-editor/esm/vs/editor/editor.worker.js'), name: 'editorWorker', fileName: (format) => `workers/editorWorker-${format}.js`, formats: ['es'] diff --git a/packages/wrapper/package.json b/packages/wrapper/package.json index e85bedcee..f943cccf6 100644 --- a/packages/wrapper/package.json +++ b/packages/wrapper/package.json @@ -1,6 +1,6 @@ { "name": "monaco-editor-wrapper", - "version": "4.0.0-next.4", + "version": "4.0.0", "license": "MIT", "description": "Wrapper for monaco-vscode-editor-api and monaco-languageclient", "keywords": [ @@ -101,34 +101,28 @@ "npm": "10.2.4" }, "dependencies": { - "@codingame/monaco-vscode-configuration-service-override": "~3.1.1", - "@codingame/monaco-vscode-editor-service-override": "~3.1.1", - "@codingame/monaco-vscode-textmate-service-override": "~3.1.1", - "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.1.1", - "@codingame/monaco-vscode-theme-service-override": "~3.1.1", - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", - "esbuild": "~0.20.1", - "monaco-languageclient": "~8.0.0-next.4", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1", + "@codingame/monaco-vscode-configuration-service-override": "~3.1.2", + "@codingame/monaco-vscode-editor-service-override": "~3.1.2", + "@codingame/monaco-vscode-textmate-service-override": "~3.1.2", + "@codingame/monaco-vscode-theme-defaults-default-extension": "~3.1.2", + "@codingame/monaco-vscode-theme-service-override": "~3.1.2", + "esbuild": "~0.20.2", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2", "vscode-languageclient": "~9.0.1", "vscode-languageserver-protocol": "~3.17.5", - "vscode-ws-jsonrpc": "~3.3.0-next.4" + "vscode-ws-jsonrpc": "~3.3.0" }, "devDependencies": { "monaco-editor-ms": "npm:monaco-editor@~0.47.0" }, "peerDependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", - "monaco-languageclient": "~8.0.0-next.4", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1" + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "monaco-languageclient": "~8.0.0", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2" }, "peerDependenciesMeta": { - "@codingame/monaco-vscode-api": { - "optional": false - }, - "@codingame/monaco-vscode-editor-api": { + "monaco-editor": { "optional": false }, "monaco-languageclient": { diff --git a/packages/wrapper/src/editorAppBase.ts b/packages/wrapper/src/editorAppBase.ts index d4917a7d4..9cff35fae 100644 --- a/packages/wrapper/src/editorAppBase.ts +++ b/packages/wrapper/src/editorAppBase.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ -import { editor, Uri } from '@codingame/monaco-vscode-editor-api'; +import { editor, Uri } from 'monaco-editor'; import { createConfiguredEditor, createConfiguredDiffEditor, createModelReference, ITextFileEditorModel } from 'vscode/monaco'; import { IReference } from '@codingame/monaco-vscode-editor-service-override'; import { updateUserConfiguration as vscodeUpdateUserConfiguration } from '@codingame/monaco-vscode-configuration-service-override'; diff --git a/packages/wrapper/src/editorAppClassic.ts b/packages/wrapper/src/editorAppClassic.ts index ee5152ea0..dad66ce51 100644 --- a/packages/wrapper/src/editorAppClassic.ts +++ b/packages/wrapper/src/editorAppClassic.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ -import { editor, languages } from '@codingame/monaco-vscode-editor-api'; +import { editor, languages } from 'monaco-editor'; import { EditorAppBase, EditorAppConfigBase, ModelUpdateType, isEqual, isModelUpdateRequired } from './editorAppBase.js'; import { UserConfig } from './wrapper.js'; import { Logger } from './logger.js'; diff --git a/packages/wrapper/src/editorAppExtended.ts b/packages/wrapper/src/editorAppExtended.ts index f47daab64..962cc3934 100644 --- a/packages/wrapper/src/editorAppExtended.ts +++ b/packages/wrapper/src/editorAppExtended.ts @@ -4,7 +4,7 @@ * ------------------------------------------------------------------------------------------ */ import type * as vscode from 'vscode'; -import { IDisposable, editor } from '@codingame/monaco-vscode-editor-api'; +import { IDisposable, editor } from 'monaco-editor'; import { EditorAppBase, EditorAppConfigBase, ModelUpdateType, isEqual, isModelUpdateRequired } from './editorAppBase.js'; import { registerExtension, IExtensionManifest, ExtensionHostKind } from 'vscode/extensions'; import { UserConfig } from './wrapper.js'; diff --git a/packages/wrapper/src/vscode/services.ts b/packages/wrapper/src/vscode/services.ts index dc0bde8f2..7967573e3 100644 --- a/packages/wrapper/src/vscode/services.ts +++ b/packages/wrapper/src/vscode/services.ts @@ -3,11 +3,11 @@ * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ -import { editor, Uri } from '@codingame/monaco-vscode-editor-api'; +import { editor, Uri } from 'monaco-editor'; import { ILogService, initialize, IWorkbenchConstructionOptions, StandaloneServices } from 'vscode/services'; import 'vscode/localExtensionHost'; import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override'; -import { MonacoEnvironmentEnhanced } from '../workerFactory.js'; +import { initEnhancedMonacoEnvironment } from '../workerFactory.js'; import { supplyRequiredServices } from 'monaco-languageclient'; import { Logger } from '../logger.js'; @@ -61,16 +61,7 @@ export const configureServices = async (input?: InitializeServiceConfig, specifi }; export const initServices = async (config?: InitializeServiceConfig, caller?: string) => { - if (!window.MonacoEnvironment) { - window.MonacoEnvironment = {}; - } - const envEnhanced = (window.MonacoEnvironment as MonacoEnvironmentEnhanced); - if (envEnhanced.vscodeApiInitialised === undefined) { - envEnhanced.vscodeApiInitialised = false; - } - if (envEnhanced.vscodeInitialising === undefined) { - envEnhanced.vscodeInitialising = false; - } + const envEnhanced = initEnhancedMonacoEnvironment(); if (!envEnhanced.vscodeInitialising) { if (envEnhanced.vscodeApiInitialised) { diff --git a/packages/wrapper/src/workerFactory.ts b/packages/wrapper/src/workerFactory.ts index d96a3a0ae..be46ddb1b 100644 --- a/packages/wrapper/src/workerFactory.ts +++ b/packages/wrapper/src/workerFactory.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ -import { Environment } from '@codingame/monaco-vscode-editor-api'; +import { Environment } from 'monaco-editor'; export type WorkerOverrides = { rootPath?: string| URL; @@ -22,10 +22,27 @@ export type WorkerConfig = { export interface MonacoEnvironmentEnhanced extends Environment { workerOverrides?: WorkerOverrides; - vscodeInitialising: boolean; - vscodeApiInitialised: boolean; + vscodeInitialising?: boolean; + vscodeApiInitialised?: boolean; } +export const initEnhancedMonacoEnvironment = (workerOverrides?: WorkerOverrides) => { + const monWin = (self as Window); + if (!monWin.MonacoEnvironment) { + monWin.MonacoEnvironment = {}; + } + const envEnhanced = monWin as MonacoEnvironmentEnhanced; + if (envEnhanced.vscodeApiInitialised === undefined) { + envEnhanced.vscodeApiInitialised = false; + } + if (envEnhanced.vscodeInitialising === undefined) { + envEnhanced.vscodeInitialising = false; + } + envEnhanced.workerOverrides = workerOverrides ?? undefined; + + return envEnhanced; +}; + export type WorkerConfigSupplier = () => WorkerConfig; export type WorkerLoader = () => Worker @@ -87,12 +104,7 @@ export const buildWorker = (config: WorkerConfig, workerOverrides?: WorkerOverri }; export const useWorkerFactory = (workerOverrides?: WorkerOverrides) => { - const monWin = (self as Window); - if (!monWin.MonacoEnvironment) { - monWin.MonacoEnvironment = {}; - } - const monEnv = monWin.MonacoEnvironment as MonacoEnvironmentEnhanced; - monEnv.workerOverrides = workerOverrides; + const envEnhanced = initEnhancedMonacoEnvironment(workerOverrides); const getWorker = (moduleId: string, label: string ) => { console.log(`getWorker: moduleId: ${moduleId} label: ${label}`); @@ -129,7 +141,7 @@ export const useWorkerFactory = (workerOverrides?: WorkerOverrides) => { } throw new Error(`Unimplemented worker ${label} (${moduleId})`); }; - monEnv.getWorker = getWorker; + envEnhanced.getWorker = getWorker; }; export const useDefaultWorkerMapping = (label: string) => { diff --git a/packages/wrapper/src/wrapper.ts b/packages/wrapper/src/wrapper.ts index 054452196..275c3c02a 100644 --- a/packages/wrapper/src/wrapper.ts +++ b/packages/wrapper/src/wrapper.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ -import { editor } from '@codingame/monaco-vscode-editor-api'; +import { editor } from 'monaco-editor'; import { MonacoLanguageClient } from 'monaco-languageclient'; import { InitializeServiceConfig, initServices, configureServices } from './vscode/services.js'; import { EditorAppExtended, EditorAppConfigExtended } from './editorAppExtended.js'; diff --git a/verify/angular/package.json b/verify/angular/package.json index e82f93475..320af2901 100644 --- a/verify/angular/package.json +++ b/verify/angular/package.json @@ -18,11 +18,10 @@ "@angular/core": "~17.2.4", "@angular/platform-browser": "~17.2.4", "@angular/platform-browser-dynamic": "~17.2.4", - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", "monaco-editor-wrapper": "../../packages/wrapper", "monaco-languageclient-examples": "../../packages/examples", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2", "rxjs": "~7.8.1", "zone.js": "~0.14.4" }, diff --git a/verify/buildAll.ps1 b/verify/buildAll.ps1 index 2d64e77fa..e50717d36 100644 --- a/verify/buildAll.ps1 +++ b/verify/buildAll.ps1 @@ -1,7 +1,7 @@ $MyPath = Split-Path -Path $MyInvocation.MyCommand.Path -Parent -cd $MyPath/vite; npm run verify:ci -cd $MyPath/webpack; npm run verify:ci -cd $MyPath/angular; npm run verify:ci -cd $MyPath/pnpm; pnpm run verify:ci -# cd $MyPath/yarn; yarn run verify:ci +Set-Location $MyPath/vite; npm run verify:ci +Set-Location $MyPath/webpack; npm run verify:ci +Set-Location $MyPath/angular; npm run verify:ci +Set-Location $MyPath/pnpm; pnpm run verify:ci +# Set-Location $MyPath/yarn; yarn run verify:ci diff --git a/verify/pnpm/package.json b/verify/pnpm/package.json index 2f8481256..2d8490a80 100644 --- a/verify/pnpm/package.json +++ b/verify/pnpm/package.json @@ -4,11 +4,10 @@ "private": true, "type": "module", "dependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", "monaco-editor-wrapper": "../../packages/wrapper", "monaco-languageclient-examples": "../../packages/examples", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2" }, "devDependencies": { "http-server": "~14.1.1", diff --git a/verify/vite/package.json b/verify/vite/package.json index 96d2092d3..fb0ff26b6 100644 --- a/verify/vite/package.json +++ b/verify/vite/package.json @@ -4,11 +4,10 @@ "private": true, "type": "module", "dependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", "monaco-editor-wrapper": "../../packages/wrapper", "monaco-languageclient-examples": "../../packages/examples", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2" }, "devDependencies": { "http-server": "~14.1.1", diff --git a/verify/webpack/package.json b/verify/webpack/package.json index 2a2132ea8..ccb5c277f 100644 --- a/verify/webpack/package.json +++ b/verify/webpack/package.json @@ -4,11 +4,10 @@ "private": true, "type": "module", "dependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", "monaco-editor-wrapper": "../../packages/wrapper", "monaco-languageclient-examples": "../../packages/examples", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1" + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2" }, "devDependencies": { "css-loader": "~6.10.0", diff --git a/verify/yarn/package.json b/verify/yarn/package.json index c74cec810..199a83aa7 100644 --- a/verify/yarn/package.json +++ b/verify/yarn/package.json @@ -4,13 +4,12 @@ "private": true, "type": "module", "dependencies": { - "@codingame/monaco-vscode-api": "~3.1.1", - "@codingame/monaco-vscode-editor-api": "~3.1.1", - "@typefox/monaco-editor-react": "3.0.0-next.4", - "monaco-editor-wrapper": "4.0.0-next.4", - "monaco-languageclient-examples": "8.0.0-next.4", - "vscode": "npm:@codingame/monaco-vscode-api@~3.1.1", - "vscode-ws-jsonrpc": "~3.3.0-next.4" + "@typefox/monaco-editor-react": "3.0.0", + "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~3.1.2", + "monaco-editor-wrapper": "4.0.0", + "monaco-languageclient-examples": "8.0.0", + "vscode": "npm:@codingame/monaco-vscode-api@~3.1.2", + "vscode-ws-jsonrpc": "~3.3.0" }, "devDependencies": { "http-server": "~14.1.1",