Move MonacoLanguageClientWrapper to monaco-languageclient

.github/workflows/main.yml

@@ -9,6 +9,7 @@ on:
   pull_request:
     branches:
       - main
+      - dev
   workflow_dispatch:
 
 jobs:

README.md

@@ -79,7 +79,7 @@ Important Project changes and notes about the project's history are found [here]
 
 These are the current versions of packages from this repository and their alignment with **@codingame/monaco-vscode-api** **monaco-editor** and **vscode**:
 
-- **monaco-languageclient**: `9.6.0` (release date: 2025-05-06)
+- **monaco-languageclient**: `10.0.0-next.0` (release date: 2025-05-xy)
 - **monaco-editor-wrapper**: `6.7.0` (release date: 2025-05-06)
 - **@typefox/monaco-editor-react**: `6.7.0` (release date: 2025-05-06)
 - Aligned with:

docs/versions-and-history.md

@@ -6,6 +6,7 @@ The following table describes which version of **monaco-languageclient** and **@
 
 | monaco-languageclient | monaco-editor-wrapper | monaco-editor-react | monaco-vscode-api / editor-api | vscode | monaco-editor | release date | comment |
 | :---- | :---- | :--- | :--- | :--- | :--- | :--- | :--- |
+| 10.0.0-next.0 | 6.7.0-next.2| 6.7.0-next.2 | 16.1.0 | 1.99.3 | 0.52.2 | 2025-05-05 | |
 | 9.6.0 | 6.7.0 | 6.7.0 | 16.1.1 | 1.99.3 | 0.52.2 | 2025-05-06 | |
 | 9.5.0 | 6.6.0 | 6.6.0 | 15.0.2 | 1.97.2 | 0.52.2 | 2025-03-13 | |
 | 9.4.0 | 6.4.0 | 6.4.0 | 14.0.4 | 1.97.2 | 0.52.2 | 2025-02-18 | |

package.json

