diff --git a/.vscode/launch.json b/.vscode/launch.json index 025c6cb17..54a190a75 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -8,7 +8,7 @@ "name": "Launch JSON LS", "type": "node", "request": "launch", - "args": ["${workspaceRoot}/packages/examples/main/src/json/server/main.ts"], + "args": ["${workspaceRoot}/packages/examples/main/src/json/server/direct.ts"], "runtimeArgs": ["--nolazy", "--loader", "ts-node/esm"], "cwd": "${workspaceRoot}/packages/examples/main", "internalConsoleOptions": "openOnSessionStart" @@ -17,7 +17,7 @@ "name": "Launch Python LS", "type": "node", "request": "launch", - "args": ["${workspaceRoot}/packages/examples/main/src/python/server.ts"], + "args": ["${workspaceRoot}/packages/examples/main/src/python/server/direct.ts"], "runtimeArgs": ["--nolazy", "--loader", "ts-node/esm"], "cwd": "${workspaceRoot}/packages/examples/main", "internalConsoleOptions": "openOnSessionStart" diff --git a/README.md b/README.md index 7ce7359fd..ad4691676 100644 --- a/README.md +++ b/README.md @@ -83,6 +83,7 @@ The following table describes which version of **monaco-languageclient** and **m | monaco-languageclient | monaco-vscode-api | monaco-editor | comment | | :---- | :---- | :--- | :--- | +| 6.4.5 | 1.81.5 | 0.41.0 | Released 2023-08-30 | | 6.4.4 | 1.81.5 | 0.41.0 | Released 2023-08-24 | | 6.4.3 | 1.81.3 | 0.41.0 | Released 2023-08-22 | | 6.4.2 | 1.81.2 | 0.41.0 | Released 2023-08-19 | @@ -144,9 +145,9 @@ There are a couple of different examples that demonstrate how the `monaco-langua - The **json-client** contains the [client web app](./packages/examples/main/src/json/client/main.ts) which connects to the language server therefore requires the node server app to be run in parallel. - [Python Language client and pyright language server example](./packages/examples/main/src/python): - - The **python-server** runs a Node.js [Express app](./packages/examples/main/src/python/server.ts) where web sockets are used to enable communication between the language server process and the client web application. The language server can be started as internal or external process. Use `npm run start:example:server:python` to start the language server (see [Server processes](#server-processes)). + - The **python-server** runs a Node.js [Express app](./packages/examples/main/src/python/server/main.ts) where web sockets are used to enable communication between the language server process and the client web application. The language server can be started as internal or external process. Use `npm run start:example:server:python` to start the language server (see [Server processes](#server-processes)). - - The **python-client** contains the [client web app](./packages/examples/main/src/python/client.ts) which connects to the language server therefore requires the node server app to be run in parallel. + - The **python-client** contains the [client web app](./packages/examples/main/src/python/client/main.ts) which connects to the language server therefore requires the node server app to be run in parallel. - Langium examples: - [Langium](https://github.com/eclipse-langium/langium) grammar language **langium-web-worker-language-server** example located in [./packages/examples/main/src/langium](./packages/examples/main/src/langium) contains both the [language client](./packages/examples/main/src/langium/langiumClient.ts) and the [langauge server (web worker)](./packages/examples/main/src/langium/langiumServerWorker.ts). diff --git a/index.html b/index.html index d211f9034..c5963a1ee 100644 --- a/index.html +++ b/index.html @@ -17,10 +17,10 @@

Examples

JSON language client and language server example

- Please execute npm run start:example:server:json beforehand:
+ Please execute npm run start:example:server:json beforehand:
Client for Node.js Language Server

Python language client and language server example

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

Langium client and language server examples

diff --git a/package-lock.json b/package-lock.json index 363fbb91c..877ab57ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -462,9 +462,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.6.2.tgz", - "integrity": "sha512-pPTNuaAG3QMH+buKyBIGJs3g/S5y0caxw0ygM3YyE6yJFySwiGGSzA+mM3KJ8QQvzeLh3blwgSonkFjgQdxzMw==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz", + "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==", "dev": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" @@ -516,18 +516,18 @@ } }, "node_modules/@eslint/js": { - "version": "8.47.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.47.0.tgz", - "integrity": "sha512-P6omY1zv5MItm93kLM8s2vr1HICJH8v0dvddDhysbIuZ+vcjOHg5Zbkf1mTkcmi2JA9oBG2anOkRnW8WJTS8Og==", + "version": "8.48.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz", + "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", - "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", + "version": "0.11.11", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz", + "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==", "dev": true, "dependencies": { "@humanwhocodes/object-schema": "^1.2.1", @@ -766,9 +766,9 @@ } }, "node_modules/@types/express-serve-static-core": { - "version": "4.17.35", - "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.35.tgz", - "integrity": "sha512-wALWQwrgiB2AWTT91CB62b6Yt0sNHpznUXeZEcnPU3DRdlDIz74x8Qg1UUYKSVFi+va5vKOLYRBI1bRKiLLKIg==", + "version": "4.17.36", + "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.36.tgz", + "integrity": "sha512-zbivROJ0ZqLAtMzgzIUC4oNqDG9iF0lSsAqpOD9kbs5xcIM3dTiyuHvBc7R8MtWBp3AAWGaovJa+wzWPjLYW7Q==", "dev": true, "dependencies": { "@types/node": "*", @@ -802,9 +802,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.17.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.5.tgz", - "integrity": "sha512-xNbS75FxH6P4UXTPUJp/zNPq6/xsfdJKussCWNOnz4aULWIRwMgP1LgaB5RiBnMX1DPCYenuqGZfnIAx5mbFLA==", + "version": "18.17.12", + "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.12.tgz", + "integrity": "sha512-d6xjC9fJ/nSnfDeU0AMDsaJyb1iHsqCSOdi84w4u+SlN/UgQdY5tRhpMzaFYsI4mnpvgTivEaQd0yOUhAtOnEQ==", "dev": true }, "node_modules/@types/prop-types": { @@ -826,9 +826,9 @@ "dev": true }, "node_modules/@types/react": { - "version": "18.2.20", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.20.tgz", - "integrity": "sha512-WKNtmsLWJM/3D5mG4U84cysVY31ivmyw85dE84fOCk5Hx78wezB/XEjVPWl2JTZ5FkEeaTJf+VgUAUn3PE7Isw==", + "version": "18.2.21", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.21.tgz", + "integrity": "sha512-neFKG/sBAwGxHgXiIxnbm3/AAVQ/cMRS93hvBpg8xYRbeQSPVABp9U2bRnPf0iI4+Ucdv3plSxKK+3CW2ENJxA==", "dev": true, "dependencies": { "@types/prop-types": "*", @@ -852,9 +852,9 @@ "dev": true }, "node_modules/@types/semver": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.0.tgz", - "integrity": "sha512-G8hZ6XJiHnuhQKR7ZmysCeJWE08o8T0AXtk5darsCaTVsYZhhgUrq53jizaR2FvsoeCwJhlmwTjkXBY5Pn/ZHw==", + "version": "7.5.1", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.1.tgz", + "integrity": "sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==", "dev": true }, "node_modules/@types/send": { @@ -894,16 +894,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.0.tgz", - "integrity": "sha512-62o2Hmc7Gs3p8SLfbXcipjWAa6qk2wZGChXG2JbBtYpwSRmti/9KHLqfbLs9uDigOexG+3PaQ9G2g3201FWLKg==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.4.1.tgz", + "integrity": "sha512-3F5PtBzUW0dYlq77Lcqo13fv+58KDwUib3BddilE8ajPJT+faGgxmI9Sw+I8ZS22BYwoir9ZhNXcLi+S+I2bkw==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.4.0", - "@typescript-eslint/type-utils": "6.4.0", - "@typescript-eslint/utils": "6.4.0", - "@typescript-eslint/visitor-keys": "6.4.0", + "@typescript-eslint/scope-manager": "6.4.1", + "@typescript-eslint/type-utils": "6.4.1", + "@typescript-eslint/utils": "6.4.1", + "@typescript-eslint/visitor-keys": "6.4.1", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -929,15 +929,15 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.0.tgz", - "integrity": "sha512-I1Ah1irl033uxjxO9Xql7+biL3YD7w9IU8zF+xlzD/YxY6a4b7DYA08PXUUCbm2sEljwJF6ERFy2kTGAGcNilg==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.4.1.tgz", + "integrity": "sha512-610G6KHymg9V7EqOaNBMtD1GgpAmGROsmfHJPXNLCU9bfIuLrkdOygltK784F6Crboyd5tBFayPB7Sf0McrQwg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.4.0", - "@typescript-eslint/types": "6.4.0", - "@typescript-eslint/typescript-estree": "6.4.0", - "@typescript-eslint/visitor-keys": "6.4.0", + "@typescript-eslint/scope-manager": "6.4.1", + "@typescript-eslint/types": "6.4.1", + "@typescript-eslint/typescript-estree": "6.4.1", + "@typescript-eslint/visitor-keys": "6.4.1", "debug": "^4.3.4" }, "engines": { @@ -957,13 +957,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.0.tgz", - "integrity": "sha512-TUS7vaKkPWDVvl7GDNHFQMsMruD+zhkd3SdVW0d7b+7Zo+bd/hXJQ8nsiUZMi1jloWo6c9qt3B7Sqo+flC1nig==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.4.1.tgz", + "integrity": "sha512-p/OavqOQfm4/Hdrr7kvacOSFjwQ2rrDVJRPxt/o0TOWdFnjJptnjnZ+sYDR7fi4OimvIuKp+2LCkc+rt9fIW+A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.4.0", - "@typescript-eslint/visitor-keys": "6.4.0" + "@typescript-eslint/types": "6.4.1", + "@typescript-eslint/visitor-keys": "6.4.1" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -974,13 +974,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.0.tgz", - "integrity": "sha512-TvqrUFFyGY0cX3WgDHcdl2/mMCWCDv/0thTtx/ODMY1QhEiyFtv/OlLaNIiYLwRpAxAtOLOY9SUf1H3Q3dlwAg==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.4.1.tgz", + "integrity": "sha512-7ON8M8NXh73SGZ5XvIqWHjgX2f+vvaOarNliGhjrJnv1vdjG0LVIz+ToYfPirOoBi56jxAKLfsLm40+RvxVVXA==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.4.0", - "@typescript-eslint/utils": "6.4.0", + "@typescript-eslint/typescript-estree": "6.4.1", + "@typescript-eslint/utils": "6.4.1", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -1001,9 +1001,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.0.tgz", - "integrity": "sha512-+FV9kVFrS7w78YtzkIsNSoYsnOtrYVnKWSTVXoL1761CsCRv5wpDOINgsXpxD67YCLZtVQekDDyaxfjVWUJmmg==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.4.1.tgz", + "integrity": "sha512-zAAopbNuYu++ijY1GV2ylCsQsi3B8QvfPHVqhGdDcbx/NK5lkqMnCGU53amAjccSpk+LfeONxwzUhDzArSfZJg==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -1014,13 +1014,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.0.tgz", - "integrity": "sha512-iDPJArf/K2sxvjOR6skeUCNgHR/tCQXBsa+ee1/clRKr3olZjZ/dSkXPZjG6YkPtnW6p5D1egeEPMCW6Gn4yLA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.4.1.tgz", + "integrity": "sha512-xF6Y7SatVE/OyV93h1xGgfOkHr2iXuo8ip0gbfzaKeGGuKiAnzS+HtVhSPx8Www243bwlW8IF7X0/B62SzFftg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.4.0", - "@typescript-eslint/visitor-keys": "6.4.0", + "@typescript-eslint/types": "6.4.1", + "@typescript-eslint/visitor-keys": "6.4.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -1041,17 +1041,17 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.0.tgz", - "integrity": "sha512-BvvwryBQpECPGo8PwF/y/q+yacg8Hn/2XS+DqL/oRsOPK+RPt29h5Ui5dqOKHDlbXrAeHUTnyG3wZA0KTDxRZw==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.4.1.tgz", + "integrity": "sha512-F/6r2RieNeorU0zhqZNv89s9bDZSovv3bZQpUNOmmQK1L80/cV4KEu95YUJWi75u5PhboFoKUJBnZ4FQcoqhDw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.4.0", - "@typescript-eslint/types": "6.4.0", - "@typescript-eslint/typescript-estree": "6.4.0", + "@typescript-eslint/scope-manager": "6.4.1", + "@typescript-eslint/types": "6.4.1", + "@typescript-eslint/typescript-estree": "6.4.1", "semver": "^7.5.4" }, "engines": { @@ -1066,12 +1066,12 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.0.tgz", - "integrity": "sha512-yJSfyT+uJm+JRDWYRYdCm2i+pmvXJSMtPR9Cq5/XQs4QIgNoLcoRtDdzsLbLsFM/c6um6ohQkg/MLxWvoIndJA==", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.4.1.tgz", + "integrity": "sha512-y/TyRJsbZPkJIZQXrHfdnxVnxyKegnpEvnRGNam7s3TRR2ykGefEWOhaef00/UUN3IZxizS7BTO3svd3lCOJRQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.4.0", + "@typescript-eslint/types": "6.4.1", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -1083,9 +1083,9 @@ } }, "node_modules/@vscode/l10n": { - "version": "0.0.13", - "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.13.tgz", - "integrity": "sha512-A3uY356uOU9nGa+TQIT/i3ziWUgJjVMUrGGXSrtRiTwklyCFjGVWIOHoEIHbJpiyhDkJd9kvIWUOfXK1IkK8XQ==" + "version": "0.0.16", + "resolved": "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.16.tgz", + "integrity": "sha512-JT5CvrIYYCrmB+dCana8sUqJEcGB1ZDXNLMQ2+42bW995WmNoenijWMUdZfwmuQUTQcEVVIa2OecZzTYWUW9Cg==" }, "node_modules/@vscode/vscode-languagedetection": { "version": "1.0.22", @@ -1482,16 +1482,16 @@ } }, "node_modules/array.prototype.findlastindex": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.2.tgz", - "integrity": "sha512-tb5thFFlUcp7NdNF6/MpDk/1r/4awWG1FIz3YqDf+/zJSTezBb+/5WViH41obXULHVpDzoiCLpJ/ZO9YbJMsdw==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", + "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" + "get-intrinsic": "^1.2.1" }, "engines": { "node": ">= 0.4" @@ -1745,9 +1745,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001519", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001519.tgz", - "integrity": "sha512-0QHgqR+Jv4bxHMp8kZ1Kn8CH55OikjKJ6JmKkZYP1F3D7w+lnFXF70nG5eNfsZS89jadi5Ywy5UCSKLAglIRkg==", + "version": "1.0.30001524", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001524.tgz", + "integrity": "sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==", "dev": true, "funding": [ { @@ -2086,9 +2086,9 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" }, "node_modules/electron-to-chromium": { - "version": "1.4.490", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.490.tgz", - "integrity": "sha512-6s7NVJz+sATdYnIwhdshx/N/9O6rvMxmhVoDSDFdj6iA45gHR8EQje70+RYsF4GeB+k0IeNSBnP7yG9ZXJFr7A==", + "version": "1.4.505", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.505.tgz", + "integrity": "sha512-0A50eL5BCCKdxig2SsCXhpuztnB9PfUgRMojj5tMvt8O54lbwz3t6wNgnpiTRosw5QjlJB7ixhVyeg8daLQwSQ==", "dev": true, "peer": true }, @@ -2448,9 +2448,9 @@ } }, "node_modules/eslint-plugin-import": { - "version": "2.28.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.0.tgz", - "integrity": "sha512-B8s/n+ZluN7sxj9eUf7/pRFERX0r5bnFA2dCaLHy2ZeaQEAz0k+ZZkFWRFHJAqxfxQDx6KLv9LeIki7cFdwW+Q==", + "version": "2.28.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz", + "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==", "dev": true, "dependencies": { "array-includes": "^3.1.6", @@ -2462,13 +2462,12 @@ "eslint-import-resolver-node": "^0.3.7", "eslint-module-utils": "^2.8.0", "has": "^1.0.3", - "is-core-module": "^2.12.1", + "is-core-module": "^2.13.0", "is-glob": "^4.0.3", "minimatch": "^3.1.2", "object.fromentries": "^2.0.6", "object.groupby": "^1.0.0", "object.values": "^1.1.6", - "resolve": "^1.22.3", "semver": "^6.3.1", "tsconfig-paths": "^3.14.2" }, @@ -2532,9 +2531,9 @@ } }, "node_modules/eslint-plugin-n": { - "version": "16.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.0.1.tgz", - "integrity": "sha512-CDmHegJN0OF3L5cz5tATH84RPQm9kG+Yx39wIqIwPR2C0uhBGMWfbbOtetR83PQjjidA5aXMu+LEFw1jaSwvTA==", + "version": "16.0.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-16.0.2.tgz", + "integrity": "sha512-Y66uDfUNbBzypsr0kELWrIz+5skicECrLUqlWuXawNSLUq3ltGlCwu6phboYYOTSnoTdHgTLrc+5Ydo6KjzZog==", "dev": true, "peer": true, "dependencies": { @@ -2764,10 +2763,6 @@ "resolved": "packages/verify/webpack", "link": true }, - "node_modules/examples-main": { - "resolved": "packages/examples/main", - "link": true - }, "node_modules/express": { "version": "4.18.2", "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", @@ -2966,16 +2961,17 @@ } }, "node_modules/flat-cache": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", - "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz", + "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==", "dev": true, "dependencies": { - "flatted": "^3.1.0", + "flatted": "^3.2.7", + "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=12.0.0" } }, "node_modules/flatted": { @@ -3036,9 +3032,9 @@ "dev": true }, "node_modules/fsevents": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", - "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "hasInstallScript": true, "optional": true, "os": [ @@ -3054,15 +3050,15 @@ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, "node_modules/function.prototype.name": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.5.tgz", - "integrity": "sha512-uN7m/BzVKQnCUF/iW8jYea67v++2u7m5UgENbHRtdDVclOUP+FMPlCNdmk0h/ysGyo2tavMJEDqJAkJdRa1vMA==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.3", - "es-abstract": "^1.19.0", - "functions-have-names": "^1.2.2" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "functions-have-names": "^1.2.3" }, "engines": { "node": ">= 0.4" @@ -3835,6 +3831,12 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", @@ -3871,6 +3873,15 @@ "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==" }, + "node_modules/keyv": { + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz", + "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==", + "dev": true, + "dependencies": { + "json-buffer": "3.0.1" + } + }, "node_modules/kind-of": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", @@ -3881,9 +3892,9 @@ } }, "node_modules/langium": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/langium/-/langium-2.0.0.tgz", - "integrity": "sha512-Sze9q3TIfamgXi6zkgwFylM/Wj5YmgoxvwUgYWivwKMTlBjp4j7J5AtQjuZC3QJ+/QYunIsjhj+lSR9WgxxzoQ==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/langium/-/langium-2.0.1.tgz", + "integrity": "sha512-EGi8NNN/5zxcUL//sA4kqpV9YVOZfDngwkkSxsZ/zfx4Wjdg9von71rWIMCV6kW1M40kPOKF6e8oMTyWeX92fg==", "dependencies": { "chevrotain": "^11.0.1", "chevrotain-allstar": "^0.3.0", @@ -4182,6 +4193,10 @@ "resolved": "packages/client", "link": true }, + "node_modules/monaco-languageclient-examples": { + "resolved": "packages/examples/main", + "link": true + }, "node_modules/ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -4270,14 +4285,14 @@ } }, "node_modules/object.fromentries": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.6.tgz", - "integrity": "sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==", + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -4287,26 +4302,26 @@ } }, "node_modules/object.groupby": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.0.tgz", - "integrity": "sha512-70MWG6NfRH9GnbZOikuhPPYzpUpof9iW2J9E4dW7FXTqPNb6rllE6u39SKwwiNh8lCwX3DDb5OgcKGiEBrTTyw==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", + "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "es-abstract": "^1.21.2", + "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1" } }, "node_modules/object.values": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.6.tgz", - "integrity": "sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==", + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "dev": true, "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -4585,9 +4600,9 @@ } }, "node_modules/postcss": { - "version": "8.4.27", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.27.tgz", - "integrity": "sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==", + "version": "8.4.29", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.29.tgz", + "integrity": "sha512-cbI+jaqIeu/VGqXEarWkRCCffhjgXc0qjBtXpqJhTBohMUjUQnbBr0xqX3vEKudc4iviTewcJo5ajcec5+wdJw==", "dev": true, "funding": [ { @@ -4721,9 +4736,9 @@ } }, "node_modules/pyright": { - "version": "1.1.324", - "resolved": "https://registry.npmjs.org/pyright/-/pyright-1.1.324.tgz", - "integrity": "sha512-/Ng8G2Gb17dzQEHKgPa+Z5a6LPCLYNA4BVno1UdpDjnC9iLw0VAn5k/RNuaGkB/mhA82lV0OBcd5JEdaWcA3qg==", + "version": "1.1.325", + "resolved": "https://registry.npmjs.org/pyright/-/pyright-1.1.325.tgz", + "integrity": "sha512-hMvcY5G9WTRbvEKGiiqTepyORAppNPXZDUer5GZ15t1DYB79WwP3M0Tec6S0an7FDoY6eaJ5CtK+diJbmISIBQ==", "bin": { "pyright": "index.js", "pyright-langserver": "langserver.index.js" @@ -4937,9 +4952,9 @@ } }, "node_modules/rollup": { - "version": "3.28.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.0.tgz", - "integrity": "sha512-d7zhvo1OUY2SXSM6pfNjgD5+d0Nz87CUp4mt8l/GgVP3oBsPwzNvSzyu1me6BSG9JIgWNTVcafIXBIyM8yQ3yw==", + "version": "3.28.1", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.1.tgz", + "integrity": "sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==", "dev": true, "bin": { "rollup": "dist/bin/rollup" @@ -5435,9 +5450,9 @@ } }, "node_modules/terser": { - "version": "5.19.2", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.2.tgz", - "integrity": "sha512-qC5+dmecKJA4cpYxRa5aVkKehYsQKc+AHeKl0Oe62aYjBL8ZA33tTljktDHJSaxxMnbI5ZYw+o/S2DxxLu8OfA==", + "version": "5.19.3", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.19.3.tgz", + "integrity": "sha512-pQzJ9UJzM0IgmT4FAtYI6+VqFf0lj/to58AV0Xfgg0Up37RyPG7Al+1cepC6/BVuAxR9oNb41/DL4DEoHJvTdg==", "dev": true, "peer": true, "dependencies": { @@ -5533,9 +5548,9 @@ } }, "node_modules/ts-api-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.1.tgz", - "integrity": "sha512-lC/RGlPmwdrIBFTX59wwNzqh7aR2otPNPR/5brHZm/XKFYKsfqxihXUe9pU3JI+3vGkl+vyCoNNnPhJn3aLK1A==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.2.tgz", + "integrity": "sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ==", "dev": true, "engines": { "node": ">=16.13.0" @@ -5619,9 +5634,9 @@ } }, "node_modules/tslib": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.1.tgz", - "integrity": "sha512-t0hLfiEKfMUoqhG+U1oid7Pva4bbDPHYfJNiB7BiIjRkj1pyC++4N3huJfqY6aRH6VTB0rvtzQwjM4K6qpfOig==", + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==", "dev": true }, "node_modules/type-check": { @@ -5926,11 +5941,11 @@ } }, "node_modules/vscode-json-languageservice": { - "version": "5.3.5", - "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.5.tgz", - "integrity": "sha512-DasT+bKtpaS2rTPEB4VMROnvO1WES2KD8RZZxXbumnk9sk5wco10VdB6sJgTlsKQN14tHQLZDXuHnSoSAlE8LQ==", + "version": "5.3.6", + "resolved": "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-5.3.6.tgz", + "integrity": "sha512-P4kthBi3GMLKi7Lmp24nkKHAWxbFfCsIDBPlMrK1Tag1aqbl3l60UferDkfAasupDVBM2dekbArzGycUjw8OHA==", "dependencies": { - "@vscode/l10n": "^0.0.13", + "@vscode/l10n": "^0.0.16", "jsonc-parser": "^3.2.0", "vscode-languageserver-textdocument": "^1.0.8", "vscode-languageserver-types": "^3.17.3", @@ -6408,7 +6423,7 @@ }, "packages/client": { "name": "monaco-languageclient", - "version": "6.4.4", + "version": "6.4.5", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -6435,19 +6450,20 @@ } }, "packages/examples/main": { - "name": "examples-main", - "version": "1.0.0", + "name": "monaco-languageclient-examples", + "version": "6.4.5-next.1", + "license": "MIT", "dependencies": { "express": "~4.18.2", - "langium": "~2.0.0", + "langium": "~2.0.1", "langium-statemachine-dsl": "~2.0.0", "monaco-editor-workers": "~0.41.0", - "monaco-languageclient": "~6.4.4", + "monaco-languageclient": "~6.4.5", "pyright": "~1.1.322", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", - "vscode-json-languageservice": "~5.3.5", + "vscode-json-languageservice": "~5.3.6", "vscode-languageserver": "~8.1.0", "vscode-ws-jsonrpc": "~3.0.0", "ws": "~8.13.0" @@ -6465,9 +6481,9 @@ "name": "example-client-vite", "version": "0.0.0", "dependencies": { - "examples-main": "../../examples/main", "monaco-editor-workers": "~0.41.0", - "monaco-languageclient": "~6.4.4", + "monaco-languageclient": "~6.4.5", + "monaco-languageclient-examples": "6.4.5-next.1", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { @@ -6478,9 +6494,9 @@ "name": "example-client-webpack", "version": "0.0.0", "dependencies": { - "examples-main": "../../examples/main", "monaco-editor-workers": "~0.41.0", - "monaco-languageclient": "~6.4.4", + "monaco-languageclient": "~6.4.5", + "monaco-languageclient-examples": "6.4.5-next.1", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { diff --git a/packages/client/CHANGELOG.md b/packages/client/CHANGELOG.md index 4df09dbbf..344d85ad8 100644 --- a/packages/client/CHANGELOG.md +++ b/packages/client/CHANGELOG.md @@ -2,6 +2,11 @@ All notable changes to this npm module are documented in this file. +## [6.4.5] - 2023-08-30 + +- Use direct `monaco-editor` imports +- Make examples publicly available + ## [6.4.4] - 2023-08-24 - Update to `monaco-vscode-api` `1.81.5` diff --git a/packages/client/package.json b/packages/client/package.json index 6a8528e9b..8f188c294 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "monaco-languageclient", - "version": "6.4.4", + "version": "6.4.5", "description": "Monaco Language client implementation", "author": { "name": "TypeFox GmbH", diff --git a/packages/examples/main/CHANGELOG.md b/packages/examples/main/CHANGELOG.md new file mode 100644 index 000000000..d5b327c6a --- /dev/null +++ b/packages/examples/main/CHANGELOG.md @@ -0,0 +1,7 @@ +# Changelog + +All notable changes to this npm module are documented in this file. + +## [6.4.5] - 2023-08-30 + +- First release of the `monaco-languageclient-examples` package diff --git a/packages/examples/main/License.txt b/packages/examples/main/License.txt new file mode 100644 index 000000000..0bb41bbdd --- /dev/null +++ b/packages/examples/main/License.txt @@ -0,0 +1,11 @@ +Copyright (c) 2018-2023 TypeFox GmbH (http://www.typefox.io) + +All rights reserved. + +MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/packages/examples/main/README.md b/packages/examples/main/README.md new file mode 100644 index 000000000..a711701cc --- /dev/null +++ b/packages/examples/main/README.md @@ -0,0 +1,17 @@ +# Monaco Language Client Examples + +[![Gitpod - Code Now](https://img.shields.io/badge/Gitpod-code%20now-blue.svg?longCache=true)](https://gitpod.io#https://github.com/TypeFox/monaco-languageclient) +[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?longCache=true)](https://github.com/TypeFox/monaco-languageclient/labels/help%20wanted) +[![monaco-languageclient](https://github.com/TypeFox/monaco-languageclient/actions/workflows/actions.yml/badge.svg)](https://github.com/TypeFox/monaco-languageclient/actions/workflows/actions.yml) +[![NPM Version](https://img.shields.io/npm/v/monaco-languageclient-examples.svg)](https://www.npmjs.com/package/monaco-languageclient-examples) +[![NPM Download](https://img.shields.io/npm/dt/monaco-languageclient-examples.svg)](https://www.npmjs.com/package/monaco-languageclient-examples) + +This package contains [all examples from the monaco-languageclient repository](https://github.com/TypeFox/monaco-languageclient/blob/main/README.md#examples). + +## CHANGELOG + +All changes are noted in the [CHANGELOG](https://github.com/TypeFox/monaco-languageclient/blob/main/packages/examples/main/CHANGELOG.md). + +## License + +[MIT](https://github.com/TypeFox/monaco-languageclient/blob/main/packages/examples/main/License.txt) diff --git a/packages/examples/main/browser.html b/packages/examples/main/browser.html index 5935bd593..bd21393c4 100644 --- a/packages/examples/main/browser.html +++ b/packages/examples/main/browser.html @@ -11,6 +11,9 @@

Monaco Language Client Browser Sample

- + diff --git a/packages/examples/main/client.html b/packages/examples/main/client.html index 757e9dda3..62b49b09a 100644 --- a/packages/examples/main/client.html +++ b/packages/examples/main/client.html @@ -10,7 +10,10 @@

Monaco Language Client Node.js Sample

- + diff --git a/packages/examples/main/langium_client.html b/packages/examples/main/langium_client.html index 0632d6d17..49c7376f8 100644 --- a/packages/examples/main/langium_client.html +++ b/packages/examples/main/langium_client.html @@ -10,7 +10,10 @@

Client & Langium Grammar DSL Web Worker Language Server Example

- +
diff --git a/packages/examples/main/package.json b/packages/examples/main/package.json index f4c6beb3f..fefc5948f 100644 --- a/packages/examples/main/package.json +++ b/packages/examples/main/package.json @@ -1,34 +1,62 @@ { - "name": "examples-main", - "version": "1.0.0", - "private": true, + "name": "monaco-languageclient-examples", + "version": "6.4.5-next.1", + "description": "Monaco Language client examples", + "author": { + "name": "TypeFox GmbH", + "url": "http://www.typefox.io" + }, + "homepage": "https://github.com/TypeFox/monaco-languageclient/blob/main/packages/examples/main/README.md", + "license": "MIT", + "repository": { + "type": "git", + "url": "https://github.com/TypeFox/monaco-languageclient", + "directory": "packages/examples/main" + }, + "bugs": { + "url": "https://github.com/TypeFox/monaco-languageclient/issues" + }, "type": "module", - "main": "./dist/common.js", - "module": "./dist/common.js", + "main": "./dist/index.js", + "module": "./dist/index.js", "exports": { ".": { - "types": "./dist/common.d.ts", - "default": "./dist/common.js" + "types": "./dist/index.d.ts", + "default": "./dist/index.js" + }, + "./node": { + "types": "./dist/node.d.ts", + "default": "./dist/node.js" + }, + "./langiumWorker": { + "types": "./dist/langium/langiumServerWorker.d.ts", + "default": "./dist/worker/langiumServerWorker.js" } }, "typesVersions": { "*": { ".": [ - "dist/common.d.ts" + "dist/index" + ], + "node": [ + "dist/node" + ], + "langiumWorker": [ + "dist/langium/langiumServerWorker" ] } }, "dependencies": { "express": "~4.18.2", - "langium": "~2.0.0", + "langium": "~2.0.1", "langium-statemachine-dsl": "~2.0.0", "monaco-editor-workers": "~0.41.0", - "monaco-languageclient": "~6.4.4", + "monaco-languageclient": "~6.4.5", "pyright": "~1.1.322", "react": "~18.2.0", "react-dom": "~18.2.0", "request-light": "~0.7.0", - "vscode-json-languageservice": "~5.3.5", + "vscode-json-languageservice": "~5.3.6", "vscode-languageserver": "~8.1.0", "vscode-ws-jsonrpc": "~3.0.0", "ws": "~8.13.0" @@ -45,6 +73,15 @@ "node": "18.17.1", "npm": "9.6.7" }, + "files": [ + "dist", + "src", + "*.html", + "*.ts", + "README.md", + "CHANGELOG.md", + "License.txt" + ], "scripts": { "clean": "shx rm -fr dist *.tsbuildinfo", "compile": "tsc --build tsconfig.src.json", @@ -53,7 +90,7 @@ "build:worker:statemachine": "esbuild ../../../node_modules/langium-statemachine-dsl/out/language-server/main-browser.js --bundle --tree-shaking=true --minify --format=iife --outfile=./dist/worker/statemachineServerWorker.js", "build:worker:langium": "esbuild ./src/langium/langiumServerWorker.js --bundle --tree-shaking=true --minify --format=iife --outfile=./dist/worker/langiumServerWorker.js", "build": "npm run build:msg && npm run clean && npm run compile && npm run build:worker:statemachine && npm run build:worker:langium", - "start:server:json": "node --loader ts-node/esm src/json/server/main.ts", - "start:server:python": "node --loader ts-node/esm src/python/server.ts" + "start:server:json": "node --loader ts-node/esm src/json/server/direct.ts", + "start:server:python": "node --loader ts-node/esm src/python/server/direct.ts" } } \ No newline at end of file diff --git a/packages/examples/main/python.html b/packages/examples/main/python.html index d2fed7307..2e79d3c66 100644 --- a/packages/examples/main/python.html +++ b/packages/examples/main/python.html @@ -10,7 +10,10 @@

Monaco Language Client Python Example

- + diff --git a/packages/examples/main/react.html b/packages/examples/main/react.html index dfd92075a..83d644984 100644 --- a/packages/examples/main/react.html +++ b/packages/examples/main/react.html @@ -10,7 +10,10 @@

Monaco Language Client React Client Example

- + diff --git a/packages/examples/main/src/browser/main.ts b/packages/examples/main/src/browser/main.ts index 31eba17e0..ecbc1d8b3 100644 --- a/packages/examples/main/src/browser/main.ts +++ b/packages/examples/main/src/browser/main.ts @@ -7,14 +7,15 @@ import { getLanguageService, TextDocument } from 'vscode-json-languageservice'; import { createConverter as createCodeConverter } from 'vscode-languageclient/lib/common/codeConverter.js'; import { createConverter as createProtocolConverter } from 'vscode-languageclient/lib/common/protocolConverter.js'; import { createDefaultJsonContent, createJsonEditor, performInit } from '../common.js'; - +import 'vscode/default-extensions/theme-defaults'; +import 'vscode/default-extensions/json'; import { buildWorkerDefinition } from 'monaco-editor-workers'; buildWorkerDefinition('../../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false); const codeConverter = createCodeConverter(); const protocolConverter = createProtocolConverter(undefined, true, true); -const createEditor = async () => { +export const startBrowserEditor = async () => { let mainVscodeDocument: VsCodeTextDocument | undefined; const languageId = 'json'; @@ -127,5 +128,3 @@ const createEditor = async () => { validate(); }); }; - -createEditor(); diff --git a/packages/examples/main/src/index.ts b/packages/examples/main/src/index.ts new file mode 100644 index 000000000..419b925b9 --- /dev/null +++ b/packages/examples/main/src/index.ts @@ -0,0 +1,13 @@ +/* -------------------------------------------------------------------------------------------- + * 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 * from './common.js'; +export * from './browser/main.js'; +export * from './json/client/main.js'; +export * from './langium/langiumClient.js'; +export * from './langium/statemachineClient.js'; +export * from './python/client/main.js'; +export * from './react/app.js'; +export * from './react/main.js'; diff --git a/packages/examples/main/src/json/client/main.ts b/packages/examples/main/src/json/client/main.ts index 96ae3cbe5..6a09157e6 100644 --- a/packages/examples/main/src/json/client/main.ts +++ b/packages/examples/main/src/json/client/main.ts @@ -7,7 +7,7 @@ import { createDefaultJsonContent, createJsonEditor, createUrl, createWebSocketA import { buildWorkerDefinition } from 'monaco-editor-workers'; buildWorkerDefinition('../../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false); -const start = async () => { +export const startJsonClient = async () => { // use the same common method to create a monaco editor for json await performInit(true); await createJsonEditor({ @@ -18,5 +18,3 @@ const start = async () => { const url = createUrl('localhost', 3000, '/sampleServer'); createWebSocketAndStartClient(url); }; - -start(); diff --git a/packages/examples/main/src/json/server/direct.ts b/packages/examples/main/src/json/server/direct.ts new file mode 100644 index 000000000..d93fa01e2 --- /dev/null +++ b/packages/examples/main/src/json/server/direct.ts @@ -0,0 +1,7 @@ +/* -------------------------------------------------------------------------------------------- + * 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. + * ------------------------------------------------------------------------------------------ */ +import { runJsonServer } from './main.js'; + +runJsonServer(); diff --git a/packages/examples/main/src/json/server/json-server.ts b/packages/examples/main/src/json/server/json-server.ts index a69eb23a9..d49de1a8e 100644 --- a/packages/examples/main/src/json/server/json-server.ts +++ b/packages/examples/main/src/json/server/json-server.ts @@ -5,8 +5,8 @@ import { readFile } from 'fs'; import requestLight from 'request-light'; import URI from 'vscode-uri'; -import { MessageReader, MessageWriter } from 'vscode-jsonrpc'; -import { _Connection, TextDocuments, DocumentSymbolParams, createConnection } from 'vscode-languageserver/lib/node/main.js'; +import { } from 'vscode-ws-jsonrpc'; +import { _Connection, TextDocuments, DocumentSymbolParams } from 'vscode-languageserver/lib/node/main.js'; import { Diagnostic, Command, CompletionList, CompletionItem, Hover, SymbolInformation, TextEdit, FoldingRange, ColorInformation, ColorPresentation @@ -15,13 +15,6 @@ import { TextDocumentPositionParams, DocumentRangeFormattingParams, ExecuteComma import { getLanguageService, LanguageService, JSONDocument } from 'vscode-json-languageservice'; import { TextDocument } from 'vscode-languageserver-textdocument'; -export function start(reader: MessageReader, writer: MessageWriter): JsonServer { - const connection = createConnection(reader, writer); - const server = new JsonServer(connection); - server.start(); - return server; -} - export class JsonServer { protected workspaceRoot: URI.URI | undefined; diff --git a/packages/examples/main/src/json/server/main.ts b/packages/examples/main/src/json/server/main.ts index 9cac788ec..6b1a63f37 100644 --- a/packages/examples/main/src/json/server/main.ts +++ b/packages/examples/main/src/json/server/main.ts @@ -8,61 +8,68 @@ import { URL } from 'url'; import { Socket } from 'net'; import express from 'express'; import { IWebSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc'; -import { start } from './json-server.js'; +import { createConnection } from 'vscode-languageserver/lib/node/main.js'; import { getLocalDirectory } from '../../utils/fs-utils.js'; +import { JsonServer } from './json-server.js'; -process.on('uncaughtException', function(err: any) { - console.error('Uncaught Exception: ', err.toString()); - if (err.stack) { - console.error(err.stack); - } -}); - -// create the express application -const app = express(); -// server the static content, i.e. index.html -const dir = getLocalDirectory(import.meta.url); -app.use(express.static(dir)); -// start the server -const server = app.listen(3000); -// create the web socket -const wss = new WebSocketServer({ - noServer: true, - perMessageDeflate: false -}); -server.on('upgrade', (request: IncomingMessage, socket: Socket, head: Buffer) => { - const baseURL = `http://${request.headers.host}/`; - const pathname = request.url ? new URL(request.url, baseURL).pathname : undefined; - if (pathname === '/sampleServer') { - wss.handleUpgrade(request, socket, head, webSocket => { - const socket: IWebSocket = { - send: content => webSocket.send(content, error => { - if (error) { - throw error; - } - }), - onMessage: cb => webSocket.on('message', (data) => { - console.log(data.toString()); - cb(data); - }), - onError: cb => webSocket.on('error', cb), - onClose: cb => webSocket.on('close', cb), - dispose: () => webSocket.close() - }; - // launch the server when the web socket is opened - if (webSocket.readyState === webSocket.OPEN) { - launch(socket); - } else { - webSocket.on('open', () => launch(socket)); - } - }); - } -}); - -const launch = (socket: IWebSocket) => { +/** + * start the language server inside the current process + */ +const launchLanguageServer = (socket: IWebSocket): JsonServer => { const reader = new WebSocketMessageReader(socket); const writer = new WebSocketMessageWriter(socket); + const connection = createConnection(reader, writer); + const server = new JsonServer(connection); + server.start(); + return server; +}; + +export const runJsonServer = () => { + process.on('uncaughtException', function(err: any) { + console.error('Uncaught Exception: ', err.toString()); + if (err.stack) { + console.error(err.stack); + } + }); - // start the language server inside the current process - start(reader, writer); + // create the express application + const app = express(); + // server the static content, i.e. index.html + const dir = getLocalDirectory(import.meta.url); + app.use(express.static(dir)); + // start the server + const server = app.listen(3000); + // create the web socket + const wss = new WebSocketServer({ + noServer: true, + perMessageDeflate: false + }); + server.on('upgrade', (request: IncomingMessage, socket: Socket, head: Buffer) => { + const baseURL = `http://${request.headers.host}/`; + const pathname = request.url ? new URL(request.url, baseURL).pathname : undefined; + if (pathname === '/sampleServer') { + wss.handleUpgrade(request, socket, head, webSocket => { + const socket: IWebSocket = { + send: content => webSocket.send(content, error => { + if (error) { + throw error; + } + }), + onMessage: cb => webSocket.on('message', (data) => { + console.log(data.toString()); + cb(data); + }), + onError: cb => webSocket.on('error', cb), + onClose: cb => webSocket.on('close', cb), + dispose: () => webSocket.close() + }; + // launch the server when the web socket is opened + if (webSocket.readyState === webSocket.OPEN) { + launchLanguageServer(socket); + } else { + webSocket.on('open', () => launchLanguageServer(socket)); + } + }); + } + }); }; diff --git a/packages/examples/main/src/langium/langiumClient.ts b/packages/examples/main/src/langium/langiumClient.ts index d92ef60ec..a3ba4372e 100644 --- a/packages/examples/main/src/langium/langiumClient.ts +++ b/packages/examples/main/src/langium/langiumClient.ts @@ -21,7 +21,7 @@ buildWorkerDefinition('../../../node_modules/monaco-editor-workers/dist/workers/ const languageId = 'langium'; let textModelRef: IReference; -const setup = async () => { +export const setupLangiumClient = async () => { await initServices({ // required for default themes enableThemeService: true, @@ -96,9 +96,7 @@ const setup = async () => { registerFileSystemOverlay(1, fileSystemProvider); textModelRef = await createModelReference(Uri.file('/workspace/example.langium')); -}; -const run = async () => { createConfiguredEditor(document.getElementById('container')!, { model: textModelRef.object.textEditorModel }); @@ -138,9 +136,10 @@ const run = async () => { // any further language client / server interaction can't be defined as needed }; -try { - await setup(); - await run(); -} catch (e) { - console.log(e); -} +export const startLangiumClient = async () => { + try { + await setupLangiumClient(); + } catch (e) { + console.log(e); + } +}; diff --git a/packages/examples/main/src/langium/statemachineClient.ts b/packages/examples/main/src/langium/statemachineClient.ts index d3846da5d..5fea8ae02 100644 --- a/packages/examples/main/src/langium/statemachineClient.ts +++ b/packages/examples/main/src/langium/statemachineClient.ts @@ -20,7 +20,7 @@ buildWorkerDefinition('../../../node_modules/monaco-editor-workers/dist/workers/ const languageId = 'statemachine'; -const setup = async () => { +export const setupStatemachineClient = async () => { // use this to demonstrate all possible services made available by the monaco-vscode-api await initServices({ enableThemeService: true, @@ -98,9 +98,7 @@ const setup = async () => { "editor.fontSize": 14, "workbench.colorTheme": "Default Dark Modern" }`); -}; -const run = async () => { const exampleStatemachineUrl = new URL('./src/langium/example.statemachine', window.location.href).href; const editorText = await (await fetch(exampleStatemachineUrl)).text(); @@ -143,9 +141,10 @@ const run = async () => { reader.onClose(() => languageClient.stop()); }; -try { - await setup(); - await run(); -} catch (e) { - console.error(e); -} +export const startStatemachineClient = async () => { + try { + await setupStatemachineClient(); + } catch (e) { + console.error(e); + } +}; diff --git a/packages/examples/main/src/node.ts b/packages/examples/main/src/node.ts new file mode 100644 index 000000000..bc508ce17 --- /dev/null +++ b/packages/examples/main/src/node.ts @@ -0,0 +1,9 @@ +/* -------------------------------------------------------------------------------------------- + * 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 * from './json/server/json-server.js'; +export * from './json/server/main.js'; +export * from './python/server/main.js'; +export * from './utils/fs-utils.js'; diff --git a/packages/examples/main/src/python/client.ts b/packages/examples/main/src/python/client/main.ts similarity index 96% rename from packages/examples/main/src/python/client.ts rename to packages/examples/main/src/python/client/main.ts index 00f981233..54b74ebad 100644 --- a/packages/examples/main/src/python/client.ts +++ b/packages/examples/main/src/python/client/main.ts @@ -17,8 +17,8 @@ import { WebSocketMessageReader, WebSocketMessageWriter, toSocket } from 'vscode import { RegisteredFileSystemProvider, registerFileSystemOverlay, RegisteredMemoryFile } from 'vscode/service-override/files'; import { buildWorkerDefinition } from 'monaco-editor-workers'; -import { createUrl } from '../common.js'; -buildWorkerDefinition('../../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false); +import { createUrl } from '../../common.js'; +buildWorkerDefinition('../../../../node_modules/monaco-editor-workers/dist/workers/', new URL('', window.location.href).href, false); const languageId = 'python'; let languageClient: MonacoLanguageClient; @@ -69,7 +69,7 @@ const createLanguageClient = (transports: MessageTransports): MonacoLanguageClie }); }; -const run = async () => { +export const startPythonClient = async () => { // init vscode-api await initServices({ enableModelService: true, @@ -166,5 +166,3 @@ const run = async () => { automaticLayout: true }); }; - -run(); diff --git a/packages/examples/main/src/python/server/direct.ts b/packages/examples/main/src/python/server/direct.ts new file mode 100644 index 000000000..925c5b3f2 --- /dev/null +++ b/packages/examples/main/src/python/server/direct.ts @@ -0,0 +1,12 @@ +/* -------------------------------------------------------------------------------------------- + * 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. + * ------------------------------------------------------------------------------------------ */ + +import { resolve } from 'path'; +import { runPythonServer } from './main.js'; +import { getLocalDirectory } from '../../utils/fs-utils.js'; + +const baseDir = resolve(getLocalDirectory(import.meta.url)); +const relativeDir = '../../../../../../node_modules/pyright/dist/pyright-langserver.js'; +runPythonServer(baseDir, relativeDir); diff --git a/packages/examples/main/src/python/server.ts b/packages/examples/main/src/python/server/main.ts similarity index 90% rename from packages/examples/main/src/python/server.ts rename to packages/examples/main/src/python/server/main.ts index b6ab35d56..22c85f961 100644 --- a/packages/examples/main/src/python/server.ts +++ b/packages/examples/main/src/python/server/main.ts @@ -11,13 +11,12 @@ import { resolve } from 'path'; import { IWebSocket, WebSocketMessageReader, WebSocketMessageWriter } from 'vscode-ws-jsonrpc'; import { createConnection, createServerProcess, forward } from 'vscode-ws-jsonrpc/server'; import { Message, InitializeRequest, InitializeParams } from 'vscode-languageserver'; -import { getLocalDirectory } from '../utils/fs-utils.js'; +import { getLocalDirectory } from '../../utils/fs-utils.js'; -const serverName = 'PYRIGHT'; - -const launchLanguageServer = (socket: IWebSocket) => { +const launchLanguageServer = (socket: IWebSocket, baseDir: string, relativeDir: string) => { + const serverName = 'PYRIGHT'; // start the language server as an external process - const ls = resolve(getLocalDirectory(import.meta.url), '../../../../../node_modules/pyright/dist/pyright-langserver.js'); + const ls = resolve(baseDir, relativeDir); const serverConnection = createServerProcess(serverName, 'node', [ls, '--stdio']); const reader = new WebSocketMessageReader(socket); @@ -42,7 +41,7 @@ const launchLanguageServer = (socket: IWebSocket) => { } }; -const run = () => { +export const runPythonServer = (baseDir: string, relativeDir: string) => { process.on('uncaughtException', function(err: any) { console.error('Uncaught Exception: ', err.toString()); if (err.stack) { @@ -98,15 +97,13 @@ const run = () => { }; // launch the server when the web socket is opened if (webSocket.readyState === webSocket.OPEN) { - launchLanguageServer(socket); + launchLanguageServer(socket, baseDir, relativeDir); } else { webSocket.on('open', () => { - launchLanguageServer(socket); + launchLanguageServer(socket, baseDir, relativeDir); }); } }); } }); }; - -run(); diff --git a/packages/examples/main/src/react/main.tsx b/packages/examples/main/src/react/main.tsx index 5f55d2dca..9c69da7b7 100644 --- a/packages/examples/main/src/react/main.tsx +++ b/packages/examples/main/src/react/main.tsx @@ -6,14 +6,16 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; import { ReactMonacoEditor } from './app.js'; -const defaultCode = `{ +export const startReactJsonClient = () => { + const defaultCode = `{ "$schema": "http://json.schemastore.org/coffeelint", "line_endings": "unix" }`; -const root = ReactDOM.createRoot(document.getElementById('root')!); -root.render(); + const root = ReactDOM.createRoot(document.getElementById('root')!); + root.render(); +}; diff --git a/packages/examples/main/statemachine_client.html b/packages/examples/main/statemachine_client.html index 7266ddcd1..6a2c89c80 100644 --- a/packages/examples/main/statemachine_client.html +++ b/packages/examples/main/statemachine_client.html @@ -10,7 +10,10 @@

