WIP: Unify examples, disabled currently broken exmaples for now. Upda…

…ted to monaco-vscode-api 2.0.3 - Integrated python wrapper & react wrapper - Integrated json client web socket example
TypeFox · Feb 7, 2024 · ee117e4 · ee117e4
1 parent f2e01d9
commit ee117e4
Show file tree

Hide file tree

Showing 53 changed files with 2,112 additions and 545 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -26,7 +26,7 @@
           "name": "Chrome",
           "type": "chrome",
           "request": "launch",
-          "url": "http://localhost:8080",
+          "url": "http://localhost:20001",
           "webRoot": "${workspaceFolder}"
         }
     ]

diff --git a/README.md b/README.md
@@ -91,10 +91,10 @@ With v7 we decided to use readily treemended version of monaco-editor called [@c
 
 ```yaml
   "overrides": {
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.0.0"
+    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.0.3"
   },
   "resolutions": {
-    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.0.0"
+    "monaco-editor": "npm:@codingame/monaco-vscode-editor-api@~2.0.3"
   }
 ```
 
@@ -336,7 +336,7 @@ loader.config({ monaco });
 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.
 
 ```json
-"vscode": "npm:@codingame/monaco-vscode-api@~2.0.0"
+"vscode": "npm:@codingame/monaco-vscode-api@~2.0.3"
 ```
 
 ## Monaco-editor / @codingame/monaco-vscode-api compatibility table

diff --git a/docs/versions-and-history.md b/docs/versions-and-history.md
@@ -6,7 +6,7 @@ The following table describes which version of **monaco-languageclient** and **@
 
 | monaco-languageclient | monaco-vscode-api | monaco-vscode-editor-api | monaco-editor | release date | comment |
 | :----         | :----   | :---   | :--- | :--- | :--- |
-| 8.0.0         | 2.0.0  | 2.0.0 | 0.45.0 | 2024-02-0x | `@codingame/monaco-vscode-editor-api` replaces `@codingame/monaco-editor-treemended` |
+| 8.0.0         | 2.0.1  | 2.0.1 | 0.45.0 | 2024-02-0x | `@codingame/monaco-vscode-editor-api` replaces `@codingame/monaco-editor-treemended` |
 | 7.3.0         | 1.85.0  | 1.85.0 | 0.45.0 | 2024-01-04 | |
 | 7.2.0         | 1.83.16  | 1.83.16 | 0.44.0 | 2023-12-07 | |
 | 7.1.0         | 1.83.12  | 1.83.12 | 0.44.0 | 2023-11-27 | |

diff --git a/index.html b/index.html
@@ -16,22 +16,47 @@
     <div style="padding: 5px">
         <h2>Examples</h2>
 
+        Please run <b><code>npm run build</code></b> if you haven't done it already.
+
+        <h2>Monaco Editor Wrapper</h2>
+
         <h3>JSON language client and language server</h3>
+
         Please execute <b><code>npm run start:example:server:json</code></b> beforehand:<br>
-        <a href="packages/examples/client.html">Client for Node.js Language Server</a>
+        <a href="./packages/examples/wrapper_ws.html">Language Client & Web Socket Language Server example</a>
+        <br>
+
+        <h3>Langium language client and language servers</h3>
+
+        <a href="./packages/examples/wrapper_langium.html">Langium Grammar DSL Language Client & Language Server (Worker)</a>
+        <br>
+        <a href="./packages/examples/wrapper_statemachine.html">Langium Statemachine Client & Language Server (Worker)</a>
+        <br>
+        Localizations: <a href="packages/examples/statemachine_client.html?locale=de">German</a> <a href="packages/examples/statemachine_client.html?locale=fr">French</a> and <a href="packages/examples/statemachine_client.html?locale=es">Spanish</a><br>
+
         <h3>Python language client and language server</h3>
         Please execute <b><code>npm run start:example:server:python</code></b> beforehand:<br>
-        <a href="packages/examples/python.html">Client for Python Pyright Language Server</a>
+        <a href="packages/examples/python.html">Client for Python Pyright Language Server</a><br>
+
+        <h3>Other Examples</h3>
+        <a href="packages/examples/browser.html">Browser Example</a>
+        <br>
+        <a href="./packages/examples/wrapper_ts.html">TypeScript Editor Worker</a>
+        <br>
+        <a href="./packages/examples/wrapper_adv.html">Multiple Editors</a>
+        <br>
+
         <h3>Groovy language client and language server</h3>
         Requires docker. Please execute <b><code>docker-compose -f ./packages/examples/resources/groovy/docker-compose.yml up -d</code></b> beforehand:<br>
         <a href="packages/examples/groovy.html">Client for Groovy Language Server</a>
-        <h3>Langium client and language server</h3>
-        <a href="packages/examples/statemachine_client.html">Client & Statemachine LS (Web Worker)</a><br>
-        Localizations: <a href="packages/examples/statemachine_client.html?locale=de">German</a> <a href="packages/examples/statemachine_client.html?locale=fr">French</a> and <a href="packages/examples/statemachine_client.html?locale=es">Spanish</a><br>
-        <h3>Other examples</h3>
-        <a href="packages/examples/browser.html">Browser Example</a>
-        <br><br>
-        <a href="packages/examples/react.html">React Client Example</a>
+
+        <h2>Monaco Editor React</h2>
+        <a href="./packages/examples/react_statemachine.html">Langium Statemachine Client & Language Server (Worker)</a>
+        <br>
+        <br>
+        Please execute  <b><code>npm run start:example:server:python</code></b> beforehand:<br>
+        <a href="./packages/examples/react_python.html">Python Language Client & Language Server</a>
+        <br>
 
         <h2>Verification</h2>
         <h3>Webpack</h3>