WIP: Update to monaco-vscode-api 1.79.2 / monaco-editor 0.39.0

README.md

@@ -78,6 +78,7 @@ The following table describes which version of **monaco-languageclient** and **m
 
 | monaco-languageclient | monaco-vscode-api | monaco-editor | comment |
 | :----         | :----   | :---   | :--- |
+| 6.1.1         | 1.79.2  | 0.39.0 | Released 2023-06-1x |
 | 6.1.0         | 1.79.1  | 0.38.0 | Released 2023-06-12 |
 | 6.0.3         | 1.78.8  | 0.37.1 | Released 2023-05-31 |
 | 6.0.2         | 1.78.6  | 0.37.1 | Released 2023-05-24 |

packages/client/CHANGELOG.md

@@ -2,7 +2,11 @@
 
 All notable changes to this npm module are documented in this file.
 
-## [6.1.0] - 2023-06-0x
+## [6.1.1] - 2023-06-12
+
+- Updated to `monaco-vscode-api` version `1.79.2` and `monaco-editor` version `0.39.0`
+
+## [6.1.0] - 2023-06-12
 
 - Updated to `monaco-vscode-api` version `1.79.0` and `monaco-editor` version `0.38.0` [#493](https://github.com/TypeFox/monaco-languageclient/issues/493)
 - Updated to `monaco-vscode-api` version `1.79.1` [#501](https://github.com/TypeFox/monaco-languageclient/pull/501)

packages/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -48,14 +48,14 @@
     "License.txt"
   ],
   "dependencies": {
-    "monaco-editor": "~0.38.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@~1.79.1",
+    "monaco-editor": "~0.39.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2",
     "vscode-jsonrpc": "~8.1.0",
     "vscode-languageclient": "~8.1.0"
   },
   "peerDependencies": {
-    "monaco-editor": "~0.38.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@~1.79.1"
+    "monaco-editor": "~0.39.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2"
   },
   "peerDependenciesMeta": {
     "monaco-editor": {

packages/client/src/monaco-vscode-api-services.ts

@@ -7,6 +7,7 @@ import { editor, Environment, Uri } from 'monaco-editor/esm/vs/editor/editor.api
 import { initialize as initializeMonacoService } from 'vscode/services';
 import { initialize as initializeVscodeExtensions } from 'vscode/extensions';
 import type { OpenEditor } from 'vscode/service-override/editor';
+import { ITerminalBackend } from 'vscode/service-override/terminal';
 
 interface MonacoEnvironmentEnhanced extends Environment {
     vscodeApiInitialised: boolean;
@@ -34,6 +35,12 @@ export type InitializeServiceConfig = {
     enablePreferencesService?: boolean;
     enableSnippetsService?: boolean;
     enableQuickaccessService?: boolean;
+    enableOutputService?: boolean;
+    configureTerminalServiceConfig?: {
+        backendImpl: ITerminalBackend
+    }
+    enableSearchService?: boolean;
+    enableMarkersService?: boolean;
     userServices?: editor.IEditorOverrideServices;
     debugLogging?: boolean;
 };
@@ -53,7 +60,11 @@ export const initServices = async (config?: InitializeServiceConfig) => {
     }
 
     if (!window.MonacoEnvironment) {
-        window.MonacoEnvironment = {};
+        window.MonacoEnvironment = {
+            createTrustedTypesPolicy: (_policyName: string) => {
+                return undefined;
+            }
+        };
     }
     (window.MonacoEnvironment as MonacoEnvironmentEnhanced).vscodeApiInitialised = true;
 };
@@ -86,9 +97,6 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
             addService('editor', import('vscode/service-override/editor'));
         }
     }
-    if (lc.enableQuickaccessService === true) {
-        addService('quickaccess', import('vscode/service-override/quickaccess'));
-    }
     if (lc.configureConfigurationServiceConfig !== undefined) {
         addService('configuration', import('vscode/service-override/configuration'));
     }
@@ -122,6 +130,21 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
     if (lc.enableSnippetsService === true) {
         addService('snippets', import('vscode/service-override/snippets'));
     }
+    if (lc.enableQuickaccessService === true) {
+        addService('quickaccess', import('vscode/service-override/quickaccess'));
+    }
+    if (lc.enableOutputService === true) {
+        addService('output', import('vscode/service-override/output'));
+    }
+    if (lc.configureTerminalServiceConfig !== undefined) {
+        addService('terminal', import('vscode/service-override/terminal'));
+    }
+    if (lc.enableSearchService === true) {
+        addService('search', import('vscode/service-override/search'));
+    }
+    if (lc.enableMarkersService === true) {
+        addService('markers', import('vscode/service-override/markers'));
+    }
 
     const reportServiceLoading = (origin: string, services: editor.IEditorOverrideServices, debugLogging: boolean) => {
         for (const serviceName of Object.keys(services)) {
@@ -180,8 +203,14 @@ const importAllServices = async (config?: InitializeServiceConfig) => {
                 services = loadedImport.default(lc.configureEditorOrViewsServiceConfig.openEditorFunc);
             }
         } else if (serviceName === 'configuration') {
-            const uri = Uri.file(lc.configureConfigurationServiceConfig!.defaultWorkspaceUri);
-            services = loadedImport.default(uri);
+            if (lc.configureConfigurationServiceConfig.defaultWorkspaceUri) {
+                const uri = Uri.file(lc.configureConfigurationServiceConfig!.defaultWorkspaceUri);
+                services = loadedImport.default(uri);
+            }
+        } else if (serviceName === 'terminal') {
+            if (lc.configureTerminalServiceConfig?.backendImpl) {
+                services = loadedImport.default(lc.configureTerminalServiceConfig.backendImpl);
+            }
         } else {
             services = loadedImport.default();
         }

packages/examples/main/package.json

@@ -23,7 +23,7 @@
     "langium": "~1.2.0",
     "langium-statemachine-dsl": "~1.2.0",
     "monaco-editor-workers": "0.38.0",
-    "monaco-languageclient": "6.1.0",
+    "monaco-languageclient": "6.1.1",
     "normalize-url": "~8.0.0",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",

packages/examples/main/src/langium/main.ts

@@ -144,6 +144,9 @@ try {
         enablePreferencesService: true,
         enableSnippetsService: true,
         enableQuickaccessService: true,
+        enableOutputService: false,
+        enableSearchService: false,
+        enableMarkersService: false,
         userServices: {
             // manually add the files service
             ...getFileServiceOverride()

packages/verify/pnpm/package.json

@@ -3,9 +3,9 @@
   "version": "0.0.0",
   "private": "true",
   "dependencies": {
-    "monaco-languageclient": "6.1.0",
-    "monaco-editor": "~0.38.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@~1.79.1"
+    "monaco-languageclient": "6.1.1",
+    "monaco-editor": "~0.39.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@~1.79.2"
   },
   "devDependencies": {
     "shx": "~0.3.4"

packages/verify/vite/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "dependencies": {
     "monaco-editor-workers": "0.38.0",
-    "monaco-languageclient": "6.1.0",
+    "monaco-languageclient": "6.1.1",
     "vscode-ws-jsonrpc": "3.0.0",
     "normalize-url": "~8.0.0"
   },

packages/verify/webpack/package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "dependencies": {
     "monaco-editor-workers": "0.38.0",
-    "monaco-languageclient": "6.1.0",
+    "monaco-languageclient": "6.1.1",
     "vscode-ws-jsonrpc": "3.0.0",
     "normalize-url": "~8.0.0"
   },

packages/verify/yarn/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": "true",
   "dependencies": {
-    "monaco-languageclient": "6.1.0"
+    "monaco-languageclient": "6.1.1"
   },
   "devDependencies": {
     "shx": "~0.3.4"