Merge monaco-editor-wrapper and monaco-editor-react into monaco-languageclient's npm workspace #600

kaisalmen · 2024-01-29T17:54:43Z

This PR is now ready for review. A couple of open points should be fixed, but review can start now.

This repository now hosts the following npm packages:

monaco-languagclient; Next release: https://www.npmjs.com/package/monaco-languageclient/v/8.0.0-next.6
vscode-ws-jsopnrpc; Next release: https://www.npmjs.com/package/vscode-ws-jsonrpc/v/3.3.0-next.6
monaco-editor-wrapper; Next release: https://www.npmjs.com/package/monaco-editor-wrapper/v/4.0.0-next.6
@typefox/monaco-editor-react; Next release: https://www.npmjs.com/package/@typefox/monaco-editor-react/v/3.0.0-next.6
monaco-languagclient-examples; Next release: https://www.npmjs.com/package/monaco-languageclient-examples/v/8.0.0-next.6

Important points:

The examples of this repository and the ones from https://github.com/TypeFox/monaco-components have been merged.
Verification examples have been removed from the npm workspace and are now contained in the directory verify.
- The Angular example has been integrated here. The build pipeline verifies they are properly building
- They have been excluded from main workspace to prevent pollution of the main node_modules (e.g. angular)
monaco-editor-workers is no longer needed and is replaced by monaco-editor-wrapper/workerFactory that integrates ideas from monaco-vscode-api demo and is fully customizable/over-writeable.
Client examples now make use of monaco-editor-wrapper or @typefox/monaco-editor-react. This made reduces the amount of boiler plate code.

Left over points required at least required to be implemented before this PR can be merged:

Browser example should also use the wrapper
Update all READMEs and linked documentation files
Check LICENSE files and statements
Update CHANGELOGs
Check if existing bugs should be fixed along or if they should be fixed with a bug-fix release
The worker based extension host needs to be integrate to allow advanced TypeScript support where needed in the example (wrapperTs and wrapperAdvanced), but this can be deferred. Moved to Enhance TypeScript related examples #611

Will close #543

kaisalmen · 2024-02-19T16:59:21Z

@CGNonofr I have updated to 2.2.0-next.1 and the font in the command palette is wrong. Should this work without change?

@codingame/monaco-vscode-typescript-basics-default-extension gives me the following error:

and @codingame/monaco-vscode-typescript-language-features-default-extension and throws an error:

kaisalmen · 2024-02-19T17:01:02Z

Did I miss changes in the vite configuration? I just checked the your demo config and I didn't see something obvious

CGNonofr · 2024-02-19T18:03:36Z

Did I miss changes in the vite configuration? I just checked the your demo config and I didn't see something obvious

I'm not aware of anything 🤔

The first error looks like the theme service override is not registered

The second one is probably due to the webworker extension host not working (the local process extension host is not able to replace worker urls by real urls)

kaisalmen · 2024-02-20T10:43:37Z

I'm not aware of anything 🤔

It is consistently using the wrong font. Did you remove to many global css instructions? Interestingly, codicon is fine. In the past, usually problems originated from there.

The first error looks like the theme service override is not registered

I mixed the classical editor mode of the wrapper with the vscode extensions and therefore the themes override was not loaded. My fault.

The second one is probably due to the webworker extension host not working (the local process extension host is not able to replace worker urls by real urls)

You have a workaround for that problem in the demo, don't you? Could we generalize that somehow. I need to fix the editor worker issue as well, too.

CGNonofr · 2024-02-20T13:23:24Z

It is consistently using the wrong font. Did you remove to many global css instructions? Interestingly, codicon is fine. In the past, usually problems originated from there.

There were some removed global style I've added back (with some tweaks to remove properties on the body and so on...)

What do you expect and what do you get?

You have a workaround for that problem in the demo, don't you? Could we generalize that somehow. I need to fix the editor worker issue as well, too.

Nop, in the demo, the default extensions run in the worker ext host

kaisalmen · 2024-02-26T12:19:10Z

@CGNonofr just tested again with 2.2.0-next.5. First two screenshots are from an new here (Chrom on Windows). Font in command palette is with serif. The last shot is from the demo of your latest code (Chrome on Ubuntu). Font is as expected.

New example Langium Grammar DSL Language Client & Server (Worker) (Chrome on Windows):

monaco-vscode-api demo (Chrome on Ubuntu):

kaisalmen · 2024-02-26T15:40:24Z

