From 0bfc7391b47279f7372ddac20cdcc8f5032c62ed Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Fri, 9 Dec 2022 10:56:36 +0100 Subject: [PATCH] pin monaco to 0.33 + remove cursor style --- frontend/package-lock.json | 180 +++++++++++++++++--------------- frontend/package.json | 4 +- frontend/src/app.css | 4 + frontend/src/lib/editorUtils.ts | 4 +- frontend/tailwind.config.cjs | 30 +----- 5 files changed, 103 insertions(+), 119 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 9b864107c7..d228920dfa 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -21,9 +21,9 @@ "chartjs-plugin-zoom": "^2.0.0", "date-fns": "^2.29.3", "highlight.js": "^11.5.1", - "monaco-editor": "^0.34.1", + "monaco-editor": "0.33.0", "monaco-editor-workers": "^0.34.2", - "monaco-languageclient": "4.0.1", + "monaco-languageclient": "2.1.0", "monaco-yaml": "^4.0.2", "set-interval-async": "^3.0.2", "svelte-autosize": "^1.0.1", @@ -3114,6 +3114,11 @@ "node": ">= 6" } }, + "node_modules/glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + }, "node_modules/global-modules": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", @@ -3994,9 +3999,9 @@ } }, "node_modules/monaco-editor": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.34.1.tgz", - "integrity": "sha512-FKc80TyiMaruhJKKPz5SpJPIjL+dflGvz4CpuThaPMc94AyN7SeC9HQ8hrvaxX7EyHdJcUY5i4D0gNyJj1vSZQ==" + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz", + "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==" }, "node_modules/monaco-editor-workers": { "version": "0.34.2", @@ -4004,37 +4009,27 @@ "integrity": "sha512-MdO1nvAbGNzc7ygyzwACvs5DOPaTOUNDjU/qTQx0Rsw00BrhL88eMi9sWBm+LYfQbPaZf+YBqwJaJUovl3M6bQ==" }, "node_modules/monaco-languageclient": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-4.0.1.tgz", - "integrity": "sha512-mUIq/7gQM/8CyOBVGv0thLRAR80vk49Ur0ROJveoh6R0/uwaUoyri+5OBslxsa5BICftLTsC8/Y+at6/iW50Ww==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-2.1.0.tgz", + "integrity": "sha512-Ps+G97MH8p/T7dk7NqJnDgub6x2+SiAmFR6rjUyJ2qdSGUNgg310bPD521rEPUTNKGfP7VwBggFjcnoGGCi0vg==", "dependencies": { - "vscode": "npm:@codingame/monaco-vscode-api@1.69.12", + "glob-to-regexp": "0.4.1", + "vscode": "npm:@codingame/monaco-vscode-api@~1.67.20", "vscode-jsonrpc": "8.0.2", - "vscode-languageclient": "8.0.2" - }, - "engines": { - "node": ">=16.11.0", - "npm": ">=8.0.0" + "vscode-languageclient": "8.0.2", + "vscode-languageserver-textdocument": "1.0.5", + "vscode-uri": "3.0.3" } }, - "node_modules/monaco-marker-data-provider": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/monaco-marker-data-provider/-/monaco-marker-data-provider-1.1.1.tgz", - "integrity": "sha512-PGB7TJSZE5tmHzkxv/OEwK2RGNC2A7dcq4JRJnnj31CUAsfmw0Gl+1QTrH0W0deKhcQmQM0YVPaqgQ+0wCt8Mg==", - "funding": { - "url": "https://github.com/sponsors/remcohaszing" - }, - "peerDependencies": { - "monaco-editor": ">=0.30.0" - } + "node_modules/monaco-languageclient/node_modules/vscode-languageserver-textdocument": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.5.tgz", + "integrity": "sha512-1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg==" }, - "node_modules/monaco-worker-manager": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/monaco-worker-manager/-/monaco-worker-manager-2.0.1.tgz", - "integrity": "sha512-kdPL0yvg5qjhKPNVjJoym331PY/5JC11aPJXtCZNwWRvBr6jhkIamvYAyiY5P1AWFmNOy0aRDRoMdZfa71h8kg==", - "peerDependencies": { - "monaco-editor": ">=0.30.0" - } + "node_modules/monaco-languageclient/node_modules/vscode-uri": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz", + "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==" }, "node_modules/monaco-yaml": { "version": "4.0.2", @@ -4059,6 +4054,25 @@ "monaco-editor": ">=0.30" } }, + "node_modules/monaco-yaml/node_modules/monaco-marker-data-provider": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/monaco-marker-data-provider/-/monaco-marker-data-provider-1.1.1.tgz", + "integrity": "sha512-PGB7TJSZE5tmHzkxv/OEwK2RGNC2A7dcq4JRJnnj31CUAsfmw0Gl+1QTrH0W0deKhcQmQM0YVPaqgQ+0wCt8Mg==", + "funding": { + "url": "https://github.com/sponsors/remcohaszing" + }, + "peerDependencies": { + "monaco-editor": ">=0.30.0" + } + }, + "node_modules/monaco-yaml/node_modules/monaco-worker-manager": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/monaco-worker-manager/-/monaco-worker-manager-2.0.1.tgz", + "integrity": "sha512-kdPL0yvg5qjhKPNVjJoym331PY/5JC11aPJXtCZNwWRvBr6jhkIamvYAyiY5P1AWFmNOy0aRDRoMdZfa71h8kg==", + "peerDependencies": { + "monaco-editor": ">=0.30.0" + } + }, "node_modules/monaco-yaml/node_modules/yaml": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.3.tgz", @@ -6708,15 +6722,11 @@ }, "node_modules/vscode": { "name": "@codingame/monaco-vscode-api", - "version": "1.69.12", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.69.12.tgz", - "integrity": "sha512-ES1xRnU232t82tcdM2ImikkjGfAMgJtrF0XkLa4poEnvcUH0SFqUhYvcqk5CFggQWh16jqxifVvozcu0/mbH7A==", + "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.34.0" - }, - "peerDependencies": { - "vscode-oniguruma": "^1.6.2", - "vscode-textmate": "^7.0.1" + "monaco-editor": "^0.33.0" } }, "node_modules/vscode-jsonrpc": { @@ -6759,18 +6769,6 @@ "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz", "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==" }, - "node_modules/vscode-oniguruma": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz", - "integrity": "sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==", - "peer": true - }, - "node_modules/vscode-textmate": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-7.0.3.tgz", - "integrity": "sha512-OkE/mYm1h5ZX9IEKeKR/2zKDt2SzYyIfTEOVFX4QhA+B3BPROvNEmDDXvBThz3qknKO3Cy/VVb8/sx1UlqP/Xw==", - "peer": true - }, "node_modules/vscode-uri": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz", @@ -9152,6 +9150,11 @@ "is-glob": "^4.0.1" } }, + "glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==" + }, "global-modules": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz", @@ -9818,9 +9821,9 @@ } }, "monaco-editor": { - "version": "0.34.1", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.34.1.tgz", - "integrity": "sha512-FKc80TyiMaruhJKKPz5SpJPIjL+dflGvz4CpuThaPMc94AyN7SeC9HQ8hrvaxX7EyHdJcUY5i4D0gNyJj1vSZQ==" + "version": "0.33.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.33.0.tgz", + "integrity": "sha512-VcRWPSLIUEgQJQIE0pVT8FcGBIgFoxz7jtqctE+IiCxWugD0DwgyQBcZBhdSrdMC84eumoqMZsGl2GTreOzwqw==" }, "monaco-editor-workers": { "version": "0.34.2", @@ -9828,27 +9831,30 @@ "integrity": "sha512-MdO1nvAbGNzc7ygyzwACvs5DOPaTOUNDjU/qTQx0Rsw00BrhL88eMi9sWBm+LYfQbPaZf+YBqwJaJUovl3M6bQ==" }, "monaco-languageclient": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-4.0.1.tgz", - "integrity": "sha512-mUIq/7gQM/8CyOBVGv0thLRAR80vk49Ur0ROJveoh6R0/uwaUoyri+5OBslxsa5BICftLTsC8/Y+at6/iW50Ww==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/monaco-languageclient/-/monaco-languageclient-2.1.0.tgz", + "integrity": "sha512-Ps+G97MH8p/T7dk7NqJnDgub6x2+SiAmFR6rjUyJ2qdSGUNgg310bPD521rEPUTNKGfP7VwBggFjcnoGGCi0vg==", "requires": { - "vscode": "npm:@codingame/monaco-vscode-api@1.69.12", + "glob-to-regexp": "0.4.1", + "vscode": "npm:@codingame/monaco-vscode-api@~1.67.20", "vscode-jsonrpc": "8.0.2", - "vscode-languageclient": "8.0.2" + "vscode-languageclient": "8.0.2", + "vscode-languageserver-textdocument": "1.0.5", + "vscode-uri": "3.0.3" + }, + "dependencies": { + "vscode-languageserver-textdocument": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.5.tgz", + "integrity": "sha512-1ah7zyQjKBudnMiHbZmxz5bYNM9KKZYz+5VQLj+yr8l+9w3g+WAhCkUkWbhMEdC5u0ub4Ndiye/fDyS8ghIKQg==" + }, + "vscode-uri": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.3.tgz", + "integrity": "sha512-EcswR2S8bpR7fD0YPeS7r2xXExrScVMxg4MedACaWHEtx9ftCF/qHG1xGkolzTPcEmjTavCQgbVzHUIdTMzFGA==" + } } }, - "monaco-marker-data-provider": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/monaco-marker-data-provider/-/monaco-marker-data-provider-1.1.1.tgz", - "integrity": "sha512-PGB7TJSZE5tmHzkxv/OEwK2RGNC2A7dcq4JRJnnj31CUAsfmw0Gl+1QTrH0W0deKhcQmQM0YVPaqgQ+0wCt8Mg==", - "requires": {} - }, - "monaco-worker-manager": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/monaco-worker-manager/-/monaco-worker-manager-2.0.1.tgz", - "integrity": "sha512-kdPL0yvg5qjhKPNVjJoym331PY/5JC11aPJXtCZNwWRvBr6jhkIamvYAyiY5P1AWFmNOy0aRDRoMdZfa71h8kg==", - "requires": {} - }, "monaco-yaml": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/monaco-yaml/-/monaco-yaml-4.0.2.tgz", @@ -9866,6 +9872,18 @@ "yaml": "^2.0.0" }, "dependencies": { + "monaco-marker-data-provider": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/monaco-marker-data-provider/-/monaco-marker-data-provider-1.1.1.tgz", + "integrity": "sha512-PGB7TJSZE5tmHzkxv/OEwK2RGNC2A7dcq4JRJnnj31CUAsfmw0Gl+1QTrH0W0deKhcQmQM0YVPaqgQ+0wCt8Mg==", + "requires": {} + }, + "monaco-worker-manager": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/monaco-worker-manager/-/monaco-worker-manager-2.0.1.tgz", + "integrity": "sha512-kdPL0yvg5qjhKPNVjJoym331PY/5JC11aPJXtCZNwWRvBr6jhkIamvYAyiY5P1AWFmNOy0aRDRoMdZfa71h8kg==", + "requires": {} + }, "yaml": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.1.3.tgz", @@ -11730,11 +11748,11 @@ } }, "vscode": { - "version": "npm:@codingame/monaco-vscode-api@1.69.12", - "resolved": "https://registry.npmjs.org/@codingame/monaco-vscode-api/-/monaco-vscode-api-1.69.12.tgz", - "integrity": "sha512-ES1xRnU232t82tcdM2ImikkjGfAMgJtrF0XkLa4poEnvcUH0SFqUhYvcqk5CFggQWh16jqxifVvozcu0/mbH7A==", + "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.34.0" + "monaco-editor": "^0.33.0" } }, "vscode-jsonrpc": { @@ -11771,18 +11789,6 @@ "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.2.tgz", "integrity": "sha512-zHhCWatviizPIq9B7Vh9uvrH6x3sK8itC84HkamnBWoDFJtzBf7SWlpLCZUit72b3os45h6RWQNC9xHRDF8dRA==" }, - "vscode-oniguruma": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.2.tgz", - "integrity": "sha512-KH8+KKov5eS/9WhofZR8M8dMHWN2gTxjMsG4jd04YhpbPR91fUj7rYQ2/XjeHCJWbg7X++ApRIU9NUwM2vTvLA==", - "peer": true - }, - "vscode-textmate": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-7.0.3.tgz", - "integrity": "sha512-OkE/mYm1h5ZX9IEKeKR/2zKDt2SzYyIfTEOVFX4QhA+B3BPROvNEmDDXvBThz3qknKO3Cy/VVb8/sx1UlqP/Xw==", - "peer": true - }, "vscode-uri": { "version": "3.0.6", "resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.0.6.tgz", diff --git a/frontend/package.json b/frontend/package.json index 1010c3436a..16374356d3 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -72,9 +72,9 @@ "chartjs-plugin-zoom": "^2.0.0", "date-fns": "^2.29.3", "highlight.js": "^11.5.1", - "monaco-editor": "^0.34.1", + "monaco-editor": "0.33.0", "monaco-editor-workers": "^0.34.2", - "monaco-languageclient": "4.0.1", + "monaco-languageclient": "2.1.0", "monaco-yaml": "^4.0.2", "set-interval-async": "^3.0.2", "svelte-autosize": "^1.0.1", diff --git a/frontend/src/app.css b/frontend/src/app.css index 3d0cb2d6e9..5a9474a3ba 100644 --- a/frontend/src/app.css +++ b/frontend/src/app.css @@ -35,6 +35,10 @@ border-top-width: 1px !important; border-bottom-width: 0px !important; } + + .monaco-editor textarea:focus { + box-shadow: none !important; + } } @layer components { diff --git a/frontend/src/lib/editorUtils.ts b/frontend/src/lib/editorUtils.ts index 70c0c4e761..266204cea5 100644 --- a/frontend/src/lib/editorUtils.ts +++ b/frontend/src/lib/editorUtils.ts @@ -21,7 +21,9 @@ export function editorConfig(model: any, code: string, lang: string, automaticLa }, lightbulb: { enabled: true - } + }, + 'bracketPairColorization.enabled': true, + matchBrackets: 'always' as 'always', } } diff --git a/frontend/tailwind.config.cjs b/frontend/tailwind.config.cjs index bb6ff3ae49..37ca106556 100644 --- a/frontend/tailwind.config.cjs +++ b/frontend/tailwind.config.cjs @@ -225,35 +225,7 @@ const config = { a: { color: theme('colors.blue.500') }, - 'input,input[type="text"],input[type="email"],input[type="url"],input[type="password"],input[type="number"],input[type="date"],input[type="datetime-local"],input[type="month"],input[type="search"],input[type="tel"],input[type="time"],input[type="week"],textarea,textarea[type="text"],select': - { - display: 'block', - fontSize: theme('fontSize.sm'), - width: '100%', - padding: `${theme('spacing.1')} ${theme('spacing.2')}`, - border: `1px solid ${theme('colors.gray.300')}`, - borderRadius: theme('borderRadius.md'), - boxShadow: theme('boxShadow.sm'), - '&:focus': { - '--tw-ring-color': theme('colors.indigo.100'), - '--tw-ring-offset-shadow': - 'var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color)', - '--tw-ring-shadow': - 'var(--tw-ring-inset) 0 0 0 calc(3px + var(--tw-ring-offset-width)) var(--tw-ring-color)', - boxShadow: - 'var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000)' - }, - '&:disabled,[disabled]': { - backgroundColor: theme('colors.gray.100') + ' !important' - } - }, - button: { - fontWeight: theme('fontWeight.semibold') - }, - a: { - color: theme('colors.blue.500') - }, - 'input,input[type="text"],input[type="email"],input[type="url"],input[type="password"],input[type="number"],input[type="date"],input[type="datetime-local"],input[type="month"],input[type="search"],input[type="tel"],input[type="time"],input[type="week"],textarea,select': + 'input,input[type="text"],input[type="email"],input[type="url"],input[type="password"],input[type="number"],input[type="date"],input[type="datetime-local"],input[type="month"],input[type="search"],input[type="tel"],input[type="time"],input[type="week"],textarea:not(.monaco-mouse-cursor-text),select': { display: 'block', fontSize: theme('fontSize.sm'),