Skip to content

Commit 789f8e5

Browse files
authored
Update to monaco-vscode-api 1.83.16 (#581)
- Prepare release 7.2.0 - Volta now uses Node 20 (current LTS)
1 parent 8ea285b commit 789f8e5

File tree

13 files changed

+386
-377
lines changed

13 files changed

+386
-377
lines changed

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@ With v7 we decided to use readily treemended version of monaco-editor called [@c
9393

9494
```yaml
9595
"overrides": {
96-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
97-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
96+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
97+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
9898
},
9999
"resolutions": {
100-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
101-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
100+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
101+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
102102
}
103103
```
104104

@@ -308,7 +308,7 @@ loader.config({ monaco });
308308
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.
309309

310310
```json
311-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
311+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
312312
```
313313

314314
## Monaco-editor / @codingame/monaco-vscode-api compatibility table
@@ -319,6 +319,7 @@ The following table describes which version of **monaco-languageclient** and **@
319319

320320
| monaco-languageclient | monaco-vscode-api | monaco-editor-treemended | monaco-editor | release date | comment |
321321
| :---- | :---- | :--- | :--- | :--- | :--- |
322+
| 7.2.0 | 1.83.16 | 1.83.16 | 0.44.0 | 2023-12-07 | |
322323
| 7.1.0 | 1.83.12 | 1.83.12 | 0.44.0 | 2023-11-27 | |
323324
| 7.0.2 | 1.83.7 | 1.83.7 | 0.44.0 | 2023-11-02 | |
324325
| 7.0.1 | 1.83.5 | 1.83.5 | 0.44.0 | 2023-11-10 | |

package-lock.json

Lines changed: 298 additions & 289 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@
33
"type": "module",
44
"devDependencies": {
55
"@types/vscode": "~1.83.3",
6-
"@typescript-eslint/eslint-plugin": "~6.12.0",
7-
"@typescript-eslint/parser": "~6.12.0",
6+
"@typescript-eslint/eslint-plugin": "~6.13.2",
7+
"@typescript-eslint/parser": "~6.13.2",
88
"editorconfig": "~2.0.0",
9-
"eslint": "~8.54.0",
9+
"eslint": "~8.55.0",
1010
"eslint-config-standard": "~17.1.0",
1111
"eslint-plugin-header": "~3.1.1",
1212
"eslint-plugin-import": "~2.29.0",
1313
"eslint-plugin-promise": "~6.1.1",
1414
"eslint-plugin-unused-imports": "~3.0.0",
1515
"shx": "~0.3.4",
16-
"typescript": "~5.3.2",
17-
"vite": "~5.0.2"
16+
"typescript": "~5.3.3",
17+
"vite": "~5.0.6"
1818
},
1919
"overrides": {
20-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
21-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
20+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
21+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
2222
},
2323
"resolutions": {
24-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
25-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
24+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
25+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
2626
},
2727
"volta": {
28-
"node": "18.18.2",
29-
"npm": "9.9.0"
28+
"node": "20.10.0",
29+
"npm": "10.2.3"
3030
},
3131
"scripts": {
3232
"clean": "npm run clean --workspaces",

packages/client/CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,15 @@
22

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

5+
## [7.2.0] - 2023-12-07
6+
7+
- Updated to `[email protected]`:
8+
- Local extension hosts is automatically started. `initVscodeExtensions` is removed again.
9+
- Volta now uses Node 20 (current LTS).
10+
511
## [7.1.0] - 2023-11-27
612

7-
- Updated to `[email protected]`.
13+
- Updated to `[email protected]`:
814
- BREAKING: If you want to use `getConfigurationServiceOverride` you need to provide a `workspaceConfig` along the `userServices` in `initServices`.
915

1016
## [7.0.2] - 2023-11-15

packages/client/package.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "monaco-languageclient",
3-
"version": "7.1.0",
3+
"version": "7.2.0",
44
"description": "Monaco Language client implementation",
55
"author": {
66
"name": "TypeFox GmbH",
@@ -37,8 +37,8 @@
3737
"npm": ">=9.0.0"
3838
},
3939
"volta": {
40-
"node": "18.18.2",
41-
"npm": "9.9.0"
40+
"node": "20.10.0",
41+
"npm": "10.2.3"
4242
},
4343
"files": [
4444
"lib",
@@ -48,16 +48,16 @@
4848
"License.txt"
4949
],
5050
"dependencies": {
51-
"@codingame/monaco-vscode-editor-service-override": "~1.83.12",
52-
"@codingame/monaco-vscode-languages-service-override": "~1.83.12",
53-
"@codingame/monaco-vscode-model-service-override": "~1.83.12",
54-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
55-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0",
51+
"@codingame/monaco-vscode-editor-service-override": "~1.83.16",
52+
"@codingame/monaco-vscode-languages-service-override": "~1.83.16",
53+
"@codingame/monaco-vscode-model-service-override": "~1.83.16",
54+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
55+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0",
5656
"vscode-languageclient": "~9.0.1"
5757
},
5858
"peerDependencies": {
5959
"monaco-editor": "0.44.0",
60-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
60+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
6161
},
6262
"peerDependenciesMeta": {
6363
"monaco-editor": {
@@ -72,8 +72,8 @@
7272
"vscode": "$vscode"
7373
},
7474
"resolutions": {
75-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
76-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
75+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
76+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
7777
},
7878
"scripts": {
7979
"clean": "shx rm -fr lib *.tsbuildinfo",

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
import { editor, Environment } from 'monaco-editor';
77
import { ILogService, initialize, IWorkbenchConstructionOptions, StandaloneServices } from 'vscode/services';
8-
import { initialize as initializeVscodeExtensions } from 'vscode/extensions';
8+
import 'vscode/localExtensionHost';
99
import { OpenEditor } from '@codingame/monaco-vscode-editor-service-override';
1010
import getLanguagesServiceOverride from '@codingame/monaco-vscode-languages-service-override';
1111
import getModelServiceOverride from '@codingame/monaco-vscode-model-service-override';
@@ -25,11 +25,6 @@ export const wasVscodeApiInitialized = () => {
2525
};
2626

2727
export const initServices = async (config?: InitializeServiceConfig) => {
28-
await initVscodeServices(config);
29-
await initVscodeExtensions(config);
30-
};
31-
32-
export const initVscodeServices = async (config?: InitializeServiceConfig) => {
3328
if (!wasVscodeApiInitialized()) {
3429
await importAllServices(config);
3530
if (config?.debugLogging === true) {
@@ -46,13 +41,6 @@ export const initVscodeServices = async (config?: InitializeServiceConfig) => {
4641
}
4742
};
4843

49-
export const initVscodeExtensions = async (config?: InitializeServiceConfig) => {
50-
await initializeVscodeExtensions();
51-
if (config?.debugLogging === true) {
52-
console.log('Initialization of vscode extensions completed successfully.');
53-
}
54-
};
55-
5644
export const useOpenEditorStub: OpenEditor = async (modelRef, options, sideBySide) => {
5745
console.log('Received open editor call with parameters: ', modelRef, options, sideBySide);
5846
return undefined;

packages/examples/CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

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

5+
## [7.2.0] - 2023-12-07
6+
7+
- Updated to `[email protected]`.
8+
- Volta now uses Node 20 (current LTS).
9+
510
## [7.1.0] - 2023-11-27
611

712
- Updated to `[email protected]` and aligned the usage of the configuration service to `[email protected]`.

packages/examples/package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "monaco-languageclient-examples",
3-
"version": "7.1.0",
3+
"version": "7.2.0",
44
"description": "Monaco Language client examples",
55
"author": {
66
"name": "TypeFox GmbH",
@@ -43,29 +43,29 @@
4343
}
4444
},
4545
"dependencies": {
46-
"@codingame/monaco-vscode-configuration-service-override": "~1.83.12",
47-
"@codingame/monaco-vscode-editor-service-override": "~1.83.12",
48-
"@codingame/monaco-vscode-files-service-override": "~1.83.12",
49-
"@codingame/monaco-vscode-json-default-extension": "~1.83.12",
50-
"@codingame/monaco-vscode-keybindings-service-override": "~1.83.12",
51-
"@codingame/monaco-vscode-python-default-extension": "~1.83.12",
52-
"@codingame/monaco-vscode-textmate-service-override": "~1.83.12",
53-
"@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.12",
54-
"@codingame/monaco-vscode-theme-service-override": "~1.83.12",
55-
"@codingame/monaco-vscode-language-pack-de": "~1.83.12",
56-
"@codingame/monaco-vscode-language-pack-es": "~1.83.12",
57-
"@codingame/monaco-vscode-language-pack-fr": "~1.83.12",
46+
"@codingame/monaco-vscode-configuration-service-override": "~1.83.16",
47+
"@codingame/monaco-vscode-editor-service-override": "~1.83.16",
48+
"@codingame/monaco-vscode-files-service-override": "~1.83.16",
49+
"@codingame/monaco-vscode-json-default-extension": "~1.83.16",
50+
"@codingame/monaco-vscode-keybindings-service-override": "~1.83.16",
51+
"@codingame/monaco-vscode-python-default-extension": "~1.83.16",
52+
"@codingame/monaco-vscode-textmate-service-override": "~1.83.16",
53+
"@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.16",
54+
"@codingame/monaco-vscode-theme-service-override": "~1.83.16",
55+
"@codingame/monaco-vscode-language-pack-de": "~1.83.16",
56+
"@codingame/monaco-vscode-language-pack-es": "~1.83.16",
57+
"@codingame/monaco-vscode-language-pack-fr": "~1.83.16",
5858
"express": "~4.18.2",
5959
"langium": "~2.1.0",
6060
"langium-statemachine-dsl": "~2.1.0",
61-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
61+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
6262
"monaco-editor-workers": "~0.44.0",
63-
"monaco-languageclient": "~7.1.0",
64-
"pyright": "~1.1.333",
63+
"monaco-languageclient": "~7.2.0",
64+
"pyright": "~1.1.338",
6565
"react": "~18.2.0",
6666
"react-dom": "~18.2.0",
6767
"request-light": "~0.7.0",
68-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0",
68+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0",
6969
"vscode-json-languageservice": "~5.3.7",
7070
"vscode-languageclient": "~9.0.1",
7171
"vscode-languageserver": "~9.0.1",
@@ -76,9 +76,9 @@
7676
"devDependencies": {
7777
"@types/ws": "~8.5.6",
7878
"@types/express": "~4.17.18",
79-
"@types/node": "~18.18.8",
80-
"@types/react": "~18.2.33",
81-
"@types/react-dom": "~18.2.14",
79+
"@types/node": "~20.10.4",
80+
"@types/react": "~18.2.42",
81+
"@types/react-dom": "~18.2.17",
8282
"ts-node": "~10.9.1",
8383
"vscode-languageserver-types": "~3.17.5"
8484
},
@@ -87,12 +87,12 @@
8787
"vscode": "$vscode"
8888
},
8989
"resolutions": {
90-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
91-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
90+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
91+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
9292
},
9393
"volta": {
94-
"node": "18.18.2",
95-
"npm": "9.9.0"
94+
"node": "20.10.0",
95+
"npm": "10.2.3"
9696
},
9797
"files": [
9898
"dist",

packages/verify/pnpm/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"version": "0.0.0",
44
"private": "true",
55
"dependencies": {
6-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
7-
"monaco-languageclient": "~7.1.0",
8-
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.12 <1.84.0"
6+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
7+
"monaco-languageclient": "~7.2.0",
8+
"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.16 <1.84.0"
99
},
1010
"devDependencies": {
1111
"shx": "~0.3.4"
@@ -18,7 +18,7 @@
1818
"clean": "shx rm -fr ./node_modules pnpm-lock.yaml"
1919
},
2020
"volta": {
21-
"node": "18.18.2",
22-
"npm": "9.9.0"
21+
"node": "20.10.0",
22+
"npm": "10.2.3"
2323
}
2424
}

packages/verify/vite/package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"private": true,
55
"type": "module",
66
"dependencies": {
7-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0",
7+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0",
88
"monaco-editor-workers": "~0.44.0",
9-
"monaco-languageclient": "~7.1.0",
10-
"monaco-languageclient-examples": "~7.1.0",
9+
"monaco-languageclient": "~7.2.0",
10+
"monaco-languageclient-examples": "~7.2.0",
1111
"vscode-ws-jsonrpc": "~3.1.0"
1212
},
1313
"devDependencies": {
@@ -17,11 +17,11 @@
1717
"monaco-editor": "$monaco-editor"
1818
},
1919
"resolutions": {
20-
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.12 <1.84.0"
20+
"monaco-editor": "npm:@codingame/monaco-editor-treemended@>=1.83.16 <1.84.0"
2121
},
2222
"volta": {
23-
"node": "18.18.2",
24-
"npm": "9.9.0"
23+
"node": "20.10.0",
24+
"npm": "10.2.3"
2525
},
2626
"scripts": {
2727
"clean": "shx rm -fr dist",

0 commit comments

Comments
 (0)