monaco-languageclient-examples 2025.8.5 → 2025.9.1-next.0

package/dist/ts/wrapperTs.js

@@ -24,7 +24,10 @@ export const runTsWrapper = async () => {
     const htmlContainer = document.getElementById('monaco-editor-root');
     const vscodeApiConfig = {
         $type: 'extended',
-        htmlContainer,
+        viewsConfig: {
+            $type: 'EditorService',
+            htmlContainer
+        },
         logLevel: LogLevel.Debug,
         serviceOverrides: {
             ...getKeybindingsServiceOverride()
@@ -47,7 +50,6 @@ export const runTsWrapper = async () => {
         monacoWorkerFactory: configureDefaultWorkerFactory
     };
     const editorAppConfig = {
-        $type: vscodeApiConfig.$type,
         codeResources: {
             modified: {
                 text: code,
@@ -59,8 +61,9 @@ export const runTsWrapper = async () => {
             }
         }
     };
+    // perform global monaco-vscode-api init
     const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
-    await apiWrapper.init();
+    await apiWrapper.start();
     const editorApp = new EditorApp(editorAppConfig);
     disableElement('button-swap-code', true);
     try {

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/json.html

@@ -17,7 +17,7 @@
     </div>
     <div id="monaco-editor-root" style="height: 80vh;"></div>
     <script type="module">
-        import { runJsonWrapper } from './src/json/client/client.ts';
+        import { runJsonWrapper } from './src/json/client/extended.ts';
 
         runJsonWrapper();
     </script>

package/{bare.html → json_classic.html}

@@ -15,7 +15,7 @@
     </div>
 	<div id="monaco-editor-root" style="width:800px;height:600px;border:1px solid grey"></div>
     <script type="module">
-        import { runClient } from "./src/bare/client.ts";
+        import { runClient } from "./src/json/client/classic.ts";
 
         runClient();
     </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "2025.8.5",
+  "version": "2025.9.1-next.0",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -29,8 +29,8 @@
       "default": "./dist/node.js"
     },
     "./json-client": {
-      "types": "./dist/json/client/client.d.ts",
-      "default": "./dist/json/client/client.js"
+      "types": "./dist/json/client/extended.d.ts",
+      "default": "./dist/json/client/extended.js"
     },
     "./python-client": {
       "types": "./dist/python/client/main.d.ts",
@@ -54,7 +54,7 @@
         "dist/node"
       ],
       "json-client": [
-        "dist/json/client/client"
+        "dist/json/client/extended"
       ],
       "worker/langium": [
         "dist/langium/langium-dsl/worker/langium-server"
@@ -69,7 +69,7 @@
     "npm": ">=10.2.3"
   },
   "volta": {
-    "node": "22.18.0",
+    "node": "22.19.0",
     "npm": "10.9.3"
   },
   "files": [
@@ -82,48 +82,48 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-cpp-default-extension": "~20.2.1",
-    "@codingame/monaco-vscode-debug-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-editor-api": "~20.2.1",
-    "@codingame/monaco-vscode-environment-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-explorer-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-files-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-groovy-default-extension": "~20.2.1",
-    "@codingame/monaco-vscode-java-default-extension": "~20.2.1",
-    "@codingame/monaco-vscode-javascript-default-extension": "~20.2.1",
-    "@codingame/monaco-vscode-json-default-extension": "~20.2.1",
-    "@codingame/monaco-vscode-keybindings-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-lifecycle-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-localization-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-preferences-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-python-default-extension": "~20.2.1",
-    "@codingame/monaco-vscode-remote-agent-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-search-result-default-extension": "~20.2.1",
-    "@codingame/monaco-vscode-search-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-secret-storage-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-standalone-json-language-features": "~20.2.1",
-    "@codingame/monaco-vscode-standalone-typescript-language-features": "~20.2.1",
-    "@codingame/monaco-vscode-testing-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-storage-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-textmate-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-theme-defaults-default-extension": "~20.2.1",
-    "@codingame/monaco-vscode-theme-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-typescript-basics-default-extension": "~20.2.1",
-    "@codingame/monaco-vscode-typescript-language-features-default-extension": "~20.2.1",
-    "@codingame/monaco-vscode-views-service-override": "~20.2.1",
-    "@codingame/monaco-vscode-outline-service-override": "~20.2.1",
-    "@typefox/monaco-editor-react": "~7.0.0-next.1",
+    "@codingame/monaco-vscode-configuration-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-cpp-default-extension": "^21.0.1",
+    "@codingame/monaco-vscode-debug-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-editor-api": "^21.0.1",
+    "@codingame/monaco-vscode-environment-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-explorer-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-files-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-groovy-default-extension": "^21.0.1",
+    "@codingame/monaco-vscode-java-default-extension": "^21.0.1",
+    "@codingame/monaco-vscode-javascript-default-extension": "^21.0.1",
+    "@codingame/monaco-vscode-json-default-extension": "^21.0.1",
+    "@codingame/monaco-vscode-keybindings-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-lifecycle-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-localization-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-preferences-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-python-default-extension": "^21.0.1",
+    "@codingame/monaco-vscode-remote-agent-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-search-result-default-extension": "^21.0.1",
+    "@codingame/monaco-vscode-search-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-secret-storage-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-standalone-json-language-features": "^21.0.1",
+    "@codingame/monaco-vscode-standalone-typescript-language-features": "^21.0.1",
+    "@codingame/monaco-vscode-testing-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-storage-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-textmate-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "^21.0.1",
+    "@codingame/monaco-vscode-theme-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-typescript-basics-default-extension": "^21.0.1",
+    "@codingame/monaco-vscode-typescript-language-features-default-extension": "^21.0.1",
+    "@codingame/monaco-vscode-views-service-override": "^21.0.1",
+    "@codingame/monaco-vscode-outline-service-override": "^21.0.1",
+    "@typefox/monaco-editor-react": "~7.0.0-next.2",
     "cors": "~2.8.5",
     "express": "~5.1.0",
     "jszip": "~3.10.1",
-    "langium": "~4.0.0",
-    "monaco-languageclient": "~10.0.0-next.1",
+    "langium": "~4.0.3",
+    "monaco-languageclient": "~10.0.0-next.2",
     "pyright": "~1.1.404",
     "react": "~19.1.1",
     "react-dom": "~19.1.1",
     "request-light": "~0.8.0",
-    "vscode": "npm:@codingame/monaco-vscode-extension-api@~20.2.1",
+    "vscode": "npm:@codingame/monaco-vscode-extension-api@^21.0.1",
     "vscode-json-languageservice": "~5.6.1",
     "vscode-languageclient": "~9.0.1",
     "vscode-languageserver": "~9.0.1",
@@ -134,7 +134,7 @@
   },
   "devDependencies": {
     "@types/cors": "~2.8.19",
-    "@types/emscripten": "~1.40.1",
+    "@types/emscripten": "~1.41.2",
     "@types/express": "~5.0.3",
     "@types/ws": "~8.18.1",
     "langium-cli": "~4.0.0",

package/src/appPlayground/config.ts

@@ -27,9 +27,9 @@ import '@codingame/monaco-vscode-typescript-language-features-default-extension'
 
 import '../../resources/vsix/open-collaboration-tools.vsix';
 
-import { defaultHtmlAugmentationInstructions, defaultViewsInit, type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';
 import type { EditorAppConfig } from 'monaco-languageclient/editorApp';
 import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscodeApiLocales';
+import { defaultHtmlAugmentationInstructions, defaultViewsInit, type HtmlContainerConfig, type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';
 import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
 import helloTsCode from '../../resources/appPlayground/hello.ts?raw';
 import testerTsCode from '../../resources/appPlayground/tester.ts?raw';
@@ -43,13 +43,12 @@ export type ConfigResult = {
     testerTsUri: vscode.Uri;
 };
 
-export const configure = async (htmlContainer?: HTMLElement): Promise<ConfigResult> => {
+export const configure = async (htmlContainer: HtmlContainerConfig): Promise<ConfigResult> => {
     const workspaceFileUri = vscode.Uri.file('/workspace.code-workspace');
 
     const vscodeApiConfig: MonacoVscodeApiConfig = {
         $type: 'extended',
         logLevel: LogLevel.Debug,
-        htmlContainer,
         serviceOverrides: {
             ...getKeybindingsServiceOverride(),
             ...getLifecycleServiceOverride(),
@@ -66,7 +65,8 @@ export const configure = async (htmlContainer?: HTMLElement): Promise<ConfigResu
             ...getOutlineServiceOverride()
         },
         viewsConfig: {
-            viewServiceType: 'ViewsService',
+            $type: 'ViewsService',
+            htmlContainer,
             htmlAugmentationInstructions: defaultHtmlAugmentationInstructions,
             viewsInitFunc: defaultViewsInit
         },
@@ -123,8 +123,7 @@ export const configure = async (htmlContainer?: HTMLElement): Promise<ConfigResu
     };
 
     const editorAppConfig: EditorAppConfig = {
-        $type: vscodeApiConfig.$type,
-        id: 'AAP',
+        id: 'AAP'
     };
 
     const workspaceUri = vscode.Uri.file('/workspace');

package/src/appPlayground/main.ts

@@ -15,7 +15,7 @@ export const runApplicationPlayground = async () => {
 
     // perform global init
     const apiWrapper = new MonacoVscodeApiWrapper(configResult.vscodeApiConfig);
-    await apiWrapper.init();
+    await apiWrapper.start();
 
     await configurePostStart(apiWrapper, configResult);
 };

package/src/appPlayground/reactMain.tsx

@@ -11,7 +11,7 @@ import { configurePostStart } from './common.js';
 
 export const runApplicationPlaygroundReact = async () => {
 
-    const configResult = await configure();
+    const configResult = await configure('ReactPlaceholder');
     const root = ReactDOM.createRoot(document.getElementById('react-root')!);
     const App = () => {
         return (

package/src/browser/main.ts

@@ -21,7 +21,6 @@ export const runBrowserEditor = async () => {
     const protocolConverter = createProtocolConverter(undefined, true, true);
 
     let mainVscodeDocument: vscode.TextDocument | undefined;
-    const htmlContainer = document.getElementById('monaco-editor-root')!;
     const languageId = 'json';
     const code = `{
     "$schema": "http://json.schemastore.org/coffeelint",
@@ -31,7 +30,10 @@ export const runBrowserEditor = async () => {
 
     const vscodeApiConfig: MonacoVscodeApiConfig = {
         $type: 'extended',
-        htmlContainer,
+        viewsConfig: {
+            $type: 'EditorService',
+            htmlContainer: document.getElementById('monaco-editor-root')!
+        },
         logLevel: LogLevel.Debug,
         serviceOverrides: {
             ...getKeybindingsServiceOverride(),
@@ -47,7 +49,6 @@ export const runBrowserEditor = async () => {
         monacoWorkerFactory: configureDefaultWorkerFactory
     };
     const editorAppConfig: EditorAppConfig = {
-        $type: vscodeApiConfig.$type,
         codeResources: {
             modified: {
                 text: code,
@@ -56,7 +57,7 @@ export const runBrowserEditor = async () => {
         }
     };
     const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
-    await apiWrapper.init();
+    await apiWrapper.start();
 
     const editorApp = new EditorApp(editorAppConfig);
 
@@ -158,7 +159,7 @@ export const runBrowserEditor = async () => {
         diagnosticCollection.clear();
     };
 
-    await editorApp.start(htmlContainer);
+    await editorApp.start(apiWrapper.getHtmlContainer());
 
     editorApp.getTextModels().modified?.onDidChangeContent(() => {
         validate();

package/src/clangd/client/config.ts

@@ -35,7 +35,6 @@ export const createClangdAppConfig = async (config: {
 }): Promise<ClangdAppConfig> => {
     const vscodeApiConfig: MonacoVscodeApiConfig = {
         $type: 'extended',
-        htmlContainer: config.htmlContainer,
         logLevel: LogLevel.Debug,
         serviceOverrides: {
             ...getKeybindingsServiceOverride(),
@@ -49,7 +48,8 @@ export const createClangdAppConfig = async (config: {
             ...getSecretStorageServiceOverride()
         },
         viewsConfig: {
-            viewServiceType: 'ViewsService',
+            $type: 'ViewsService',
+            htmlContainer: config.htmlContainer,
             htmlAugmentationInstructions: defaultHtmlAugmentationInstructions,
             viewsInitFunc: defaultViewsInit
         },
@@ -102,7 +102,7 @@ export const createClangdAppConfig = async (config: {
     };
 
     const languageClientConfig: LanguageClientConfig = {
-        name: 'Clangd WASM Language Server',
+        languageId: 'cpp',
         connection: {
             options: {
                 $type: 'WorkerDirect',
@@ -125,9 +125,7 @@ export const createClangdAppConfig = async (config: {
         }
     };
 
-    const editorAppConfig: EditorAppConfig = {
-        $type: vscodeApiConfig.$type
-    };
+    const editorAppConfig: EditorAppConfig = {};
 
     return {
         vscodeApiConfig,

package/src/clangd/client/main.ts

@@ -41,7 +41,7 @@ export const runClangdWrapper = async () => {
 
     // perform global init
     const apiWrapper = new MonacoVscodeApiWrapper(appConfig.vscodeApiConfig);
-    await apiWrapper.init();
+    await apiWrapper.start();
 
     const lcWrapper = new LanguageClientWrapper(appConfig.languageClientConfig);
 

package/src/common/client/extendedClient.ts

@@ -13,9 +13,10 @@ import { EditorApp, type EditorAppConfig } from 'monaco-languageclient/editorApp
 import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
 import { LanguageClientWrapper, type LanguageClientConfig } from 'monaco-languageclient/lcwrapper';
 import { MonacoVscodeApiWrapper, type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';
+import { LangiumMonarchContent } from '../../langium/langium-dsl/config/langium.monarch.js';
 
 export const runExtendedClient = async (lsConfig: ExampleLsConfig, helloCode: string) => {
-    const helloUri = vscode.Uri.file(`${lsConfig.basePath}/workspace/hello.${lsConfig.documentSelector}`);
+    const helloUri = vscode.Uri.file(`${lsConfig.basePath}/workspace/hello.${lsConfig.languageId}`);
     const fileSystemProvider = new RegisteredFileSystemProvider(false);
     fileSystemProvider.registerFile(new RegisteredMemoryFile(helloUri, helloCode));
     registerFileSystemOverlay(1, fileSystemProvider);
@@ -23,7 +24,10 @@ export const runExtendedClient = async (lsConfig: ExampleLsConfig, helloCode: st
     const htmlContainer = document.getElementById('monaco-editor-root')!;
     const vscodeApiConfig: MonacoVscodeApiConfig = {
         $type: 'extended',
-        htmlContainer,
+        viewsConfig: {
+            $type: 'EditorService',
+            htmlContainer
+        },
         logLevel: LogLevel.Debug,
         serviceOverrides: {
             ...getKeybindingsServiceOverride(),
@@ -41,6 +45,7 @@ export const runExtendedClient = async (lsConfig: ExampleLsConfig, helloCode: st
     };
 
     const languageClientConfig: LanguageClientConfig = {
+        languageId: lsConfig.languageId,
         connection: {
             options: {
                 $type: 'WebSocketUrl',
@@ -60,7 +65,7 @@ export const runExtendedClient = async (lsConfig: ExampleLsConfig, helloCode: st
             },
         },
         clientOptions: {
-            documentSelector: [lsConfig.documentSelector],
+            documentSelector: [lsConfig.languageId],
             workspaceFolder: {
                 index: 0,
                 name: 'workspace',
@@ -70,25 +75,28 @@ export const runExtendedClient = async (lsConfig: ExampleLsConfig, helloCode: st
     };
 
     const editorAppConfig: EditorAppConfig = {
-        $type: vscodeApiConfig.$type,
         codeResources: {
             modified: {
                 text: helloCode,
                 uri: helloUri.path
             }
+        },
+        languageDef: {
+            monarchLanguage: LangiumMonarchContent,
+            languageExtensionConfig: { id: 'langium' }
         }
     };
 
     // perform global init
     const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
-    await apiWrapper.init();
+    await apiWrapper.start();
 
     const lcWrapper = new LanguageClientWrapper(languageClientConfig, apiWrapper.getLogger());
     const editorApp = new EditorApp(editorAppConfig);
 
     try {
         document.querySelector('#button-start')?.addEventListener('click', async () => {
-            await editorApp.start(htmlContainer);
+            await editorApp.start(apiWrapper.getHtmlContainer());
             await lcWrapper.start();
 
             // open files, so the LS can pick it up
@@ -107,5 +115,5 @@ export type ExampleLsConfig = {
     port: number;
     path: string;
     basePath: string;
-    documentSelector: string;
+    languageId: string;
 };

package/src/debugger/common/definitions.ts

@@ -4,6 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 
 import { RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
+import type { HtmlContainerConfig } from 'monaco-languageclient/vscodeApiWrapper';
 import { Uri } from 'vscode';
 
 export type FileDefinition = {
@@ -26,7 +27,7 @@ export type ConfigParams = {
     homeDir: string;
     workspaceRoot: string;
     workspaceFile: Uri;
-    htmlContainer?: HTMLElement;
+    htmlContainer: HtmlContainerConfig;
     protocol: 'ws' | 'wss';
     hostname: string;
     port: number;

package/src/eclipse.jdt.ls/config.ts

@@ -9,5 +9,5 @@ export const eclipseJdtLsConfig: ExampleLsConfig = {
     port: 30003,
     path: '/jdtls',
     basePath: '/home/mlc/packages/examples/resources/eclipse.jdt.ls',
-    documentSelector: 'java'
+    languageId: 'java'
 };

package/src/groovy/config.ts

@@ -9,5 +9,5 @@ export const groovyConfig: ExampleLsConfig = {
     port: 30002,
     path: '/groovy',
     basePath: '/home/gradle/mlc/packages/examples/resources/groovy',
-    documentSelector: 'groovy'
+    languageId: 'groovy'
 };

package/src/{bare/client.ts → json/client/classic.ts}

@@ -4,58 +4,61 @@
  * ------------------------------------------------------------------------------------------ */
 
 import { LogLevel } from '@codingame/monaco-vscode-api';
-import * as monaco from '@codingame/monaco-vscode-editor-api';
-import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override';
-import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-override';
-import { MonacoVscodeApiWrapper, type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';
-// monaco-editor does not supply json highlighting with the json worker,
-// that's why we use the textmate extension from VSCode
-import '@codingame/monaco-vscode-json-default-extension';
-import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
+import type { Logger } from 'monaco-languageclient/common';
+import { EditorApp, type EditorAppConfig } from 'monaco-languageclient/editorApp';
 import { LanguageClientWrapper, type LanguageClientConfig } from 'monaco-languageclient/lcwrapper';
+import { MonacoVscodeApiWrapper, type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';
+import { defineDefaultWorkerLoaders, useWorkerFactory } from 'monaco-languageclient/workerFactory';
 
 export const runClient = async () => {
     const htmlContainer = document.getElementById('monaco-editor-root')!;
     const vscodeApiConfig: MonacoVscodeApiConfig = {
         $type: 'classic',
-        logLevel: LogLevel.Debug,
-        serviceOverrides: {
-            ...getTextmateServiceOverride(),
-            ...getThemeServiceOverride()
+        viewsConfig: {
+            $type: 'EditorService',
+            htmlContainer
         },
+        logLevel: LogLevel.Debug,
         userConfiguration: {
             json: JSON.stringify({
                 'editor.experimental.asyncTokenization': true
             })
         },
-        monacoWorkerFactory: configureDefaultWorkerFactory
+        monacoWorkerFactory: configureClassicWorkerFactory
     };
 
     const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
-    await apiWrapper.init();
+    await apiWrapper.start();
 
-    // register the JSON language with Monaco
-    monaco.languages.register({
-        id: 'json',
-        extensions: ['.json', '.jsonc'],
-        aliases: ['JSON', 'json'],
-        mimetypes: ['application/json']
-    });
-
-    // create monaco editor
-    monaco.editor.create(htmlContainer, {
-        value: `{
+    const languageId = 'json';
+    const code = `{
     "$schema": "http://json.schemastore.org/coffeelint",
     "line_endings": "unix"
-}`,
-        language: 'json',
-        automaticLayout: true,
-        wordBasedSuggestions: 'off'
-    });
+}`;
+    const codeUri = '/workspace/model.json';
+    const editorAppConfig: EditorAppConfig = {
+        codeResources: {
+            modified: {
+                text: code,
+                uri: codeUri
+            }
+        },
+        languageDef: {
+            languageExtensionConfig: {
+                id: languageId,
+                extensions: ['.json', '.jsonc'],
+                aliases: ['JSON', 'json'],
+                mimetypes: ['application/json']
+            }
+        }
+    };
+    const editorApp = new EditorApp(editorAppConfig);
+    await editorApp.start(apiWrapper.getHtmlContainer());
 
     const languageClientConfig: LanguageClientConfig = {
+        languageId,
         clientOptions: {
-            documentSelector: ['json']
+            documentSelector: [languageId]
         },
         connection: {
             options: {
@@ -70,3 +73,13 @@ export const runClient = async () => {
     );
     await languageClientWrapper.start();
 };
+
+export const configureClassicWorkerFactory = (logger?: Logger) => {
+    const defaultworkerLoaders = defineDefaultWorkerLoaders();
+    // remove textmate worker as it is not compatible with classic mode
+    defaultworkerLoaders.TextMateWorker = undefined;
+    useWorkerFactory({
+        workerLoaders: defaultworkerLoaders,
+        logger
+    });
+};

package/src/json/client/config.ts

@@ -9,5 +9,5 @@ export const jsontLsConfig: ExampleLsConfig = {
     port: 30000,
     path: '/sampleServer',
     basePath: '/home/mlc/packages/examples/resources/json',
-    documentSelector: 'json'
+    languageId: 'json'
 };

package/src/json/client/{client.ts → extended.ts}

@@ -5,10 +5,13 @@
 
 // this is required syntax highlighting
 import '@codingame/monaco-vscode-json-default-extension';
-import helloJsonCode from '../../../resources/json/workspace/hello.json?raw';
 import { runExtendedClient } from '../../common/client/extendedClient.js';
 import { jsontLsConfig } from './config.js';
 
 export const runJsonWrapper = async () => {
+    const helloJsonCode = `{
+    "$schema": "http://json.schemastore.org/coffeelint",
+    "line_endings": {"value": "unix"}
+}`;
     await runExtendedClient(jsontLsConfig, helloJsonCode);
 };

package/src/langium/langium-dsl/config/extendedConfig.ts

@@ -59,9 +59,7 @@ export const setupLangiumClientExtended = async (): Promise<ExampleAppConfig> =>
     await fileSystemProvider.writeFile(langiumTypesLangiumUri, textEncoder.encode(langiumTypesLangium), options);
     registerFileSystemOverlay(1, fileSystemProvider);
 
-    const editorAppConfig: EditorAppConfig = {
-        $type: overallConfigType
-    };
+    const editorAppConfig: EditorAppConfig = {};
 
     const innerHtml = `<div id="editorsDiv">
     <div id="editors"></div>
@@ -86,12 +84,12 @@ export const setupLangiumClientExtended = async (): Promise<ExampleAppConfig> =>
     const vscodeApiConfig: MonacoVscodeApiConfig = {
         $type: overallConfigType,
         logLevel: LogLevel.Debug,
-        htmlContainer: document.body,
         serviceOverrides: {
             ...getKeybindingsServiceOverride()
         },
         viewsConfig: {
-            viewServiceType: 'ViewsService',
+            $type: 'ViewsService',
+            htmlContainer: document.body,
             htmlAugmentationInstructions: (htmlElement: HTMLElement | null | undefined) => {
                 const htmlContainer = document.createElement('div', { is: 'app' });
                 htmlContainer.innerHTML = innerHtml;
@@ -136,6 +134,7 @@ export const setupLangiumClientExtended = async (): Promise<ExampleAppConfig> =>
     };
 
     const languageClientConfig: LanguageClientConfig = {
+        languageId: 'langium',
         clientOptions: {
             documentSelector: ['langium']
         },

package/src/langium/langium-dsl/main.ts

@@ -15,7 +15,7 @@ export const runLangiumGrammarDsl = async () => {
 
         // perform global init
         const apiWrapper = new MonacoVscodeApiWrapper(appConfig.vscodeApiConfig);
-        await apiWrapper.init();
+        await apiWrapper.start();
 
         // init language client
         const lcWrapper = new LanguageClientWrapper(appConfig.languageClientConfig);