Update to monaco-vscode-api 1.83.15

TypeFox · Dec 5, 2023 · 9895485 · 9895485
1 parent 8ea285b
commit 9895485
Show file tree

Hide file tree

Showing 10 changed files with 325 additions and 337 deletions.
diff --git a/README.md b/README.md
@@ -93,12 +93,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.83.12 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.15-next.0 <1.84.0"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.15-next.0 <1.84.0"
   }
 ```
 
@@ -308,7 +308,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.83.12 <1.84.0"
+"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.15-next.0 <1.84.0"
 ```
 
 ## Monaco-editor / @codingame/monaco-vscode-api compatibility table

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -3,26 +3,26 @@
   "type": "module",
   "devDependencies": {
     "@types/vscode": "~1.83.3",
-    "@typescript-eslint/eslint-plugin": "~6.12.0",
-    "@typescript-eslint/parser": "~6.12.0",
+    "@typescript-eslint/eslint-plugin": "~6.13.2",
+    "@typescript-eslint/parser": "~6.13.2",
     "editorconfig": "~2.0.0",
-    "eslint": "~8.54.0",
+    "eslint": "~8.55.0",
     "eslint-config-standard": "~17.1.0",
     "eslint-plugin-header": "~3.1.1",
     "eslint-plugin-import": "~2.29.0",
     "eslint-plugin-promise": "~6.1.1",
     "eslint-plugin-unused-imports": "~3.0.0",
     "shx": "~0.3.4",
     "typescript": "~5.3.2",
-    "vite": "~5.0.2"
+    "vite": "~5.0.5"
   },
   "overrides": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.15-next.0 <1.84.0"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.15-next.0 <1.84.0"
   },
   "volta": {
     "node": "18.18.2",

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -48,16 +48,16 @@
     "License.txt"
   ],
   "dependencies": {
-    "@codingame/monaco-vscode-editor-service-override": "~1.83.12",
-    "@codingame/monaco-vscode-languages-service-override": "~1.83.12",
-    "@codingame/monaco-vscode-model-service-override": "~1.83.12",
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0",
+    "@codingame/monaco-vscode-editor-service-override": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-languages-service-override": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-model-service-override": "~1.83.15-next.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.15-next.0 <1.84.0",
     "vscode-languageclient": "~9.0.1"
   },
   "peerDependencies": {
     "monaco-editor": "0.44.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.15-next.0 <1.84.0"
   },
   "peerDependenciesMeta": {
     "monaco-editor": {
@@ -72,8 +72,8 @@
     "vscode": "$vscode"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.15-next.0 <1.84.0"
   },
   "scripts": {
     "clean": "shx rm -fr lib *.tsbuildinfo",

diff --git a/packages/client/src/monaco-vscode-api-services.ts b/packages/client/src/monaco-vscode-api-services.ts
@@ -5,7 +5,7 @@
 
 import { editor, Environment } from 'monaco-editor';
 import { ILogService, initialize, IWorkbenchConstructionOptions, StandaloneServices } from 'vscode/services';
-import { initialize as initializeVscodeExtensions } from 'vscode/extensions';
+import 'vscode/localExtensionHost';
 import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
 import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
 import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
@@ -25,11 +25,6 @@ export const wasVscodeApiInitialized = () => {
 };
 
 export const initServices = async (config?: InitializeServiceConfig) => {
-    await initVscodeServices(config);
-    await initVscodeExtensions(config);
-};
-
-export const initVscodeServices = async (config?: InitializeServiceConfig) => {
     if (!wasVscodeApiInitialized()) {
         await importAllServices(config);
         if (config?.debugLogging === true) {
@@ -46,13 +41,6 @@ export const initVscodeServices = async (config?: InitializeServiceConfig) => {
     }
 };
 
-export const initVscodeExtensions = async (config?: InitializeServiceConfig) => {
-    await initializeVscodeExtensions();
-    if (config?.debugLogging === true) {
-        console.log('Initialization of vscode extensions completed successfully.');
-    }
-};
-
 export const useOpenEditorStub: OpenEditor = async (modelRef, options, sideBySide) => {
     console.log('Received open editor call with parameters: ', modelRef, options, sideBySide);
     return undefined;

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -43,29 +43,29 @@
     }
   },
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~1.83.12",
-    "@codingame/monaco-vscode-editor-service-override": "~1.83.12",
-    "@codingame/monaco-vscode-files-service-override": "~1.83.12",
-    "@codingame/monaco-vscode-json-default-extension": "~1.83.12",
-    "@codingame/monaco-vscode-keybindings-service-override": "~1.83.12",
-    "@codingame/monaco-vscode-python-default-extension": "~1.83.12",
-    "@codingame/monaco-vscode-textmate-service-override": "~1.83.12",
-    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.12",
-    "@codingame/monaco-vscode-theme-service-override": "~1.83.12",
-    "@codingame/monaco-vscode-language-pack-de": "~1.83.12",
-    "@codingame/monaco-vscode-language-pack-es": "~1.83.12",
-    "@codingame/monaco-vscode-language-pack-fr": "~1.83.12",
+    "@codingame/monaco-vscode-configuration-service-override": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-editor-service-override": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-files-service-override": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-json-default-extension": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-keybindings-service-override": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-python-default-extension": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-textmate-service-override": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-theme-service-override": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-language-pack-de": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-language-pack-es": "~1.83.15-next.0",
+    "@codingame/monaco-vscode-language-pack-fr": "~1.83.15-next.0",
     "express": "~4.18.2",
     "langium": "~2.1.0",
     "langium-statemachine-dsl": "~2.1.0",
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
     "monaco-languageclient": "~7.1.0",
-    "pyright": "~1.1.333",
+    "pyright": "~1.1.338",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "request-light": "~0.7.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.15-next.0 <1.84.0",
     "vscode-json-languageservice": "~5.3.7",
     "vscode-languageclient": "~9.0.1",
     "vscode-languageserver": "~9.0.1",
@@ -76,9 +76,9 @@
   "devDependencies": {
     "@types/ws": "~8.5.6",
     "@types/express": "~4.17.18",
-    "@types/node": "~18.18.8",
-    "@types/react": "~18.2.33",
-    "@types/react-dom": "~18.2.14",
+    "@types/node": "~18.18.14",
+    "@types/react": "~18.2.42",
+    "@types/react-dom": "~18.2.17",
     "ts-node": "~10.9.1",
     "vscode-languageserver-types": "~3.17.5"
   },
@@ -87,8 +87,8 @@
     "vscode": "$vscode"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.15-next.0 <1.84.0"
   },
   "volta": {
     "node": "18.18.2",

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.83.12 <1.84.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
     "monaco-languageclient": "~7.1.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.15-next.0 <1.84.0"
   },
   "devDependencies": {
     "shx": "~0.3.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.83.12 <1.84.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
     "monaco-languageclient": "~7.1.0",
     "monaco-languageclient-examples": "~7.1.0",
@@ -17,7 +17,7 @@
     "monaco-editor": "$monaco-editor"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0"
   },
   "volta": {
     "node": "18.18.2",

diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
     "monaco-languageclient": "~7.1.0",
     "monaco-languageclient-examples": "~7.1.0",
@@ -22,7 +22,7 @@
     "monaco-editor": "$monaco-editor"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0"
   },
   "volta": {
     "node": "18.18.2",

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.83.12 <1.84.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0",
     "monaco-languageclient": "~7.1.0"
   },
   "devDependencies": {
     "shx": "~0.3.4"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.15-next.0 <1.84.0"
   },
   "scripts": {
     "clean": "shx rm -fr ./node_modules yarn.lock",