Merge pull request #552 from TypeFox/mva-1.83.0

Update to monaco-vscode-api 1.83.2 and monaco-editor 0.44.0

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.6.0         | 1.83.2  | 0.44.0 | Released 2023-10-16 |
 | 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 |
@@ -325,7 +326,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.5 <1.83.0"
+"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0"
 ```
 
 ## Changelogs

package.json

@@ -2,7 +2,7 @@
   "private": true,
   "type": "module",
   "devDependencies": {
-    "@types/vscode": "~1.82.0",
+    "@types/vscode": "~1.83.0",
     "@typescript-eslint/eslint-plugin": "~6.7.4",
     "@typescript-eslint/parser": "~6.7.4",
     "editorconfig": "~2.0.0",
@@ -17,8 +17,8 @@
     "vite": "~4.4.11"
   },
   "volta": {
-    "node": "18.18.0",
-    "npm": "9.8.1"
+    "node": "18.18.1",
+    "npm": "9.9.0"
   },
   "scripts": {
     "clean": "npm run clean --workspaces",

packages/client/CHANGELOG.md

@@ -2,9 +2,13 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [6.6.0] - 2023-10-16
+
+- Updated to `monaco-editor` `0.44.0` and `monaco-vscode-api` `1.83.2`.
+
 ## [6.5.3] - 2023-10-11
 
-- Updated to `monaco-vscode-api` `1.82.5`. Fixes requirung `"skipLibCheck": true` with previous versions of 1.82.
+- Updated to `monaco-vscode-api` `1.82.5`. Fixes requirung `"skipLibCheck": true` with previous versions of 1.82.x.
 
 ## [6.5.2] - 2023-10-07
 

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "6.5.3",
+  "version": "6.6.0",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -37,8 +37,8 @@
     "npm": ">=9.0.0"
   },
   "volta": {
-    "node": "18.18.0",
-    "npm": "9.8.1"
+    "node": "18.18.1",
+    "npm": "9.9.0"
   },
   "files": [
     "lib",
@@ -48,16 +48,16 @@
     "License.txt"
   ],
   "dependencies": {
-    "monaco-editor": "~0.43.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",
+    "monaco-editor": "~0.44.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0",
+    "@codingame/monaco-vscode-editor-service-override": "~1.83.2",
+    "@codingame/monaco-vscode-languages-service-override": "~1.83.2",
+    "@codingame/monaco-vscode-model-service-override": "~1.83.2",
     "vscode-languageclient": "~8.1.0"
   },
   "peerDependencies": {
-    "monaco-editor": "~0.43.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5 <1.83.0"
+    "monaco-editor": "~0.44.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0"
   },
   "peerDependenciesMeta": {
     "monaco-editor": {

packages/examples/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [6.6.0] - 2023-10-16
+
+- Updated to `[email protected]`
+
 ## [6.5.3] - 2023-10-11
 
 - Updated to `[email protected]`

packages/examples/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "6.5.3",
+  "version": "6.6.0",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -43,25 +43,25 @@
     }
   },
   "dependencies": {
-    "@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",
+    "@codingame/monaco-vscode-configuration-service-override": "~1.83.2",
+    "@codingame/monaco-vscode-editor-service-override": "~1.83.2",
+    "@codingame/monaco-vscode-files-service-override": "~1.83.2",
+    "@codingame/monaco-vscode-json-default-extension": "~1.83.2",
+    "@codingame/monaco-vscode-keybindings-service-override": "~1.83.2",
+    "@codingame/monaco-vscode-python-default-extension": "~1.83.2",
+    "@codingame/monaco-vscode-textmate-service-override": "~1.83.2",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.2",
+    "@codingame/monaco-vscode-theme-service-override": "~1.83.2",
     "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",
+    "monaco-editor-workers": "~0.44.0",
+    "monaco-languageclient": "~6.6.0",
     "pyright": "~1.1.330",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "request-light": "~0.7.0",
-    "vscode-json-languageservice": "~5.3.6",
+    "vscode-json-languageservice": "~5.3.7",
     "vscode-languageserver": "~8.1.0",
     "vscode-uri": "~3.0.8",
     "vscode-ws-jsonrpc": "~3.0.0",
@@ -77,8 +77,8 @@
     "vscode-languageserver-types": "~3.17.3"
   },
   "volta": {
-    "node": "18.18.0",
-    "npm": "9.8.1"
+    "node": "18.18.1",
+    "npm": "9.9.0"
   },
   "files": [
     "dist",

packages/examples/src/browser/main.ts

@@ -58,8 +58,8 @@ export const startBrowserEditor = async () => {
             return protocolConverter.asCompletionResult(completionList);
         },
 
-        resolveCompletionItem(item, _token) {
-            return jsonService.doResolve(codeConverter.asCompletionItem(item)).then(result => protocolConverter.asCompletionItem(result));
+        async resolveCompletionItem(item, _token) {
+            return await jsonService.doResolve(codeConverter.asCompletionItem(item)).then(result => protocolConverter.asCompletionItem(result));
         }
     });
 
@@ -80,10 +80,10 @@ export const startBrowserEditor = async () => {
     });
 
     languages.registerHoverProvider(languageId, {
-        provideHover(vscodeDocument, position, _token) {
+        async provideHover(vscodeDocument, position, _token) {
             const document = createDocument(vscodeDocument);
             const jsonDocument = jsonService.parseJSONDocument(document);
-            return jsonService.doHover(document, codeConverter.asPosition(position), jsonDocument).then((hover) => {
+            return await jsonService.doHover(document, codeConverter.asPosition(position), jsonDocument).then((hover) => {
                 return protocolConverter.asHover(hover)!;
             });
         }

packages/verify/pnpm/package.json

@@ -3,9 +3,9 @@
   "version": "0.0.0",
   "private": "true",
   "dependencies": {
-    "monaco-languageclient": "~6.5.3",
-    "monaco-editor": "~0.43.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.82.5 <1.83.0"
+    "monaco-languageclient": "~6.6.0",
+    "monaco-editor": "~0.44.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0"
   },
   "devDependencies": {
     "shx": "~0.3.4"
@@ -15,7 +15,7 @@
     "test:treemending": "monaco-treemending"
   },
   "volta": {
-    "node": "18.18.0",
-    "npm": "9.8.1"
+    "node": "18.18.1",
+    "npm": "9.9.0"
   }
 }

packages/verify/vite/package.json

@@ -4,17 +4,17 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "monaco-editor-workers": "~0.43.0",
-    "monaco-languageclient": "~6.5.3",
-    "monaco-languageclient-examples": "~6.5.3",
+    "monaco-editor-workers": "~0.44.0",
+    "monaco-languageclient": "~6.6.0",
+    "monaco-languageclient-examples": "~6.6.0",
     "vscode-ws-jsonrpc": "~3.0.0"
   },
   "devDependencies": {
     "http-server": "~14.1.1"
   },
   "volta": {
-    "node": "18.18.0",
-    "npm": "9.8.1"
+    "node": "18.18.1",
+    "npm": "9.9.0"
   },
   "scripts": {
     "clean": "shx rm -fr dist",

packages/verify/webpack/package.json

@@ -4,9 +4,9 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "monaco-editor-workers": "~0.43.0",
-    "monaco-languageclient": "~6.5.3",
-    "monaco-languageclient-examples": "~6.5.3",
+    "monaco-editor-workers": "~0.44.0",
+    "monaco-languageclient": "~6.6.0",
+    "monaco-languageclient-examples": "~6.6.0",
     "vscode-ws-jsonrpc": "~3.0.0"
   },
   "devDependencies": {
@@ -18,8 +18,8 @@
     "http-server": "~14.1.1"
   },
   "volta": {
-    "node": "18.18.0",
-    "npm": "9.8.1"
+    "node": "18.18.1",
+    "npm": "9.9.0"
   },
   "scripts": {
     "clean": "shx rm -fr dist *.tsbuildinfo",

packages/verify/yarn/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": "true",
   "dependencies": {
-    "monaco-languageclient": "~6.5.3"
+    "monaco-languageclient": "~6.6.0"
   },
   "devDependencies": {
     "shx": "~0.3.4"
@@ -13,7 +13,7 @@
     "test:treemending": "monaco-treemending"
   },
   "volta": {
-    "node": "18.18.0",
+    "node": "18.18.1",
     "yarn": "1.22.19"
   }
 }

packages/vscode-ws-jsonrpc/package.json

@@ -51,8 +51,8 @@
     "npm": ">=8.0.0"
   },
   "volta": {
-    "node": "18.18.0",
-    "npm": "9.8.1"
+    "node": "18.18.1",
+    "npm": "9.9.0"
   },
   "files": [
     "lib",