Skip to content

Commit

Permalink
Update to monaco-vscode-api 1.83.16 (#581)
Browse files Browse the repository at this point in the history
- Prepare release 7.2.0
- Volta now uses Node 20 (current LTS)
  • Loading branch information
kaisalmen authored Dec 7, 2023
1 parent 8ea285b commit 789f8e5
Show file tree
Hide file tree
Showing 13 changed files with 386 additions and 377 deletions.
11 changes: 6 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <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.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
}
```

Expand Down Expand Up @@ -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.16 <1.84.0"
```

## Monaco-editor / @codingame/monaco-vscode-api compatibility table
Expand All @@ -319,6 +319,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.2.0 | 1.83.16 | 1.83.16 | 0.44.0 | 2023-12-07 | |
| 7.1.0 | 1.83.12 | 1.83.12 | 0.44.0 | 2023-11-27 | |
| 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 | |
Expand Down
587 changes: 298 additions & 289 deletions package-lock.json

Large diffs are not rendered by default.

22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
"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"
"typescript": "~5.3.3",
"vite": "~5.0.6"
},
"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.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <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.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
},
"volta": {
"node": "18.18.2",
"npm": "9.9.0"
"node": "20.10.0",
"npm": "10.2.3"
},
"scripts": {
"clean": "npm run clean --workspaces",
Expand Down
8 changes: 7 additions & 1 deletion packages/client/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@

All notable changes to this npm module are documented in this file.

## [7.2.0] - 2023-12-07

- Updated to `monaco-vscode-api@1.83.16`:
- Local extension hosts is automatically started. `initVscodeExtensions` is removed again.
- Volta now uses Node 20 (current LTS).

## [7.1.0] - 2023-11-27

- Updated to `monaco-vscode-api@1.83.12`.
- Updated to `monaco-vscode-api@1.83.12`:
- BREAKING: If you want to use `getConfigurationServiceOverride` you need to provide a `workspaceConfig` along the `userServices` in `initServices`.

## [7.0.2] - 2023-11-15
Expand Down
22 changes: 11 additions & 11 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monaco-languageclient",
"version": "7.1.0",
"version": "7.2.0",
"description": "Monaco Language client implementation",
"author": {
"name": "TypeFox GmbH",
Expand Down Expand Up @@ -37,8 +37,8 @@
"npm": ">=9.0.0"
},
"volta": {
"node": "18.18.2",
"npm": "9.9.0"
"node": "20.10.0",
"npm": "10.2.3"
},
"files": [
"lib",
Expand All @@ -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.16",
"@codingame/monaco-vscode-languages-service-override": "~1.83.16",
"@codingame/monaco-vscode-model-service-override": "~1.83.16",
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <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.16 <1.84.0"
},
"peerDependenciesMeta": {
"monaco-editor": {
Expand All @@ -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.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
},
"scripts": {
"clean": "shx rm -fr lib *.tsbuildinfo",
Expand Down
14 changes: 1 addition & 13 deletions packages/client/src/monaco-vscode-api-services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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) {
Expand All @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions packages/examples/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

All notable changes to this npm module are documented in this file.

## [7.2.0] - 2023-12-07

- Updated to `monaco-languageclient@7.2.0`.
- Volta now uses Node 20 (current LTS).

## [7.1.0] - 2023-11-27

- Updated to `monaco-languageclient@7.1.0` and aligned the usage of the configuration service to `monaco-vscode-api@1.83.12`.
Expand Down
48 changes: 24 additions & 24 deletions packages/examples/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monaco-languageclient-examples",
"version": "7.1.0",
"version": "7.2.0",
"description": "Monaco Language client examples",
"author": {
"name": "TypeFox GmbH",
Expand Down Expand Up @@ -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.16",
"@codingame/monaco-vscode-editor-service-override": "~1.83.16",
"@codingame/monaco-vscode-files-service-override": "~1.83.16",
"@codingame/monaco-vscode-json-default-extension": "~1.83.16",
"@codingame/monaco-vscode-keybindings-service-override": "~1.83.16",
"@codingame/monaco-vscode-python-default-extension": "~1.83.16",
"@codingame/monaco-vscode-textmate-service-override": "~1.83.16",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.16",
"@codingame/monaco-vscode-theme-service-override": "~1.83.16",
"@codingame/monaco-vscode-language-pack-de": "~1.83.16",
"@codingame/monaco-vscode-language-pack-es": "~1.83.16",
"@codingame/monaco-vscode-language-pack-fr": "~1.83.16",
"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.16 <1.84.0",
"monaco-editor-workers": "~0.44.0",
"monaco-languageclient": "~7.1.0",
"pyright": "~1.1.333",
"monaco-languageclient": "~7.2.0",
"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.16 <1.84.0",
"vscode-json-languageservice": "~5.3.7",
"vscode-languageclient": "~9.0.1",
"vscode-languageserver": "~9.0.1",
Expand All @@ -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": "~20.10.4",
"@types/react": "~18.2.42",
"@types/react-dom": "~18.2.17",
"ts-node": "~10.9.1",
"vscode-languageserver-types": "~3.17.5"
},
Expand All @@ -87,12 +87,12 @@
"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.16 <1.84.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
},
"volta": {
"node": "18.18.2",
"npm": "9.9.0"
"node": "20.10.0",
"npm": "10.2.3"
},
"files": [
"dist",
Expand Down
10 changes: 5 additions & 5 deletions packages/verify/pnpm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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-languageclient": "~7.1.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
"monaco-languageclient": "~7.2.0",
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
},
"devDependencies": {
"shx": "~0.3.4"
Expand All @@ -18,7 +18,7 @@
"clean": "shx rm -fr ./node_modules pnpm-lock.yaml"
},
"volta": {
"node": "18.18.2",
"npm": "9.9.0"
"node": "20.10.0",
"npm": "10.2.3"
}
}
12 changes: 6 additions & 6 deletions packages/verify/vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"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.16 <1.84.0",
"monaco-editor-workers": "~0.44.0",
"monaco-languageclient": "~7.1.0",
"monaco-languageclient-examples": "~7.1.0",
"monaco-languageclient": "~7.2.0",
"monaco-languageclient-examples": "~7.2.0",
"vscode-ws-jsonrpc": "~3.1.0"
},
"devDependencies": {
Expand All @@ -17,11 +17,11 @@
"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.16 <1.84.0"
},
"volta": {
"node": "18.18.2",
"npm": "9.9.0"
"node": "20.10.0",
"npm": "10.2.3"
},
"scripts": {
"clean": "shx rm -fr dist",
Expand Down
12 changes: 6 additions & 6 deletions packages/verify/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"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.16 <1.84.0",
"monaco-editor-workers": "~0.44.0",
"monaco-languageclient": "~7.1.0",
"monaco-languageclient-examples": "~7.1.0",
"monaco-languageclient": "~7.2.0",
"monaco-languageclient-examples": "~7.2.0",
"vscode-ws-jsonrpc": "~3.1.0"
},
"devDependencies": {
Expand All @@ -22,11 +22,11 @@
"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.16 <1.84.0"
},
"volta": {
"node": "18.18.2",
"npm": "9.9.0"
"node": "20.10.0",
"npm": "10.2.3"
},
"scripts": {
"clean": "shx rm -fr dist *.tsbuildinfo",
Expand Down
8 changes: 4 additions & 4 deletions packages/verify/yarn/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,21 @@
"version": "0.0.0",
"private": "true",
"dependencies": {
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
"monaco-languageclient": "~7.1.0"
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
"monaco-languageclient": "~7.2.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.16 <1.84.0"
},
"scripts": {
"clean": "shx rm -fr ./node_modules yarn.lock",
"test:treemending": "monaco-treemending"
},
"volta": {
"node": "18.18.2",
"node": "20.10.0",
"yarn": "1.22.19"
}
}
4 changes: 2 additions & 2 deletions packages/vscode-ws-jsonrpc/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@
"npm": ">=8.0.0"
},
"volta": {
"node": "18.18.2",
"npm": "9.9.0"
"node": "20.10.0",
"npm": "10.2.3"
},
"files": [
"lib",
Expand Down

0 comments on commit 789f8e5

Please sign in to comment.