Merge pull request #549 from TypeFox/mva-1.82.5

Update to monaco-vscode-api 1.82.5

Author: kaisalmen

.gitpod.yml

@@ -1,5 +1,6 @@
 ports:
-  - port: 3000
+  - port: 30000
+  - port: 30001
   - port: 8080
 tasks:
   - before: bash scripts/auth.sh

README.md

@@ -94,6 +94,7 @@ The following table describes which version of **monaco-languageclient** and **@
 
 | monaco-languageclient | @codingame/monaco-vscode-api | monaco-editor | comment |
 | :----         | :----   | :---   | :--- |
+| 6.5.3         | 1.82.5  | 0.43.0 | Released 2023-10-11 |
 | 6.5.2         | 1.82.4  | 0.43.0 | Released 2023-10-07 |
 | 6.5.1         | 1.82.3  | 0.43.0 | Released 2023-10-04 |
 | 6.5.0         | 1.82.2  | 0.43.0 | Released 2023-09-29 |
@@ -324,7 +325,7 @@ loader.config({ monaco });
 If you use pnpm, you have to add `vscode` / `@codingame/monaco-vscode-api` as direct dependency (see the [following table](#monaco-editor--codingamemonaco-vscode-api-compatibility-table)), otherwise the installation will fail.
 
 ```json
-"vscode": "npm:@codingame/monaco-vscode-api@>=1.82.4 <1.83.0"
+"vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5 <1.83.0"
 ```
 
 ## Changelogs

package-lock.json

@@ -2,6 +2,10 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [6.5.3] - 2023-10-11
+
+- Updated to `monaco-vscode-api` `1.82.5`. Fixes requirung `"skipLibCheck": true` with previous versions of 1.82.
+
 ## [6.5.2] - 2023-10-07
 
 - Updated to `monaco-vscode-api` `1.82.4`

packages/client/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "6.5.2",
+  "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.4 <1.83.0",
-    "@codingame/monaco-vscode-languages-service-override": "~1.82.4",
-    "@codingame/monaco-vscode-model-service-override": "~1.82.4",
-    "vscode-jsonrpc": "~8.1.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5 <1.83.0",
+    "@codingame/monaco-vscode-editor-service-override": "~1.82.5",
+    "@codingame/monaco-vscode-languages-service-override": "~1.82.5",
+    "@codingame/monaco-vscode-model-service-override": "~1.82.5",
     "vscode-languageclient": "~8.1.0"
   },
   "peerDependencies": {
     "monaco-editor": "~0.43.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.4 <1.83.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5 <1.83.0"
   },
   "peerDependenciesMeta": {
     "monaco-editor": {

packages/client/package.json

@@ -3,8 +3,7 @@
   "compilerOptions": {
     "rootDir": "src",
     "outDir": "lib",
-    "declarationDir": "lib",
-    "skipLibCheck": true
+    "declarationDir": "lib"
   },
   "references": [{
     "path": "../vscode-ws-jsonrpc/tsconfig.src.json"

packages/client/tsconfig.src.json

@@ -2,6 +2,11 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [6.5.3] - 2023-10-11
+
+- Updated to `[email protected]`
+- Unify python and json language server. Extract common function.
+
 ## [6.5.2] - 2023-10-07
 
 - Updated to `[email protected]`

packages/examples/CHANGELOG.md

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "6.5.2",
+  "version": "6.5.3-next.3",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -43,19 +43,20 @@
     }
   },
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~1.82.4",
-    "@codingame/monaco-vscode-editor-service-override": "~1.82.4",
-    "@codingame/monaco-vscode-json-default-extension": "~1.82.4",
-    "@codingame/monaco-vscode-keybindings-service-override": "~1.82.4",
-    "@codingame/monaco-vscode-python-default-extension": "~1.82.4",
-    "@codingame/monaco-vscode-textmate-service-override": "~1.82.4",
-    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.82.4",
-    "@codingame/monaco-vscode-theme-service-override": "~1.82.4",
+    "@codingame/monaco-vscode-configuration-service-override": "~1.82.5",
+    "@codingame/monaco-vscode-editor-service-override": "~1.82.5",
+    "@codingame/monaco-vscode-files-service-override": "~1.82.5",
+    "@codingame/monaco-vscode-json-default-extension": "~1.82.5",
+    "@codingame/monaco-vscode-keybindings-service-override": "~1.82.5",
+    "@codingame/monaco-vscode-python-default-extension": "~1.82.5",
+    "@codingame/monaco-vscode-textmate-service-override": "~1.82.5",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.82.5",
+    "@codingame/monaco-vscode-theme-service-override": "~1.82.5",
     "express": "~4.18.2",
     "langium": "~2.0.2",
     "langium-statemachine-dsl": "~2.0.0",
     "monaco-editor-workers": "~0.43.0",
-    "monaco-languageclient": "~6.5.2",
+    "monaco-languageclient": "~6.5.3-next.3",
     "pyright": "~1.1.330",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
@@ -69,6 +70,7 @@
   "devDependencies": {
     "@types/ws": "~8.5.6",
     "@types/express": "~4.17.18",
+    "@types/node": "~18.18.3",
     "@types/react": "~18.2.24",
     "@types/react-dom": "~18.2.9",
     "ts-node": "~10.9.1",

packages/examples/package.json

@@ -6,7 +6,7 @@ import { languages, workspace, TextDocument as VsCodeTextDocument } from 'vscode
 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 { createDefaultJsonContent, createJsonEditor, performInit } from '../common.js';
+import { createDefaultJsonContent, createJsonEditor, performInit } from '../common/client-commons.js';
 import '@codingame/monaco-vscode-theme-defaults-default-extension';
 import '@codingame/monaco-vscode-json-default-extension';
 import { buildWorkerDefinition } from 'monaco-editor-workers';