Latest force-push using @codingame/[email protected] fixes the issue above ⬆️

kaisalmen · 2024-02-27T09:38:23Z

@CGNonofr I am continuing to merge and update the examples (latest code is not yet pushed). Have you seen this error already? Using the standalone editor here with 2.2.1:

kaisalmen · 2024-02-27T09:39:31Z

I am not importing any workbench related things and I guess that should not be needed.

ls-infra · 2024-02-29T20:37:44Z

should i put this #595 feature on hold until this WIP PR is merged and released ?
btw, for the language-client-runner , is there a way to save the edited value in code editor back so that it can submit back to the API? it is related to TypeFox/monaco-languageclient-ng-example#5 , i am keen to help to update the angular demo once this two way data binding feature is in place in the wrapper .

thx

kaisalmen · 2024-03-04T08:08:06Z

should i put this #595 feature on hold until this WIP PR is merged and released ?

Yes, that makes sense. I hope to get this ready finally this week. My own availability will be better again now.

btw, for the language-client-runner , is there a way to save the edited value in code editor back so that it can submit back to the API? it is related to TypeFox/monaco-languageclient-ng-example#5 , i am keen to help to update the angular demo once this two way data binding feature is in place in the wrapper .

The wrapper allows you already to get access to the editor/model itself. See for example. https://github.com/TypeFox/monaco-languageclient/blob/merge-monaco-edtior-wrapper/packages/wrapper/src/wrapper.ts#L156-L190 This is also put to use in some of the examples.

kaisalmen · 2024-03-18T13:30:20Z

@CGNonofr README updates and LICENSE unification are done. CHANGELOGs are next.

kaisalmen · 2024-03-18T15:42:59Z

@CGNonofr this is ready for review. Please go ahead.

CGNonofr · 2024-03-18T16:03:31Z

@CGNonofr this is ready for review. Please go ahead.

There is still a WIP commit, am I supposed to review it?

kaisalmen · 2024-03-18T17:03:34Z

There is still a WIP commit, am I supposed to review it?

A the first one. Nevermind, go ahead

kaisalmen · 2024-03-18T17:28:01Z

... or give me a 30 minutes. I can fix the commit message, but need to finish something else first

CGNonofr

didn't spot anything weird but not the easiest PR of my life !

packages/client/README.md

packages/examples/src/utils/localeLoader.ts

…nify examples - Updated to monaco-vscode-api 2.2.1 - Integrated python wrapper & react wrapper - Integrated json wrapper client web socket example - Converted groovy example to wrapper - Updated versions to 8.0.0-next.0, 4.0.0-next.0 and 3.0.0-next.0

…langium examples

…-next.cc1a49c

…itor

…nstruction of worker - Integrate angular example

- Include build of all verification examples - workerFactory allows to use configuration or worker for the definition

… for now

…1. Fix locale loading

…used

… callback is thrown

…riggered once

… monaco-vscode-api 3.1.2, use monaco-editor as dependency designator - Moved some code back from the wrapper to the languageclient as otherwise it can be used standalone - Cleaned enhanced MonacoEnvironment and fixed init bug in new common init function

kaisalmen · 2024-03-18T17:33:29Z

@CGNonofr It's rebased and the first to commits on the branch have been merged.

kaisalmen · 2024-03-18T17:36:31Z

didn't spot anything weird but not the easiest PR of my life !

Yes, I know and I am sorry for this, but merging this all in one place couldn't be done in small steps. We can iterate from here.

kaisalmen force-pushed the merge-monaco-edtior-wrapper branch from e7a2a44 to ee117e4 Compare February 7, 2024 09:06

kaisalmen force-pushed the merge-monaco-edtior-wrapper branch from ee117e4 to 0354fe3 Compare February 14, 2024 22:05

This was referenced Feb 16, 2024

8.0.0 status #605

Closed

Implement dispose method on WebSocketMessageReader. #602

Merged

kaisalmen force-pushed the merge-monaco-edtior-wrapper branch 2 times, most recently from 9f51b4f to 816c4fa Compare February 19, 2024 16:50

kaisalmen mentioned this pull request Feb 26, 2024

Full workbench mode CodinGame/monaco-vscode-api#349

Merged

CGNonofr mentioned this pull request Feb 26, 2024

Restore standalone editor style CodinGame/monaco-vscode-api#353

Merged

kaisalmen force-pushed the merge-monaco-edtior-wrapper branch 2 times, most recently from 41721dc to c2ff580 Compare February 26, 2024 15:39

