Use monaco-editor-treemended with overrides for regular monaco-editor

TypeFox · Oct 23, 2023 · 1868d62 · 1868d62
1 parent 993d486
commit 1868d62
Show file tree

Hide file tree

Showing 8 changed files with 652 additions and 1,451 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,10 +12,14 @@
     "eslint-plugin-import": "~2.28.1",
     "eslint-plugin-promise": "~6.1.1",
     "eslint-plugin-unused-imports": "~3.0.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.3 <1.84.0",
     "shx": "~0.3.4",
     "typescript": "~5.2.2",
     "vite": "~4.4.11"
   },
+  "overrides": {
+    "monaco-editor": "$monaco-editor"
+  },
   "volta": {
     "node": "18.18.1",
     "npm": "9.9.0"

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "6.6.1",
+  "version": "6.6.2-next.0",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -51,12 +51,15 @@
     "@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"
   },
+  "overrides": {
+    "monaco-editor": "$monaco-editor"
+  },
   "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": {
@@ -68,7 +71,6 @@
     }
   },
   "scripts": {
-    "postinstall": "monaco-treemending",
     "clean": "shx rm -fr lib *.tsbuildinfo",
     "compile": "tsc --build tsconfig.src.json",
     "build:msg": "echo Building monaco-languageclient:",

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "6.6.1",
+  "version": "6.6.2-next.0",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -58,6 +58,7 @@
     "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",
     "pyright": "~1.1.330",
@@ -80,6 +81,9 @@
     "ts-node": "~10.9.1",
     "vscode-languageserver-types": "~3.17.3"
   },
+  "overrides": {
+    "monaco-editor": "$monaco-editor"
+  },
   "volta": {
     "node": "18.18.1",
     "npm": "9.9.0"

diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json
@@ -3,8 +3,8 @@
   "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.0",
     "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0"
   },
   "devDependencies": {

diff --git a/packages/verify/vite/package.json b/packages/verify/vite/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.0",
+    "monaco-languageclient-examples": "~6.6.2-next.0",
     "vscode-ws-jsonrpc": "~3.0.0"
   },
   "devDependencies": {

diff --git a/packages/verify/webpack/package.json b/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.0",
+    "monaco-languageclient-examples": "~6.6.2-next.0",
     "vscode-ws-jsonrpc": "~3.0.0"
   },
   "devDependencies": {

diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json
@@ -3,7 +3,8 @@
   "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.0"
   },
   "devDependencies": {
     "shx": "~0.3.4"