monaco-languageclient-examples 8.3.1 → 8.4.1

package/dist/python/server/direct.js

@@ -2,9 +2,9 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
-import { resolve } from 'path';
+import { resolve } from 'node:path';
 import { runPythonServer } from './main.js';
-import { getLocalDirectory } from '../../utils/fs-utils.js';
+import { getLocalDirectory } from '../../common/node/server-commons.js';
 const baseDir = resolve(getLocalDirectory(import.meta.url));
 const relativeDir = '../../../../../node_modules/pyright/dist/pyright-langserver.js';
 runPythonServer(baseDir, relativeDir);

package/dist/python/server/direct.js.map

@@ -1 +1 @@
-{"version":3,"file":"direct.js","sourceRoot":"","sources":["../../../src/python/server/direct.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5D,MAAM,WAAW,GAAG,gEAAgE,CAAC;AACrF,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC"}
+{"version":3,"file":"direct.js","sourceRoot":"","sources":["../../../src/python/server/direct.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,MAAM,qCAAqC,CAAC;AAExE,MAAM,OAAO,GAAG,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5D,MAAM,WAAW,GAAG,gEAAgE,CAAC;AACrF,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC"}

package/dist/python/server/main.js

@@ -2,9 +2,9 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
-import { resolve } from 'path';
-import { runLanguageServer } from '../../common/language-server-runner.js';
-import { LanguageName } from '../../common/server-commons.js';
+import { resolve } from 'node:path';
+import { runLanguageServer } from '../../common/node/language-server-runner.js';
+import { LanguageName } from '../../common/node/server-commons.js';
 export const runPythonServer = (baseDir, relativeDir) => {
     const processRunPath = resolve(baseDir, relativeDir);
     runLanguageServer({

package/dist/python/server/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/python/server/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAE3E,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,WAAmB,EAAE,EAAE;IACpE,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACrD,iBAAiB,CAAC;QACd,UAAU,EAAE,SAAS;QACrB,QAAQ,EAAE,UAAU;QACpB,UAAU,EAAE,KAAK;QACjB,UAAU,EAAE,YAAY,CAAC,IAAI;QAC7B,cAAc,EAAE;YACZ,cAAc;YACd,SAAS;SACZ;QACD,eAAe,EAAE;YACb,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,KAAK;YACxB,cAAc,EAAE,IAAI;YACpB,YAAY,EAAE,CACV,UAAqE,EACrE,QAAQ,EACV,EAAE;gBACA,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC9E,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAC9D,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;oBAC3B,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACnB,CAAC;qBAAM,CAAC;oBACJ,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACpB,CAAC;YACL,CAAC;SACJ;KACJ,CAAC,CAAC;AACP,CAAC,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../../src/python/server/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,qCAAqC,CAAC;AAEnE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAe,EAAE,WAAmB,EAAE,EAAE;IACpE,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IACrD,iBAAiB,CAAC;QACd,UAAU,EAAE,SAAS;QACrB,QAAQ,EAAE,UAAU;QACpB,UAAU,EAAE,KAAK;QACjB,UAAU,EAAE,YAAY,CAAC,IAAI;QAC7B,cAAc,EAAE;YACZ,cAAc;YACd,SAAS;SACZ;QACD,eAAe,EAAE;YACb,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,KAAK;YACxB,cAAc,EAAE,IAAI;YACpB,YAAY,EAAE,CACV,UAAqE,EACrE,QAAQ,EACV,EAAE;gBACA,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,GAAG,UAAU,CAAC,MAAM,GAAG,UAAU,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC9E,MAAM,SAAS,GAAG,SAAS,CAAC,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAC9D,IAAI,SAAS,KAAK,UAAU,EAAE,CAAC;oBAC3B,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACnB,CAAC;qBAAM,CAAC;oBACJ,QAAQ,CAAC,KAAK,CAAC,CAAC;gBACpB,CAAC;YACL,CAAC;SACJ;KACJ,CAAC,CAAC;AACP,CAAC,CAAC"}

package/dist/ts/wrapperAdvanced.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapperAdvanced.d.ts","sourceRoot":"","sources":["../../src/ts/wrapperAdvanced.ts"],"names":[],"mappings":"AAMA,OAAO,+CAA+C,CAAC;AACvD,OAAO,kEAAkE,CAAC;AAI1E,eAAO,MAAM,sBAAsB,YAIlC,CAAC;AAgKF,eAAO,MAAM,kBAAkB,qBAkB9B,CAAC"}
+{"version":3,"file":"wrapperAdvanced.d.ts","sourceRoot":"","sources":["../../src/ts/wrapperAdvanced.ts"],"names":[],"mappings":"AAMA,OAAO,+CAA+C,CAAC;AACvD,OAAO,kEAAkE,CAAC;AAI1E,eAAO,MAAM,sBAAsB,YAIlC,CAAC;AAuMF,eAAO,MAAM,kBAAkB,qBAkB9B,CAAC"}

package/dist/ts/wrapperAdvanced.js

@@ -26,22 +26,30 @@ const wrapper42Config = {
         },
         editorAppConfig: {
             $type: 'classic',
-            languageId: 'text/plain',
-            useDiffEditor: true,
-            codeOriginal: `This line is equal.
+            codeResources: {
+                original: {
+                    text: `This line is equal.
 This number is different 2002
 Misspeelled!
 Same again.`,
-            code: `This line is equal.
+                    fileExt: 'txt'
+                },
+                main: {
+                    text: `This line is equal.
 This number is different 2022
 Misspelled!
-Same again.`
+Same again.`,
+                    fileExt: 'txt'
+                }
+            },
+            useDiffEditor: true,
         }
     },
     languageClientConfig: {
+        languageId: 'json',
+        name: 'wrapper42 language client',
         options: {
             $type: 'WebSocket',
-            name: 'wrapper42 language client',
             host: 'localhost',
             port: 30000,
             path: 'sampleServer',
@@ -60,10 +68,17 @@ const wrapper43Config = {
         },
         editorAppConfig: {
             $type: 'classic',
-            languageId: 'text/plain',
+            codeResources: {
+                original: {
+                    text: 'This line is equal.\nThis number is different 3022.\nMisspelled!Same again.',
+                    fileExt: 'txt'
+                },
+                main: {
+                    text: 'This line is equal.\nThis number is different 3002.\nMisspelled!Same again.',
+                    fileExt: 'txt'
+                }
+            },
             useDiffEditor: true,
-            codeOriginal: 'This line is equal.\nThis number is different 3022.\nMisspelled!Same again.',
-            code: 'This line is equal.\nThis number is different 3002.\nMisspelled!Same again.',
             editorOptions: {
                 lineNumbers: 'off'
             },
@@ -84,11 +99,15 @@ const wrapper44Config = {
         },
         editorAppConfig: {
             $type: 'classic',
-            languageId: 'javascript',
-            useDiffEditor: false,
-            code: `function logMe() {
+            codeResources: {
+                main: {
+                    text: `function logMe() {
     console.log('Hello monaco-editor-wrapper!');
 };`,
+                    fileExt: 'js'
+                }
+            },
+            useDiffEditor: false,
             editorOptions: {
                 minimap: {
                     enabled: true
@@ -116,26 +135,44 @@ const sleepOne = (milliseconds) => {
         await wrapper42.dispose();
         wrapper42Config.languageClientConfig = undefined;
         const appConfig42 = wrapper42Config.wrapperConfig.editorAppConfig;
-        appConfig42.languageId = 'javascript';
-        appConfig42.useDiffEditor = false;
-        appConfig42.code = `function logMe() {
+        appConfig42.codeResources = {
+            main: {
+                text: `function logMe() {
     console.log('Hello swap editors!');
-};`;
+};`,
+                fileExt: 'js'
+            }
+        };
+        appConfig42.useDiffEditor = false;
         const w42Start = wrapper42.initAndStart(wrapper42Config, document.getElementById('monaco-editor-root-42'));
-        const w43Start = wrapper43.updateDiffModel({
-            languageId: 'javascript',
-            code: 'text 5678',
-            codeOriginal: 'text 1234'
+        const w43Start = await wrapper43.updateCodeResources({
+            main: {
+                text: 'text 5678',
+                fileExt: 'txt'
+            },
+            original: {
+                text: 'text 1234',
+                fileExt: 'txt'
+            }
         });
         await wrapper44.dispose();
         const appConfig44 = wrapper44Config.wrapperConfig.editorAppConfig;
-        appConfig44.languageId = 'text/plain';
         appConfig44.useDiffEditor = true;
-        appConfig44.codeOriginal = 'oh la la la!';
-        appConfig44.code = 'oh lo lo lo!';
+        appConfig44.codeResources = {
+            original: {
+                text: 'oh la la la!',
+                fileExt: 'txt'
+            },
+            main: {
+                text: 'oh lo lo lo!',
+                fileExt: 'txt'
+            }
+        };
         // This affects all editors globally and is only effective
         // if it is not in contrast to one configured later
-        appConfig44.theme = 'vs-light';
+        appConfig44.editorOptions = {
+            theme: 'vs-light'
+        };
         const w44Start = wrapper44.initAndStart(wrapper44Config, document.getElementById('monaco-editor-root-44'));
         await w42Start;
         console.log('Restarted wrapper42.');
@@ -151,7 +188,9 @@ const sleepTwo = (milliseconds) => {
         await wrapper44.dispose();
         const appConfig44 = wrapper44Config.wrapperConfig.editorAppConfig;
         appConfig44.useDiffEditor = false;
-        appConfig44.theme = 'vs-dark';
+        appConfig44.editorOptions = {
+            theme: 'vs-dark'
+        };
         await wrapper44.initAndStart(wrapper44Config, document.getElementById('monaco-editor-root-44'));
         console.log('Restarted wrapper44.');
     }, milliseconds);

package/dist/ts/wrapperAdvanced.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapperAdvanced.js","sourceRoot":"","sources":["../../src/ts/wrapperAdvanced.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wrapperAdvanced.js","sourceRoot":"","sources":["../../src/ts/wrapperAdvanced.ts"],"names":[],"mappings":"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"}

package/dist/ts/wrapperTs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wrapperTs.d.ts","sourceRoot":"","sources":["../../src/ts/wrapperTs.ts"],"names":[],"mappings":"AAQA,OAAO,2DAA2D,CAAC;AACnE,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AAKjF,eAAO,MAAM,sBAAsB,YAOlC,CAAC;AAEF,eAAO,MAAM,YAAY,qBA4FxB,CAAC"}
+{"version":3,"file":"wrapperTs.d.ts","sourceRoot":"","sources":["../../src/ts/wrapperTs.ts"],"names":[],"mappings":"AAQA,OAAO,2DAA2D,CAAC;AACnE,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AAIjF,eAAO,MAAM,sBAAsB,YAOlC,CAAC;AAEF,eAAO,MAAM,YAAY,qBA6GxB,CAAC"}

package/dist/ts/wrapperTs.js

@@ -8,7 +8,7 @@ import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-
 import '@codingame/monaco-vscode-theme-defaults-default-extension';
 import '@codingame/monaco-vscode-typescript-basics-default-extension';
 import '@codingame/monaco-vscode-typescript-language-features-default-extension';
-import { disposeEditor, getWrapper, startEditor, swapEditors, updateModel } from '../common/example-apps-common.js';
+import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
 import { useWorkerFactory } from 'monaco-editor-wrapper/workerFactory';
 export const configureMonacoWorkers = () => {
     useWorkerFactory({
@@ -20,11 +20,11 @@ export const configureMonacoWorkers = () => {
 };
 export const runTsWrapper = async () => {
     const codeUri = '/workspace/hello.ts';
-    let code = `function sayHello(): string {
+    const code = `function sayHello(): string {
     return "Hello";
 };`;
     const codeOriginalUri = '/workspace/goodbye.ts';
-    let codeOriginal = `function sayGoodbye(): string {
+    const codeOriginal = `function sayGoodbye(): string {
     return "Goodbye";
 };`;
     const monacoEditorConfig = {
@@ -52,21 +52,28 @@ export const runTsWrapper = async () => {
             },
             editorAppConfig: {
                 $type: 'extended',
-                languageId: 'typescript',
-                code,
-                codeUri: codeUri,
-                codeOriginal: codeOriginal,
+                codeResources: {
+                    main: {
+                        text: code,
+                        uri: codeUri
+                    },
+                    original: {
+                        text: codeOriginal,
+                        uri: codeOriginalUri,
+                    }
+                },
                 useDiffEditor: false,
                 editorOptions: monacoEditorConfig,
                 diffEditorOptions: monacoDiffEditorConfig
             }
         }
     };
+    const wrapper = new MonacoEditorLanguageClientWrapper();
+    const htmlElement = document.getElementById('monaco-editor-root');
     try {
-        const wrapper = getWrapper();
-        const htmlElement = document.getElementById('monaco-editor-root');
         document.querySelector('#button-start')?.addEventListener('click', async () => {
-            await startEditor(userConfig, htmlElement, code, codeOriginal);
+            await wrapper.dispose();
+            await wrapper.initAndStart(userConfig, htmlElement);
             vscode.commands.getCommands().then((x) => {
                 console.log(`Found ${x.length} commands`);
                 const finding = x.find((elem) => elem === 'actions.find');
@@ -75,32 +82,40 @@ export const runTsWrapper = async () => {
             wrapper.getEditor()?.focus();
             await vscode.commands.executeCommand('actions.find');
         });
-        document.querySelector('#button-swap')?.addEventListener('click', () => {
-            swapEditors(userConfig, htmlElement, code, codeOriginal);
-        });
         document.querySelector('#button-swap-code')?.addEventListener('click', () => {
-            if (wrapper.getMonacoEditorApp()?.getConfig().codeUri === codeUri) {
-                updateModel({
-                    code: codeOriginal,
-                    codeUri: codeOriginalUri,
-                    languageId: 'typescript',
+            const codeResources = wrapper.getMonacoEditorApp()?.getConfig().codeResources;
+            if ((codeResources?.main).uri === codeUri) {
+                wrapper.updateCodeResources({
+                    main: {
+                        text: codeOriginal,
+                        uri: codeOriginalUri
+                    },
+                    original: {
+                        text: code,
+                        uri: codeUri
+                    }
                 });
             }
             else {
-                updateModel({
-                    code: code,
-                    codeUri: codeUri,
-                    languageId: 'typescript',
+                wrapper.updateCodeResources({
+                    main: {
+                        text: code,
+                        uri: codeUri
+                    },
+                    original: {
+                        text: codeOriginal,
+                        uri: codeOriginalUri
+                    }
                 });
             }
         });
+        document.querySelector('#button-diff')?.addEventListener('click', async () => {
+            userConfig.wrapperConfig.editorAppConfig.useDiffEditor = !userConfig.wrapperConfig.editorAppConfig.useDiffEditor;
+            await wrapper.dispose();
+            await wrapper.initAndStart(userConfig, htmlElement);
+        });
         document.querySelector('#button-dispose')?.addEventListener('click', async () => {
-            if (wrapper.getMonacoEditorApp()?.getConfig().codeUri === codeUri) {
-                code = await disposeEditor(userConfig.wrapperConfig.editorAppConfig.useDiffEditor);
-            }
-            else {
-                codeOriginal = await disposeEditor(userConfig.wrapperConfig.editorAppConfig.useDiffEditor);
-            }
+            await wrapper.dispose();
         });
     }
     catch (e) {

package/dist/ts/wrapperTs.js.map

@@ -1 +1 @@
-{"version":3,"file":"wrapperTs.js","sourceRoot":"","sources":["../../src/ts/wrapperTs.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"wrapperTs.js","sourceRoot":"","sources":["../../src/ts/wrapperTs.ts"],"names":[],"mappings":"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"}

package/groovy.html

@@ -2,14 +2,14 @@
 <html>
 
 <head>
-    <title>Monaco Language Client Groovy Example</title>
+    <title>Groovy Language Client & Language Server (Web Socket)</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="style.css">
 </head>
 
 <body>
-	<h2>Monaco Language Client Groovy Example</h2>
+	<h2>Groovy Language Client & Language Server (Web Socket)</h2>
     <button type="button" id="button-start">Start</button>
     <button type="button" id="button-dispose">Dispose</button>
 	<div id="monaco-editor-root" style="width:800px;height:600px;border:1px solid grey"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "8.3.1",
+  "version": "8.4.1",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -54,65 +54,65 @@
     }
   },
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~4.3.2",
-    "@codingame/monaco-vscode-files-service-override": "~4.3.2",
-    "@codingame/monaco-vscode-groovy-default-extension": "~4.3.2",
-    "@codingame/monaco-vscode-keybindings-service-override": "~4.3.2",
-    "@codingame/monaco-vscode-lifecycle-service-override": "~4.3.2",
-    "@codingame/monaco-vscode-localization-service-override": "~4.3.2",
-    "@codingame/monaco-vscode-javascript-default-extension": "~4.3.2",
-    "@codingame/monaco-vscode-json-default-extension": "~4.3.2",
-    "@codingame/monaco-vscode-python-default-extension": "~4.3.2",
-    "@codingame/monaco-vscode-standalone-languages": "~4.3.2",
-    "@codingame/monaco-vscode-standalone-typescript-language-features": "~4.3.2",
-    "@codingame/monaco-vscode-standalone-json-language-features": "~4.3.2",
-    "@codingame/monaco-vscode-textmate-service-override": "~4.3.2",
-    "@codingame/monaco-vscode-theme-defaults-default-extension": "~4.3.2",
-    "@codingame/monaco-vscode-theme-service-override": "~4.3.2",
-    "@codingame/monaco-vscode-typescript-basics-default-extension": "~4.3.2",
-    "@codingame/monaco-vscode-typescript-language-features-default-extension": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-cs": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-de": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-es": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-fr": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-it": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-ja": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-ko": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-pl": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-pt-br": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-qps-ploc": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-ru": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-tr": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-zh-hans": "~4.3.2",
-    "@codingame/monaco-vscode-language-pack-zh-hant": "~4.3.2",
-    "@typefox/monaco-editor-react": "~3.2.1",
+    "@codingame/monaco-vscode-configuration-service-override": "~5.1.1",
+    "@codingame/monaco-vscode-files-service-override": "~5.1.1",
+    "@codingame/monaco-vscode-groovy-default-extension": "~5.1.1",
+    "@codingame/monaco-vscode-keybindings-service-override": "~5.1.1",
+    "@codingame/monaco-vscode-lifecycle-service-override": "~5.1.1",
+    "@codingame/monaco-vscode-localization-service-override": "~5.1.1",
+    "@codingame/monaco-vscode-javascript-default-extension": "~5.1.1",
+    "@codingame/monaco-vscode-json-default-extension": "~5.1.1",
+    "@codingame/monaco-vscode-python-default-extension": "~5.1.1",
+    "@codingame/monaco-vscode-standalone-languages": "~5.1.1",
+    "@codingame/monaco-vscode-standalone-typescript-language-features": "~5.1.1",
+    "@codingame/monaco-vscode-standalone-json-language-features": "~5.1.1",
+    "@codingame/monaco-vscode-textmate-service-override": "~5.1.1",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~5.1.1",
+    "@codingame/monaco-vscode-theme-service-override": "~5.1.1",
+    "@codingame/monaco-vscode-typescript-basics-default-extension": "~5.1.1",
+    "@codingame/monaco-vscode-typescript-language-features-default-extension": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-cs": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-de": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-es": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-fr": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-it": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-ja": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-ko": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-pl": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-pt-br": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-qps-ploc": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-ru": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-tr": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-zh-hans": "~5.1.1",
+    "@codingame/monaco-vscode-language-pack-zh-hant": "~5.1.1",
+    "@typefox/monaco-editor-react": "~4.1.0",
     "express": "~4.19.2",
     "langium": "3.0.0",
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~4.3.2",
-    "monaco-editor-wrapper": "~4.2.1",
-    "monaco-languageclient": "~8.3.1",
-    "pyright": "~1.1.359",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
+    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~5.1.1",
+    "monaco-editor-wrapper": "~5.1.0",
+    "monaco-languageclient": "~8.4.0",
+    "pyright": "~1.1.362",
+    "react": "~18.3.1",
+    "react-dom": "~18.3.1",
     "request-light": "~0.7.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@~4.3.2",
-    "vscode-json-languageservice": "~5.3.10",
+    "vscode": "npm:@codingame/monaco-vscode-api@~5.1.1",
+    "vscode-json-languageservice": "~5.3.11",
     "vscode-languageclient": "~9.0.1",
     "vscode-languageserver": "~9.0.1",
     "vscode-uri": "~3.0.8",
     "vscode-ws-jsonrpc": "~3.3.1",
-    "ws": "~8.16.0"
+    "ws": "~8.17.0"
   },
   "devDependencies": {
     "@types/express": "~4.17.21",
     "@types/ws": "~8.5.10",
-    "langium-cli": "3.0.1",
+    "langium-cli": "3.0.3",
     "ts-node": "~10.9.1",
     "vscode-languageserver-types": "~3.17.5"
   },
   "volta": {
-    "node": "20.12.2",
-    "npm": "10.5.0"
+    "node": "20.13.1",
+    "npm": "10.5.2"
   },
   "files": [
     "dist",
@@ -129,6 +129,7 @@
     "resources:download": "vite-node ./build/downloadResources.mts",
     "build:msg": "echo Building main examples:",
     "build": "npm run build:msg && npm run clean && npm run resources:download && npm run compile",
+    "build:bundle": "vite --config vite.bundle.config.ts build",
     "start:server:json": "node --loader ts-node/esm src/json/server/direct.ts",
     "start:server:python": "node --loader ts-node/esm src/python/server/direct.ts",
     "start:server:groovy": "node --watch --loader  ts-node/esm src/groovy/server/direct.ts",

package/python.html

@@ -2,14 +2,14 @@
 <html>
 
 <head>
-    <title>Monaco Language Client Python Example</title>
+    <title>Python Language Client & Pyright Language Server (Web Socket)</title>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="style.css">
 </head>
 
 <body>
-    <h2>Monaco Language Client Python Example</h2>
+    <h2>Python Language Client & Pyright Language Server (Web Socket)</h2>
     <button type="button" id="button-start">Start</button>
     <button type="button" id="button-dispose">Dispose</button>
     <div id="monaco-editor-root" style="width:800px;height:600px;border:1px solid grey"></div>

package/react_python.html

@@ -4,13 +4,13 @@
     <head>
         <meta charset="UTF-8" />
         <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-        <title>Monaco Editor React: Python Example</title>
+        <title>React: Python Language Client & Language Server (Web Socket)</title>
         <link rel="stylesheet" href="style.css">
     </head>
 
     <body>
-        <h2>Monaco Editor React: Python Example</h2>
-        <div id="root"></div>
+        <h2>React: Python Language Client & Language Server (Web Socket)</h2>
+        <div id="monaco-editor-root"></div>
         <script type="module">
             import { configureMonacoWorkers, runPythonReact } from './src/python/client/reactPython.tsx';
 

package/react_statemachine.html

@@ -4,13 +4,13 @@
 <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Monaco Editor React: Langium Statemachine Example</title>
+    <title>React: Langium Statemachine Language Client & Language Server (Worker)</title>
     <link rel="stylesheet" href="style.css">
 </head>
 
 <body>
-    <h2>Monaco Editor React: Langium Statemachine Example</h2>
-    <div id="root"></div>
+    <h2>React: Langium Statemachine Language Client & Language Server (Worker)</h2>
+    <div id="monaco-editor-root"></div>
     <script type="module">
         import { configureMonacoWorkers, runStatemachineReact } from './src/langium/statemachine/main-react.tsx';
 

package/src/browser/main.ts

@@ -43,9 +43,12 @@ export const runBrowserEditor = async () => {
             },
             editorAppConfig: {
                 $type: 'extended',
-                languageId: 'json',
-                code,
-                codeUri,
+                codeResources: {
+                    main: {
+                        text: code,
+                        uri: codeUri
+                    }
+                },
                 useDiffEditor: false,
                 userConfiguration: {
                     json: JSON.stringify({
@@ -159,7 +162,7 @@ export const runBrowserEditor = async () => {
 
     await wrapper.start(htmlElement);
 
-    wrapper.getModel()?.onDidChangeContent(() => {
+    wrapper.getTextModels()?.text?.onDidChangeContent(() => {
         validate();
     });
 };

package/src/common/client/app-utils.ts

@@ -0,0 +1,16 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+export const toggleSwapDiffButton = (enabled: boolean) => {
+    const button = document.getElementById('button-swap') as HTMLButtonElement;
+    if (button !== null) {
+        button.disabled = !enabled;
+    }
+};
+
+export const getTextContent = async (url: URL) => {
+    const response = await fetch(url.href);
+    return response.text();
+};