Skip to content

Commit

Permalink
Release preparations
Browse files Browse the repository at this point in the history
  • Loading branch information
kaisalmen committed Dec 18, 2024
1 parent 25de048 commit 1c771d2
Show file tree
Hide file tree
Showing 22 changed files with 100 additions and 121 deletions.
5 changes: 5 additions & 0 deletions .github/workflows/ghp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ jobs:
- name: Volta
uses: volta-cli/action@v4

- name: Use pnpm
uses: pnpm/action-setup@v3
with:
version: 9

- name: Install
shell: bash
run: |
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,11 @@ jobs:
- name: Volta
uses: volta-cli/action@v4

- name: Use pnpm
uses: pnpm/action-setup@v3
with:
version: 9

- name: Install
shell: bash
run: |
Expand Down
2 changes: 1 addition & 1 deletion docs/versions-and-history.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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.0.0-next.14 | 6.0.0-next.14 | 6.0.0-next.14 | 11.1.2 | 1.95.3 | 0.52.0 | 2024-12-18 | |
| 9.0.0 | 6.0.0 | 6.0.0 | 11.1.2 | 1.95.3 | 0.52.0 | 2024-12-18 | |
| 8.8.3 | 5.5.3 | 4.5.3 | 8.0.4 | 1.92.2 | 0.51.0 | 2024-08-26 | |
| 8.8.2 | 5.5.2 | 4.5.2 | 8.0.2 | 1.92.2 | 0.50.0 | 2024-08-21 | |
| 8.8.1 | 5.5.1 | 4.5.1 | 8.0.1 | 1.92.1 | 0.50.0 | 2024-08-12 | |
Expand Down
28 changes: 14 additions & 14 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"devDependencies": {
"@codingame/esbuild-import-meta-url-plugin": "~1.0.2",
"@codingame/monaco-vscode-rollup-vsix-plugin": "~11.1.2",
"@eslint/js": "~9.17.0",
"@eslint/eslintrc": "~3.2.0",
"@eslint/js": "~9.17.0",
"@stylistic/eslint-plugin": "~2.12.1",
"@testing-library/react": "~16.1.0",
"@types/node": "~22.10.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "monaco-languageclient",
"version": "9.0.0-next.14",
"version": "9.0.0",
"description": "Monaco Language client implementation",
"author": {
"name": "TypeFox GmbH",
Expand Down
4 changes: 4 additions & 0 deletions packages/examples/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.

## [2024.12.6] - 2024-12-18

- Use final release of `[email protected]`, `[email protected]`, `[email protected]` and `@typefox/[email protected]`.

## [2024.12.5] - 2024-12-18

- Remove all `peerDependencies` and only use regular `dependencies.
Expand Down
28 changes: 14 additions & 14 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.12.5",
"version": "2024.12.6",
"description": "Monaco Language client examples",
"author": {
"name": "TypeFox GmbH",
Expand Down Expand Up @@ -73,36 +73,36 @@
"dependencies": {
"@codingame/monaco-vscode-configuration-service-override": "~11.1.2",
"@codingame/monaco-vscode-cpp-default-extension": "~11.1.2",
"@codingame/monaco-vscode-environment-service-override": "~11.1.2",
"@codingame/monaco-vscode-explorer-service-override": "~11.1.2",
"@codingame/monaco-vscode-files-service-override": "~11.1.2",
"@codingame/monaco-vscode-groovy-default-extension": "~11.1.2",
"@codingame/monaco-vscode-keybindings-service-override": "~11.1.2",
"@codingame/monaco-vscode-lifecycle-service-override": "~11.1.2",
"@codingame/monaco-vscode-localization-service-override": "~11.1.2",
"@codingame/monaco-vscode-java-default-extension": "~11.1.2",
"@codingame/monaco-vscode-javascript-default-extension": "~11.1.2",
"@codingame/monaco-vscode-json-default-extension": "~11.1.2",
"@codingame/monaco-vscode-keybindings-service-override": "~11.1.2",
"@codingame/monaco-vscode-lifecycle-service-override": "~11.1.2",
"@codingame/monaco-vscode-localization-service-override": "~11.1.2",
"@codingame/monaco-vscode-python-default-extension": "~11.1.2",
"@codingame/monaco-vscode-remote-agent-service-override": "~11.1.2",
"@codingame/monaco-vscode-secret-storage-service-override": "~11.1.2",
"@codingame/monaco-vscode-standalone-json-language-features": "~11.1.2",
"@codingame/monaco-vscode-standalone-languages": "~11.1.2",
"@codingame/monaco-vscode-standalone-typescript-language-features": "~11.1.2",
"@codingame/monaco-vscode-standalone-json-language-features": "~11.1.2",
"@codingame/monaco-vscode-textmate-service-override": "~11.1.2",
"@codingame/monaco-vscode-theme-defaults-default-extension": "~11.1.2",
"@codingame/monaco-vscode-theme-service-override": "~11.1.2",
"@codingame/monaco-vscode-typescript-basics-default-extension": "~11.1.2",
"@codingame/monaco-vscode-typescript-language-features-default-extension": "~11.1.2",
"@codingame/monaco-vscode-views-service-override": "~11.1.2",
"@codingame/monaco-vscode-remote-agent-service-override": "~11.1.2",
"@codingame/monaco-vscode-environment-service-override": "~11.1.2",
"@codingame/monaco-vscode-secret-storage-service-override": "~11.1.2",
"@typefox/monaco-editor-react": "~6.0.0-next.14",
"@typefox/monaco-editor-react": "~6.0.0",
"cors": "^2.8.5",
"express": "~4.21.2",
"jszip": "~3.10.1",
"langium": "~3.3.0",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~11.1.2",
"monaco-editor-wrapper": "~6.0.0-next.14",
"monaco-languageclient": "~9.0.0-next.14",
"monaco-editor-wrapper": "~6.0.0",
"monaco-languageclient": "~9.0.0",
"pyright": "~1.1.391",
"react": "~18.3.1",
"react-dom": "~18.3.1",
Expand All @@ -112,17 +112,17 @@
"vscode-languageclient": "~9.0.1",
"vscode-languageserver": "~9.0.1",
"vscode-uri": "~3.0.8",
"vscode-ws-jsonrpc": "~3.4.0-next.14",
"vscode-ws-jsonrpc": "~3.4.0",
"ws": "~8.18.0",
"wtd-core": "~4.0.1"
},
"devDependencies": {
"@types/cors": "^2.8.17",
"@types/emscripten": "~1.39.13",
"@types/express": "~5.0.0",
"@types/ws": "~8.5.13",
"@types/emscripten": "~1.39.13",
"mini-coi": "~0.4.2",
"langium-cli": "~3.3.0",
"mini-coi": "~0.4.2",
"ts-node": "~10.9.1",
"vite-plugin-static-copy": "~2.2.0",
"vscode-languageserver-types": "~3.17.5"
Expand Down
2 changes: 1 addition & 1 deletion packages/vscode-ws-jsonrpc/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vscode-ws-jsonrpc",
"version": "3.4.0-next.14",
"version": "3.4.0",
"description": "VSCode JSON RPC over WebSocket",
"author": {
"name": "TypeFox GmbH",
Expand Down
4 changes: 2 additions & 2 deletions packages/wrapper-react/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +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.

## [6.0.0-next.14] - 2024-12-18
## [6.0.0] - 2024-12-18

- Only `monaco-editor-wrapper` is a `peerDependencies`
- Updated engine engine requirements for node to (`>=18.19.0`) and for npm to (`>=10.2.3`)
- Updated to `[email protected]-next.14` and `[email protected]-next.14`. Updated all `@codingame/monaco-vscode` packages to `11.1.2`.
- Updated to `[email protected]` and `[email protected]`. Updated all `@codingame/monaco-vscode` packages to `11.1.2`.
- Bugfix: Wrapper: Text model content is not properly updated with updateCodeResource [#808](https://github.com/TypeFox/monaco-languageclient/pull/808)
- Workaround for `@codingame/monaco-vscode-chat-extensions-notebook-task-terminal-testing-common` dependency problem
- Run language clients independent of wrapper lifecycle [#784](https://github.com/TypeFox/monaco-languageclient/pull/784)
Expand Down
61 changes: 14 additions & 47 deletions packages/wrapper-react/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,70 +16,37 @@ This is npm package is part of the [monaco-languageclient mono repo](https://git

You can import the monaco react component for easy use in an existing React project. Below you can see a quick example of a fully functional implementation in TypeScript. The react component uses the same `UserConfig` approach which is then applied to `monaco-editor-wrapper`.

```typescript
```tsx
import React from 'react';
import ReactDOM from 'react-dom/client';
import '@codingame/monaco-vscode-python-default-extension';
import { UserConfig } from 'monaco-editor-wrapper';
import { WrapperConfig } from 'monaco-editor-wrapper';
import { MonacoEditorReactComp } from '@typefox/monaco-editor-react';

const userConfig: UserConfig = {
wrapperConfig: {
$type: 'extendend',
editorAppConfig: {
codeResources: {
main: {
text: 'print("Hello, World!")',
uri: '/workspace/hello.py'
}
const wrapperConfig: WrapperConfig = {
$type: 'extendend',
htmlContainer: document.getElementById('monaco-editor-root')!,
editorAppConfig: {
codeResources: {
main: {
text: 'print("Hello, World!")',
uri: '/workspace/hello.py'
}
}
}
};

const comp = <MonacoEditorReactComp
userConfig={userConfig}
style={{
'paddingTop': '5px',
'height': '80vh'
wrapperConfig={wrapperConfig}
style={{ 'height': '100%' }}
onLoad={(wrapper: MonacoEditorLanguageClientWrapper) => {
// use the wrapper to get access to monaco-editor or the languageclient
}}
/>;
ReactDOM.createRoot(document.getElementById('react-root')!).render(comp);

```

### Invoking Custom Commands

*An experimental feature.*

If you have hooked up this component to talk with a language server, then you also may want to invoke custom LSP commands. This can be helpful when you want to perform specific actions on the internal representation of your language, or when you want to expose some details about your language for use in your React application. This could include generator functionality, such that other parts of your application can interact with your language without knowledge of the language server's internals.

Custom commands can be invoked by getting a reference to your Monaco component. This *breaks* the standard encapsulation that React is built on, so no guarantees this won't cause other issues with your React app.

```ts
// based on the official React example for refs:
// https://reactjs.org/docs/refs-and-the-dom.html#creating-refs

class MyComponent extends React.Component {
constructor(props) {
super(props);
this.myRef = React.createRef();
}

render() {
return <MonacoEditorReactComp ref={this.myRef} .../>;
}
}
```

You can then access the `current` property of the ref to get a reference to your component. This can then be used to invoke the `executeCommands` function present in the component.

```ts
this.myRef.current.executeCommand('myCustomCommand', args...);
```

This will return an instance of `Thenable`, which should contain the returned data of executing your custom command. As you can imagine, this is incredibly helpful for getting internal access for specific language handling, but without needing details about the internals of your language server to do it.

## Examples

For a detailed list of examples please look at [this section](<https://github.com/TypeFox/monaco-languageclient#examples-overview>) in the main repository.
Expand Down
10 changes: 5 additions & 5 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.0.0-next.14",
"version": "6.0.0",
"license": "MIT",
"description": "React component for Monaco-Editor and Monaco Languageclient",
"keywords": [
Expand Down Expand Up @@ -46,14 +46,14 @@
"npm": "10.9.0"
},
"dependencies": {
"react": "~18.3.1",
"monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~11.1.2",
"monaco-languageclient": "~9.0.0-next.14",
"monaco-languageclient": "~9.0.0",
"react": "~18.3.1",
"vscode": "npm:@codingame/monaco-vscode-api@~11.1.2",
"vscode-ws-jsonrpc": "~3.4.0-next.14"
"vscode-ws-jsonrpc": "~3.4.0"
},
"peerDependencies": {
"monaco-editor-wrapper": "~6.0.0-next.14"
"monaco-editor-wrapper": "~6.0.0"
},
"peerDependenciesMeta": {
"monaco-editor-wrapper": {
Expand Down
4 changes: 2 additions & 2 deletions packages/wrapper/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

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

## [6.0.0-next.14] - 2024-12-18
## [6.0.0] - 2024-12-18

- Only `monaco-languageclient` and `vscode-ws-jsonrpc` are `peerDependencies`.
- Updated to `[email protected]-next.14` and `[email protected]-next.14`. Updated all `@codingame/monaco-vscode` packages to `11.1.2`.
- Updated to `[email protected]` and `[email protected]`. Updated all `@codingame/monaco-vscode` packages to `11.1.2`.
- Updated engine engine requirements for node to (`>=18.19.0`) and for npm to (`>=10.2.3`)
- Bugfix: Wrapper: Text model content is not properly updated with updateCodeResource [#808](https://github.com/TypeFox/monaco-languageclient/pull/808)
- Fixed WebSocket type checking error [#800](https://github.com/TypeFox/monaco-languageclient/pull/800)
Expand Down
Loading

0 comments on commit 1c771d2

Please sign in to comment.