kaisalmen force-pushed the merge-monaco-edtior-wrapper branch 3 times, most recently from 4aef2fb to 2e44d6f Compare February 27, 2024 07:09

kaisalmen force-pushed the merge-monaco-edtior-wrapper branch 2 times, most recently from cba8b08 to 2af7bdd Compare February 28, 2024 15:10

This was referenced Mar 4, 2024

Selective applicance of wrappers css TypeFox/monaco-components#65

Closed

Important: In the near future (before April March 2024) this repo will be fused with monaco-languageclient TypeFox/monaco-components#66

Closed

kaisalmen self-assigned this Mar 4, 2024

kaisalmen mentioned this pull request Mar 7, 2024

Vite & monaco-editor-workers TypeFox/monaco-components#67

Closed

CGNonofr approved these changes Mar 18, 2024

View reviewed changes

packages/client/README.md Show resolved Hide resolved

packages/examples/src/utils/localeLoader.ts Show resolved Hide resolved

kaisalmen added 16 commits March 18, 2024 18:31

Integrate Langium Statemachine example code directly and restructure …

b90680d

…langium examples

Update to latest monaco-vscode-api 2.2.2 and Langium next build 3.0.0…

d1d8a98

…-next.cc1a49c

Integrate worker handling and remove need for dependency to monaco-ed…

10471ce

…itor

Remove non module worker support from worker factory. Allow direct co…

860e261

…nstruction of worker - Integrate angular example

Update to latest monaco-vscode packages (3.1.0)

bbd82c5

- Include build of all verification examples - workerFactory allows to use configuration or worker for the definition

Align example execution. Only use basic javascript/typescript support…

2e6d24b

… for now

Port browser example to the wrapper. Update to monaco-vscode-api 3.1.…

d60677a

…1. Fix locale loading

Switch wrapperTs to classic mode

0331849

fix: services and default extensions are only imported when they are …

e29229e

…used

fix: TypeFox/monaco-components#62 Exceptions are forwarded to onError…

af3e997

… callback is thrown

fix: TypeFox/monaco-components#64 service initalization can only be t…

2793dac

…riggered once

Next preview releases (next.4)

938ea4f

Documentation update, make LICENSE usage consistent

a99615b

Updated CHANGELOGs and version to -next.6

b81ff04

kaisalmen force-pushed the merge-monaco-edtior-wrapper branch from 3118e93 to b81ff04 Compare March 18, 2024 17:32

CGNonofr self-requested a review March 18, 2024 17:34

CGNonofr approved these changes Mar 18, 2024

View reviewed changes

kaisalmen merged commit 4624c5c into main Mar 18, 2024

kaisalmen deleted the merge-monaco-edtior-wrapper branch March 18, 2024 20:16

kaisalmen mentioned this pull request Mar 18, 2024

Enhance TypeScript related examples #611

Closed

Uh oh!

Merge monaco-editor-wrapper and monaco-editor-react into monaco-languageclient's npm workspace #600

Merge monaco-editor-wrapper and monaco-editor-react into monaco-languageclient's npm workspace #600

Uh oh!

Conversation

kaisalmen commented Jan 29, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kaisalmen commented Feb 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kaisalmen commented Feb 19, 2024

Uh oh!

CGNonofr commented Feb 19, 2024

Uh oh!

kaisalmen commented Feb 20, 2024

Uh oh!

CGNonofr commented Feb 20, 2024

Uh oh!

kaisalmen commented Feb 26, 2024

Uh oh!

kaisalmen commented Feb 26, 2024

Uh oh!

kaisalmen commented Feb 27, 2024

Uh oh!

kaisalmen commented Feb 27, 2024

Uh oh!

ls-infra commented Feb 29, 2024

Uh oh!

kaisalmen commented Mar 4, 2024

Uh oh!

kaisalmen commented Mar 18, 2024

Uh oh!

kaisalmen commented Mar 18, 2024

Uh oh!

CGNonofr commented Mar 18, 2024

Uh oh!

kaisalmen commented Mar 18, 2024

Uh oh!

kaisalmen commented Mar 18, 2024

Uh oh!

CGNonofr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

kaisalmen commented Mar 18, 2024

Uh oh!

kaisalmen commented Mar 18, 2024

Uh oh!

Uh oh!

kaisalmen commented Jan 29, 2024 •

edited

Loading

kaisalmen commented Feb 19, 2024 •

edited

Loading