Merge pull request #852 from TypeFox/mva-next

Update to monaco-vscode-api 14.0.2 and incremented versions to x.3.0
TypeFox · Feb 12, 2025 · 82cd0b3 · 82cd0b3
2 parents 9b3e699 + 41e5700
commit 82cd0b3
Show file tree

Hide file tree

Showing 23 changed files with 2,158 additions and 1,777 deletions.
diff --git a/README.md b/README.md
@@ -306,7 +306,7 @@ Because `@codingame/monaco-vscode-api` relies on it own build of `monaco-editor`
 
 ```json
 "overrides": {
-  "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~13.1.6"
+  "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~14.0.2"
 }
 ```
 
@@ -315,7 +315,7 @@ Because `@codingame/monaco-vscode-api` relies on it own build of `monaco-editor`
 If you use pnpm, you have to add `vscode` / `@codingame/monaco-vscode-api` as direct dependency (you find the [compatibility table here](https://github.com/TypeFox/monaco-languageclient/blob/main/docs/versions-and-history.md#monaco-editor--codingamemonaco-vscode-api-compatibility-table), otherwise the installation will fail.
 
 ```json
-"vscode": "npm:@codingame/monaco-vscode-extension-api@~13.1.6"
+"vscode": "npm:@codingame/monaco-vscode-extension-api@~14.0.2"
 ```
 
 ## Licenses

diff --git a/docs/versions-and-history.md b/docs/versions-and-history.md
@@ -6,6 +6,7 @@ The following table describes which version of **monaco-languageclient** and **@
 
 | monaco-languageclient | monaco-editor-wrapper | monaco-editor-react | monaco-vscode-api / editor-api | vscode | monaco-editor | release date | comment |
 | :---- | :---- | :--- | :--- | :--- | :--- | :--- | :--- |
+| 9.3.0 | 6.3.0 | 6.3.0 | 14.0.2 | 1.97.0 | 0.52.2 | 2025-02-1x | |
 | 9.2.5 | 6.2.5 | 6.2.5 | 13.1.6 | 1.96.4 | 0.52.2 | 2025-02-08 | |
 | 9.2.4 | 6.2.4 | 6.2.4 | 13.1.4 | 1.96.4 | 0.52.2 | 2025-02-06 | |
 | 9.2.3 | 6.2.3 | 6.2.3 | 13.1.3 | 1.96.4 | 0.52.2 | 2025-02-04 | |

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,22 +12,22 @@
     "yarn": "4.6.0"
   },
   "devDependencies": {
-    "@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
-    "@codingame/monaco-vscode-rollup-vsix-plugin": "~13.1.6",
+    "@codingame/esbuild-import-meta-url-plugin": "~1.0.3",
+    "@codingame/monaco-vscode-rollup-vsix-plugin": "~14.0.2",
     "@eslint/eslintrc": "~3.2.0",
-    "@eslint/js": "~9.19.0",
-    "@stylistic/eslint-plugin": "~3.0.1",
+    "@eslint/js": "~9.20.0",
+    "@stylistic/eslint-plugin": "~3.1.0",
     "@testing-library/react": "~16.2.0",
     "@types/node": "~22.13.1",
     "@types/react": "~19.0.8",
     "@types/react-dom": "~19.0.3",
-    "@typescript-eslint/eslint-plugin": "~8.23.0",
-    "@typescript-eslint/parser": "~8.23.0",
+    "@typescript-eslint/eslint-plugin": "~8.24.0",
+    "@typescript-eslint/parser": "~8.24.0",
     "@vitejs/plugin-react": "~4.3.4",
     "@vitest/browser": "~3.0.5",
     "editorconfig": "~2.0.1",
-    "esbuild": "~0.24.2",
-    "eslint": "~9.19.0",
+    "esbuild": "~0.25.0",
+    "eslint": "~9.20.0",
     "eslint-plugin-header": "~3.1.1",
     "eslint-plugin-import": "~2.31.0",
     "eslint-plugin-unused-imports": "~4.1.4",

diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [9.3.0] - 2025-02-1x
+
+- Updated all `@codingame/monaco-vscode` packages to `14.0.2`.
+
 ## [9.2.5] - 2025-02-08
 
 - Updated all `@codingame/monaco-vscode` packages to `13.1.6`.

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "9.2.5",
+  "version": "9.3.0",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -76,17 +76,17 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@codingame/monaco-vscode-api": "~13.1.6",
-    "@codingame/monaco-vscode-configuration-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-editor-api": "~13.1.6",
-    "@codingame/monaco-vscode-editor-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-extensions-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-extension-api": "~13.1.6",
-    "@codingame/monaco-vscode-languages-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-localization-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-log-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-model-service-override": "~13.1.6",
-    "vscode": "npm:@codingame/monaco-vscode-extension-api@~13.1.6",
+    "@codingame/monaco-vscode-api": "~14.0.2",
+    "@codingame/monaco-vscode-configuration-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-editor-api": "~14.0.2",
+    "@codingame/monaco-vscode-editor-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-extensions-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-extension-api": "~14.0.2",
+    "@codingame/monaco-vscode-languages-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-localization-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-log-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-model-service-override": "~14.0.2",
+    "vscode": "npm:@codingame/monaco-vscode-extension-api@~14.0.2",
     "vscode-languageclient": "~9.0.1"
   },
   "scripts": {

diff --git a/packages/examples/CHANGELOG.md b/packages/examples/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [2025.2.5] - 2025-02-1x
+
+- Integrate python debugger [#842](https://github.com/TypeFox/monaco-languageclient/pull/842)
+- Updated all `@codingame/monaco-vscode` packages to `14.0.2`.
+- Updated to `[email protected]`, `[email protected]` and `@typefox/[email protected]`.
+
 ## [2025.2.4] - 2025-02-08
 
 - Updated all `@codingame/monaco-vscode` packages to `13.1.6`.

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "2025.2.4",
+  "version": "2025.2.5",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -71,49 +71,49 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-cpp-default-extension": "~13.1.6",
-    "@codingame/monaco-vscode-debug-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-editor-api": "~13.1.6",
-    "@codingame/monaco-vscode-environment-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-explorer-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-files-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-groovy-default-extension": "~13.1.6",
-    "@codingame/monaco-vscode-java-default-extension": "~13.1.6",
-    "@codingame/monaco-vscode-javascript-default-extension": "~13.1.6",
-    "@codingame/monaco-vscode-json-default-extension": "~13.1.6",
-    "@codingame/monaco-vscode-keybindings-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-lifecycle-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-localization-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-preferences-service-override": "~13.1.6", 
-    "@codingame/monaco-vscode-python-default-extension": "~13.1.6",
-    "@codingame/monaco-vscode-remote-agent-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-search-result-default-extension": "~13.1.6",
-    "@codingame/monaco-vscode-search-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-secret-storage-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-standalone-json-language-features": "~13.1.6",
-    "@codingame/monaco-vscode-standalone-languages": "~13.1.6",
-    "@codingame/monaco-vscode-standalone-typescript-language-features": "~13.1.6",
-    "@codingame/monaco-vscode-testing-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-storage-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-textmate-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-theme-defaults-default-extension": "~13.1.6",
-    "@codingame/monaco-vscode-theme-service-override": "~13.1.6",
-    "@codingame/monaco-vscode-typescript-basics-default-extension": "~13.1.6",
-    "@codingame/monaco-vscode-typescript-language-features-default-extension": "~13.1.6",
-    "@codingame/monaco-vscode-views-service-override": "~13.1.6",
-    "@typefox/monaco-editor-react": "~6.2.5",
+    "@codingame/monaco-vscode-configuration-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-cpp-default-extension": "~14.0.2",
+    "@codingame/monaco-vscode-debug-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-editor-api": "~14.0.2",
+    "@codingame/monaco-vscode-environment-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-explorer-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-files-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-groovy-default-extension": "~14.0.2",
+    "@codingame/monaco-vscode-java-default-extension": "~14.0.2",
+    "@codingame/monaco-vscode-javascript-default-extension": "~14.0.2",
+    "@codingame/monaco-vscode-json-default-extension": "~14.0.2",
+    "@codingame/monaco-vscode-keybindings-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-lifecycle-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-localization-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-preferences-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-python-default-extension": "~14.0.2",
+    "@codingame/monaco-vscode-remote-agent-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-search-result-default-extension": "~14.0.2",
+    "@codingame/monaco-vscode-search-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-secret-storage-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-standalone-json-language-features": "~14.0.2",
+    "@codingame/monaco-vscode-standalone-languages": "~14.0.2",
+    "@codingame/monaco-vscode-standalone-typescript-language-features": "~14.0.2",
+    "@codingame/monaco-vscode-testing-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-storage-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-textmate-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~14.0.2",
+    "@codingame/monaco-vscode-theme-service-override": "~14.0.2",
+    "@codingame/monaco-vscode-typescript-basics-default-extension": "~14.0.2",
+    "@codingame/monaco-vscode-typescript-language-features-default-extension": "~14.0.2",
+    "@codingame/monaco-vscode-views-service-override": "~14.0.2",
+    "@typefox/monaco-editor-react": "~6.3.0",
     "cors": "^2.8.5",
     "express": "~4.21.2",
     "jszip": "~3.10.1",
     "langium": "~3.3.1",
-    "monaco-editor-wrapper": "~6.2.5",
-    "monaco-languageclient": "~9.2.5",
+    "monaco-editor-wrapper": "~6.3.0",
+    "monaco-languageclient": "~9.3.0",
     "pyright": "~1.1.393",
     "react": "~19.0.0",
     "react-dom": "~19.0.0",
     "request-light": "~0.8.0",
-    "vscode": "npm:@codingame/monaco-vscode-extension-api@~13.1.6",
+    "vscode": "npm:@codingame/monaco-vscode-extension-api@~14.0.2",
     "vscode-json-languageservice": "~5.4.2",
     "vscode-languageclient": "~9.0.1",
     "vscode-languageserver": "~9.0.1",

diff --git a/packages/examples/src/multi/twoLanguageClients.ts b/packages/examples/src/multi/twoLanguageClients.ts
@@ -9,7 +9,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
 import '@codingame/monaco-vscode-json-default-extension';
 import '@codingame/monaco-vscode-python-default-extension';
 import { LogLevel } from '@codingame/monaco-vscode-api';
-import { type CodePlusFileExt, configureAndInitVscodeApi, disposeLanguageClients, LanguageClientWrapper, MonacoEditorLanguageClientWrapper, type WrapperConfig } from 'monaco-editor-wrapper';
+import { type CodePlusFileExt, MonacoEditorLanguageClientWrapper, type WrapperConfig } from 'monaco-editor-wrapper';
 import { configureMonacoWorkers, disableElement } from '../common/client/utils.js';
 import { createJsonLanguageClientConfig, createPythonLanguageClientConfig } from './config.js';
 
@@ -30,15 +30,6 @@ print("Hello Moon!")
     let currentText = textJson;
     let currenFileExt = 'json';
 
-    const lccJson = createJsonLanguageClientConfig();
-    const lcwJson = new LanguageClientWrapper({
-        languageClientConfig: lccJson
-    });
-    const lccPython = createPythonLanguageClientConfig();
-    const lcwPython = new LanguageClientWrapper({
-        languageClientConfig: lccPython
-    });
-
     const wrapperConfig: WrapperConfig = {
         id: '42',
         $type: 'extended',
@@ -64,71 +55,54 @@ print("Hello Moon!")
                 }
             },
             monacoWorkerFactory: configureMonacoWorkers
+        },
+        languageClientConfigs: {
+            json: createJsonLanguageClientConfig(),
+            python: createPythonLanguageClientConfig()
         }
     };
 
     const wrapper = new MonacoEditorLanguageClientWrapper();
 
