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

…onaco-editor - Reference local monaco-editor dependency in overrides - Update all dependencies
TypeFox · Oct 31, 2023 · a912bc3 · a912bc3
1 parent f2f9f95
commit a912bc3
Show file tree

Hide file tree

Showing 6 changed files with 594 additions and 450 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,7 +1,6 @@
 {
     "editor.guides.bracketPairs": true,
     "editor.formatOnSave": false,
-    "workbench.editor.revealIfOpen": true,
     "[javascript]": {
       "editor.formatOnSave": true
     },
@@ -25,6 +24,5 @@
     ],
     "[json]": {
       "editor.defaultFormatter": "vscode.json-language-features"
-    },
-    "typescript.tsdk": "node_modules\\typescript\\lib"
+    }
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,20 +20,30 @@
     "@types/node": "~18.18.5",
     "@types/shelljs": "~0.8.13",
     "@types/vscode": "~1.83.0",
-    "@typescript-eslint/eslint-plugin": "~6.8.0",
-    "@typescript-eslint/parser": "~6.8.0",
+    "@typescript-eslint/eslint-plugin": "~6.9.1",
+    "@typescript-eslint/parser": "~6.9.1s",
     "@vitest/browser": "~0.34.6",
     "editorconfig": "~2.0.0",
-    "eslint": "~8.51.0",
+    "eslint": "~8.52.0",
     "shelljs": "~0.8.5",
     "shx": "~0.3.4",
     "typescript": "~5.2.2",
-    "vite": "~4.4.11",
+    "vite": "~4.5.0",
     "vitest": "~0.34.6",
-    "webdriverio": "~8.18.2"
+    "webdriverio": "~8.20.4"
+  },
+  "overrides": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0",
+    "vscode-languageserver": "~9.0.1"
+  },
+  "resolutions": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0",
+    "vscode-languageserver": "~9.0.1"
   },
   "volta": {
-    "node": "18.18.1",
+    "node": "18.18.2",
     "npm": "9.9.0"
   },
   "workspaces": [

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,38 +1,49 @@
 {
   "name": "monaco-editor-wrapper-examples",
   "private": true,
-  "version": "3.3.0",
+  "version": "3.3.1-next.0",
   "type": "module",
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~1.83.2",
-    "@codingame/monaco-vscode-editor-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",
-    "@typefox/monaco-editor-react": "~2.3.0",
+    "@codingame/monaco-vscode-configuration-service-override": "~1.83.5",
+    "@codingame/monaco-vscode-editor-service-override": "~1.83.5",
+    "@codingame/monaco-vscode-json-default-extension": "~1.83.5",
+    "@codingame/monaco-vscode-keybindings-service-override": "~1.83.5",
+    "@codingame/monaco-vscode-python-default-extension": "~1.83.5",
+    "@typefox/monaco-editor-react": "~2.3.1-next.0",
     "http-server": "~14.1.1",
     "langium": "~2.0.2",
     "langium-statemachine-dsl": "~2.0.0",
-    "monaco-editor": "~0.44.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
-    "monaco-editor-wrapper": "~3.3.0",
-    "monaco-languageclient-examples": "~6.6.0",
+    "monaco-editor-wrapper": "~3.3.1-next.0",
+    "monaco-languageclient": "~7.0.0-next.1",
+    "monaco-languageclient-examples": "~7.0.0-next.1",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "request-light": "~0.7.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0",
     "vscode-uri": "~3.0.8",
-    "vscode-languageclient": "~8.1.0",
-    "vscode-languageserver": "~8.1.0",
+    "vscode-languageclient": "~9.0.1",
+    "vscode-languageserver": "~9.0.1",
     "vscode-json-languageservice": "~5.3.7"
   },
   "devDependencies": {
     "@types/react": "~18.2.28",
     "@types/react-dom": "~18.2.13",
     "ts-node": "~10.9.1"
   },
+  "overrides": {
+    "monaco-editor": "$monaco-editor",
+    "vscode": "$vscode",
+    "vscode-languageserver": "$vscode-languageserver"
+  },
+  "resolutions": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0",
+    "vscode-languageserver": "~9.0.1"
+  },
   "volta": {
-    "node": "18.18.1",
+    "node": "18.18.2",
     "npm": "9.9.0"
   },
   "scripts": {

diff --git a/packages/monaco-editor-react/package.json b/packages/monaco-editor-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typefox/monaco-editor-react",
-  "version": "2.3.0",
+  "version": "2.3.1-next.0",
   "license": "MIT",
   "description": "React component for Monaco-Editor and Monaco Languageclient",
   "keywords": [
@@ -46,18 +46,29 @@
     "build": "npm run clean && npm run compile && npm run build:bundle"
   },
   "volta": {
-    "node": "18.18.1",
+    "node": "18.18.2",
     "npm": "9.9.0"
   },
-  "peerDependencies": {
-    "monaco-editor": "~0.44.0",
-    "monaco-editor-wrapper": "~3.3.0",
+  "dependencies": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
+    "monaco-editor-wrapper": "~3.3.1-next.0",
     "react": "~18.2.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
+  },
+  "peerDependencies": {
+    "monaco-editor-wrapper": "~3.3.1-next.0"
   },
   "devDependencies": {
     "@types/react": "~18.2.23"
   },
+  "overrides": {
+    "monaco-editor": "$monaco-editor",
+    "vscode": "$vscode"
+  },
+  "resolutions": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/TypeFox/monaco-components.git",

diff --git a/packages/monaco-editor-wrapper/package.json b/packages/monaco-editor-wrapper/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-editor-wrapper",
-  "version": "3.3.0",
+  "version": "3.3.1-next.0",
   "license": "MIT",
   "description": "Monaco-Editor and Monaco Languageclient Wrapper",
   "keywords": [
@@ -54,26 +54,34 @@
     "build": "npm run clean && npm run compile && npm run bundle"
   },
   "volta": {
-    "node": "18.18.1",
+    "node": "18.18.2",
     "npm": "9.9.0"
   },
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~1.83.2",
-    "@codingame/monaco-vscode-editor-service-override": "~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",
-    "monaco-editor": "~0.44.0",
-    "monaco-languageclient": "~6.6.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0",
-    "vscode-languageclient": "~8.1.0",
-    "vscode-languageserver-protocol":"~3.17.3",
+    "@codingame/monaco-vscode-configuration-service-override": "~1.83.5",
+    "@codingame/monaco-vscode-editor-service-override": "~1.83.5",
+    "@codingame/monaco-vscode-textmate-service-override": "~1.83.5",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.5",
+    "@codingame/monaco-vscode-theme-service-override": "~1.83.5",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
+    "monaco-languageclient": "~7.0.0-next.1",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0",
+    "vscode-languageclient": "~9.0.1",
+    "vscode-languageserver-protocol":"~3.17.5",
     "vscode-ws-jsonrpc": "~3.0.0"
   },
   "peerDependencies": {
-    "monaco-languageclient": "~6.6.0",
+    "monaco-languageclient": "~7.0.0-next.1",
     "vscode-ws-jsonrpc": "~3.0.0"
   },
+  "overrides": {
+    "monaco-editor": "$monaco-editor",
+    "vscode": "$vscode"
+  },
+  "resolutions": {
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.5 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.5 <1.84.0"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/TypeFox/monaco-components.git",