From c49fccdc0824a8360f508b0fbfe9d8e25adad940 Mon Sep 17 00:00:00 2001 From: Kai Salmen Date: Fri, 20 Oct 2023 11:36:41 +0200 Subject: [PATCH] Updated to monaco-vscode-api 1.83.3 Add localization support to statemachine example --- README.md | 3 +- index.html | 3 +- package-lock.json | 164 ++++++++++-------- packages/client/CHANGELOG.md | 4 + packages/client/package.json | 12 +- packages/client/src/monaco-language-client.ts | 4 - packages/examples/package.json | 26 +-- packages/examples/src/langium/localeLoader.ts | 28 +++ packages/examples/statemachine_client.html | 6 +- packages/verify/pnpm/package.json | 4 +- packages/verify/vite/package.json | 4 +- packages/verify/webpack/package.json | 4 +- packages/verify/yarn/package.json | 2 +- 13 files changed, 164 insertions(+), 100 deletions(-) create mode 100644 packages/examples/src/langium/localeLoader.ts diff --git a/README.md b/README.md index abb903bac..a828fb6bc 100644 --- a/README.md +++ b/README.md @@ -94,6 +94,7 @@ The following table describes which version of **monaco-languageclient** and **@ | monaco-languageclient | @codingame/monaco-vscode-api | monaco-editor | comment | | :---- | :---- | :--- | :--- | +| 6.6.1 | 1.83.3 | 0.44.0 | Released 2023-10-20 | | 6.6.0 | 1.83.2 | 0.44.0 | Released 2023-10-16 | | 6.5.3 | 1.82.5 | 0.43.0 | Released 2023-10-11 | | 6.5.2 | 1.82.4 | 0.43.0 | Released 2023-10-07 | @@ -326,7 +327,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@>=1.83.2 <1.84.0" +"vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0" ``` ## Changelogs diff --git a/index.html b/index.html index 59050ea24..c158cea13 100644 --- a/index.html +++ b/index.html @@ -23,7 +23,8 @@

Python language client and language server

Please execute npm run start:example:server:python beforehand:
Client for Python Pyright Language Server

Langium client and language server

- Client & Statemachine LS (Web Worker) + Client & Statemachine LS (Web Worker)
+ Localizations: German French and Spanish

Other examples

Browser Example