-    try {
-        document.querySelector('#button-start')?.addEventListener('click', async () => {
-            wrapperConfig.vscodeApiConfig!.vscodeApiInitPerformExternally = (document.getElementById('checkbox-extlc')! as HTMLInputElement).checked;
-            if (wrapperConfig.vscodeApiConfig!.vscodeApiInitPerformExternally === true) {
-
-                const logger = wrapper.getLogger();
-                logger.setLevel(wrapperConfig.logLevel!);
-                await configureAndInitVscodeApi(wrapperConfig.$type, {
-                    vscodeApiConfig: wrapperConfig.vscodeApiConfig!,
-                    logLevel: wrapperConfig.logLevel!,
-                }, {
-                    htmlContainer: wrapperConfig.htmlContainer,
-                    caller: 'runMultipleLanguageClientsExample',
-                    logger
-                });
+    document.querySelector('#button-start')?.addEventListener('click', async () => {
+        try {
+            disableElement('button-start', true);
+            disableElement('button-flip', false);
+            disableElement('checkbox-extlc', true);
 
-                const allPromises: Array<Promise<void>> = [];
-                if (!lcwJson.isStarted()) {
-                    allPromises.push(lcwJson.start());
-                }
-                if (!lcwPython.isStarted()) {
-                    allPromises.push(lcwPython.start());
-                }
-                await Promise.all(allPromises);
-            } else {
-                wrapperConfig.languageClientConfigs = {
-                    json: lccJson,
-                    python: lccPython
-                };
-            }
+            const externalLc = (document.getElementById('checkbox-extlc')! as HTMLInputElement).checked;
 
-            await wrapper.initAndStart(wrapperConfig);
+            await wrapper.initAndStart(wrapperConfig, !externalLc);
             if (wrapperConfig.editorAppConfig?.codeResources?.modified !== undefined) {
                 (wrapperConfig.editorAppConfig.codeResources.modified as CodePlusFileExt).text = currentText;
                 (wrapperConfig.editorAppConfig.codeResources.modified as CodePlusFileExt).fileExt = currenFileExt;
             }
 
-            disableElement('button-flip', false);
-            disableElement('checkbox-extlc', true);
-        });
-        document.querySelector('#button-dispose')?.addEventListener('click', async () => {
-            disableElement('button-flip', true);
+            // init language clients after start
+            if (externalLc === true) {
+                wrapper.initLanguageClients();
+                await wrapper.startLanguageClients();
+            }
+        } catch (e) {
+            console.error(e);
+        }
+    });
+    document.querySelector('#button-dispose')?.addEventListener('click', async () => {
+        disableElement('button-flip', true);
+        disableElement('button-dispose', true);
+        disableElement('button-start', false);
 
-            wrapperConfig.vscodeApiConfig!.vscodeApiInitPerformExternally = (document.getElementById('checkbox-extlc')! as HTMLInputElement).checked;
-            if (wrapperConfig.vscodeApiConfig!.vscodeApiInitPerformExternally === true) {
-                disposeLanguageClients([lcwJson, lcwPython], false);
+        await wrapper.dispose();
+    });
+    document.querySelector('#button-flip')?.addEventListener('click', async () => {
+        currentText = currentText === textJson ? textPython : textJson;
+        currenFileExt = currenFileExt === 'json' ? 'py' : 'json';
+        wrapper.updateCodeResources({
+            modified: {
+                text: currentText,
+                fileExt: currenFileExt
             }
-            await wrapper.dispose();
-        });
-        document.querySelector('#button-flip')?.addEventListener('click', async () => {
-            currentText = currentText === textJson ? textPython : textJson;
-            currenFileExt = currenFileExt === 'json' ? 'py' : 'json';
-            wrapper.updateCodeResources({
-                modified: {
-                    text: currentText,
-                    fileExt: currenFileExt
-                }
-            });
         });
-    } catch (e) {
-        console.error(e);
-    }
+    });
+
 };
diff --git a/packages/wrapper-react/CHANGELOG.md b/packages/wrapper-react/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to npm module [@typefox/monaco-editor-react](https://www.npmjs.com/package/@typefox/monaco-editor-react) are documented in this file.
 
+## [6.3.0] - 2025-02-1x
+
+- Move text changes handling from react component to the wrapper [#849](https://github.com/TypeFox/monaco-languageclient/pull/849)
+- Updated to `[email protected]` and `[email protected]`.
+- Updated all `@codingame/monaco-vscode` packages to `14.0.2`.
+
 ## [6.2.5] - 2025-02-08
 
 - Updated to `[email protected]` and `[email protected]`.

diff --git a/packages/wrapper-react/package.json b/packages/wrapper-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typefox/monaco-editor-react",
-  "version": "6.2.5",
+  "version": "6.3.0",
   "license": "MIT",
   "description": "React component for Monaco-Editor and Monaco Languageclient",
   "keywords": [
@@ -46,8 +46,8 @@
     "npm": "10.9.2"
   },
   "dependencies": {
-    "@codingame/monaco-vscode-editor-api": "~13.1.6",
-    "monaco-editor-wrapper": "~6.2.5",
+    "@codingame/monaco-vscode-editor-api": "~14.0.2",
+    "monaco-editor-wrapper": "~6.3.0",
     "react": ">=18.0.0 || <20.0.0"
   },
   "repository": {

diff --git a/packages/wrapper/CHANGELOG.md b/packages/wrapper/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to npm module [monaco-editor-wrapper](https://www.npmjs.com/package/monaco-editor-wrapper) are documented in this file.
 
+## [6.3.0] - 2025-02-1x
+
+- Move text changes handling from react component to the wrapper [#849](https://github.com/TypeFox/monaco-languageclient/pull/849)
+- Updated all `@codingame/monaco-vscode` packages to `14.0.2`.
+- Updated to `[email protected]`.
+
 ## [6.2.5] - 2025-02-08
 
 - Updated all `@codingame/monaco-vscode` packages to `13.1.6`.