Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to monaco-vscode-api 7.0.3 #707

Merged
merged 2 commits into from
Jul 11, 2024
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
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ loader.config({ monaco });
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-api@~6.0.3"
"vscode": "npm:@codingame/monaco-vscode-api@~7.0.3"
```

## 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 |
| :---- | :---- | :--- | :--- | :--- | :--- | :--- | :--- |
| 8.7.0 | 5.4.0 | 4.4.0 | 7.0.3 | 1.91.0 | 0.50.0 | 2024-07-1x | |
| 8.6.0 | 5.3.1 | 4.3.2 | 6.0.3 | 1.90.0 | 0.50.0 | 2024-07-02 | |
| 8.6.0 | 5.3.0 | 4.3.0 | 6.0.3 | 1.90.0 | 0.50.0 | 2024-06-29 | |
| 8.5.0 | 5.2.0 | 4.2.0 | 5.2.0 | 1.89.1 | 0.48.0 | 2024-06-04 | |
Expand Down
2,399 changes: 1,556 additions & 843 deletions package-lock.json

Large diffs are not rendered by default.

26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
"type": "module",
"devDependencies": {
"@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
"@codingame/monaco-vscode-rollup-vsix-plugin": "~6.0.3",
"@codingame/monaco-vscode-rollup-vsix-plugin": "~7.0.3",
"@rollup/pluginutils": "~5.1.0",
"@testing-library/react": "~16.0.0",
"@types/node": "~20.14.9",
"@types/node": "~20.14.10",
"@types/react": "~18.3.3",
"@types/react-dom": "~18.3.0",
"@types/vscode": "~1.90.0",
"@typescript-eslint/eslint-plugin": "~7.14.1",
"@typescript-eslint/parser": "~7.14.1",
"@types/vscode": "~1.91.0",
"@typescript-eslint/eslint-plugin": "~7.16.0",
"@typescript-eslint/parser": "~7.16.0",
"@vitejs/plugin-react": "~4.3.1",
"@vitest/browser": "~1.6.0",
"@vitest/browser": "~2.0.2",
"editorconfig": "~2.0.0",
"esbuild": "~0.21.5",
"esbuild": "~0.23.0",
"eslint": "~8.57.0",
"eslint-plugin-header": "~3.1.1",
"eslint-plugin-import": "~2.29.1",
"eslint-plugin-unused-imports": "~3.2.0",
"http-server": "~14.1.1",
"minimatch": "~9.0.5",
"typescript": "~5.5.2",
"vite": "~5.3.2",
"vite-node": "~1.6.0",
"vitest": "~1.6.0",
"webdriverio": "~8.39.0"
"minimatch": "~10.0.1",
"typescript": "~5.5.3",
"vite": "~5.3.3",
"vite-node": "~2.0.2",
"vitest": "~2.0.2",
"webdriverio": "~8.39.1"
},
"volta": {
"node": "20.14.0",
Expand Down
5 changes: 5 additions & 0 deletions packages/client/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.

## [8.7.0] - 2024-07-1x

- Update to latest monaco-vscode-api [#7xx](https://github.com/TypeFox/monaco-languageclient/pull/7xx)
- Updated to version `7.0.3` of `@codingame/monaco-vscode` packages

## [8.6.0] - 2024-06-29

- Update to latest monaco-vscode-api [#691](https://github.com/TypeFox/monaco-languageclient/pull/691)
Expand Down
18 changes: 9 additions & 9 deletions packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monaco-languageclient",
"version": "8.6.0",
"version": "8.7.0",
"description": "Monaco Language client implementation",
"author": {
"name": "TypeFox GmbH",
Expand Down Expand Up @@ -62,17 +62,17 @@
"LICENSE"
],
"dependencies": {
"@codingame/monaco-vscode-extensions-service-override": "~6.0.3",
"@codingame/monaco-vscode-languages-service-override": "~6.0.3",
"@codingame/monaco-vscode-localization-service-override": "~6.0.3",
"@codingame/monaco-vscode-model-service-override": "~6.0.3",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~6.0.3",
"vscode": "npm:@codingame/monaco-vscode-api@~6.0.3",
"@codingame/monaco-vscode-extensions-service-override": "~7.0.3",
"@codingame/monaco-vscode-languages-service-override": "~7.0.3",
"@codingame/monaco-vscode-localization-service-override": "~7.0.3",
"@codingame/monaco-vscode-model-service-override": "~7.0.3",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~7.0.3",
"vscode": "npm:@codingame/monaco-vscode-api@~7.0.3",
"vscode-languageclient": "~9.0.1"
},
"peerDependencies": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~6.0.3",
"vscode": "npm:@codingame/monaco-vscode-api@~6.0.3"
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~7.0.3",
"vscode": "npm:@codingame/monaco-vscode-api@~7.0.3"
},
"peerDependenciesMeta": {
"monaco-editor": {
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.

## [2024.7.3] - 2024-07-1x

- Update to latest monaco-vscode-api [#7xx](https://github.com/TypeFox/monaco-languageclient/pull/7xx)
- Updated to `monaco-languageclient@8.7.0`, `monaco-editor-wrapper@5.4.0` and `@typefox/monaco-editor-react@4.4.0`. Updated all `@codingame/monaco-vscode` packages to `7.0.3`.

## [2024.7.2] - 2024-07-02

- Updated to `monaco-editor-wrapper@5.3.1` and `@typefox/monaco-editor-react@4.3.2`.
Expand Down
54 changes: 27 additions & 27 deletions packages/examples/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monaco-languageclient-examples",
"version": "2024.7.2",
"version": "2024.7.3",
"description": "Monaco Language client examples",
"author": {
"name": "TypeFox GmbH",
Expand Down Expand Up @@ -54,40 +54,40 @@
}
},
"dependencies": {
"@codingame/monaco-vscode-configuration-service-override": "~6.0.3",
"@codingame/monaco-vscode-files-service-override": "~6.0.3",
"@codingame/monaco-vscode-groovy-default-extension": "~6.0.3",
"@codingame/monaco-vscode-keybindings-service-override": "~6.0.3",
"@codingame/monaco-vscode-lifecycle-service-override": "~6.0.3",
"@codingame/monaco-vscode-localization-service-override": "~6.0.3",
"@codingame/monaco-vscode-javascript-default-extension": "~6.0.3",
"@codingame/monaco-vscode-json-default-extension": "~6.0.3",
"@codingame/monaco-vscode-python-default-extension": "~6.0.3",
"@codingame/monaco-vscode-standalone-languages": "~6.0.3",
"@codingame/monaco-vscode-standalone-typescript-language-features": "~6.0.3",
"@codingame/monaco-vscode-standalone-json-language-features": "~6.0.3",
"@codingame/monaco-vscode-textmate-service-override": "~6.0.3",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~6.0.3",
"@codingame/monaco-vscode-theme-service-override": "~6.0.3",
"@codingame/monaco-vscode-typescript-basics-default-extension": "~6.0.3",
"@codingame/monaco-vscode-typescript-language-features-default-extension": "~6.0.3",
"@typefox/monaco-editor-react": "~4.3.2",
"@codingame/monaco-vscode-configuration-service-override": "~7.0.3",
"@codingame/monaco-vscode-files-service-override": "~7.0.3",
"@codingame/monaco-vscode-groovy-default-extension": "~7.0.3",
"@codingame/monaco-vscode-keybindings-service-override": "~7.0.3",
"@codingame/monaco-vscode-lifecycle-service-override": "~7.0.3",
"@codingame/monaco-vscode-localization-service-override": "~7.0.3",
"@codingame/monaco-vscode-javascript-default-extension": "~7.0.3",
"@codingame/monaco-vscode-json-default-extension": "~7.0.3",
"@codingame/monaco-vscode-python-default-extension": "~7.0.3",
"@codingame/monaco-vscode-standalone-languages": "~7.0.3",
"@codingame/monaco-vscode-standalone-typescript-language-features": "~7.0.3",
"@codingame/monaco-vscode-standalone-json-language-features": "~7.0.3",
"@codingame/monaco-vscode-textmate-service-override": "~7.0.3",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~7.0.3",
"@codingame/monaco-vscode-theme-service-override": "~7.0.3",
"@codingame/monaco-vscode-typescript-basics-default-extension": "~7.0.3",
"@codingame/monaco-vscode-typescript-language-features-default-extension": "~7.0.3",
"@typefox/monaco-editor-react": "~4.4.0",
"express": "~4.19.2",
"langium": "~3.1.1",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~6.0.3",
"monaco-editor-wrapper": "~5.3.1",
"monaco-languageclient": "~8.6.0",
"pyright": "~1.1.369",
"langium": "~3.1.2",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~7.0.3",
"monaco-editor-wrapper": "~5.4.0",
"monaco-languageclient": "~8.7.0",
"pyright": "~1.1.371",
"react": "~18.3.1",
"react-dom": "~18.3.1",
"request-light": "~0.7.0",
"vscode": "npm:@codingame/monaco-vscode-api@~6.0.3",
"request-light": "~0.8.0",
"vscode": "npm:@codingame/monaco-vscode-api@~7.0.3",
"vscode-json-languageservice": "~5.4.0",
"vscode-languageclient": "~9.0.1",
"vscode-languageserver": "~9.0.1",
"vscode-uri": "~3.0.8",
"vscode-ws-jsonrpc": "~3.3.2",
"ws": "~8.17.1"
"ws": "~8.18.0"
},
"devDependencies": {
"@types/express": "~4.17.21",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* Licensed under the MIT License. See LICENSE in the package root for license information.
* ------------------------------------------------------------------------------------------ */

import { Uri } from 'vscode';
import getConfigurationServiceOverride from '@codingame/monaco-vscode-configuration-service-override';
import getEditorServiceOverride from '@codingame/monaco-vscode-editor-service-override';
import getKeybindingsServiceOverride from '@codingame/monaco-vscode-keybindings-service-override';
Expand All @@ -27,18 +26,7 @@ export const setupLangiumClientClassic = async (): Promise<UserConfig> => {
...getEditorServiceOverride(useOpenEditorStub),
...getKeybindingsServiceOverride()
},
debugLogging: true,
workspaceConfig: {
workspaceProvider: {
trusted: true,
workspace: {
workspaceUri: Uri.file('/workspace')
},
async open() {
return false;
}
}
}
debugLogging: true
},
editorAppConfig: {
$type: 'classic',
Expand Down
5 changes: 5 additions & 0 deletions packages/wrapper-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

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

## [4.4.0] - 2024-07-1x

- Update to latest monaco-vscode-api [#7xx](https://github.com/TypeFox/monaco-languageclient/pull/7xx)
- Updated to `monaco-editor-wrapper@5.4.0`, `monaco-languageclient@8.7.0` and version `7.0.3` of `@codingame/monaco-vscode` packages

## [4.3.2] - 2024-07-02

- Updated to `monaco-editor-wrapper@5.3.1`
Expand Down
18 changes: 9 additions & 9 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": "4.3.2",
"version": "4.4.0",
"license": "MIT",
"description": "React component for Monaco-Editor and Monaco Languageclient",
"keywords": [
Expand Down Expand Up @@ -42,18 +42,18 @@
"npm": "10.7.0"
},
"dependencies": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~6.0.3",
"monaco-editor-wrapper": "~5.3.1",
"monaco-languageclient": "~8.6.0",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~7.0.3",
"monaco-editor-wrapper": "~5.4.0",
"monaco-languageclient": "~8.7.0",
"react": "~18.3.1",
"vscode": "npm:@codingame/monaco-vscode-api@~6.0.3"
"vscode": "npm:@codingame/monaco-vscode-api@~7.0.3"
},
"peerDependencies": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~6.0.3",
"monaco-editor-wrapper": "~5.3.1",
"monaco-languageclient": "~8.6.0",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~7.0.3",
"monaco-editor-wrapper": "~5.4.0",
"monaco-languageclient": "~8.7.0",
"react": "~18.3.1",
"vscode": "npm:@codingame/monaco-vscode-api@~6.0.3"
"vscode": "npm:@codingame/monaco-vscode-api@~7.0.3"
},
"peerDependenciesMeta": {
"monaco-editor": {
Expand Down
5 changes: 5 additions & 0 deletions packages/wrapper/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

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

## [5.4.0] - 2024-07-1x

- Update to latest monaco-vscode-api [#7xx](https://github.com/TypeFox/monaco-languageclient/pull/7x)
- Updated to `monaco-languageclient@8.7.0`, `7.0.3` of `@codingame/monaco-vscode` packages

## [5.3.1] - 2024-07-02

- Fix Diff Editor Model Refs [#696](https://github.com/TypeFox/monaco-languageclient/pull/696)
Expand Down
62 changes: 31 additions & 31 deletions packages/wrapper/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monaco-editor-wrapper",
"version": "5.3.1",
"version": "5.4.0",
"license": "MIT",
"description": "Wrapper for monaco-vscode-editor-api and monaco-languageclient",
"keywords": [
Expand Down Expand Up @@ -85,43 +85,43 @@
"npm": "10.7.0"
},
"dependencies": {
"@codingame/monaco-vscode-configuration-service-override": "~6.0.3",
"@codingame/monaco-vscode-editor-service-override": "~6.0.3",
"@codingame/monaco-vscode-language-pack-cs": "~6.0.3",
"@codingame/monaco-vscode-language-pack-de": "~6.0.3",
"@codingame/monaco-vscode-language-pack-es": "~6.0.3",
"@codingame/monaco-vscode-language-pack-fr": "~6.0.3",
"@codingame/monaco-vscode-language-pack-it": "~6.0.3",
"@codingame/monaco-vscode-language-pack-ja": "~6.0.3",
"@codingame/monaco-vscode-language-pack-ko": "~6.0.3",
"@codingame/monaco-vscode-language-pack-pl": "~6.0.3",
"@codingame/monaco-vscode-language-pack-pt-br": "~6.0.3",
"@codingame/monaco-vscode-language-pack-qps-ploc": "~6.0.3",
"@codingame/monaco-vscode-language-pack-ru": "~6.0.3",
"@codingame/monaco-vscode-language-pack-tr": "~6.0.3",
"@codingame/monaco-vscode-language-pack-zh-hans": "~6.0.3",
"@codingame/monaco-vscode-language-pack-zh-hant": "~6.0.3",
"@codingame/monaco-vscode-monarch-service-override": "~6.0.3",
"@codingame/monaco-vscode-textmate-service-override": "~6.0.3",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~6.0.3",
"@codingame/monaco-vscode-theme-service-override": "~6.0.3",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~6.0.3",
"vscode": "npm:@codingame/monaco-vscode-api@~6.0.3",
"@codingame/monaco-vscode-configuration-service-override": "~7.0.3",
"@codingame/monaco-vscode-editor-service-override": "~7.0.3",
"@codingame/monaco-vscode-language-pack-cs": "~7.0.3",
"@codingame/monaco-vscode-language-pack-de": "~7.0.3",
"@codingame/monaco-vscode-language-pack-es": "~7.0.3",
"@codingame/monaco-vscode-language-pack-fr": "~7.0.3",
"@codingame/monaco-vscode-language-pack-it": "~7.0.3",
"@codingame/monaco-vscode-language-pack-ja": "~7.0.3",
"@codingame/monaco-vscode-language-pack-ko": "~7.0.3",
"@codingame/monaco-vscode-language-pack-pl": "~7.0.3",
"@codingame/monaco-vscode-language-pack-pt-br": "~7.0.3",
"@codingame/monaco-vscode-language-pack-qps-ploc": "~7.0.3",
"@codingame/monaco-vscode-language-pack-ru": "~7.0.3",
"@codingame/monaco-vscode-language-pack-tr": "~7.0.3",
"@codingame/monaco-vscode-language-pack-zh-hans": "~7.0.3",
"@codingame/monaco-vscode-language-pack-zh-hant": "~7.0.3",
"@codingame/monaco-vscode-monarch-service-override": "~7.0.3",
"@codingame/monaco-vscode-textmate-service-override": "~7.0.3",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~7.0.3",
"@codingame/monaco-vscode-theme-service-override": "~7.0.3",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~7.0.3",
"vscode": "npm:@codingame/monaco-vscode-api@~7.0.3",
"vscode-languageclient": "~9.0.1",
"vscode-languageserver-protocol": "~3.17.5",
"vscode-ws-jsonrpc": "~3.3.2"
},
"devDependencies": {
"@codingame/monaco-vscode-standalone-languages": "~6.0.3",
"@codingame/monaco-vscode-standalone-css-language-features": "~6.0.3",
"@codingame/monaco-vscode-standalone-html-language-features": "~6.0.3",
"@codingame/monaco-vscode-standalone-json-language-features": "~6.0.3",
"@codingame/monaco-vscode-standalone-typescript-language-features": "~6.0.3"
"@codingame/monaco-vscode-standalone-languages": "~7.0.3",
"@codingame/monaco-vscode-standalone-css-language-features": "~7.0.3",
"@codingame/monaco-vscode-standalone-html-language-features": "~7.0.3",
"@codingame/monaco-vscode-standalone-json-language-features": "~7.0.3",
"@codingame/monaco-vscode-standalone-typescript-language-features": "~7.0.3"
},
"peerDependencies": {
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~6.0.3",
"monaco-languageclient": "~8.6.0",
"vscode": "npm:@codingame/monaco-vscode-api@~6.0.3"
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~7.0.3",
"monaco-languageclient": "~8.7.0",
"vscode": "npm:@codingame/monaco-vscode-api@~7.0.3"
},
"peerDependenciesMeta": {
"monaco-editor": {
Expand Down
3 changes: 2 additions & 1 deletion packages/wrapper/src/vscode/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ export const configureServices = async (config: VscodeServicesConfig): Promise<I
workspaceUri: vscode.Uri.file('/workspace')
},
async open() {
return false;
window.open(window.location.href);
return true;
}
}
};
Expand Down
Loading