Client & Statemachine DSL Web Worker Language Server Example

- + diff --git a/packages/verify/pnpm/package.json b/packages/verify/pnpm/package.json index 099947ed9..316c73363 100644 --- a/packages/verify/pnpm/package.json +++ b/packages/verify/pnpm/package.json @@ -3,7 +3,7 @@ "version": "0.0.0", "private": "true", "dependencies": { - "monaco-languageclient": "~6.4.4", + "monaco-languageclient": "~6.4.5", "monaco-editor": "~0.41.0", "vscode": "npm:@codingame/monaco-vscode-api@1.81.5" }, diff --git a/packages/verify/vite/package.json b/packages/verify/vite/package.json index 569ff32e2..b2a7de3e0 100644 --- a/packages/verify/vite/package.json +++ b/packages/verify/vite/package.json @@ -5,8 +5,8 @@ "type": "module", "dependencies": { "monaco-editor-workers": "~0.41.0", - "monaco-languageclient": "~6.4.4", - "examples-main": "../../examples/main", + "monaco-languageclient": "~6.4.5", + "monaco-languageclient-examples": "6.4.5-next.1", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { diff --git a/packages/verify/vite/src/client/main.ts b/packages/verify/vite/src/client/main.ts index 9feb1d640..bd15bd057 100644 --- a/packages/verify/vite/src/client/main.ts +++ b/packages/verify/vite/src/client/main.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ -import { createDefaultJsonContent, createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from 'examples-main'; +import { createDefaultJsonContent, createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from 'monaco-languageclient-examples'; import { buildWorkerDefinition } from 'monaco-editor-workers'; buildWorkerDefinition('./workers', new URL('', window.location.href).href, false); diff --git a/packages/verify/webpack/package.json b/packages/verify/webpack/package.json index 483811a39..fde0c7b50 100644 --- a/packages/verify/webpack/package.json +++ b/packages/verify/webpack/package.json @@ -5,8 +5,8 @@ "type": "module", "dependencies": { "monaco-editor-workers": "~0.41.0", - "monaco-languageclient": "~6.4.4", - "examples-main": "../../examples/main", + "monaco-languageclient": "~6.4.5", + "monaco-languageclient-examples": "6.4.5-next.1", "vscode-ws-jsonrpc": "~3.0.0" }, "devDependencies": { diff --git a/packages/verify/webpack/src/client/main.ts b/packages/verify/webpack/src/client/main.ts index ae249e89c..65d9ce0d9 100644 --- a/packages/verify/webpack/src/client/main.ts +++ b/packages/verify/webpack/src/client/main.ts @@ -3,7 +3,7 @@ * Licensed under the MIT License. See License.txt in the project root for license information. * ------------------------------------------------------------------------------------------ */ -import { createDefaultJsonContent, createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from 'examples-main'; +import { createDefaultJsonContent, createJsonEditor, createUrl, createWebSocketAndStartClient, performInit } from 'monaco-languageclient-examples'; import { buildWorkerDefinition } from 'monaco-editor-workers'; buildWorkerDefinition('dist/client/workers', new URL('', window.location.href).href, false); diff --git a/packages/verify/webpack/webpack.config.js b/packages/verify/webpack/webpack.config.js index d37f22edf..d0dfc1a57 100644 --- a/packages/verify/webpack/webpack.config.js +++ b/packages/verify/webpack/webpack.config.js @@ -26,7 +26,7 @@ const config = { enforce: 'pre', use: ['source-map-loader'], // These modules seems to have broken sourcemaps, exclude them to prevent an error flood in the logs - exclude: [/vscode-jsonrpc/, /vscode-languageclient/, /vscode-languageserver-protocol/] + exclude: [/vscode-jsonrpc/, /vscode-languageclient/, /vscode-languageserver/, /vscode-languageserver-protocol/] }, { test: /\.(mp3|wasm)$/i, diff --git a/packages/verify/yarn/package.json b/packages/verify/yarn/package.json index 161ad3e68..b92749342 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.4.4" + "monaco-languageclient": "~6.4.5" }, "devDependencies": { "shx": "~0.3.4"