monaco-languageclient-examples 2025.6.1 → 2025.6.3

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [2025.6.3] - 2025-0z-xy
+
+- Updated to `monaco-languageclient@10.0.0-next.0`, `monaco-editor-wrapper@7.0.0-next.0` and `@typefox/monaco-editor-react@7.0.0-next.0`.
+
+## [2025.6.2] - 2025-06-24
+
+- Updated to `monaco-languageclient@9.8.0`, `monaco-editor-wrapper@6.9.0` and `@typefox/monaco-editor-react@6.9.0`.
+
 ## [2025.6.1] - 2025-06-17
 
 - Updated to `monaco-languageclient@9.7.1`, `monaco-editor-wrapper@6.8.1` and `@typefox/monaco-editor-react@6.8.1`.

package/dist/appPlayground/common.d.ts

@@ -1,4 +1,4 @@
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
 import type { ConfigResult } from './config.js';
-export declare const configurePostStart: (wrapper: MonacoEditorLanguageClientWrapper, configResult: ConfigResult) => Promise<void>;
+import type { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
+export declare const configurePostStart: (apiWrapper: MonacoVscodeApiWrapper, configResult: ConfigResult) => Promise<void>;
 //# sourceMappingURL=common.d.ts.map

package/dist/appPlayground/common.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/appPlayground/common.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,eAAO,MAAM,kBAAkB,GAAU,SAAS,iCAAiC,EAAE,cAAc,YAAY,kBAiB9G,CAAC"}
+{"version":3,"file":"common.d.ts","sourceRoot":"","sources":["../../src/appPlayground/common.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAErF,eAAO,MAAM,kBAAkB,GAAU,YAAY,sBAAsB,EAAE,cAAc,YAAY,kBAiBtG,CAAC"}

package/dist/appPlayground/common.js

@@ -3,9 +3,8 @@
 * Licensed under the MIT License. See LICENSE in the package root for license information.
 * ------------------------------------------------------------------------------------------ */
 import * as vscode from 'vscode';
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
-export const configurePostStart = async (wrapper, configResult) => {
-    const result = wrapper.getExtensionRegisterResult('mlc-app-playground');
+export const configurePostStart = async (apiWrapper, configResult) => {
+    const result = apiWrapper.getExtensionRegisterResult('mlc-app-playground');
     result.setAsDefaultApi();
     // WA: Force show explorer and not search
     await vscode.commands.executeCommand('workbench.view.explorer');

package/dist/appPlayground/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/appPlayground/common.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAG1E,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAA0C,EAAE,YAA0B,EAAE,EAAE;IAC/G,MAAM,MAAM,GAAG,OAAO,CAAC,0BAA0B,CAAC,oBAAoB,CAAwC,CAAC;IAC/G,MAAM,CAAC,eAAe,EAAE,CAAC;IAEzB,yCAAyC;IACzC,MAAM,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,yBAAyB,CAAC,CAAC;IAEhE,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,MAAM,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC,UAAU,CAAC;QAChE,MAAM,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAC;KACpE,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,MAAM,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,UAAU,CAAC;KAChE,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;AAClD,CAAC,CAAC"}
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/appPlayground/common.ts"],"names":[],"mappings":"AAAA;;;+FAG+F;AAE/F,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAKjC,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,UAAkC,EAAE,YAA0B,EAAE,EAAE;IACvG,MAAM,MAAM,GAAG,UAAU,CAAC,0BAA0B,CAAC,oBAAoB,CAAwC,CAAC;IAClH,MAAM,CAAC,eAAe,EAAE,CAAC;IAEzB,yCAAyC;IACzC,MAAM,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,yBAAyB,CAAC,CAAC;IAEhE,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,MAAM,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC,UAAU,CAAC;QAChE,MAAM,MAAM,CAAC,SAAS,CAAC,gBAAgB,CAAC,YAAY,CAAC,WAAW,CAAC;KACpE,CAAC,CAAC;IAEH,MAAM,OAAO,CAAC,GAAG,CAAC;QACd,MAAM,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,UAAU,CAAC;KAChE,CAAC,CAAC;IAEH,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC,CAAC;AAClD,CAAC,CAAC"}

package/dist/appPlayground/config.d.ts

@@ -1,14 +1,16 @@
 import * as vscode from 'vscode';
+import '@codingame/monaco-vscode-search-result-default-extension';
 import '@codingame/monaco-vscode-typescript-basics-default-extension';
 import '@codingame/monaco-vscode-typescript-language-features-default-extension';
-import '@codingame/monaco-vscode-search-result-default-extension';
 import '../../resources/vsix/open-collaboration-tools.vsix';
-import type { WrapperConfig } from 'monaco-editor-wrapper';
+import { type MonacoVscodeApiConfig } from 'monaco-languageclient/vscodeApiWrapper';
+import type { EditorAppConfig } from 'monaco-languageclient/editorApp';
 export type ConfigResult = {
-    wrapperConfig: WrapperConfig;
-    workspaceFile: vscode.Uri;
+    vscodeApiConfig: MonacoVscodeApiConfig;
+    editorAppConfig: EditorAppConfig;
+    workspaceFileUri: vscode.Uri;
     helloTsUri: vscode.Uri;
     testerTsUri: vscode.Uri;
 };
-export declare const configure: (htmlContainer?: HTMLElement) => ConfigResult;
+export declare const configure: (htmlContainer?: HTMLElement) => Promise<ConfigResult>;
 //# sourceMappingURL=config.d.ts.map

package/dist/appPlayground/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/appPlayground/config.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAiBjC,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AACjF,OAAO,0DAA0D,CAAC;AAElE,OAAO,oDAAoD,CAAC;AAQ5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAE3D,MAAM,MAAM,YAAY,GAAG;IACvB,aAAa,EAAE,aAAa,CAAA;IAC5B,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,gBAAgB,WAAW,KAAG,YA+FvD,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/appPlayground/config.ts"],"names":[],"mappings":"AAoBA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAGjC,OAAO,0DAA0D,CAAC;AAClE,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AAEjF,OAAO,oDAAoD,CAAC;AAE5D,OAAO,EAAyD,KAAK,qBAAqB,EAAE,MAAM,wCAAwC,CAAC;AAC3I,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAOvE,MAAM,MAAM,YAAY,GAAG;IACvB,eAAe,EAAE,qBAAqB,CAAC;IACvC,eAAe,EAAE,eAAe,CAAA;IAChC,gBAAgB,EAAE,MAAM,CAAC,GAAG,CAAC;IAC7B,UAAU,EAAE,MAAM,CAAC,GAAG,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC,GAAG,CAAC;CAC3B,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,gBAAgB,WAAW,KAAG,OAAO,CAAC,YAAY,CA6GjF,CAAC"}

package/dist/appPlayground/config.js

@@ -2,96 +2,94 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
-import * as vscode from 'vscode';
 import { LogLevel } from '@codingame/monaco-vscode-api';
-import { RegisteredFileSystemProvider, registerFileSystemOverlay, RegisteredMemoryFile } from '@codingame/monaco-vscode-files-service-override';
+import getEnvironmentServiceOverride from '@codingame/monaco-vscode-environment-service-override';
+import getExplorerServiceOverride from '@codingame/monaco-vscode-explorer-service-override';
+import { InMemoryFileSystemProvider, registerFileSystemOverlay } from '@codingame/monaco-vscode-files-service-override';
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 import getLifecycleServiceOverride from '@codingame/monaco-vscode-lifecycle-service-override';
 import getLocalizationServiceOverride from '@codingame/monaco-vscode-localization-service-override';
-import getBannerServiceOverride from '@codingame/monaco-vscode-view-banner-service-override';
-import getStatusBarServiceOverride from '@codingame/monaco-vscode-view-status-bar-service-override';
-import getTitleBarServiceOverride from '@codingame/monaco-vscode-view-title-bar-service-override';
-import getExplorerServiceOverride from '@codingame/monaco-vscode-explorer-service-override';
+import getOutlineServiceOverride from '@codingame/monaco-vscode-outline-service-override';
 import getRemoteAgentServiceOverride from '@codingame/monaco-vscode-remote-agent-service-override';
-import getEnvironmentServiceOverride from '@codingame/monaco-vscode-environment-service-override';
+import getSearchServiceOverride from '@codingame/monaco-vscode-search-service-override';
 import getSecretStorageServiceOverride from '@codingame/monaco-vscode-secret-storage-service-override';
 import getStorageServiceOverride from '@codingame/monaco-vscode-storage-service-override';
-import getSearchServiceOverride from '@codingame/monaco-vscode-search-service-override';
+import getBannerServiceOverride from '@codingame/monaco-vscode-view-banner-service-override';
+import getStatusBarServiceOverride from '@codingame/monaco-vscode-view-status-bar-service-override';
+import getTitleBarServiceOverride from '@codingame/monaco-vscode-view-title-bar-service-override';
+import * as vscode from 'vscode';
 // this is required syntax highlighting
+import '@codingame/monaco-vscode-search-result-default-extension';
 import '@codingame/monaco-vscode-typescript-basics-default-extension';
 import '@codingame/monaco-vscode-typescript-language-features-default-extension';
-import '@codingame/monaco-vscode-search-result-default-extension';
 import '../../resources/vsix/open-collaboration-tools.vsix';
-import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscode/services';
-import { defaultHtmlAugmentationInstructions, defaultViewsInit } from 'monaco-editor-wrapper/vscode/services';
-import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
-import { createDefaultWorkspaceFile } from '../common/client/utils.js';
+import { defaultHtmlAugmentationInstructions, defaultViewsInit } from 'monaco-languageclient/vscodeApiWrapper';
+import { createDefaultLocaleConfiguration } from 'monaco-languageclient/vscodeApiLocales';
+import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
 import helloTsCode from '../../resources/appPlayground/hello.ts?raw';
 import testerTsCode from '../../resources/appPlayground/tester.ts?raw';
-export const configure = (htmlContainer) => {
-    const workspaceFile = vscode.Uri.file('/workspace/.vscode/workspace.code-workspace');
-    const wrapperConfig = {
+import { createDefaultWorkspaceContent } from '../common/client/utils.js';
+export const configure = async (htmlContainer) => {
+    const workspaceFileUri = vscode.Uri.file('/workspace.code-workspace');
+    const vscodeApiConfig = {
         $type: 'extended',
-        id: 'AAP',
         logLevel: LogLevel.Debug,
         htmlContainer,
-        vscodeApiConfig: {
-            serviceOverrides: {
-                ...getKeybindingsServiceOverride(),
-                ...getLifecycleServiceOverride(),
-                ...getLocalizationServiceOverride(createDefaultLocaleConfiguration()),
-                ...getBannerServiceOverride(),
-                ...getStatusBarServiceOverride(),
-                ...getTitleBarServiceOverride(),
-                ...getExplorerServiceOverride(),
-                ...getRemoteAgentServiceOverride(),
-                ...getEnvironmentServiceOverride(),
-                ...getSecretStorageServiceOverride(),
-                ...getStorageServiceOverride(),
-                ...getSearchServiceOverride()
-            },
-            enableExtHostWorker: true,
-            viewsConfig: {
-                viewServiceType: 'ViewsService',
-                htmlAugmentationInstructions: defaultHtmlAugmentationInstructions,
-                viewsInitFunc: defaultViewsInit
+        serviceOverrides: {
+            ...getKeybindingsServiceOverride(),
+            ...getLifecycleServiceOverride(),
+            ...getLocalizationServiceOverride(createDefaultLocaleConfiguration()),
+            ...getBannerServiceOverride(),
+            ...getStatusBarServiceOverride(),
+            ...getTitleBarServiceOverride(),
+            ...getExplorerServiceOverride(),
+            ...getRemoteAgentServiceOverride(),
+            ...getEnvironmentServiceOverride(),
+            ...getSecretStorageServiceOverride(),
+            ...getStorageServiceOverride(),
+            ...getSearchServiceOverride(),
+            ...getOutlineServiceOverride()
+        },
+        viewsConfig: {
+            viewServiceType: 'ViewsService',
+            htmlAugmentationInstructions: defaultHtmlAugmentationInstructions,
+            viewsInitFunc: defaultViewsInit
+        },
+        workspaceConfig: {
+            enableWorkspaceTrust: true,
+            windowIndicator: {
+                label: 'mlc-app-playground',
+                tooltip: '',
+                command: ''
             },
-            workspaceConfig: {
-                enableWorkspaceTrust: true,
-                windowIndicator: {
-                    label: 'mlc-app-playground',
-                    tooltip: '',
-                    command: ''
-                },
-                workspaceProvider: {
-                    trusted: true,
-                    async open() {
-                        window.open(window.location.href);
-                        return true;
-                    },
-                    workspace: {
-                        workspaceUri: workspaceFile
-                    }
+            workspaceProvider: {
+                trusted: true,
+                async open() {
+                    window.open(window.location.href);
+                    return true;
                 },
-                configurationDefaults: {
-                    'window.title': 'mlc-app-playground${separator}${dirty}${activeEditorShort}'
-                },
-                productConfiguration: {
-                    nameShort: 'mlc-app-playground',
-                    nameLong: 'mlc-app-playground'
+                workspace: {
+                    workspaceUri: workspaceFileUri
                 }
             },
-            userConfiguration: {
-                json: JSON.stringify({
-                    'workbench.colorTheme': 'Default Dark Modern',
-                    'editor.wordBasedSuggestions': 'off',
-                    'typescript.tsserver.web.projectWideIntellisense.enabled': true,
-                    'typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors': false,
-                    'editor.guides.bracketPairsHorizontal': true,
-                    'oct.serverUrl': 'https://api.open-collab.tools/',
-                    'editor.experimental.asyncTokenization': false
-                })
+            configurationDefaults: {
+                'window.title': 'mlc-app-playground${separator}${dirty}${activeEditorShort}'
             },
+            productConfiguration: {
+                nameShort: 'mlc-app-playground',
+                nameLong: 'mlc-app-playground'
+            }
+        },
+        userConfiguration: {
+            json: JSON.stringify({
+                'workbench.colorTheme': 'Default Dark Modern',
+                'editor.wordBasedSuggestions': 'off',
+                'typescript.tsserver.web.projectWideIntellisense.enabled': true,
+                'typescript.tsserver.web.projectWideIntellisense.suppressSemanticErrors': false,
+                'editor.guides.bracketPairsHorizontal': true,
+                'oct.serverUrl': 'https://api.open-collab.tools/',
+                'editor.experimental.asyncTokenization': false
+            })
         },
         extensions: [{
                 config: {
@@ -103,20 +101,35 @@ export const configure = (htmlContainer) => {
                     }
                 }
             }],
-        editorAppConfig: {
-            monacoWorkerFactory: configureDefaultWorkerFactory
-        }
+        advanced: {
+            enableExtHostWorker: true,
+        },
+        monacoWorkerFactory: configureDefaultWorkerFactory
     };
+    const editorAppConfig = {
+        $type: vscodeApiConfig.$type,
+        id: 'AAP',
+    };
+    const workspaceUri = vscode.Uri.file('/workspace');
     const helloTsUri = vscode.Uri.file('/workspace/hello.ts');
     const testerTsUri = vscode.Uri.file('/workspace/tester.ts');
-    const fileSystemProvider = new RegisteredFileSystemProvider(false);
-    fileSystemProvider.registerFile(new RegisteredMemoryFile(helloTsUri, helloTsCode));
-    fileSystemProvider.registerFile(new RegisteredMemoryFile(testerTsUri, testerTsCode));
-    fileSystemProvider.registerFile(createDefaultWorkspaceFile(workspaceFile, '/workspace'));
+    const fileSystemProvider = new InMemoryFileSystemProvider();
+    const textEncoder = new TextEncoder();
+    const options = {
+        atomic: false,
+        unlock: false,
+        create: true,
+        overwrite: true
+    };
+    await fileSystemProvider.mkdir(workspaceUri);
+    await fileSystemProvider.writeFile(helloTsUri, textEncoder.encode(helloTsCode), options);
+    await fileSystemProvider.writeFile(testerTsUri, textEncoder.encode(testerTsCode), options);
+    await fileSystemProvider.writeFile(workspaceFileUri, textEncoder.encode(createDefaultWorkspaceContent('/workspace')), options);
     registerFileSystemOverlay(1, fileSystemProvider);
     return {
-        wrapperConfig,
-        workspaceFile,
+        vscodeApiConfig,
+        editorAppConfig,
+        workspaceFileUri,
         helloTsUri,
         testerTsUri
     };

package/dist/appPlayground/config.js.map

@@ -1 +1 @@
-{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/appPlayground/config.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,4BAA4B,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,MAAM,iDAAiD,CAAC;AAChJ,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,2BAA2B,MAAM,qDAAqD,CAAC;AAC9F,OAAO,8BAA8B,MAAM,wDAAwD,CAAC;AACpG,OAAO,wBAAwB,MAAM,uDAAuD,CAAC;AAC7F,OAAO,2BAA2B,MAAM,2DAA2D,CAAC;AACpG,OAAO,0BAA0B,MAAM,0DAA0D,CAAC;AAClG,OAAO,0BAA0B,MAAM,oDAAoD,CAAC;AAC5F,OAAO,6BAA6B,MAAM,wDAAwD,CAAC;AACnG,OAAO,6BAA6B,MAAM,uDAAuD,CAAC;AAClG,OAAO,+BAA+B,MAAM,0DAA0D,CAAC;AACvG,OAAO,yBAAyB,MAAM,mDAAmD,CAAC;AAC1F,OAAO,wBAAwB,MAAM,kDAAkD,CAAC;AAExF,uCAAuC;AACvC,OAAO,8DAA8D,CAAC;AACtE,OAAO,yEAAyE,CAAC;AACjF,OAAO,0DAA0D,CAAC;AAElE,OAAO,oDAAoD,CAAC;AAE5D,OAAO,EAAE,gCAAgC,EAAE,MAAM,uCAAuC,CAAC;AACzF,OAAO,EAAE,mCAAmC,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AAC9G,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,0BAA0B,EAAE,MAAM,2BAA2B,CAAC;AACvE,OAAO,WAAW,MAAM,4CAA4C,CAAC;AACrE,OAAO,YAAY,MAAM,6CAA6C,CAAC;AAUvE,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,aAA2B,EAAgB,EAAE;IACnE,MAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;IAErF,MAAM,aAAa,GAAkB;QACjC,KAAK,EAAE,UAAU;QACjB,EAAE,EAAE,KAAK;QACT,QAAQ,EAAE,QAAQ,CAAC,KAAK;QACxB,aAAa;QACb,eAAe,EAAE;YACb,gBAAgB,EAAE;gBACd,GAAG,6BAA6B,EAAE;gBAClC,GAAG,2BAA2B,EAAE;gBAChC,GAAG,8BAA8B,CAAC,gCAAgC,EAAE,CAAC;gBACrE,GAAG,wBAAwB,EAAE;gBAC7B,GAAG,2BAA2B,EAAE;gBAChC,GAAG,0BAA0B,EAAE;gBAC/B,GAAG,0BAA0B,EAAE;gBAC/B,GAAG,6BAA6B,EAAE;gBAClC,GAAG,6BAA6B,EAAE;gBAClC,GAAG,+BAA+B,EAAE;gBACpC,GAAG,yBAAyB,EAAE;gBAC9B,GAAG,wBAAwB,EAAE;aAChC;YACD,mBAAmB,EAAE,IAAI;YACzB,WAAW,EAAE;gBACT,eAAe,EAAE,cAAc;gBAC/B,4BAA4B,EAAE,mCAAmC;gBACjE,aAAa,EAAE,gBAAgB;aAClC;YACD,eAAe,EAAE;gBACb,oBAAoB,EAAE,IAAI;gBAC1B,eAAe,EAAE;oBACb,KAAK,EAAE,oBAAoB;oBAC3B,OAAO,EAAE,EAAE;oBACX,OAAO,EAAE,EAAE;iBACd;gBACD,iBAAiB,EAAE;oBACf,OAAO,EAAE,IAAI;oBACb,KAAK,CAAC,IAAI;wBACN,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;wBAClC,OAAO,IAAI,CAAC;oBAChB,CAAC;oBACD,SAAS,EAAE;wBACP,YAAY,EAAE,aAAa;qBAC9B;iBACJ;gBACD,qBAAqB,EAAE;oBACnB,cAAc,EAAE,4DAA4D;iBAC/E;gBACD,oBAAoB,EAAE;oBAClB,SAAS,EAAE,oBAAoB;oBAC/B,QAAQ,EAAE,oBAAoB;iBACjC;aACJ;YACD,iBAAiB,EAAE;gBACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACjB,sBAAsB,EAAE,qBAAqB;oBAC7C,6BAA6B,EAAE,KAAK;oBACpC,yDAAyD,EAAE,IAAI;oBAC/D,wEAAwE,EAAE,KAAK;oBAC/E,sCAAsC,EAAE,IAAI;oBAC5C,eAAe,EAAE,gCAAgC;oBACjD,uCAAuC,EAAE,KAAK;iBACjD,CAAC;aACL;SACJ;QACD,UAAU,EAAE,CAAC;gBACT,MAAM,EAAE;oBACJ,IAAI,EAAE,oBAAoB;oBAC1B,SAAS,EAAE,SAAS;oBACpB,OAAO,EAAE,OAAO;oBAChB,OAAO,EAAE;wBACL,MAAM,EAAE,GAAG;qBACd;iBACJ;aACJ,CAAC;QACF,eAAe,EAAE;YACb,mBAAmB,EAAE,6BAA6B;SACrD;KACJ,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;IAC5D,MAAM,kBAAkB,GAAG,IAAI,4BAA4B,CAAC,KAAK,CAAC,CAAC;IACnE,kBAAkB,CAAC,YAAY,CAAC,IAAI,oBAAoB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;IACnF,kBAAkB,CAAC,YAAY,CAAC,IAAI,oBAAoB,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC;IACrF,kBAAkB,CAAC,YAAY,CAAC,0BAA0B,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;IACzF,yBAAyB,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;IAEjD,OAAO;QACH,aAAa;QACb,aAAa;QACb,UAAU;QACV,WAAW;KACd,CAAC;AACN,CAAC,CAAC"}
+{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/appPlayground/config.ts"],"names":[],"mappings":"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"}

package/dist/appPlayground/launcher.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
-import { initLocaleLoader } from 'monaco-editor-wrapper/vscode/locale';
+import { initLocaleLoader } from 'monaco-languageclient/vscodeApiLocales';
 await initLocaleLoader();
 const { runApplicationPlayground } = await import('./main.js');
 runApplicationPlayground();

package/dist/appPlayground/launcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../src/appPlayground/launcher.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,MAAM,gBAAgB,EAAE,CAAC;AAEzB,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;AAC/D,wBAAwB,EAAE,CAAC"}
+{"version":3,"file":"launcher.js","sourceRoot":"","sources":["../../src/appPlayground/launcher.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE1E,MAAM,gBAAgB,EAAE,CAAC;AAEzB,MAAM,EAAE,wBAAwB,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;AAC/D,wBAAwB,EAAE,CAAC"}

package/dist/appPlayground/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/appPlayground/main.ts"],"names":[],"mappings":"AAYA,eAAO,MAAM,wBAAwB,qBAKpC,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/appPlayground/main.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,wBAAwB,qBAUpC,CAAC"}

package/dist/appPlayground/main.js

@@ -2,15 +2,16 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
 import { configure } from './config.js';
 import { configurePostStart } from './common.js';
 import { disableElement } from '../common/client/utils.js';
-const wrapper = new MonacoEditorLanguageClientWrapper();
+import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
 export const runApplicationPlayground = async () => {
     disableElement('button-start', true);
-    const configResult = configure(document.body);
-    await wrapper.init(configResult.wrapperConfig);
-    await configurePostStart(wrapper, configResult);
+    const configResult = await configure(document.body);
+    // perform global init
+    const apiWrapper = new MonacoVscodeApiWrapper(configResult.vscodeApiConfig);
+    await apiWrapper.init();
+    await configurePostStart(apiWrapper, configResult);
 };
 //# sourceMappingURL=main.js.map

package/dist/appPlayground/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/appPlayground/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAE3D,MAAM,OAAO,GAAG,IAAI,iCAAiC,EAAE,CAAC;AAExD,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,IAAI,EAAE;IAC/C,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IACrC,MAAM,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;IAC/C,MAAM,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;AACpD,CAAC,CAAC"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/appPlayground/main.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,wCAAwC,CAAC;AAEhF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,IAAI,EAAE;IAC/C,cAAc,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAErC,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEpD,sBAAsB;IACtB,MAAM,UAAU,GAAG,IAAI,sBAAsB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC;IAC5E,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;IAExB,MAAM,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;AACvD,CAAC,CAAC"}

package/dist/appPlayground/reactLauncher.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See LICENSE in the package root for license information.
  * ------------------------------------------------------------------------------------------ */
-import { initLocaleLoader } from 'monaco-editor-wrapper/vscode/locale';
+import { initLocaleLoader } from 'monaco-languageclient/vscodeApiLocales';
 await initLocaleLoader();
 const { runApplicationPlaygroundReact } = await import('./reactMain.js');
 runApplicationPlaygroundReact();

package/dist/appPlayground/reactLauncher.js.map

@@ -1 +1 @@
-{"version":3,"file":"reactLauncher.js","sourceRoot":"","sources":["../../src/appPlayground/reactLauncher.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,gBAAgB,EAAE,MAAM,qCAAqC,CAAC;AACvE,MAAM,gBAAgB,EAAE,CAAC;AAEzB,MAAM,EAAE,6BAA6B,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACzE,6BAA6B,EAAE,CAAC"}
+{"version":3,"file":"reactLauncher.js","sourceRoot":"","sources":["../../src/appPlayground/reactLauncher.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAE1E,MAAM,gBAAgB,EAAE,CAAC;AAEzB,MAAM,EAAE,6BAA6B,EAAE,GAAG,MAAM,MAAM,CAAC,gBAAgB,CAAC,CAAC;AACzE,6BAA6B,EAAE,CAAC"}

package/dist/appPlayground/reactMain.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reactMain.d.ts","sourceRoot":"","sources":["../../src/appPlayground/reactMain.tsx"],"names":[],"mappings":"AAYA,eAAO,MAAM,6BAA6B,qBAmBzC,CAAC"}
+{"version":3,"file":"reactMain.d.ts","sourceRoot":"","sources":["../../src/appPlayground/reactMain.tsx"],"names":[],"mappings":"AAWA,eAAO,MAAM,6BAA6B,qBAoBzC,CAAC"}

package/dist/appPlayground/reactMain.js

@@ -4,17 +4,16 @@
  * ------------------------------------------------------------------------------------------ */
 import React from 'react';
 import ReactDOM from 'react-dom/client';
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
 import { MonacoEditorReactComp } from '@typefox/monaco-editor-react';
 import { configure } from './config.js';
 import { configurePostStart } from './common.js';
 export const runApplicationPlaygroundReact = async () => {
-    const configResult = configure();
+    const configResult = await configure();
     const root = ReactDOM.createRoot(document.getElementById('react-root'));
     const App = () => {
         return (React.createElement("div", { style: { 'backgroundColor': '#1f1f1f' } },
-            React.createElement(MonacoEditorReactComp, { wrapperConfig: configResult.wrapperConfig, onLoad: async (wrapper) => {
-                    await configurePostStart(wrapper, configResult);
+            React.createElement(MonacoEditorReactComp, { vscodeApiConfig: configResult.vscodeApiConfig, editorAppConfig: configResult.editorAppConfig, onVscodeApiInitDone: async (apiWrapper) => {
+                    await configurePostStart(apiWrapper, configResult);
                 }, onError: (e) => {
                     console.error(e);
                 } })));

package/dist/appPlayground/reactMain.js.map

@@ -1 +1 @@
-{"version":3,"file":"reactMain.js","sourceRoot":"","sources":["../../src/appPlayground/reactMain.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,iCAAiC,EAAE,MAAM,uBAAuB,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,IAAI,EAAE;IAEpD,MAAM,YAAY,GAAG,SAAS,EAAE,CAAC;IACjC,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAE,CAAC,CAAC;IACzE,MAAM,GAAG,GAAG,GAAG,EAAE;QACb,OAAO,CACH,6BAAK,KAAK,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE;YACxC,oBAAC,qBAAqB,IAClB,aAAa,EAAE,YAAY,CAAC,aAAa,EACzC,MAAM,EAAE,KAAK,EAAE,OAA0C,EAAE,EAAE;oBACzD,MAAM,kBAAkB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;gBACpD,CAAC,EACD,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,GAAI,CACP,CACT,CAAC;IACN,CAAC,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,oBAAC,GAAG,OAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}
+{"version":3,"file":"reactMain.js","sourceRoot":"","sources":["../../src/appPlayground/reactMain.tsx"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,QAAQ,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEjD,MAAM,CAAC,MAAM,6BAA6B,GAAG,KAAK,IAAI,EAAE;IAEpD,MAAM,YAAY,GAAG,MAAM,SAAS,EAAE,CAAC;IACvC,MAAM,IAAI,GAAG,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,cAAc,CAAC,YAAY,CAAE,CAAC,CAAC;IACzE,MAAM,GAAG,GAAG,GAAG,EAAE;QACb,OAAO,CACH,6BAAK,KAAK,EAAE,EAAE,iBAAiB,EAAE,SAAS,EAAE;YACxC,oBAAC,qBAAqB,IAClB,eAAe,EAAE,YAAY,CAAC,eAAe,EAC7C,eAAe,EAAE,YAAY,CAAC,eAAe,EAC7C,mBAAmB,EAAE,KAAK,EAAE,UAAU,EAAE,EAAE;oBACtC,MAAM,kBAAkB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;gBACvD,CAAC,EACD,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;oBACX,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBACrB,CAAC,GAAI,CACP,CACT,CAAC;IACN,CAAC,CAAC;IACF,IAAI,CAAC,MAAM,CAAC,oBAAC,GAAG,OAAG,CAAC,CAAC;AACzB,CAAC,CAAC"}

package/dist/bare/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/bare/client.ts"],"names":[],"mappings":"AAYA,OAAO,iDAAiD,CAAC;AAKzD,eAAO,MAAM,SAAS,qBAuDrB,CAAC"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/bare/client.ts"],"names":[],"mappings":"AAYA,OAAO,iDAAiD,CAAC;AAIzD,eAAO,MAAM,SAAS,qBAuDrB,CAAC"}

package/dist/bare/client.js

@@ -2,21 +2,21 @@
  * Copyright (c) 2024 TypeFox and others.
  * Licensed under the MIT License. See License.txt in the project root for license information.
  * ------------------------------------------------------------------------------------------ */
+import { LogLevel } from '@codingame/monaco-vscode-api';
 import * as monaco from '@codingame/monaco-vscode-editor-api';
-import { initServices } from 'monaco-languageclient/vscode/services';
 import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override';
 import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-override';
-import { LogLevel } from '@codingame/monaco-vscode-api';
+import { MonacoVscodeApiWrapper } 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 { ConsoleLogger } from 'monaco-languageclient/tools';
-import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
-import { LanguageClientWrapper } from 'monaco-editor-wrapper';
+import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
+import { LanguageClientWrapper } from 'monaco-languageclient/lcwrapper';
 export const runClient = async () => {
-    const logger = new ConsoleLogger(LogLevel.Debug);
     const htmlContainer = document.getElementById('monaco-editor-root');
-    await initServices({
+    const vscodeApiConfig = {
+        $type: 'classic',
+        logLevel: LogLevel.Debug,
         serviceOverrides: {
             ...getTextmateServiceOverride(),
             ...getThemeServiceOverride()
@@ -26,9 +26,10 @@ export const runClient = async () => {
                 'editor.experimental.asyncTokenization': true
             })
         },
-    }, {
-        logger
-    });
+        monacoWorkerFactory: configureDefaultWorkerFactory
+    };
+    const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
+    await apiWrapper.init();
     // register the JSON language with Monaco
     monaco.languages.register({
         id: 'json',
@@ -36,7 +37,6 @@ export const runClient = async () => {
         aliases: ['JSON', 'json'],
         mimetypes: ['application/json']
     });
-    configureDefaultWorkerFactory(logger);
     // create monaco editor
     monaco.editor.create(htmlContainer, {
         value: `{
@@ -58,10 +58,7 @@ export const runClient = async () => {
             }
         }
     };
-    const languageClientWrapper = new LanguageClientWrapper({
-        languageClientConfig,
-        logger
-    });
+    const languageClientWrapper = new LanguageClientWrapper(languageClientConfig, apiWrapper.getLogger());
     await languageClientWrapper.start();
 };
 //# sourceMappingURL=client.js.map

package/dist/bare/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/bare/client.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,0BAA0B,MAAM,oDAAoD,CAAC;AAC5F,OAAO,uBAAuB,MAAM,iDAAiD,CAAC;AACtF,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,wEAAwE;AACxE,uDAAuD;AACvD,OAAO,iDAAiD,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,6BAA6B,EAAE,MAAM,6CAA6C,CAAC;AAC5F,OAAO,EAAE,qBAAqB,EAA6B,MAAM,uBAAuB,CAAC;AAEzF,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;IAChC,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACjD,MAAM,aAAa,GAAG,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE,CAAC;IACrE,MAAM,YAAY,CAAC;QACf,gBAAgB,EAAE;YACd,GAAG,0BAA0B,EAAE;YAC/B,GAAG,uBAAuB,EAAE;SAC/B;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACjB,uCAAuC,EAAE,IAAI;aAChD,CAAC;SACL;KACJ,EAAE;QACC,MAAM;KACT,CAAC,CAAC;IAEH,yCAAyC;IACzC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;QACtB,EAAE,EAAE,MAAM;QACV,UAAU,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;QAC/B,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QACzB,SAAS,EAAE,CAAC,kBAAkB,CAAC;KAClC,CAAC,CAAC;IAEH,6BAA6B,CAAC,MAAM,CAAC,CAAC;IAEtC,uBAAuB;IACvB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE;QAChC,KAAK,EAAE;;;EAGb;QACM,QAAQ,EAAE,MAAM;QAChB,eAAe,EAAE,IAAI;QACrB,oBAAoB,EAAE,KAAK;KAC9B,CAAC,CAAC;IAEH,MAAM,oBAAoB,GAAyB;QAC/C,aAAa,EAAE;YACX,gBAAgB,EAAE,CAAC,MAAM,CAAC;SAC7B;QACD,UAAU,EAAE;YACR,OAAO,EAAE;gBACL,KAAK,EAAE,cAAc;gBACrB,GAAG,EAAE,mCAAmC;aAC3C;SACJ;KACJ,CAAC;IACF,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,CAAC;QACpD,oBAAoB;QACpB,MAAM;KACT,CAAC,CAAC;IAEH,MAAM,qBAAqB,CAAC,KAAK,EAAE,CAAC;AACxC,CAAC,CAAC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/bare/client.ts"],"names":[],"mappings":"AAAA;;;gGAGgG;AAEhG,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,KAAK,MAAM,MAAM,qCAAqC,CAAC;AAC9D,OAAO,0BAA0B,MAAM,oDAAoD,CAAC;AAC5F,OAAO,uBAAuB,MAAM,iDAAiD,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAA8B,MAAM,wCAAwC,CAAC;AAC5G,wEAAwE;AACxE,uDAAuD;AACvD,OAAO,iDAAiD,CAAC;AACzD,OAAO,EAAE,6BAA6B,EAAE,MAAM,qCAAqC,CAAC;AACpF,OAAO,EAAE,qBAAqB,EAA6B,MAAM,iCAAiC,CAAC;AAEnG,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,IAAI,EAAE;IAChC,MAAM,aAAa,GAAG,QAAQ,CAAC,cAAc,CAAC,oBAAoB,CAAE,CAAC;IACrE,MAAM,eAAe,GAA0B;QAC3C,KAAK,EAAE,SAAS;QAChB,QAAQ,EAAE,QAAQ,CAAC,KAAK;QACxB,gBAAgB,EAAE;YACd,GAAG,0BAA0B,EAAE;YAC/B,GAAG,uBAAuB,EAAE;SAC/B;QACD,iBAAiB,EAAE;YACf,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACjB,uCAAuC,EAAE,IAAI;aAChD,CAAC;SACL;QACD,mBAAmB,EAAE,6BAA6B;KACrD,CAAC;IAEF,MAAM,UAAU,GAAG,IAAI,sBAAsB,CAAC,eAAe,CAAC,CAAC;IAC/D,MAAM,UAAU,CAAC,IAAI,EAAE,CAAC;IAExB,yCAAyC;IACzC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC;QACtB,EAAE,EAAE,MAAM;QACV,UAAU,EAAE,CAAC,OAAO,EAAE,QAAQ,CAAC;QAC/B,OAAO,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC;QACzB,SAAS,EAAE,CAAC,kBAAkB,CAAC;KAClC,CAAC,CAAC;IAEH,uBAAuB;IACvB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,EAAE;QAChC,KAAK,EAAE;;;EAGb;QACM,QAAQ,EAAE,MAAM;QAChB,eAAe,EAAE,IAAI;QACrB,oBAAoB,EAAE,KAAK;KAC9B,CAAC,CAAC;IAEH,MAAM,oBAAoB,GAAyB;QAC/C,aAAa,EAAE;YACX,gBAAgB,EAAE,CAAC,MAAM,CAAC;SAC7B;QACD,UAAU,EAAE;YACR,OAAO,EAAE;gBACL,KAAK,EAAE,cAAc;gBACrB,GAAG,EAAE,mCAAmC;aAC3C;SACJ;KACJ,CAAC;IACF,MAAM,qBAAqB,GAAG,IAAI,qBAAqB,CACnD,oBAAoB,EACpB,UAAU,CAAC,SAAS,EAAE,CACzB,CAAC;IACF,MAAM,qBAAqB,CAAC,KAAK,EAAE,CAAC;AACxC,CAAC,CAAC"}

package/dist/browser/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/browser/main.ts"],"names":[],"mappings":"AAOA,OAAO,2DAA2D,CAAC;AACnE,OAAO,iDAAiD,CAAC;AAQzD,eAAO,MAAM,gBAAgB,qBAkJ5B,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/browser/main.ts"],"names":[],"mappings":"AAOA,OAAO,2DAA2D,CAAC;AACnE,OAAO,iDAAiD,CAAC;AASzD,eAAO,MAAM,gBAAgB,qBAmJ5B,CAAC"}

package/dist/browser/main.js

@@ -10,8 +10,9 @@ import { getLanguageService, TextDocument } from 'vscode-json-languageservice';
 import { createConverter as createCodeConverter } from 'vscode-languageclient/lib/common/codeConverter.js';
 import { createConverter as createProtocolConverter } from 'vscode-languageclient/lib/common/protocolConverter.js';
 import { LogLevel } from '@codingame/monaco-vscode-api';
-import { MonacoEditorLanguageClientWrapper } from 'monaco-editor-wrapper';
-import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
+import { EditorApp } from 'monaco-languageclient/editorApp';
+import { configureDefaultWorkerFactory } from 'monaco-languageclient/workerFactory';
+import { MonacoVscodeApiWrapper } from 'monaco-languageclient/vscodeApiWrapper';
 export const runBrowserEditor = async () => {
     const codeConverter = createCodeConverter();
     const protocolConverter = createProtocolConverter(undefined, true, true);
@@ -23,35 +24,35 @@ export const runBrowserEditor = async () => {
     "line_endings": "unix"
 }`;
     const codeUri = '/workspace/model.json';
-    const wrapper = new MonacoEditorLanguageClientWrapper();
-    const jsonClientUserConfig = {
+    const vscodeApiConfig = {
         $type: 'extended',
         htmlContainer,
         logLevel: LogLevel.Debug,
-        vscodeApiConfig: {
-            serviceOverrides: {
-                ...getKeybindingsServiceOverride(),
-            },
-            userConfiguration: {
-                json: JSON.stringify({
-                    'workbench.colorTheme': 'Default Dark Modern',
-                    'editor.guides.bracketPairsHorizontal': 'active',
-                    'editor.lightbulb.enabled': 'On',
-                    'editor.experimental.asyncTokenization': true
-                })
-            }
+        serviceOverrides: {
+            ...getKeybindingsServiceOverride(),
+        },
+        userConfiguration: {
+            json: JSON.stringify({
+                'workbench.colorTheme': 'Default Dark Modern',
+                'editor.guides.bracketPairsHorizontal': 'active',
+                'editor.lightbulb.enabled': 'On',
+                'editor.experimental.asyncTokenization': true
+            })
         },
-        editorAppConfig: {
-            codeResources: {
-                modified: {
-                    text: code,
-                    uri: codeUri
-                }
-            },
-            monacoWorkerFactory: configureDefaultWorkerFactory
+        monacoWorkerFactory: configureDefaultWorkerFactory
+    };
+    const editorAppConfig = {
+        $type: vscodeApiConfig.$type,
+        codeResources: {
+            modified: {
+                text: code,
+                uri: codeUri
+            }
         }
     };
-    await wrapper.init(jsonClientUserConfig);
+    const apiWrapper = new MonacoVscodeApiWrapper(vscodeApiConfig);
+    await apiWrapper.init();
+    const editorApp = new EditorApp(editorAppConfig);
     vscode.workspace.onDidOpenTextDocument((_event) => {
         mainVscodeDocument = _event;
     });
@@ -136,8 +137,8 @@ export const runBrowserEditor = async () => {
     const cleanDiagnostics = () => {
         diagnosticCollection.clear();
     };
-    await wrapper.start();
-    wrapper.getTextModels()?.modified?.onDidChangeContent(() => {
+    await editorApp.start(htmlContainer);
+    editorApp.getTextModels().modified?.onDidChangeContent(() => {
         validate();
     });
 };