From f255cc253fcf14850442e8d4bf64635287b88314 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 27 Jul 2022 21:07:38 +0200 Subject: [PATCH] fix: monaco editor fixes --- frontend/package-lock.json | 129 +++++++----------- frontend/package.json | 4 +- frontend/src/lib/components/Editor.svelte | 59 ++++---- frontend/src/lib/components/ModuleStep.svelte | 1 + frontend/src/lib/utils.ts | 4 +- frontend/vite.config.js | 2 +- 6 files changed, 93 insertions(+), 106 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index de67414e9bf0..8ecd6c830fc1 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -14,7 +14,7 @@ "highlight.js": "^11.5.1", "monaco-editor": "^0.33.0", "monaco-editor-workers": "^0.33.0", - "monaco-languageclient": "2.0.2", + "monaco-languageclient": "2.1.0", "vscode-ws-jsonrpc": "^1.0.2" }, "devDependencies": { @@ -23,7 +23,7 @@ "@sveltejs/kit": "next", "@tailwindcss/forms": "^0.5.1", "@tailwindcss/typography": "^0.5.3", - "@types/vscode": "^1.69.0", + "@types/vscode": "~1.67.0", "@typescript-eslint/eslint-plugin": "^5.31.0", "@typescript-eslint/parser": "^5.31.0", "@zerodevx/svelte-toast": "^0.7.2", @@ -474,9 +474,10 @@ } }, "node_modules/@types/vscode": { - "version": "1.69.0", - "dev": true, - "license": "MIT" + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.67.0.tgz", + "integrity": "sha512-GH8BDf8cw9AC9080uneJfulhSa7KHSMI2s/CyKePXoGNos9J486w2V4YKoeNUqIEkW4hKoEAWp6/cXTwyGj47g==", + "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "5.31.0", @@ -2644,26 +2645,18 @@ } }, "node_modules/monaco-languageclient": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-2.0.2.tgz", - "integrity": "sha512-r9Zm6IrVuoJI/9BT8avCXkOXqWApvwQ/f1R9d5ZJHkDHUae/iOYvu9LLQHkMdsG4ilPfDsWoGTN51EVUAHtppw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-2.1.0.tgz", + "integrity": "sha512-Ps+G97MH8p/T7dk7NqJnDgub6x2+SiAmFR6rjUyJ2qdSGUNgg310bPD521rEPUTNKGfP7VwBggFjcnoGGCi0vg==", "dependencies": { "glob-to-regexp": "0.4.1", - "vscode": "npm:@codingame/monaco-vscode-api@^1.68.4", - "vscode-jsonrpc": "8.0.1", - "vscode-languageclient": "8.0.1", + "vscode": "npm:@codingame/monaco-vscode-api@~1.67.20", + "vscode-jsonrpc": "8.0.2", + "vscode-languageclient": "8.0.2", "vscode-languageserver-textdocument": "1.0.5", "vscode-uri": "3.0.3" } }, - "node_modules/monaco-languageclient/node_modules/vscode-jsonrpc": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz", - "integrity": "sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==", - "engines": { - "node": ">=14.0.0" - } - }, "node_modules/mri": { "version": "1.2.0", "dev": true, @@ -4679,9 +4672,9 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.68.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.68.7.tgz", - "integrity": "sha512-pJ5ukCDNrHh6rgE0GnGWXVWdE9T8UWqM0mju3LfDQ5iP6NjxEQsBmZsb+lEtzPGWwv5y/WWchztMzoW0qF/Z4Q==", + "version": "1.67.20", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.67.20.tgz", + "integrity": "sha512-3+swJLtpNWmn2hsnVFv/qbLuQLt+FlaDLgcK0PgYwWVIJn2FjO48a0+ke8ZYS/tiqZxJgJSk+y6hdohgZo7n0g==", "dependencies": { "monaco-editor": "^0.33.0" } @@ -4695,33 +4688,25 @@ } }, "node_modules/vscode-languageclient": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.1.tgz", - "integrity": "sha512-9XoE+HJfaWvu7Y75H3VmLo5WLCtsbxEgEhrLPqwt7eyoR49lUIyyrjb98Yfa50JCMqF2cePJAEVI6oe2o1sIhw==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.2.tgz", + "integrity": "sha512-lHlthJtphG9gibGb/y72CKqQUxwPsMXijJVpHEC2bvbFqxmkj9LwQ3aGU9dwjBLqsX1S4KjShYppLvg1UJDF/Q==", "dependencies": { "minimatch": "^3.0.4", "semver": "^7.3.5", - "vscode-languageserver-protocol": "3.17.1" + "vscode-languageserver-protocol": "3.17.2" }, "engines": { "vscode": "^1.67.0" } }, "node_modules/vscode-languageserver-protocol": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz", - "integrity": "sha512-BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz", + "integrity": "sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==", "dependencies": { - "vscode-jsonrpc": "8.0.1", - "vscode-languageserver-types": "3.17.1" - } - }, - "node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz", - "integrity": "sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==", - "engines": { - "node": ">=14.0.0" + "vscode-jsonrpc": "8.0.2", + "vscode-languageserver-types": "3.17.2" } }, "node_modules/vscode-languageserver-textdocument": { @@ -4729,9 +4714,9 @@ "license": "MIT" }, "node_modules/vscode-languageserver-types": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz", - "integrity": "sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ==" + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz", + "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==" }, "node_modules/vscode-uri": { "version": "3.0.3", @@ -5114,7 +5099,9 @@ } }, "@types/vscode": { - "version": "1.69.0", + "version": "1.67.0", + "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.67.0.tgz", + "integrity": "sha512-GH8BDf8cw9AC9080uneJfulhSa7KHSMI2s/CyKePXoGNos9J486w2V4YKoeNUqIEkW4hKoEAWp6/cXTwyGj47g==", "dev": true }, "@typescript-eslint/eslint-plugin": { @@ -6461,23 +6448,16 @@ } }, "monaco-languageclient": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-2.0.2.tgz", - "integrity": "sha512-r9Zm6IrVuoJI/9BT8avCXkOXqWApvwQ/f1R9d5ZJHkDHUae/iOYvu9LLQHkMdsG4ilPfDsWoGTN51EVUAHtppw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-2.1.0.tgz", + "integrity": "sha512-Ps+G97MH8p/T7dk7NqJnDgub6x2+SiAmFR6rjUyJ2qdSGUNgg310bPD521rEPUTNKGfP7VwBggFjcnoGGCi0vg==", "requires": { "glob-to-regexp": "0.4.1", - "vscode": "npm:@codingame/monaco-vscode-api@^1.68.4", - "vscode-jsonrpc": "8.0.1", - "vscode-languageclient": "8.0.1", + "vscode": "npm:@codingame/monaco-vscode-api@~1.67.20", + "vscode-jsonrpc": "8.0.2", + "vscode-languageclient": "8.0.2", "vscode-languageserver-textdocument": "1.0.5", "vscode-uri": "3.0.3" - }, - "dependencies": { - "vscode-jsonrpc": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz", - "integrity": "sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==" - } } }, "mri": { @@ -7655,9 +7635,9 @@ } }, "vscode": { - "version": "npm:@codingame/monaco-vscode-api@1.68.7", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.68.7.tgz", - "integrity": "sha512-pJ5ukCDNrHh6rgE0GnGWXVWdE9T8UWqM0mju3LfDQ5iP6NjxEQsBmZsb+lEtzPGWwv5y/WWchztMzoW0qF/Z4Q==", + "version": "npm:@codingame/monaco-vscode-api@1.67.20", + "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.67.20.tgz", + "integrity": "sha512-3+swJLtpNWmn2hsnVFv/qbLuQLt+FlaDLgcK0PgYwWVIJn2FjO48a0+ke8ZYS/tiqZxJgJSk+y6hdohgZo7n0g==", "requires": { "monaco-editor": "^0.33.0" } @@ -7668,38 +7648,31 @@ "integrity": "sha512-RY7HwI/ydoC1Wwg4gJ3y6LpU9FJRZAUnTYMXthqhFXXu77ErDd/xkREpGuk4MyYkk4a+XDWAMqe0S3KkelYQEQ==" }, "vscode-languageclient": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.1.tgz", - "integrity": "sha512-9XoE+HJfaWvu7Y75H3VmLo5WLCtsbxEgEhrLPqwt7eyoR49lUIyyrjb98Yfa50JCMqF2cePJAEVI6oe2o1sIhw==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-8.0.2.tgz", + "integrity": "sha512-lHlthJtphG9gibGb/y72CKqQUxwPsMXijJVpHEC2bvbFqxmkj9LwQ3aGU9dwjBLqsX1S4KjShYppLvg1UJDF/Q==", "requires": { "minimatch": "^3.0.4", "semver": "^7.3.5", - "vscode-languageserver-protocol": "3.17.1" + "vscode-languageserver-protocol": "3.17.2" } }, "vscode-languageserver-protocol": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.1.tgz", - "integrity": "sha512-BNlAYgQoYwlSgDLJhSG+DeA8G1JyECqRzM2YO6tMmMji3Ad9Mw6AW7vnZMti90qlAKb0LqAlJfSVGEdqMMNzKg==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.2.tgz", + "integrity": "sha512-8kYisQ3z/SQ2kyjlNeQxbkkTNmVFoQCqkmGrzLH6A9ecPlgTbp3wDTnUNqaUxYr4vlAcloxx8zwy7G5WdguYNg==", "requires": { - "vscode-jsonrpc": "8.0.1", - "vscode-languageserver-types": "3.17.1" - }, - "dependencies": { - "vscode-jsonrpc": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.0.1.tgz", - "integrity": "sha512-N/WKvghIajmEvXpatSzvTvOIz61ZSmOSa4BRA4pTLi+1+jozquQKP/MkaylP9iB68k73Oua1feLQvH3xQuigiQ==" - } + "vscode-jsonrpc": "8.0.2", + "vscode-languageserver-types": "3.17.2" } }, "vscode-languageserver-textdocument": { "version": "1.0.5" }, "vscode-languageserver-types": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.1.tgz", - "integrity": "sha512-K3HqVRPElLZVVPtMeKlsyL9aK0GxGQpvtAUTfX4k7+iJ4mc1M+JM+zQwkgGy2LzY0f0IAafe8MKqIkJrxfGGjQ==" + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz", + "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==" }, "vscode-uri": { "version": "3.0.3" diff --git a/frontend/package.json b/frontend/package.json index 7663de021ee8..884586a75506 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -20,7 +20,7 @@ "@sveltejs/kit": "next", "@tailwindcss/forms": "^0.5.1", "@tailwindcss/typography": "^0.5.3", - "@types/vscode": "^1.69.0", + "@types/vscode": "~1.67.0", "@typescript-eslint/eslint-plugin": "^5.31.0", "@typescript-eslint/parser": "^5.31.0", "@zerodevx/svelte-toast": "^0.7.2", @@ -59,7 +59,7 @@ "highlight.js": "^11.5.1", "monaco-editor": "^0.33.0", "monaco-editor-workers": "^0.33.0", - "monaco-languageclient": "2.0.2", + "monaco-languageclient": "2.1.0", "vscode-ws-jsonrpc": "^1.0.2" } } diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte index 6721187eb0e4..e4c14ee78386 100644 --- a/frontend/src/lib/components/Editor.svelte +++ b/frontend/src/lib/components/Editor.svelte @@ -1,17 +1,28 @@