Fix json server startup. Integrated monaco-vscode-api 1.82.5-next.1

TypeFox · Oct 11, 2023 · d4601a4 · d4601a4
1 parent fe747da
commit d4601a4
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 96 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "6.5.3-next.0",
+  "version": "6.5.3-next.3",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -49,15 +49,15 @@
   ],
   "dependencies": {
     "monaco-editor": "~0.43.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5-next.0 <1.83.0",
-    "@codingame/monaco-vscode-editor-service-override": "~1.82.5-next.0",
-    "@codingame/monaco-vscode-languages-service-override": "~1.82.5-next.0",
-    "@codingame/monaco-vscode-model-service-override": "~1.82.5-next.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5-next.1 <1.83.0",
+    "@codingame/monaco-vscode-editor-service-override": "~1.82.5-next.1",
+    "@codingame/monaco-vscode-languages-service-override": "~1.82.5-next.1",
+    "@codingame/monaco-vscode-model-service-override": "~1.82.5-next.1",
     "vscode-languageclient": "~8.1.0"
   },
   "peerDependencies": {
     "monaco-editor": "~0.43.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5-next.0 <1.83.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5-next.1 <1.83.0"
   },
   "peerDependenciesMeta": {
     "monaco-editor": {

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "6.5.3-next.0",
+  "version": "6.5.3-next.3",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -43,20 +43,20 @@
     }
   },
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~1.82.5-next.0",
-    "@codingame/monaco-vscode-editor-service-override": "~1.82.5-next.0",
-    "@codingame/monaco-vscode-files-service-override": "~1.82.5-next.0",
-    "@codingame/monaco-vscode-json-default-extension": "~1.82.5-next.0",
-    "@codingame/monaco-vscode-keybindings-service-override": "~1.82.5-next.0",
-    "@codingame/monaco-vscode-python-default-extension": "~1.82.5-next.0",
-    "@codingame/monaco-vscode-textmate-service-override": "~1.82.5-next.0",
-    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.82.5-next.0",
-    "@codingame/monaco-vscode-theme-service-override": "~1.82.5-next.0",
+    "@codingame/monaco-vscode-configuration-service-override": "~1.82.5-next.1",
+    "@codingame/monaco-vscode-editor-service-override": "~1.82.5-next.1",
+    "@codingame/monaco-vscode-files-service-override": "~1.82.5-next.1",
+    "@codingame/monaco-vscode-json-default-extension": "~1.82.5-next.1",
+    "@codingame/monaco-vscode-keybindings-service-override": "~1.82.5-next.1",
+    "@codingame/monaco-vscode-python-default-extension": "~1.82.5-next.1",
+    "@codingame/monaco-vscode-textmate-service-override": "~1.82.5-next.1",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.82.5-next.1",
+    "@codingame/monaco-vscode-theme-service-override": "~1.82.5-next.1",
     "express": "~4.18.2",
     "langium": "~2.0.2",
     "langium-statemachine-dsl": "~2.0.0",
     "monaco-editor-workers": "~0.43.0",
-    "monaco-languageclient": "~6.5.3-next.0",
+    "monaco-languageclient": "~6.5.3-next.3",
     "pyright": "~1.1.330",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",

diff --git a/packages/examples/src/common/server-commons.ts b/packages/examples/src/common/server-commons.ts
@@ -17,11 +17,11 @@ import { Message, InitializeRequest, InitializeParams } from 'vscode-languageser
 export const launchLanguageServer = (serverName: string, socket: IWebSocket, baseDir: string, relativeDir: string) => {
     // start the language server as an external process
     const ls = resolve(baseDir, relativeDir);
-    const serverConnection = createServerProcess(serverName, 'node', [ls, '--stdio']);
 
     const reader = new WebSocketMessageReader(socket);
     const writer = new WebSocketMessageWriter(socket);
     const socketConnection = createConnection(reader, writer, () => socket.dispose());
+    const serverConnection = createServerProcess(serverName, 'node', [ls, '--stdio']);
     if (serverConnection) {
         forward(socketConnection, serverConnection, message => {
             if (Message.isRequest(message)) {

diff --git a/packages/examples/src/json/server/json-server.ts b/packages/examples/src/json/server/json-server.ts
@@ -257,6 +257,9 @@ export class JsonServer {
     }
 }
 
-const connection = createConnection(ProposedFeatures.all);
-const ls = new JsonServer(connection);
-ls.start();
+const scriptExec = process.argv[2];
+if (scriptExec === '--stdio') {
+    const connection = createConnection(ProposedFeatures.all);
+    const ls = new JsonServer(connection);
+    ls.start();
+}
diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json
@@ -3,9 +3,9 @@
   "version": "0.0.0",
   "private": "true",
   "dependencies": {
-    "monaco-languageclient": "~6.5.3-next.0",
+    "monaco-languageclient": "~6.5.3-next.3",
     "monaco-editor": "~0.43.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5-next.0 <1.83.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5-next.1 <1.83.0"
   },
   "devDependencies": {
     "shx": "~0.3.4"

diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json
@@ -5,8 +5,8 @@
   "type": "module",
   "dependencies": {
     "monaco-editor-workers": "~0.43.0",
-    "monaco-languageclient": "~6.5.3-next.0",
-    "monaco-languageclient-examples": "~6.5.3-next.0",
+    "monaco-languageclient": "~6.5.3-next.3",
+    "monaco-languageclient-examples": "~6.5.3-next.3",
     "vscode-ws-jsonrpc": "~3.0.0"
   },
   "devDependencies": {