@@ -75,8 +75,8 @@
     "test:install": "playwright install --with-deps chromium"
   },
   "workspaces": [
-    "packages/client",
     "packages/vscode-ws-jsonrpc",
+    "packages/client",
     "packages/wrapper",
     "packages/wrapper-react",
     "packages/examples"

packages/client/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [10.0.0-next.0] - 2025-05-xy
+
+- Move MonacoLanguageClientWrapper to monaco-languageclient [#920](https://github.com/TypeFox/monaco-languageclient/pull/920)
+
 ## [9.6.0] - 2025-05-06
 
 - Updated all `@codingame/monaco-vscode` packages to `16.1.1`.

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "9.6.0",
+  "version": "10.0.0-next.0",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -41,8 +41,8 @@
       "default": "./lib/workerFactory.js"
     },
     "./wrapper": {
-      "types": "./lib/languageClientWrapper.test.d.ts",
-      "default": "./lib/languageClientWrapper.test.js"
+      "types": "./lib/languageClientWrapper.d.ts",
+      "default": "./lib/languageClientWrapper.js"
     }
   },
   "typesVersions": {
@@ -94,7 +94,8 @@
     "@codingame/monaco-vscode-log-service-override": "~16.1.1",
     "@codingame/monaco-vscode-model-service-override": "~16.1.1",
     "vscode": "npm:@codingame/monaco-vscode-extension-api@~16.1.1",
-    "vscode-languageclient": "~9.0.1"
+    "vscode-languageclient": "~9.0.1",
+    "vscode-ws-jsonrpc": "~3.4.0"
   },
   "scripts": {
     "clean": "shx rm -fr ./lib *.tsbuildinfo",

packages/wrapper/test/languageClientWrapper.test.ts → packages/client/test/languageClientWrapper.test.ts

@@ -5,7 +5,7 @@
 
 import { beforeAll, describe, expect, test } from 'vitest';
 import { BrowserMessageReader, BrowserMessageWriter } from 'vscode-languageclient/browser.js';
-import { LanguageClientWrapper } from 'monaco-editor-wrapper';
+import { LanguageClientWrapper } from 'monaco-languageclient/wrapper';
 import { initServices } from 'monaco-languageclient/vscode/services';
 import { createDefaultLcUnreachableUrlConfig, createDefaultLcWorkerConfig, createUnreachableWorkerConfig } from './support/helper.js';
 

packages/client/test/support/helper.ts

@@ -0,0 +1,56 @@
+/* --------------------------------------------------------------------------------------------
+ * Copyright (c) 2024 TypeFox and others.
+ * Licensed under the MIT License. See LICENSE in the package root for license information.
+ * ------------------------------------------------------------------------------------------ */
+
+import { MessageTransports } from 'vscode-languageclient';
+import type { LanguageClientConfig } from 'monaco-languageclient/wrapper';
+
+export const createDefaultLcWorkerConfig = (worker: Worker, languageId: string,
+    messageTransports?: MessageTransports): LanguageClientConfig => {
+    return {
+        name: 'test-worker-direct',
+        clientOptions: {
+            documentSelector: [languageId]
+        },
+        connection: {
+            options: {
+                $type: 'WorkerDirect',
+                // create a web worker to pass to the wrapper
+                worker
+            },
+            messageTransports
+        }
+    };
+};
+
+export const createUnreachableWorkerConfig = (): LanguageClientConfig => {
+    return {
+        name: 'test-worker-unreachable',
+        clientOptions: {
+            documentSelector: ['javascript']
+        },
+        connection: {
+            options: {
+                $type: 'WorkerConfig',
+                url: new URL(`${import.meta.url.split('@fs')[0]}/packages/wrapper/test/worker/langium-server.ts`),
+                type: 'module'
+            }
+        }
+    };
+};
+
+export const createDefaultLcUnreachableUrlConfig = (port: number): LanguageClientConfig => {
+    return {
+        name: 'test-ws-unreachable',
+        clientOptions: {
+            documentSelector: ['javascript']
+        },
+        connection: {
+            options: {
+                $type: 'WebSocketUrl',
+                url: `ws://localhost:${port}/rester`
+            },
+        }
+    };
+};

packages/examples/package.json

@@ -118,7 +118,7 @@
     "jszip": "~3.10.1",
     "langium": "~3.5.0",
     "monaco-editor-wrapper": "~6.7.0",
-    "monaco-languageclient": "~9.6.0",
+    "monaco-languageclient": "~10.0.0-next.0",
     "pyright": "~1.1.400",
     "react": "~19.1.0",
     "react-dom": "~19.1.0",

packages/examples/src/bare/client.ts

@@ -13,7 +13,7 @@ import { LogLevel } from '@codingame/monaco-vscode-api';
 import '@codingame/monaco-vscode-json-default-extension';
 import { ConsoleLogger } from 'monaco-languageclient/tools';
 import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
-import { LanguageClientWrapper, type LanguageClientConfig } from 'monaco-editor-wrapper';
+import { LanguageClientWrapper, type LanguageClientConfig } from 'monaco-languageclient/wrapper';
 
 export const runClient = async () => {
     const logger = new ConsoleLogger(LogLevel.Debug);

packages/examples/src/multi/config.ts

@@ -5,7 +5,7 @@
 
 import * as vscode from 'vscode';
 import { MonacoLanguageClient } from 'monaco-languageclient';
-import type { LanguageClientConfig } from 'monaco-editor-wrapper';
+import type { LanguageClientConfig } from 'monaco-languageclient/wrapper';
 
 export const createJsonLanguageClientConfig: () => LanguageClientConfig = () => {
     return {

packages/wrapper-react/test/helper.ts

@@ -5,7 +5,8 @@
 
 import { MessageTransports } from 'vscode-languageclient';
 import { LogLevel } from '@codingame/monaco-vscode-api';
-import type { CodeResources, LanguageClientConfig, WrapperConfig } from 'monaco-editor-wrapper';
+import type { LanguageClientConfig } from 'monaco-languageclient/wrapper';
+import type { CodeResources, WrapperConfig } from 'monaco-editor-wrapper';
 import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
 
 export const createDefaultWrapperConfig = (codeResources: CodeResources, logLevel?: LogLevel): WrapperConfig => {

packages/wrapper/package.json

@@ -91,7 +91,7 @@
     "@codingame/monaco-vscode-theme-service-override": "~16.1.1",
     "@codingame/monaco-vscode-views-service-override": "~16.1.1",
     "@codingame/monaco-vscode-workbench-service-override": "~16.1.1",
-    "monaco-languageclient": "~9.6.0",
+    "monaco-languageclient": "~10.0.0-next.0",
     "vscode": "npm:@codingame/monaco-vscode-extension-api@~16.1.1",
     "vscode-languageclient": "~9.0.1",
     "vscode-languageserver-protocol": "~3.17.5",

packages/wrapper/src/index.ts

@@ -4,5 +4,4 @@
  * ------------------------------------------------------------------------------------------ */
 
 export * from './editorApp.js';
-export * from './languageClientWrapper.js';
 export * from './wrapper.js';

packages/wrapper/src/wrapper.ts

@@ -12,7 +12,7 @@ import { initServices, type VscodeApiConfig } from 'monaco-languageclient/vscode
 import { type Logger, ConsoleLogger } from 'monaco-languageclient/tools';
 import { augmentVscodeApiConfig, checkServiceConsistency, type OverallConfigType } from './vscode/services.js';
 import { type CodeResources, EditorApp, type EditorAppConfig, type TextContents, type TextModels, verifyUrlOrCreateDataUrl } from './editorApp.js';
-import { type LanguageClientConfig, LanguageClientWrapper } from './languageClientWrapper.js';
+import { type LanguageClientConfig, LanguageClientWrapper } from 'monaco-languageclient/wrapper';
 
 export interface ExtensionConfig {
     config: IExtensionManifest;

packages/wrapper/test/support/helper.ts

@@ -4,7 +4,8 @@
  * ------------------------------------------------------------------------------------------ */
 
 import { MessageTransports } from 'vscode-languageclient';
-import type { CodeResources, LanguageClientConfig, WrapperConfig } from 'monaco-editor-wrapper';
+import type { LanguageClientConfig } from 'monaco-languageclient/wrapper';
+import type { CodeResources, WrapperConfig } from 'monaco-editor-wrapper';
 import { configureDefaultWorkerFactory } from 'monaco-editor-wrapper/workers/workerLoaders';
 
 export const createMonacoEditorDiv = () => {
@@ -46,22 +47,6 @@ export const createDefaultLcWorkerConfig = (worker: Worker, languageId: string,
     };
 };
 
-export const createUnreachableWorkerConfig = (): LanguageClientConfig => {
-    return {
-        name: 'test-worker-unreachable',
-        clientOptions: {
-            documentSelector: ['javascript']
-        },
-        connection: {
-            options: {
-                $type: 'WorkerConfig',
-                url: new URL(`${import.meta.url.split('@fs')[0]}/packages/wrapper/test/worker/langium-server.ts`),
-                type: 'module'
-            }
-        }
-    };
-};
-
 export const createDefaultLcUnreachableUrlConfig = (port: number): LanguageClientConfig => {
     return {
         name: 'test-ws-unreachable',

vitest.config.ts

@@ -34,8 +34,8 @@ export const vitestConfig = {
             '**/client/test/tools/index.test.ts',
             '**/client/test/tools/utils.test.ts',
             '**/client/test/vscode/services.test.ts',
+            '**/client/test/languageClientWrapper.test.ts',
             '**/wrapper/test/editorApp.test.ts',
-            '**/wrapper/test/languageClientWrapper.test.ts',
             '**/wrapper/test/utils.test.ts',
             '**/wrapper/test/wrapper.test.ts',
             '**/wrapper/test/vscode/services.test.ts',