Updated to [email protected]. Align with changes

TypeFox · Nov 23, 2023 · 8e767d7 · 8e767d7
1 parent d3cdabf
commit 8e767d7
Show file tree

Hide file tree

Showing 15 changed files with 651 additions and 363 deletions.
diff --git a/README.md b/README.md
@@ -91,12 +91,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.7 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <1.84.0"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <1.84.0"
   }
 ```
 
@@ -295,7 +295,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.7 <1.84.0"
+"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <1.84.0"
 ```
 
 ## Monaco-editor / @codingame/monaco-vscode-api compatibility table
@@ -306,6 +306,7 @@ The following table describes which version of **monaco-languageclient** and **@
 
 | monaco-languageclient | monaco-vscode-api | monaco-editor-treemended | monaco-editor | release date | comment |
 | :----         | :----   | :---   | :--- | :--- | :--- |
+| 7.1.0         | 1.83.10  | 1.83.10 | 0.44.0 | 2023-11-2x | |
 | 7.0.2         | 1.83.7  | 1.83.7 | 0.44.0 | 2023-11-02 | |
 | 7.0.1         | 1.83.5  | 1.83.5 | 0.44.0 | 2023-11-10 | |
 | 7.0.0         | 1.83.5  | 1.83.5 | 0.44.0 | 2023-11-02 | Introduction of `@codingame/monaco-editor-treemended` |

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.9.1",
-    "@typescript-eslint/parser": "~6.9.1",
+    "@typescript-eslint/eslint-plugin": "~6.12.0",
+    "@typescript-eslint/parser": "~6.12.0",
     "editorconfig": "~2.0.0",
