Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ Because `@codingame/monaco-vscode-api` relies on it own build of `monaco-editor`

```json
"overrides": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@13.1.3"
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@13.1.4"
}
```

Expand All @@ -315,7 +315,7 @@ Because `@codingame/monaco-vscode-api` relies on it own build of `monaco-editor`
If you use pnpm, you have to add `vscode` / `@codingame/monaco-vscode-api` as direct dependency (you find the [compatibility table here](https://github.com/TypeFox/monaco-languageclient/blob/main/docs/versions-and-history.md#monaco-editor--codingamemonaco-vscode-api-compatibility-table), otherwise the installation will fail.

```json
"vscode": "npm:@codingame/monaco-vscode-extension-api@13.1.3"
"vscode": "npm:@codingame/monaco-vscode-extension-api@13.1.4"
```

## Licenses
Expand Down
1 change: 1 addition & 0 deletions docs/versions-and-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ The following table describes which version of **monaco-languageclient** and **@

| monaco-languageclient | monaco-editor-wrapper | monaco-editor-react | monaco-vscode-api / editor-api | vscode | monaco-editor | release date | comment |
| :---- | :---- | :--- | :--- | :--- | :--- | :--- | :--- |
| 9.2.4 | 6.2.4 | 6.2.4 | 13.1.4 | 1.96.4 | 0.52.2 | 2025-02-06 | |
| 9.2.3 | 6.2.3 | 6.2.3 | 13.1.3 | 1.96.4 | 0.52.2 | 2025-02-04 | |
| 9.2.2 | 6.2.2 | 6.2.2 | 13.1.2 | 1.96.4 | 0.52.2 | 2025-02-03 | |
| 9.2.1 | 6.2.1 | 6.2.1 | 13.1.1 | 1.96.4 | 0.52.2 | 2025-01-31 | |
Expand Down
2,394 changes: 1,200 additions & 1,194 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"devDependencies": {
"@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
"@codingame/monaco-vscode-rollup-vsix-plugin": "13.1.3",
"@codingame/monaco-vscode-rollup-vsix-plugin": "13.1.4",
"@eslint/eslintrc": "~3.2.0",
"@eslint/js": "~9.19.0",
"@stylistic/eslint-plugin": "~3.0.1",
Expand All @@ -36,7 +36,7 @@
"minimatch": "~10.0.1",
"playwright": "~1.50.1",
"typescript": "~5.7.3",
"vite": "~6.0.11",
"vite": "~6.1.0",
"vite-node": "~3.0.5",
"vitest": "~3.0.5"
},
Expand Down
4 changes: 4 additions & 0 deletions packages/client/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

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

## [9.2.4] - 2025-02-06

- Updated all `@codingame/monaco-vscode` packages to `13.1.4`.

## [9.2.3] - 2025-02-04

- Updated all `@codingame/monaco-vscode` packages to `13.1.3`.
Expand Down
24 changes: 12 additions & 12 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monaco-languageclient",
"version": "9.2.3",
"version": "9.2.4",
"description": "Monaco Language client implementation",
"author": {
"name": "TypeFox GmbH",
Expand Down Expand Up @@ -76,17 +76,17 @@
"LICENSE"
],
"dependencies": {
"@codingame/monaco-vscode-api": "~13.1.3",
"@codingame/monaco-vscode-configuration-service-override": "~13.1.3",
"@codingame/monaco-vscode-editor-api": "~13.1.3",
"@codingame/monaco-vscode-editor-service-override": "~13.1.3",
"@codingame/monaco-vscode-extensions-service-override": "~13.1.3",
"@codingame/monaco-vscode-extension-api": "~13.1.3",
"@codingame/monaco-vscode-languages-service-override": "~13.1.3",
"@codingame/monaco-vscode-localization-service-override": "~13.1.3",
"@codingame/monaco-vscode-log-service-override": "~13.1.3",
"@codingame/monaco-vscode-model-service-override": "~13.1.3",
"vscode": "npm:@codingame/monaco-vscode-extension-api@13.1.3",
"@codingame/monaco-vscode-api": "~13.1.4",
"@codingame/monaco-vscode-configuration-service-override": "~13.1.4",
"@codingame/monaco-vscode-editor-api": "~13.1.4",
"@codingame/monaco-vscode-editor-service-override": "~13.1.4",
"@codingame/monaco-vscode-extensions-service-override": "~13.1.4",
"@codingame/monaco-vscode-extension-api": "~13.1.4",
"@codingame/monaco-vscode-languages-service-override": "~13.1.4",
"@codingame/monaco-vscode-localization-service-override": "~13.1.4",
"@codingame/monaco-vscode-log-service-override": "~13.1.4",
"@codingame/monaco-vscode-model-service-override": "~13.1.4",
"vscode": "npm:@codingame/monaco-vscode-extension-api@13.1.4",
"vscode-languageclient": "~9.0.1"
},
"scripts": {
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.

## [2025.2.3] - 2025-02-06

- Updated all `@codingame/monaco-vscode` packages to `13.1.4`.
- Updated to `monaco-languageclient@9.2.4`, `monaco-editor-wrapper@6.2.4` and `@typefox/monaco-editor-react@6.2.4`.

## [2025.2.2] - 2025-02-04

- Updated all `@codingame/monaco-vscode` packages to `13.1.3`.
Expand Down
68 changes: 34 additions & 34 deletions packages/examples/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monaco-languageclient-examples",
"version": "2025.2.2",
"version": "2025.2.3",
"description": "Monaco Language client examples",
"author": {
"name": "TypeFox GmbH",
Expand Down Expand Up @@ -71,50 +71,50 @@
"LICENSE"
],
"dependencies": {
"@codingame/monaco-vscode-configuration-service-override": "13.1.3",
"@codingame/monaco-vscode-cpp-default-extension": "13.1.3",
"@codingame/monaco-vscode-editor-api": "13.1.3",
"@codingame/monaco-vscode-environment-service-override": "13.1.3",
"@codingame/monaco-vscode-explorer-service-override": "13.1.3",
"@codingame/monaco-vscode-files-service-override": "13.1.3",
"@codingame/monaco-vscode-groovy-default-extension": "13.1.3",
"@codingame/monaco-vscode-java-default-extension": "13.1.3",
"@codingame/monaco-vscode-javascript-default-extension": "13.1.3",
"@codingame/monaco-vscode-json-default-extension": "13.1.3",
"@codingame/monaco-vscode-keybindings-service-override": "13.1.3",
"@codingame/monaco-vscode-lifecycle-service-override": "13.1.3",
"@codingame/monaco-vscode-localization-service-override": "13.1.3",
"@codingame/monaco-vscode-python-default-extension": "13.1.3",
"@codingame/monaco-vscode-remote-agent-service-override": "13.1.3",
"@codingame/monaco-vscode-search-result-default-extension": "13.1.3",
"@codingame/monaco-vscode-search-service-override": "13.1.3",
"@codingame/monaco-vscode-secret-storage-service-override": "13.1.3",
"@codingame/monaco-vscode-standalone-json-language-features": "13.1.3",
"@codingame/monaco-vscode-standalone-languages": "13.1.3",
"@codingame/monaco-vscode-standalone-typescript-language-features": "13.1.3",
"@codingame/monaco-vscode-storage-service-override": "13.1.3",
"@codingame/monaco-vscode-textmate-service-override": "13.1.3",
"@codingame/monaco-vscode-theme-defaults-default-extension": "13.1.3",
"@codingame/monaco-vscode-theme-service-override": "13.1.3",
"@codingame/monaco-vscode-typescript-basics-default-extension": "13.1.3",
"@codingame/monaco-vscode-typescript-language-features-default-extension": "13.1.3",
"@codingame/monaco-vscode-views-service-override": "13.1.3",
"@typefox/monaco-editor-react": "~6.2.3",
"@codingame/monaco-vscode-configuration-service-override": "13.1.4",
"@codingame/monaco-vscode-cpp-default-extension": "13.1.4",
"@codingame/monaco-vscode-editor-api": "13.1.4",
"@codingame/monaco-vscode-environment-service-override": "13.1.4",
"@codingame/monaco-vscode-explorer-service-override": "13.1.4",
"@codingame/monaco-vscode-files-service-override": "13.1.4",
"@codingame/monaco-vscode-groovy-default-extension": "13.1.4",
"@codingame/monaco-vscode-java-default-extension": "13.1.4",
"@codingame/monaco-vscode-javascript-default-extension": "13.1.4",
"@codingame/monaco-vscode-json-default-extension": "13.1.4",
"@codingame/monaco-vscode-keybindings-service-override": "13.1.4",
"@codingame/monaco-vscode-lifecycle-service-override": "13.1.4",
"@codingame/monaco-vscode-localization-service-override": "13.1.4",
"@codingame/monaco-vscode-python-default-extension": "13.1.4",
"@codingame/monaco-vscode-remote-agent-service-override": "13.1.4",
"@codingame/monaco-vscode-search-result-default-extension": "13.1.4",
"@codingame/monaco-vscode-search-service-override": "13.1.4",
"@codingame/monaco-vscode-secret-storage-service-override": "13.1.4",
"@codingame/monaco-vscode-standalone-json-language-features": "13.1.4",
"@codingame/monaco-vscode-standalone-languages": "13.1.4",
"@codingame/monaco-vscode-standalone-typescript-language-features": "13.1.4",
"@codingame/monaco-vscode-storage-service-override": "13.1.4",
"@codingame/monaco-vscode-textmate-service-override": "13.1.4",
"@codingame/monaco-vscode-theme-defaults-default-extension": "13.1.4",
"@codingame/monaco-vscode-theme-service-override": "13.1.4",
"@codingame/monaco-vscode-typescript-basics-default-extension": "13.1.4",
"@codingame/monaco-vscode-typescript-language-features-default-extension": "13.1.4",
"@codingame/monaco-vscode-views-service-override": "13.1.4",
"@typefox/monaco-editor-react": "~6.2.4",
"cors": "^2.8.5",
"express": "~4.21.2",
"jszip": "~3.10.1",
"langium": "~3.3.1",
"monaco-editor-wrapper": "~6.2.3",
"monaco-languageclient": "~9.2.3",
"monaco-editor-wrapper": "~6.2.4",
"monaco-languageclient": "~9.2.4",
"pyright": "~1.1.393",
"react": "~19.0.0",
"react-dom": "~19.0.0",
"request-light": "~0.8.0",
"vscode": "npm:@codingame/monaco-vscode-extension-api@13.1.3",
"vscode": "npm:@codingame/monaco-vscode-extension-api@13.1.4",
"vscode-json-languageservice": "~5.4.2",
"vscode-languageclient": "~9.0.1",
"vscode-languageserver": "~9.0.1",
"vscode-uri": "~3.0.8",
"vscode-uri": "~3.1.0",
"vscode-ws-jsonrpc": "~3.4.0",
"ws": "~8.18.0",
"wtd-core": "~4.0.1"
Expand Down
6 changes: 6 additions & 0 deletions packages/wrapper-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

All notable changes to npm module [@typefox/monaco-editor-react](https://www.npmjs.com/package/@typefox/monaco-editor-react) are documented in this file.

## [6.2.4] - 2025-02-06

- Fix non dynamic import of @codingame/monaco-vscode-views-service-override [#844](https://github.com/TypeFox/monaco-languageclient/pull/844)
- Updated to `monaco-languageclient@9.2.4` and `monaco-editor-wrapper@6.2.4`.
- Updated all `@codingame/monaco-vscode` packages to `13.1.4`.

## [6.2.3] - 2025-02-04

- clean subscriptions in react [#839](https://github.com/TypeFox/monaco-languageclient/pull/839)
Expand Down
6 changes: 3 additions & 3 deletions packages/wrapper-react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@typefox/monaco-editor-react",
"version": "6.2.3",
"version": "6.2.4",
"license": "MIT",
"description": "React component for Monaco-Editor and Monaco Languageclient",
"keywords": [
Expand Down Expand Up @@ -46,8 +46,8 @@
"npm": "10.9.2"
},
"dependencies": {
"@codingame/monaco-vscode-editor-api": "13.1.3",
"monaco-editor-wrapper": "~6.2.3",
"@codingame/monaco-vscode-editor-api": "13.1.4",
"monaco-editor-wrapper": "~6.2.4",
"react": ">=18.0.0 || <20.0.0"
},
"repository": {
Expand Down
5 changes: 1 addition & 4 deletions packages/wrapper-react/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,7 @@ export const MonacoEditorReactComp: React.FC<MonacoEditorProps> = (props) => {
}
});

const viewServiceType = wrapperConfig.vscodeApiConfig?.viewsConfig?.viewServiceType;
if (viewServiceType === 'EditorService' || viewServiceType === undefined) {
await wrapperRef.current.start();
}
await wrapperRef.current.start();
onLoad?.(wrapperRef.current);
handleOnTextChanged();
} catch (e) {
Expand Down
13 changes: 12 additions & 1 deletion packages/wrapper/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,20 @@

All notable changes to npm module [monaco-editor-wrapper](https://www.npmjs.com/package/monaco-editor-wrapper) are documented in this file.

## [6.2.4] - 2025-02-06

- Fix non dynamic import of @codingame/monaco-vscode-views-service-override [#844](https://github.com/TypeFox/monaco-languageclient/pull/844)
- Updated all `@codingame/monaco-vscode` packages to `13.1.4`.
- Updated to `monaco-languageclient@9.2.4`.

## [6.2.3] - 2025-02-04

- Updated all `@codingame/monaco-vscode` packages to `13.1.3`
- Updated to `monaco-languageclient@9.2.3`.

## [6.2.2] - 2025-02-03

- Updated all `@codingame/monaco-vscode` packages to `13.1.1`
- Updated all `@codingame/monaco-vscode` packages to `13.1.2`
- Updated to `monaco-languageclient@9.2.2`.

## [6.2.1] - 2025-01-31
Expand Down
56 changes: 28 additions & 28 deletions packages/wrapper/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monaco-editor-wrapper",
"version": "6.2.3",
"version": "6.2.4",
"license": "MIT",
"description": "Wrapper for monaco-vscode-editor-api and monaco-languageclient",
"keywords": [
Expand Down Expand Up @@ -60,33 +60,33 @@
"npm": "10.9.2"
},
"dependencies": {
"@codingame/monaco-vscode-api": "13.1.3",
"@codingame/monaco-vscode-configuration-service-override": "13.1.3",
"@codingame/monaco-vscode-editor-api": "13.1.3",
"@codingame/monaco-vscode-editor-service-override": "13.1.3",
"@codingame/monaco-vscode-extension-api": "13.1.3",
"@codingame/monaco-vscode-language-pack-cs": "13.1.3",
"@codingame/monaco-vscode-language-pack-de": "13.1.3",
"@codingame/monaco-vscode-language-pack-es": "13.1.3",
"@codingame/monaco-vscode-language-pack-fr": "13.1.3",
"@codingame/monaco-vscode-language-pack-it": "13.1.3",
"@codingame/monaco-vscode-language-pack-ja": "13.1.3",
"@codingame/monaco-vscode-language-pack-ko": "13.1.3",
"@codingame/monaco-vscode-language-pack-pl": "13.1.3",
"@codingame/monaco-vscode-language-pack-pt-br": "13.1.3",
"@codingame/monaco-vscode-language-pack-qps-ploc": "13.1.3",
"@codingame/monaco-vscode-language-pack-ru": "13.1.3",
"@codingame/monaco-vscode-language-pack-tr": "13.1.3",
"@codingame/monaco-vscode-language-pack-zh-hans": "13.1.3",
"@codingame/monaco-vscode-language-pack-zh-hant": "13.1.3",
"@codingame/monaco-vscode-monarch-service-override": "13.1.3",
"@codingame/monaco-vscode-textmate-service-override": "13.1.3",
"@codingame/monaco-vscode-theme-defaults-default-extension": "13.1.3",
"@codingame/monaco-vscode-theme-service-override": "13.1.3",
"@codingame/monaco-vscode-views-service-override": "13.1.3",
"@codingame/monaco-vscode-workbench-service-override": "13.1.3",
"monaco-languageclient": "~9.2.3",
"vscode": "npm:@codingame/monaco-vscode-extension-api@13.1.3",
"@codingame/monaco-vscode-api": "13.1.4",
"@codingame/monaco-vscode-configuration-service-override": "13.1.4",
"@codingame/monaco-vscode-editor-api": "13.1.4",
"@codingame/monaco-vscode-editor-service-override": "13.1.4",
"@codingame/monaco-vscode-extension-api": "13.1.4",
"@codingame/monaco-vscode-language-pack-cs": "13.1.4",
"@codingame/monaco-vscode-language-pack-de": "13.1.4",
"@codingame/monaco-vscode-language-pack-es": "13.1.4",
"@codingame/monaco-vscode-language-pack-fr": "13.1.4",
"@codingame/monaco-vscode-language-pack-it": "13.1.4",
"@codingame/monaco-vscode-language-pack-ja": "13.1.4",
"@codingame/monaco-vscode-language-pack-ko": "13.1.4",
"@codingame/monaco-vscode-language-pack-pl": "13.1.4",
"@codingame/monaco-vscode-language-pack-pt-br": "13.1.4",
"@codingame/monaco-vscode-language-pack-qps-ploc": "13.1.4",
"@codingame/monaco-vscode-language-pack-ru": "13.1.4",
"@codingame/monaco-vscode-language-pack-tr": "13.1.4",
"@codingame/monaco-vscode-language-pack-zh-hans": "13.1.4",
"@codingame/monaco-vscode-language-pack-zh-hant": "13.1.4",
"@codingame/monaco-vscode-monarch-service-override": "13.1.4",
"@codingame/monaco-vscode-textmate-service-override": "13.1.4",
"@codingame/monaco-vscode-theme-defaults-default-extension": "13.1.4",
"@codingame/monaco-vscode-theme-service-override": "13.1.4",
"@codingame/monaco-vscode-views-service-override": "13.1.4",
"@codingame/monaco-vscode-workbench-service-override": "13.1.4",
"monaco-languageclient": "~9.2.4",
"vscode": "npm:@codingame/monaco-vscode-extension-api@13.1.4",
"vscode-languageclient": "~9.0.1",
"vscode-languageserver-protocol": "~3.17.5",
"vscode-ws-jsonrpc": "~3.4.0"
Expand Down
25 changes: 12 additions & 13 deletions packages/wrapper/src/vscode/viewsService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,31 @@
* Copyright (c) 2024 TypeFox and others.
* Licensed under the MIT License. See LICENSE in the package root for license information.
* ------------------------------------------------------------------------------------------ */
import * as mvs from '@codingame/monaco-vscode-views-service-override';

export const defaultViewsInit = async () => {
const { onPartVisibilityChange, isPartVisibile, attachPart, getSideBarPosition, onDidChangeSideBarPosition } = await import('@codingame/monaco-vscode-views-service-override');
const { Parts, Position, onPartVisibilityChange, isPartVisibile, attachPart, getSideBarPosition, onDidChangeSideBarPosition } = await import('@codingame/monaco-vscode-views-service-override');

for (const config of [
{ part: mvs.Parts.TITLEBAR_PART, element: '#titleBar' },
{ part: mvs.Parts.BANNER_PART, element: '#banner' },
{ part: Parts.TITLEBAR_PART, element: '#titleBar' },
{ part: Parts.BANNER_PART, element: '#banner' },
{
part: mvs.Parts.SIDEBAR_PART, get element() {
return getSideBarPosition() === mvs.Position.LEFT ? '#sidebar' : '#sidebar-right';
part: Parts.SIDEBAR_PART, get element() {
return getSideBarPosition() === Position.LEFT ? '#sidebar' : '#sidebar-right';
}, onDidElementChange: onDidChangeSideBarPosition
},
{
part: mvs.Parts.ACTIVITYBAR_PART, get element() {
return getSideBarPosition() === mvs.Position.LEFT ? '#activityBar' : '#activityBar-right';
part: Parts.ACTIVITYBAR_PART, get element() {
return getSideBarPosition() === Position.LEFT ? '#activityBar' : '#activityBar-right';
}, onDidElementChange: onDidChangeSideBarPosition
},
{
part: mvs.Parts.AUXILIARYBAR_PART, get element() {
return getSideBarPosition() === mvs.Position.LEFT ? '#auxiliaryBar' : '#auxiliaryBar-left';
part: Parts.AUXILIARYBAR_PART, get element() {
return getSideBarPosition() === Position.LEFT ? '#auxiliaryBar' : '#auxiliaryBar-left';
}, onDidElementChange: onDidChangeSideBarPosition
},
{ part: mvs.Parts.EDITOR_PART, element: '#editors' },
{ part: mvs.Parts.PANEL_PART, element: '#panel' },
{ part: mvs.Parts.STATUSBAR_PART, element: '#statusBar' }
{ part: Parts.EDITOR_PART, element: '#editors' },
{ part: Parts.PANEL_PART, element: '#panel' },
{ part: Parts.STATUSBAR_PART, element: '#statusBar' }
]) {
attachPart(config.part, document.querySelector<HTMLDivElement>(config.element)!);

Expand Down
15 changes: 10 additions & 5 deletions packages/wrapper/src/wrapper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -166,12 +166,17 @@ export class MonacoEditorLanguageClientWrapper {
throw new Error('No init was performed. Please call init() before start()');
}

this.logger.info(`Starting monaco-editor (${this.id})`);
const html = htmlContainer === undefined ? this.wrapperConfig?.htmlContainer : htmlContainer;
if (html === undefined) {
throw new Error('No html container provided. Unable to start monaco-editor.');
const viewServiceType = this.wrapperConfig?.vscodeApiConfig?.viewsConfig?.viewServiceType;
if (viewServiceType === 'EditorService' || viewServiceType === undefined) {
this.logger.info(`Starting monaco-editor (${this.id})`);
const html = htmlContainer === undefined ? this.wrapperConfig?.htmlContainer : htmlContainer;
if (html === undefined) {
throw new Error('No html container provided. Unable to start monaco-editor.');
} else {
await this.editorApp?.createEditors(html);
}
} else {
await this.editorApp?.createEditors(html);
this.logger.info('No EditorService configured. monaco-editor will not be started.');
}

await this.startLanguageClients();
Expand Down
Loading