Updated to @codingame/[email protected] and all other dependen…

…cies
TypeFox · Jan 19, 2024 · dfd6778 · dfd6778
1 parent 341d107
commit dfd6778
Show file tree

Hide file tree

Showing 13 changed files with 415 additions and 376 deletions.
diff --git a/README.md b/README.md
@@ -86,12 +86,12 @@ With v7 we decided to use readily treemended version of monaco-editor called [@c
 
 ```yaml
   "overrides": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.4 <1.86.0"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.4 <1.86.0"
   }
 ```
 
@@ -301,7 +301,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.85.0 <1.86.0"
+"vscode": "npm:@codingame/monaco-vscode-api@>=1.85.4 <1.86.0"
 ```
 
 ## Monaco-editor / @codingame/monaco-vscode-api compatibility table

diff --git a/docs/versions-and-history.md b/docs/versions-and-history.md
@@ -6,6 +6,7 @@ The following table describes which version of **monaco-languageclient** and **@
 
 | monaco-languageclient | monaco-vscode-api | monaco-editor-treemended | monaco-editor | release date | comment |
 | :----         | :----   | :---   | :--- | :--- | :--- |
+| 7.4.0         | 1.85.4  | 1.85.4 | 0.45.0 | 2024-01-2x | |
 | 7.3.0         | 1.85.0  | 1.85.0 | 0.45.0 | 2024-01-04 | |
 | 7.2.0         | 1.83.16  | 1.83.16 | 0.44.0 | 2023-12-07 | |
 | 7.1.0         | 1.83.12  | 1.83.12 | 0.44.0 | 2023-11-27 | |

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,8 +3,8 @@
   "type": "module",
   "devDependencies": {
     "@types/vscode": "~1.85.0",
-    "@typescript-eslint/eslint-plugin": "~6.17.0",
-    "@typescript-eslint/parser": "~6.17.0",
+    "@typescript-eslint/eslint-plugin": "~6.19.0",
+    "@typescript-eslint/parser": "~6.19.0",
     "editorconfig": "~2.0.0",
     "eslint": "~8.56.0",
     "eslint-config-standard": "~17.1.0",
@@ -14,19 +14,19 @@
     "eslint-plugin-unused-imports": "~3.0.0",
     "shx": "~0.3.4",
     "typescript": "~5.3.3",
-    "vite": "~5.0.10"
+    "vite": "~5.0.12"
   },
   "overrides": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.4 <1.86.0"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.4 <1.86.0"
   },
   "volta": {
-    "node": "20.10.0",
-    "npm": "10.2.3"
+    "node": "20.11.0",
+    "npm": "10.2.4"
   },
   "scripts": {
     "clean": "npm run clean --workspaces",

diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [7.4.0] - 2024-01-2x
+
+- Updated to `@codingame/[email protected]`
+- WIP: Move useful common code from examples to client
+
 ## [7.3.0] - 2024-01-04
 
 - Updated to `@codingame/[email protected]` and `@codingame/[email protected]` / `[email protected]`

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -37,8 +37,8 @@
     "npm": ">=9.0.0"
   },
   "volta": {
-    "node": "20.10.0",
-    "npm": "10.2.3"
+    "node": "20.11.0",
+    "npm": "10.2.4"
   },
   "files": [
     "lib",
@@ -48,16 +48,16 @@
     "License.txt"
   ],
   "dependencies": {
-    "@codingame/monaco-vscode-editor-service-override": "~1.85.0",
-    "@codingame/monaco-vscode-languages-service-override": "~1.85.0",
-    "@codingame/monaco-vscode-model-service-override": "~1.85.0",
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0",
+    "@codingame/monaco-vscode-editor-service-override": "~1.85.4",
+    "@codingame/monaco-vscode-languages-service-override": "~1.85.4",
+    "@codingame/monaco-vscode-model-service-override": "~1.85.4",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.4 <1.86.0",
     "vscode-languageclient": "~9.0.1"
   },
   "peerDependencies": {
     "monaco-editor": "0.45.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.4 <1.86.0"
   },
   "peerDependenciesMeta": {
     "monaco-editor": {
@@ -72,8 +72,8 @@
     "vscode": "$vscode"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.4 <1.86.0"
   },
   "scripts": {
     "clean": "shx rm -fr lib *.tsbuildinfo",

diff --git a/packages/examples/CHANGELOG.md b/packages/examples/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [7.4.0] - 2024-01-2x
+
+- Updated to `[email protected]`
+- WIP: Move useful common code from examples to client
+
 ## [7.3.0] - 2023-01-04
 
 - Updated to `[email protected]`.

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -43,29 +43,29 @@
     }
   },
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~1.85.0",
-    "@codingame/monaco-vscode-editor-service-override": "~1.85.0",
-    "@codingame/monaco-vscode-files-service-override": "~1.85.0",
-    "@codingame/monaco-vscode-json-default-extension": "~1.85.0",
-    "@codingame/monaco-vscode-keybindings-service-override": "~1.85.0",
-    "@codingame/monaco-vscode-python-default-extension": "~1.85.0",
-    "@codingame/monaco-vscode-textmate-service-override": "~1.85.0",
-    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.85.0",
-    "@codingame/monaco-vscode-theme-service-override": "~1.85.0",
-    "@codingame/monaco-vscode-language-pack-de": "~1.85.0",
-    "@codingame/monaco-vscode-language-pack-es": "~1.85.0",
-    "@codingame/monaco-vscode-language-pack-fr": "~1.85.0",
+    "@codingame/monaco-vscode-configuration-service-override": "~1.85.4",
+    "@codingame/monaco-vscode-editor-service-override": "~1.85.4",
+    "@codingame/monaco-vscode-files-service-override": "~1.85.4",
+    "@codingame/monaco-vscode-json-default-extension": "~1.85.4",
+    "@codingame/monaco-vscode-keybindings-service-override": "~1.85.4",
+    "@codingame/monaco-vscode-python-default-extension": "~1.85.4",
+    "@codingame/monaco-vscode-textmate-service-override": "~1.85.4",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.85.4",
+    "@codingame/monaco-vscode-theme-service-override": "~1.85.4",
+    "@codingame/monaco-vscode-language-pack-de": "~1.85.4",
+    "@codingame/monaco-vscode-language-pack-es": "~1.85.4",
+    "@codingame/monaco-vscode-language-pack-fr": "~1.85.4",
     "express": "~4.18.2",
     "langium": "~2.1.0",
     "langium-statemachine-dsl": "~2.1.0",
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
     "monaco-editor-workers": "~0.45.0",
     "monaco-languageclient": "~7.3.0",
-    "pyright": "~1.1.344",
+    "pyright": "~1.1.347",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "request-light": "~0.7.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.4 <1.86.0",
     "vscode-json-languageservice": "~5.3.7",
     "vscode-languageclient": "~9.0.1",
     "vscode-languageserver": "~9.0.1",
@@ -74,9 +74,9 @@
     "ws": "~8.16.0"
   },
   "devDependencies": {
-    "@types/express": "~4.17.18",
-    "@types/node": "~20.10.6",
-    "@types/react": "~18.2.46",
+    "@types/express": "~4.17.21",
+    "@types/node": "~20.11.5",
+    "@types/react": "~18.2.48",
     "@types/react-dom": "~18.2.18",
     "@types/ws": "~8.5.10",
     "ts-node": "~10.9.1",
@@ -87,12 +87,12 @@
     "vscode": "$vscode"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.4 <1.86.0"
   },
   "volta": {
-    "node": "20.10.0",
-    "npm": "10.2.3"
+    "node": "20.11.0",
+    "npm": "10.2.4"
   },
   "files": [
     "dist",

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-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
     "monaco-languageclient": "~7.3.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.0 <1.86.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.85.4 <1.86.0"
   },
   "devDependencies": {
     "shx": "~0.3.4"
@@ -18,7 +18,7 @@
     "clean": "shx rm -fr ./node_modules pnpm-lock.yaml"
   },
   "volta": {
-    "node": "20.10.0",
-    "npm": "10.2.3"
+    "node": "20.11.0",
+    "npm": "10.2.4"
   }
 }
diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
     "monaco-editor-workers": "~0.45.0",
     "monaco-languageclient": "~7.3.0",
     "monaco-languageclient-examples": "~7.3.0",
@@ -17,11 +17,11 @@
     "monaco-editor": "$monaco-editor"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0"
   },
   "volta": {
-    "node": "20.10.0",
-    "npm": "10.2.3"
+    "node": "20.11.0",
+    "npm": "10.2.4"
   },
   "scripts": {
     "clean": "shx rm -fr dist",

diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json
@@ -4,16 +4,16 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
     "monaco-editor-workers": "~0.45.0",
     "monaco-languageclient": "~7.3.0",
     "monaco-languageclient-examples": "~7.3.0",
     "vscode-ws-jsonrpc": "~3.1.0"
   },
   "devDependencies": {
-    "css-loader": "~6.8.1",
-    "source-map-loader": "~4.0.2",
-    "style-loader": "~3.3.3",
+    "css-loader": "~6.9.1",
+    "source-map-loader": "~5.0.0",
+    "style-loader": "~3.3.4",
     "ts-loader": "~9.5.0",
     "webpack-cli": "~5.1.4",
     "http-server": "~14.1.1"
@@ -22,11 +22,11 @@
     "monaco-editor": "$monaco-editor"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0"
   },
   "volta": {
-    "node": "20.10.0",
-    "npm": "10.2.3"
+    "node": "20.11.0",
+    "npm": "10.2.4"
   },
   "scripts": {
     "clean": "shx rm -fr dist *.tsbuildinfo",

diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json
@@ -3,14 +3,14 @@
   "version": "0.0.0",
   "private": "true",
   "dependencies": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0",
     "monaco-languageclient": "~7.3.0"
   },
   "devDependencies": {
     "shx": "~0.3.4"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.0 <1.86.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.85.4 <1.86.0"
   },
   "scripts": {
     "clean": "shx rm -fr ./node_modules yarn.lock",

diff --git a/packages/vscode-ws-jsonrpc/package.json b/packages/vscode-ws-jsonrpc/package.json
@@ -51,8 +51,8 @@
     "npm": ">=8.0.0"
   },
   "volta": {
-    "node": "20.10.0",
-    "npm": "10.2.3"
+    "node": "20.11.0",
+    "npm": "10.2.4"
   },
   "files": [
     "lib",