-    "eslint": "~8.52.0",
+    "eslint": "~8.54.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.2.2",
-    "vite": "~4.5.0"
+    "typescript": "~5.3.2",
+    "vite": "~5.0.2"
   },
   "overrides": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <1.84.0"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <1.84.0"
   },
   "volta": {
     "node": "18.18.2",

diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md
@@ -2,9 +2,13 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [7.1.0] - 2023-11-2x
+
+- Updated to `[email protected]`.
+
 ## [7.0.2] - 2023-11-15
 
-- Updated to `monaco-vscode-api` `1.83.7`.
+- Updated to `monaco-vscode-api@1.83.7`.
 
 ## [7.0.1] - 2023-11-10
 

diff --git a/packages/client/package.json b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient",
-  "version": "7.0.2",
+  "version": "7.1.0-next.0",
   "description": "Monaco Language client implementation",
   "author": {
     "name": "TypeFox GmbH",
@@ -48,16 +48,16 @@
     "License.txt"
   ],
   "dependencies": {
-    "@codingame/monaco-vscode-editor-service-override": "~1.83.7",
-    "@codingame/monaco-vscode-languages-service-override": "~1.83.7",
-    "@codingame/monaco-vscode-model-service-override": "~1.83.7",
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0",
+    "@codingame/monaco-vscode-editor-service-override": "~1.83.10",
+    "@codingame/monaco-vscode-languages-service-override": "~1.83.10",
+    "@codingame/monaco-vscode-model-service-override": "~1.83.10",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <1.84.0",
     "vscode-languageclient": "~9.0.1"
   },
   "peerDependencies": {
     "monaco-editor": "0.44.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <1.84.0"
   },
   "peerDependenciesMeta": {
     "monaco-editor": {
@@ -72,8 +72,8 @@
     "vscode": "$vscode"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <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
@@ -4,7 +4,7 @@
  * ------------------------------------------------------------------------------------------ */
 
 import { editor, Environment } from 'monaco-editor';
-import { ILogService, initialize, LogLevel, StandaloneServices } from 'vscode/services';
+import { ILogService, initialize, IWorkbenchConstructionOptions, StandaloneServices } from 'vscode/services';
 import { initialize as initializeVscodeExtensions } from 'vscode/extensions';
 import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
 import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
@@ -17,7 +17,7 @@ export interface MonacoEnvironmentEnhanced extends Environment {
 export type InitializeServiceConfig = {
     userServices?: editor.IEditorOverrideServices;
     debugLogging?: boolean;
-    logLevel?: LogLevel
+    workspaceConfig?: IWorkbenchConstructionOptions;
 };
 
 export const wasVscodeApiInitialized = () => {
@@ -112,7 +112,8 @@ export const importAllServices = async (config?: InitializeServiceConfig) => {
     }
 
     await initialize(userServices);
-    if (lc.logLevel) {
-        StandaloneServices.get(ILogService).setLevel(lc.logLevel);
+    const logLevel = lc.workspaceConfig?.developmentOptions?.logLevel;
+    if (logLevel) {
+        StandaloneServices.get(ILogService).setLevel(logLevel);
     }
 };
diff --git a/packages/examples/CHANGELOG.md b/packages/examples/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 All notable changes to this npm module are documented in this file.
 
+## [7.1.0] - 2023-11-2x
+
+- Updated to `[email protected]`.
+  - Updated usage of configuration service to be in line with `[email protected]`.
+
 ## [7.0.2] - 2023-11-15
 
 - Updated to `[email protected]`.

diff --git a/packages/examples/package.json b/packages/examples/package.json
@@ -1,6 +1,6 @@
 {
   "name": "monaco-languageclient-examples",
-  "version": "7.0.2",
+  "version": "7.1.0-next.0",
   "description": "Monaco Language client examples",
   "author": {
     "name": "TypeFox GmbH",
@@ -43,29 +43,29 @@
     }
   },
   "dependencies": {
-    "@codingame/monaco-vscode-configuration-service-override": "~1.83.7",
-    "@codingame/monaco-vscode-editor-service-override": "~1.83.7",
-    "@codingame/monaco-vscode-files-service-override": "~1.83.7",
-    "@codingame/monaco-vscode-json-default-extension": "~1.83.7",
-    "@codingame/monaco-vscode-keybindings-service-override": "~1.83.7",
-    "@codingame/monaco-vscode-python-default-extension": "~1.83.7",
-    "@codingame/monaco-vscode-textmate-service-override": "~1.83.7",
-    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.7",
-    "@codingame/monaco-vscode-theme-service-override": "~1.83.7",
-    "@codingame/monaco-vscode-language-pack-de": "~1.83.7",
-    "@codingame/monaco-vscode-language-pack-es": "~1.83.7",
-    "@codingame/monaco-vscode-language-pack-fr": "~1.83.7",
+    "@codingame/monaco-vscode-configuration-service-override": "~1.83.10",
+    "@codingame/monaco-vscode-editor-service-override": "~1.83.10",
+    "@codingame/monaco-vscode-files-service-override": "~1.83.10",
+    "@codingame/monaco-vscode-json-default-extension": "~1.83.10",
+    "@codingame/monaco-vscode-keybindings-service-override": "~1.83.10",
+    "@codingame/monaco-vscode-python-default-extension": "~1.83.10",
+    "@codingame/monaco-vscode-textmate-service-override": "~1.83.10",
+    "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.10",
+    "@codingame/monaco-vscode-theme-service-override": "~1.83.10",
+    "@codingame/monaco-vscode-language-pack-de": "~1.83.10",
+    "@codingame/monaco-vscode-language-pack-es": "~1.83.10",
+    "@codingame/monaco-vscode-language-pack-fr": "~1.83.10",
     "express": "~4.18.2",
     "langium": "~2.1.0",
     "langium-statemachine-dsl": "~2.1.0",
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
-    "monaco-languageclient": "~7.0.2",
+    "monaco-languageclient": "~7.1.0-next.0",
     "pyright": "~1.1.333",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "request-light": "~0.7.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <1.84.0",
     "vscode-json-languageservice": "~5.3.7",
     "vscode-languageclient": "~9.0.1",
     "vscode-languageserver": "~9.0.1",
@@ -87,8 +87,8 @@
     "vscode": "$vscode"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <1.84.0"
   },
   "volta": {
     "node": "18.18.2",

diff --git a/packages/examples/src/common/client-commons.ts b/packages/examples/src/common/client-commons.ts
@@ -89,10 +89,21 @@ export const performInit = async (vscodeApiInit: boolean) => {
             userServices: {
                 ...getThemeServiceOverride(),
                 ...getTextmateServiceOverride(),
-                ...getConfigurationServiceOverride(Uri.file('/workspace')),
+                ...getConfigurationServiceOverride(),
                 ...getKeybindingsServiceOverride()
             },
-            debugLogging: true
+            debugLogging: true,
+            workspaceConfig: {
+                workspaceProvider: {
+                    trusted: true,
+                    workspace: {
+                        workspaceUri: Uri.file('/workspace')
+                    },
+                    async open() {
+                        return false;
+                    }
+                }
+            }
         });
 
         // register the JSON language with Monaco

diff --git a/packages/examples/src/langium/statemachineClient.ts b/packages/examples/src/langium/statemachineClient.ts
@@ -14,7 +14,6 @@ import getEditorServiceOverride from '@codingame/monaco-vscode-editor-service-ov
 import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
 import getThemeServiceOverride from '@codingame/monaco-vscode-theme-service-override';
 import getTextmateServiceOverride from '@codingame/monaco-vscode-textmate-service-override';
-import { LogLevel } from 'vscode/services';
 import '@codingame/monaco-vscode-theme-defaults-default-extension';
 import { Uri } from 'vscode';
 
@@ -28,12 +27,22 @@ export const setupStatemachineClient = async () => {
         userServices: {
             ...getThemeServiceOverride(),
             ...getTextmateServiceOverride(),
-            ...getConfigurationServiceOverride(Uri.file('/workspace')),
+            ...getConfigurationServiceOverride(),
             ...getEditorServiceOverride(useOpenEditorStub),
             ...getKeybindingsServiceOverride()
         },
         debugLogging: true,
-        logLevel: LogLevel.Info
+        workspaceConfig: {
+            workspaceProvider: {
+                trusted: true,
+                workspace: {
+                    workspaceUri: Uri.file('/workspace')
+                },
+                async open() {
+                    return false;
+                }
+            }
+        }
     };
     await initServices(serviceConfig);
 

diff --git a/packages/examples/src/python/client/main.ts b/packages/examples/src/python/client/main.ts
@@ -79,11 +79,24 @@ export const startPythonClient = async () => {
         userServices: {
             ...getThemeServiceOverride(),
             ...getTextmateServiceOverride(),
-            ...getConfigurationServiceOverride(Uri.file('/workspace')),
+            ...getConfigurationServiceOverride(),
             ...getKeybindingsServiceOverride()
         },
         debugLogging: true,
-        logLevel: LogLevel.Debug
+        workspaceConfig: {
+            workspaceProvider: {
+                trusted: true,
+                workspace: {
+                    workspaceUri: Uri.file('/workspace')
+                },
+                async open() {
+                    return false;
+                }
+            },
+            developmentOptions: {
+                logLevel: LogLevel.Debug
+            }
+        }
     });
 
     console.log('Before ready themes');

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.7 <1.84.0",
-    "monaco-languageclient": "~7.0.2",
-    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.7 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
+    "monaco-languageclient": "~7.1.0-next.0",
+    "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.10 <1.84.0"
   },
   "devDependencies": {
     "shx": "~0.3.4"

diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json
@@ -4,10 +4,10 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
-    "monaco-languageclient": "~7.0.2",
-    "monaco-languageclient-examples": "~7.0.2",
+    "monaco-languageclient": "~7.1.0-next.0",
+    "monaco-languageclient-examples": "~7.1.0-next.0",
     "vscode-ws-jsonrpc": "~3.1.0"
   },
   "devDependencies": {
@@ -17,7 +17,7 @@
     "monaco-editor": "$monaco-editor"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0"
   },
   "volta": {
     "node": "18.18.2",

diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json
@@ -4,10 +4,10 @@
   "private": true,
   "type": "module",
   "dependencies": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0",
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
     "monaco-editor-workers": "~0.44.0",
-    "monaco-languageclient": "~7.0.2",
-    "monaco-languageclient-examples": "~7.0.2",
+    "monaco-languageclient": "~7.1.0-next.0",
+    "monaco-languageclient-examples": "~7.1.0-next.0",
     "vscode-ws-jsonrpc": "~3.1.0"
   },
   "devDependencies": {
@@ -22,7 +22,7 @@
     "monaco-editor": "$monaco-editor"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <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.7 <1.84.0",
-    "monaco-languageclient": "~7.0.2"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0",
+    "monaco-languageclient": "~7.1.0-next.0"
   },
   "devDependencies": {
     "shx": "~0.3.4"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.7 <1.84.0"
+    "monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.10 <1.84.0"
   },
   "scripts": {
     "clean": "shx rm -fr ./node_modules yarn.lock",