diff --git a/package-lock.json b/package-lock.json index 20d6c9785..c9ff92026 100644 --- a/package-lock.json +++ b/package-lock.json @@ -71,101 +71,125 @@ "integrity": "sha512-YslZMgtJUyuMbZ+aKvfF3x1f5liK4mWNxghFRv7jqRR9C3R3fAOGTTKvxXDa2Y1s9zSbcpuO0cAxDYsc9SrXoQ==" }, "node_modules/@codingame/monaco-vscode-configuration-service-override": { - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-configuration-service-override/-/monaco-vscode-configuration-service-override-1.83.2.tgz", - "integrity": "sha512-I13oNZjAs3Ypmo8wQzKRwvTjFhBOYGBR107/MpZI9JJgi16t1DwfL8IaDnc2yOOwNFkVrJ44Wr2TwFKS6RhUHw==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-configuration-service-override/-/monaco-vscode-configuration-service-override-1.83.3.tgz", + "integrity": "sha512-13KqHosK4VLxiVy76T+jJQMaziOH+LZHdd/zpjszk0rrOzcpUUtG9mnoD/kWiuXo5LqiTw/aNhQMtMjSibWopg==", "dependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" } }, "node_modules/@codingame/monaco-vscode-editor-service-override": { - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-editor-service-override/-/monaco-vscode-editor-service-override-1.83.2.tgz", - "integrity": "sha512-Ou6StiX26baj98GGKDd5FIICe0pEl6RbopBlrPZ7H20F5T+d5WckEmzopBpGfrnLj/VaOHr8BT6tC3WzaNJWbw==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-editor-service-override/-/monaco-vscode-editor-service-override-1.83.3.tgz", + "integrity": "sha512-9j3ixC2KO+U2U4edm27ki17UetdpiQm/nGRAtdLXzUj6fnj34vr4EOyiVaj6/YtCa+qUuEqBrveosvRbUdxJAQ==", "dependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" } }, "node_modules/@codingame/monaco-vscode-files-service-override": { - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-1.83.2.tgz", - "integrity": "sha512-Y5WCe2Ar1s9971dT3kLQ8ThWJMJFJfMuZ1zGVQ//KCWs1SRuoykuk4NxYYovDNNwqn4Z9myHWPqSO6n07r4nGQ==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-files-service-override/-/monaco-vscode-files-service-override-1.83.3.tgz", + "integrity": "sha512-JxGmUDnEuChXgvMe/y9JN0XvI8dZr70P3rEErvBgRm1dq7+KJGQrRzdA0jvQkC04PNgvLzsRaVAATlRW5MOmoQ==", "dependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" } }, "node_modules/@codingame/monaco-vscode-json-default-extension": { - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-json-default-extension/-/monaco-vscode-json-default-extension-1.83.2.tgz", - "integrity": "sha512-8YIoMSd8iD6+0BfN+zi261R83gk2zo05jGrW9LwLJQuFYZwZl1D55rct73ZEv57EXky77PdFg59Q1OFfklE4FA==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-json-default-extension/-/monaco-vscode-json-default-extension-1.83.3.tgz", + "integrity": "sha512-dDvD23QMhdY29ElBQ7FhcjZ1g+dxyrYF0W47JbiW0NC9FKW0G5ggb5Rod+YYDLYV6MJjprCWIYg+fQXKlnfrcw==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.83.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" } }, "node_modules/@codingame/monaco-vscode-keybindings-service-override": { - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-keybindings-service-override/-/monaco-vscode-keybindings-service-override-1.83.2.tgz", - "integrity": "sha512-zEsTTH/H70DZzyZTu2WeLhakZ8N1W/LlPhgKxksrPluAVMeUAOaU2cuia7PXwxJ7mUtVf13W5BL4HZVwYxngrw==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-keybindings-service-override/-/monaco-vscode-keybindings-service-override-1.83.3.tgz", + "integrity": "sha512-yVcIn8xTOdPAIoMSa2k1YT38S8MGs7mU+psQgOen/bQLk9JKKXJSr5aJxs0fAF3Qs6qhdEVwwkJAe6w0wHDHQA==", "dependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" + } + }, + "node_modules/@codingame/monaco-vscode-language-pack-de": { + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-de/-/monaco-vscode-language-pack-de-1.83.3.tgz", + "integrity": "sha512-vDUDQmY7nitpi7DA4qihV58XSV/C+82JMoSbfossGf64Vp7CdjrC1YFr1zCtwfONlInfSJQ1kJX7ZxCFVY3okg==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" + } + }, + "node_modules/@codingame/monaco-vscode-language-pack-es": { + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-es/-/monaco-vscode-language-pack-es-1.83.3.tgz", + "integrity": "sha512-5tYrhvk/GGT/PRSX3SiCbKpqPy8bW1igMvvIlAbaoy/+/27K/9dsvvUwCqoR+T/8G+ptKn+bpTXM23XvPv8uyA==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" + } + }, + "node_modules/@codingame/monaco-vscode-language-pack-fr": { + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-language-pack-fr/-/monaco-vscode-language-pack-fr-1.83.3.tgz", + "integrity": "sha512-yhEYy2ZrmsuVrnC1Utxs66nvvdbfgOAtvEFRC27u3i9FxU4GcQwk++itFESkcrPSGdOiu2ZrHn4+ynfgViWxpA==", + "dependencies": { + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" } }, "node_modules/@codingame/monaco-vscode-languages-service-override": { - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-languages-service-override/-/monaco-vscode-languages-service-override-1.83.2.tgz", - "integrity": "sha512-re9A6EF4cHzXWGkoZcuUERr+O3JiGMEQ2UsH470gKKzsWfbcJ7Ob8u/G6F06PRZoFuTUTqeTTzL7xdPN8tnjKA==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-languages-service-override/-/monaco-vscode-languages-service-override-1.83.3.tgz", + "integrity": "sha512-ECIZbjFnB1gv+KiEhYVH26InXYUhBy1lZ8L8LJqL2fk8M9uni3bnVoV8yfP0OXd0L+tpjsL3hsNXv304a222+g==", "dependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" } }, "node_modules/@codingame/monaco-vscode-model-service-override": { - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-model-service-override/-/monaco-vscode-model-service-override-1.83.2.tgz", - "integrity": "sha512-hWAbiOcDegRv4ft2HZHMAMisw5U4Vy6iILY3JwNN+y2tNhuRZz4aqHhHVgVz7bIz/iJtS4wmyN7aKmyXtUnokw==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-model-service-override/-/monaco-vscode-model-service-override-1.83.3.tgz", + "integrity": "sha512-Bc0LujY0SBMvVJqB1YOVQzJPfApWyhHU79pCQiCPG2HbhdAOw1RDakbZ1iTA2i95q8ksgQTKVzgWLfL1Kj/McA==", "dependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" } }, "node_modules/@codingame/monaco-vscode-python-default-extension": { - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-python-default-extension/-/monaco-vscode-python-default-extension-1.83.2.tgz", - "integrity": "sha512-t2SSAmVynIf/Bhyy88LPET5Rfx+oCKj2ihGhB6I+39LsF+Kb61Vu3PonpID+IHyQJi8buqAb7KnPYmazX+fXfg==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-python-default-extension/-/monaco-vscode-python-default-extension-1.83.3.tgz", + "integrity": "sha512-C+Mv4dqhxx29ox2rkPYZr2K3k1Tp73P6AHZMbhvLjXp9IfOVDWNWZwZczseiBzWf+nG6hsLBEyENbXDJuAIskw==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.83.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" } }, "node_modules/@codingame/monaco-vscode-textmate-service-override": { - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-textmate-service-override/-/monaco-vscode-textmate-service-override-1.83.2.tgz", - "integrity": "sha512-R7ScgN80uSmNBOHmZop+ae+dbboH3SBCPHOYOctyflD7E8UKrENwEv+4OPJqjUm+HjgrRrDDfgwNzSbvPAhjvw==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-textmate-service-override/-/monaco-vscode-textmate-service-override-1.83.3.tgz", + "integrity": "sha512-QYtFlNUEHvQZYh92k3gvChxoliE3dRB0Q3SeijUfRHbzxJTjG6T+fJIQNSYGDQZFKtShQbSCezWbPf6XFfrayg==", "dependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.2", + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3", "vscode-oniguruma": "1.7.0", "vscode-textmate": "9.0.0" } }, "node_modules/@codingame/monaco-vscode-theme-defaults-default-extension": { - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-defaults-default-extension/-/monaco-vscode-theme-defaults-default-extension-1.83.2.tgz", - "integrity": "sha512-PsFRBLN+ce6bP5PVkTBCTUoHMCALwBWwjDeYfsRWS6RQuIFTL9rTEzS2D1i/gRDNadWN6Emb6tce6D4Oqj+/qQ==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-defaults-default-extension/-/monaco-vscode-theme-defaults-default-extension-1.83.3.tgz", + "integrity": "sha512-mxGGP6H5glYXxI6zfdUSdtJSfZ154oXjWdW3BNjtf9JGJ8C4tMBaMm4C5vD3ZHcEGk4I6pHNM4SYLOivKo/otA==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.83.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" } }, "node_modules/@codingame/monaco-vscode-theme-service-override": { - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-service-override/-/monaco-vscode-theme-service-override-1.83.2.tgz", - "integrity": "sha512-aJWZBrD/c12YGia43iV7JmXFc16MJ3oYS3iYBj8RByV3pWfkhgIGDCGZbenRLdf2R045X1lQ8StAVrZe88oZzw==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-theme-service-override/-/monaco-vscode-theme-service-override-1.83.3.tgz", + "integrity": "sha512-u5Q3/BvCpzOlSAvzurPY6+reCyrgmN21W3GF/qcLBmSXu7LMB9f8mH9uabXiThecuEpN9T94oPhw0GSCbfjdeg==", "dependencies": { "monaco-editor": "0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@1.83.2" + "vscode": "npm:@codingame/monaco-vscode-api@1.83.3" } }, "node_modules/@cspotcode/source-map-support": { @@ -6023,9 +6047,9 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.83.2", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.83.2.tgz", - "integrity": "sha512-wTdkrnMZV85jyZQm9PZW98JMTwhzuETALAtTiMVX9Lvw/tdrbRQC5lBZjjEytHGxhSC141rd5JcwPrDkuimZGA==", + "version": "1.83.3", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.83.3.tgz", + "integrity": "sha512-UhhThNT7mgUrnpLgoW0QiidFjD5vI0ia5uPvw88Z6uj4FngzXG33rqOhA/36xYwkFZKkNqOvSPnCG3zyTd0l2Q==", "dependencies": { "monaco-editor": "0.44.0" }, @@ -6449,15 +6473,15 @@ }, "packages/client": { "name": "monaco-languageclient", - "version": "6.6.0", + "version": "6.6.1", "hasInstallScript": true, "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-editor-service-override": "~1.83.2", - "@codingame/monaco-vscode-languages-service-override": "~1.83.2", - "@codingame/monaco-vscode-model-service-override": "~1.83.2", + "@codingame/monaco-vscode-editor-service-override": "~1.83.3", + "@codingame/monaco-vscode-languages-service-override": "~1.83.3", + "@codingame/monaco-vscode-model-service-override": "~1.83.3", "monaco-editor": "~0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0", "vscode-languageclient": "~8.1.0" }, "engines": { @@ -6466,7 +6490,7 @@ }, "peerDependencies": { "monaco-editor": "~0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0" + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0" }, "peerDependenciesMeta": { "monaco-editor": { @@ -6479,27 +6503,31 @@ }, "packages/examples": { "name": "monaco-languageclient-examples", - "version": "6.6.0", + "version": "6.6.1", "license": "MIT", "dependencies": { - "@codingame/monaco-vscode-configuration-service-override": "~1.83.2", - "@codingame/monaco-vscode-editor-service-override": "~1.83.2", - "@codingame/monaco-vscode-files-service-override": "~1.83.2", - "@codingame/monaco-vscode-json-default-extension": "~1.83.2", - "@codingame/monaco-vscode-keybindings-service-override": "~1.83.2", - "@codingame/monaco-vscode-python-default-extension": "~1.83.2", - "@codingame/monaco-vscode-textmate-service-override": "~1.83.2", - "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.2", - "@codingame/monaco-vscode-theme-service-override": "~1.83.2", + "@codingame/monaco-vscode-configuration-service-override": "~1.83.3", + "@codingame/monaco-vscode-editor-service-override": "~1.83.3", + "@codingame/monaco-vscode-files-service-override": "~1.83.3", + "@codingame/monaco-vscode-json-default-extension": "~1.83.3", + "@codingame/monaco-vscode-keybindings-service-override": "~1.83.3", + "@codingame/monaco-vscode-language-pack-de": "~1.83.3", + "@codingame/monaco-vscode-language-pack-es": "~1.83.3", + "@codingame/monaco-vscode-language-pack-fr": "~1.83.3", + "@codingame/monaco-vscode-python-default-extension": "~1.83.3", + "@codingame/monaco-vscode-textmate-service-override": "~1.83.3", + "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.3", + "@codingame/monaco-vscode-theme-service-override": "~1.83.3", "express": "~4.18.2", "langium": "~2.0.2", "langium-statemachine-dsl": "~2.0.0", "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~6.6.0", + "monaco-languageclient": "~6.6.1", "pyright": "~1.1.330", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0", "vscode-json-languageservice": "~5.3.7", "vscode-languageserver": "~8.1.0", "vscode-uri": "~3.0.8", @@ -6521,8 +6549,8 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~6.6.0", - "monaco-languageclient-examples": "~6.6.0", + "monaco-languageclient": "~6.6.1", + "monaco-languageclient-examples": "~6.6.1", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { @@ -6534,8 +6562,8 @@ "version": "0.0.0", "dependencies": { "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~6.6.0", - "monaco-languageclient-examples": "~6.6.0", + "monaco-languageclient": "~6.6.1", + "monaco-languageclient-examples": "~6.6.1", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index 3b4d294b4..e6a59a46b 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this npm module are documented in this file. +## [6.6.1] - 2023-10-20 + +- Updated to `monaco-vscode-api` `1.83.3` which adds l10n suppport. + ## [6.6.0] - 2023-10-16 - Updated to `monaco-editor` `0.44.0` and `monaco-vscode-api` `1.83.2`. diff --git a/packages/client/package.json b/packages/client/package.json index f82419ab2..dd93be4f5 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient", - "version": "6.6.0", + "version": "6.6.1", "description": "Monaco Language client implementation", "author": { "name": "TypeFox GmbH", @@ -48,16 +48,16 @@ "License.txt" ], "dependencies": { + "@codingame/monaco-vscode-editor-service-override": "~1.83.3", + "@codingame/monaco-vscode-languages-service-override": "~1.83.3", + "@codingame/monaco-vscode-model-service-override": "~1.83.3", "monaco-editor": "~0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0", - "@codingame/monaco-vscode-editor-service-override": "~1.83.2", - "@codingame/monaco-vscode-languages-service-override": "~1.83.2", - "@codingame/monaco-vscode-model-service-override": "~1.83.2", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0", "vscode-languageclient": "~8.1.0" }, "peerDependencies": { "monaco-editor": "~0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0" + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0" }, "peerDependenciesMeta": { "monaco-editor": { diff --git a/packages/client/src/monaco-language-client.ts b/packages/client/src/monaco-language-client.ts index c6139a6b6..aeb26f1de 100644 --- a/packages/client/src/monaco-language-client.ts +++ b/packages/client/src/monaco-language-client.ts @@ -27,8 +27,4 @@ export class MonacoLanguageClient extends BaseLanguageClient { protected override createMessageTransports(encoding: string): Promise { return this.connectionProvider.get(encoding); } - - protected override getLocale(): string { - return super.getLocale() || 'en-US'; - } } diff --git a/packages/examples/package.json b/packages/examples/package.json index b56e9a6f8..c3d02cfb2 100644 --- a/packages/examples/package.json +++ b/packages/examples/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient-examples", - "version": "6.6.0", + "version": "6.6.1", "description": "Monaco Language client examples", "author": { "name": "TypeFox GmbH", @@ -43,24 +43,28 @@ } }, "dependencies": { - "@codingame/monaco-vscode-configuration-service-override": "~1.83.2", - "@codingame/monaco-vscode-editor-service-override": "~1.83.2", - "@codingame/monaco-vscode-files-service-override": "~1.83.2", - "@codingame/monaco-vscode-json-default-extension": "~1.83.2", - "@codingame/monaco-vscode-keybindings-service-override": "~1.83.2", - "@codingame/monaco-vscode-python-default-extension": "~1.83.2", - "@codingame/monaco-vscode-textmate-service-override": "~1.83.2", - "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.2", - "@codingame/monaco-vscode-theme-service-override": "~1.83.2", + "@codingame/monaco-vscode-configuration-service-override": "~1.83.3", + "@codingame/monaco-vscode-editor-service-override": "~1.83.3", + "@codingame/monaco-vscode-files-service-override": "~1.83.3", + "@codingame/monaco-vscode-json-default-extension": "~1.83.3", + "@codingame/monaco-vscode-keybindings-service-override": "~1.83.3", + "@codingame/monaco-vscode-python-default-extension": "~1.83.3", + "@codingame/monaco-vscode-textmate-service-override": "~1.83.3", + "@codingame/monaco-vscode-theme-defaults-default-extension": "~1.83.3", + "@codingame/monaco-vscode-theme-service-override": "~1.83.3", + "@codingame/monaco-vscode-language-pack-de": "~1.83.3", + "@codingame/monaco-vscode-language-pack-es": "~1.83.3", + "@codingame/monaco-vscode-language-pack-fr": "~1.83.3", "express": "~4.18.2", "langium": "~2.0.2", "langium-statemachine-dsl": "~2.0.0", "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~6.6.0", + "monaco-languageclient": "~6.6.1", "pyright": "~1.1.330", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0", "vscode-json-languageservice": "~5.3.7", "vscode-languageserver": "~8.1.0", "vscode-uri": "~3.0.8", diff --git a/packages/examples/src/langium/localeLoader.ts b/packages/examples/src/langium/localeLoader.ts new file mode 100644 index 000000000..597777dbf --- /dev/null +++ b/packages/examples/src/langium/localeLoader.ts @@ -0,0 +1,28 @@ +/* -------------------------------------------------------------------------------------------- + * Copyright (c) 2018-2022 TypeFox GmbH (http://www.typefox.io). All rights reserved. + * Licensed under the MIT License. See License.txt in the project root for license information. + * ------------------------------------------------------------------------------------------ */ + +export const loadLocales = async () => { + const locale = new URLSearchParams(window.location.search).get('locale'); + const localeLoader: Partial Promise>> = { + de: async () => { + await import('@codingame/monaco-vscode-language-pack-de'); + }, + es: async () => { + await import('@codingame/monaco-vscode-language-pack-es'); + }, + fr: async () => { + await import('@codingame/monaco-vscode-language-pack-fr'); + } + }; + + if (locale != null) { + const loader = localeLoader[locale]; + if (loader != null) { + await loader(); + } else { + console.error(`Unknown locale ${locale}`); + } + } +}; diff --git a/packages/examples/statemachine_client.html b/packages/examples/statemachine_client.html index 6a2c89c80..8975ddba9 100644 --- a/packages/examples/statemachine_client.html +++ b/packages/examples/statemachine_client.html @@ -11,8 +11,10 @@

Client & Statemachine DSL Web Worker Language Server Example

diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json index ed243b857..80ad58880 100644 --- a/packages/verify/pnpm/package.json +++ b/packages/verify/pnpm/package.json @@ -3,9 +3,9 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "~6.6.0", + "monaco-languageclient": "~6.6.1", "monaco-editor": "~0.44.0", - "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.2 <1.84.0" + "vscode": "npm:@codingame/monaco-vscode-api@>=1.83.3 <1.84.0" }, "devDependencies": { "shx": "~0.3.4" diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index 775cee734..7a4f62a9d 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -5,8 +5,8 @@ "type": "module", "dependencies": { "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~6.6.0", - "monaco-languageclient-examples": "~6.6.0", + "monaco-languageclient": "~6.6.1", + "monaco-languageclient-examples": "~6.6.1", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index b4bc2cff1..9610e5990 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -5,8 +5,8 @@ "type": "module", "dependencies": { "monaco-editor-workers": "~0.44.0", - "monaco-languageclient": "~6.6.0", - "monaco-languageclient-examples": "~6.6.0", + "monaco-languageclient": "~6.6.1", + "monaco-languageclient-examples": "~6.6.1", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json index 72bb096e5..3c8f583f1 100644 --- a/packages/verify/yarn/package.json +++ b/packages/verify/yarn/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "~6.6.0" + "monaco-languageclient": "~6.6.1" }, "devDependencies": { "shx": "~0.3.4"