Use monaco-editor-treemended with overrides/resoultions for regular m…

…onaco-editor

package.json

@@ -16,6 +16,9 @@
     "typescript": "~5.2.2",
     "vite": "~4.4.11"
   },
+  "overrides": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0"
+  },
   "volta": {
     "node": "18.18.1",
     "npm": "9.9.0"

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "6.6.1",
+  "version": "6.6.2-next.1",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -51,12 +51,12 @@
     "@codingame/monaco-vscode-editor-service-override": "~1.83.3",
     "@codingame/monaco-vscode-languages-service-override": "~1.83.3",
     "@codingame/monaco-vscode-model-service-override": "~1.83.3",
-    "monaco-editor": "~0.44.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0",
     "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0",
     "vscode-languageclient": "~8.1.0"
   },
   "peerDependencies": {
-    "monaco-editor": "~0.44.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0",
     "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0"
   },
   "peerDependenciesMeta": {
@@ -67,8 +67,13 @@
       "optional": false
     }
   },
+  "overrides": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0"
+  },
+  "resolutions": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0"
+  },
   "scripts": {
-    "postinstall": "monaco-treemending",
     "clean": "shx rm -fr lib *.tsbuildinfo",
     "compile": "tsc --build tsconfig.src.json",
     "build:msg": "echo Building monaco-languageclient:",

packages/examples/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "6.6.1",
+  "version": "6.6.2-next.1",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -58,8 +58,9 @@
     "express": "~4.18.2",
     "langium": "~2.0.2",
     "langium-statemachine-dsl": "~2.0.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
-    "monaco-languageclient": "~6.6.1",
+    "monaco-languageclient": "~6.6.2-next.1",
     "pyright": "~1.1.330",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
@@ -80,6 +81,12 @@
     "ts-node": "~10.9.1",
     "vscode-languageserver-types": "~3.17.3"
   },
+  "overrides": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0"
+  },
+  "resolutions": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0"
+  },
   "volta": {
     "node": "18.18.1",
     "npm": "9.9.0"

packages/verify/pnpm/package.json

@@ -3,16 +3,18 @@
   "version": "0.0.0",
   "private": "true",
   "dependencies": {
-    "monaco-languageclient": "~6.6.1",
-    "monaco-editor": "~0.44.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0",
+    "monaco-languageclient": "~6.6.2-next.1",
     "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0"
   },
   "devDependencies": {
     "shx": "~0.3.4"
   },
+  "overrides": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0"
+  },
   "scripts": {
-    "clean": "shx rm -fr ./node_modules pnpm-lock.yaml",
-    "test:treemending": "monaco-treemending"
+    "clean": "shx rm -fr ./node_modules pnpm-lock.yaml"
   },
   "volta": {
     "node": "18.18.1",

packages/verify/vite/package.json

@@ -4,14 +4,21 @@
   "private": true,
   "type": "module",
   "dependencies": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
-    "monaco-languageclient": "~6.6.1",
-    "monaco-languageclient-examples": "~6.6.1",
+    "monaco-languageclient": "~6.6.2-next.1",
+    "monaco-languageclient-examples": "~6.6.2-next.1",
     "vscode-ws-jsonrpc": "~3.0.0"
   },
   "devDependencies": {
     "http-server": "~14.1.1"
   },
+  "overrides": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0"
+  },
+  "resolutions": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0"
+  },
   "volta": {
     "node": "18.18.1",
     "npm": "9.9.0"

packages/verify/webpack/package.json

@@ -4,9 +4,10 @@
   "private": true,
   "type": "module",
   "dependencies": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
-    "monaco-languageclient": "~6.6.1",
-    "monaco-languageclient-examples": "~6.6.1",
+    "monaco-languageclient": "~6.6.2-next.1",
+    "monaco-languageclient-examples": "~6.6.2-next.1",
     "vscode-ws-jsonrpc": "~3.0.0"
   },
   "devDependencies": {
@@ -17,6 +18,12 @@
     "webpack-cli": "~5.1.4",
     "http-server": "~14.1.1"
   },
+  "overrides": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0"
+  },
+  "resolutions": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0"
+  },
   "volta": {
     "node": "18.18.1",
     "npm": "9.9.0"

packages/verify/yarn/package.json

@@ -3,11 +3,15 @@
   "version": "0.0.0",
   "private": "true",
   "dependencies": {
-    "monaco-languageclient": "~6.6.1"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0",
+    "monaco-languageclient": "~6.6.2-next.1"
   },
   "devDependencies": {
     "shx": "~0.3.4"
   },
+  "resolutions": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0"
+  },
   "scripts": {
     "clean": "shx rm -fr ./node_modules yarn.lock",
     "test:treemending": "monaco-treemending"