From 00caf8a655bc3ceccf4362d71fabeb92ec71ac1c Mon Sep 17 00:00:00 2001 From: Stefan Dej Date: Sun, 22 Aug 2021 14:57:19 +0200 Subject: [PATCH] feature(editor): add JSON syntax highlighting Signed-off-by: Stefan Dej --- package-lock.json | 765 +++++++++++++++------------ package.json | 13 +- src/components/inputs/Codemirror.vue | 10 +- src/store/printer/getters.ts | 2 +- 4 files changed, 441 insertions(+), 349 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9822a5ec..677327a6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,21 @@ { "name": "mainsail", - "version": "2.0.0-beta", + "version": "2.0.0-RC", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "mainsail", - "version": "2.0.0-beta", + "version": "2.0.0-RC", "dependencies": { - "@codemirror/basic-setup": "^0.18.2", - "@codemirror/legacy-modes": "^0.18.1", - "@codemirror/state": "^0.18.7", - "@codemirror/stream-parser": "^0.18.2", - "@codemirror/view": "^0.18.19", + "@codemirror/basic-setup": "^0.19.0", + "@codemirror/highlight": "^0.19.2", + "@codemirror/lang-javascript": "^0.19.1", + "@codemirror/lang-json": "^0.19.1", + "@codemirror/legacy-modes": "^0.19.0", + "@codemirror/state": "^0.19.1", + "@codemirror/stream-parser": "^0.19.1", + "@codemirror/view": "^0.19.1", "axios": "^0.21.1", "core-js": "^3.16.0", "echarts": "^5.1.2", @@ -1448,246 +1451,274 @@ } }, "node_modules/@codemirror/autocomplete": { - "version": "0.18.8", - "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-0.18.8.tgz", - "integrity": "sha512-Va1Q763Vu/rVmIazru/ZnO2kkWVq6SlmMEjeD0qmxLAypyP6j/QNdpmaPDI1qb/+Mb9VFZBbac6a0aLTTi8qxQ==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-0.19.1.tgz", + "integrity": "sha512-xc7BqgTrul+kW9RpM1zB9hmmILF6GOgmz2B6UQkTv3bbH+sQ9LV0edvCJf/QUphep0mpsjLu/e2cAhkVdy6kZw==", "dependencies": { - "@codemirror/language": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/tooltip": "^0.18.4", - "@codemirror/view": "^0.18.0", - "lezer-tree": "^0.13.0" + "@codemirror/language": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/tooltip": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/common": "^0.15.0" } }, "node_modules/@codemirror/basic-setup": { - "version": "0.18.2", - "resolved": "https://registry.npmjs.org/@codemirror/basic-setup/-/basic-setup-0.18.2.tgz", - "integrity": "sha512-4UNFQ4jhU7wKxJH23AJcZW6Ho54VXUpmbtFnN5amIdtGci4ZLvci4M7JKgKFraHmKfDIYQnSzN8d8ohXR7CRhw==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/basic-setup/-/basic-setup-0.19.0.tgz", + "integrity": "sha512-Yhrf7fIz8+INHWOhpWeRwbs8fpc0KsydX9baD7TyYqniLVWyTi0Hwm52mr0f5O+k4YaJPeHAgT3x9gzDXZIvOw==", + "license": "MIT", "dependencies": { - "@codemirror/autocomplete": "^0.18.0", - "@codemirror/closebrackets": "^0.18.0", - "@codemirror/commands": "^0.18.0", - "@codemirror/comment": "^0.18.0", - "@codemirror/fold": "^0.18.0", - "@codemirror/gutter": "^0.18.3", - "@codemirror/highlight": "^0.18.0", - "@codemirror/history": "^0.18.0", - "@codemirror/language": "^0.18.0", - "@codemirror/lint": "^0.18.0", - "@codemirror/matchbrackets": "^0.18.0", - "@codemirror/rectangular-selection": "^0.18.0", - "@codemirror/search": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/autocomplete": "^0.19.0", + "@codemirror/closebrackets": "^0.19.0", + "@codemirror/commands": "^0.19.0", + "@codemirror/comment": "^0.19.0", + "@codemirror/fold": "^0.19.0", + "@codemirror/gutter": "^0.19.0", + "@codemirror/highlight": "^0.19.0", + "@codemirror/history": "^0.19.0", + "@codemirror/language": "^0.19.0", + "@codemirror/lint": "^0.19.0", + "@codemirror/matchbrackets": "^0.19.0", + "@codemirror/rectangular-selection": "^0.19.0", + "@codemirror/search": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "node_modules/@codemirror/closebrackets": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@codemirror/closebrackets/-/closebrackets-0.18.0.tgz", - "integrity": "sha512-O1RAgUkzF4nq/B8IyXenZKZ1rJi2Mc7I6y4IhWhELiTnjyQy7YdAthTsJ40mNr8kZ6gRbasYe3K7TraITElZJA==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/closebrackets/-/closebrackets-0.19.0.tgz", + "integrity": "sha512-dFWX5OEVYWRNtGaifSbwIAlymnRRjxWMiMbffbAjF7p0zfGHDbdGkiT56q3Xud63h5/tQdSo5dK1iyNTzHz5vg==", "dependencies": { - "@codemirror/language": "^0.18.0", - "@codemirror/rangeset": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/language": "^0.19.0", + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "node_modules/@codemirror/commands": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-0.18.3.tgz", - "integrity": "sha512-nHYDG13qOirioXTAKmjl10W2L0eZ1ftvmTwvUTNY27UWVBPFSpk5zDXP3WqJ0mgMhQ4AOFLJaTjJEO3hmPComg==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-0.19.1.tgz", + "integrity": "sha512-6c9MlBW3UI13rCEqZkhD4etzWpxQKqeYKVn7CygsQ3LRtVprhfQxRts/K4vOcefC/Qq0VeRzYQt6crUPsOpaVA==", "dependencies": { - "@codemirror/language": "^0.18.0", - "@codemirror/matchbrackets": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0", - "lezer-tree": "^0.13.0" + "@codemirror/language": "^0.19.0", + "@codemirror/matchbrackets": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/common": "^0.15.0" } }, "node_modules/@codemirror/comment": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@codemirror/comment/-/comment-0.18.1.tgz", - "integrity": "sha512-Inhqs0F24WE28Fcp1dBZghwixBGv1HDwY9MjE0d5tpMY/IPGI6uT30fGyHAXrir6hUqk7eJRkO4UYnODGOnoIA==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/comment/-/comment-0.19.0.tgz", + "integrity": "sha512-3hqAd0548fxqOBm4khFMcXVIivX8p0bSlbAuZJ6PNoUn/0wXhxkxowPp0FmFzU2+y37Z+ZQF5cRB5EREWPRIiQ==", "dependencies": { - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "node_modules/@codemirror/fold": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@codemirror/fold/-/fold-0.18.1.tgz", - "integrity": "sha512-vvMUgDeSmeVow7/75YoNTERxPsdnIBeEw1JL2YVpLyscsUlalqwuxdhiHDLT5zjAu6JvMoTC103mwqgAYwM9tA==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/fold/-/fold-0.19.0.tgz", + "integrity": "sha512-cHbr2hqKe2pMls1Ia1a4IwXly87ljpmvPUKkul6H/Uv9kCwpQLOP3dGMPXbMGm/1hGjBF/0wnc+m2iba9iJBTQ==", "dependencies": { - "@codemirror/gutter": "^0.18.0", - "@codemirror/language": "^0.18.0", - "@codemirror/rangeset": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/gutter": "^0.19.0", + "@codemirror/language": "^0.19.0", + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "node_modules/@codemirror/gutter": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/gutter/-/gutter-0.18.4.tgz", - "integrity": "sha512-Sf2IWshMi9zwVVqpGmd2NRplY0qfrE2IiBEII9n2gB9M8hgIMg5GCyhdnsUDsOm0gcSut65W62vV7/DfYJHQCA==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/gutter/-/gutter-0.19.1.tgz", + "integrity": "sha512-lPZJt7m3s1EIaUzkqYIr0vARnhh4ZcgzaLFaSweDn2IFIFq10TOnYzsuXJrgD7KfeU0Epjgznyg3VC0utHX7uA==", "dependencies": { - "@codemirror/rangeset": "^0.18.3", - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "node_modules/@codemirror/highlight": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/highlight/-/highlight-0.18.4.tgz", - "integrity": "sha512-3azJntqWrShOIq/0kVcdMc9k7ACL0LQErgK+A6aWXmCj5Mx0gShq+Iajy8AMQ2zB0v3nhCBgFaniL1LLD5m5hQ==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@codemirror/highlight/-/highlight-0.19.2.tgz", + "integrity": "sha512-SSbGFCZMXeWhhG3sQ+YiN1ChONiXrx3vA1uYddgrglqdyFakotVe7mwiWOW0e7TKO5JfQKYdVJx0SIRXTIomXg==", "dependencies": { - "@codemirror/language": "^0.18.0", - "@codemirror/rangeset": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0", - "lezer-tree": "^0.13.0", + "@codemirror/language": "^0.19.0", + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/common": "^0.15.0", "style-mod": "^4.0.0" } }, "node_modules/@codemirror/history": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@codemirror/history/-/history-0.18.1.tgz", - "integrity": "sha512-Aad3p4zs6UYKCUMXYjh7cvPK0ajuL+rMib9yBZ61w81LLl6OkM31Xrn9J6CLJmPxCwP3OJFiqBmNSBQ05oIsTw==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/history/-/history-0.19.0.tgz", + "integrity": "sha512-E0H+lncH66IMDhaND9jgkjE7s0dhYfjCPmS+Ig2Yes9I8+UIEecIdObj8c8HPCFGctGg3fxXqRAw2mdHl2Wouw==", "dependencies": { - "@codemirror/state": "^0.18.3", - "@codemirror/view": "^0.18.0" + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" + } + }, + "node_modules/@codemirror/lang-javascript": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-0.19.1.tgz", + "integrity": "sha512-fFAP4nkfU36c14K8f6ytVYYeuX/2E7dJ+bD7UCZPWavXYjwdHAgDCJGH84MjhBSh0lMc908We80vyYg1j3MnRQ==", + "dependencies": { + "@codemirror/autocomplete": "^0.19.0", + "@codemirror/highlight": "^0.19.0", + "@codemirror/language": "^0.19.0", + "@codemirror/lint": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/javascript": "^0.15.0" + } + }, + "node_modules/@codemirror/lang-json": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-0.19.1.tgz", + "integrity": "sha512-66K5TT9HO0ODtpjY+3Ub6t3r0OB1d27P+Kl5oygk4tDavHUBpsyHTJRFw/CdeRM2VwjbpBfctGm/cTrSthFDZg==", + "dependencies": { + "@codemirror/highlight": "^0.19.0", + "@codemirror/language": "^0.19.0", + "@lezer/json": "^0.15.0" } }, "node_modules/@codemirror/language": { - "version": "0.18.2", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-0.18.2.tgz", - "integrity": "sha512-2Kz0Xyfvt1Ex2KfTUcYZ3IBxpnFCqHaJijwZknGBT7JXv9dwbOPs9SfPfL4oxVuDIHZx8JTPfoV3LTTJrm8M3Q==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-0.19.2.tgz", + "integrity": "sha512-Zz/gVezTknHhH2HcaMsYauxz06+3+IFU0nhhZmdTMcGbDL/ryQI2R543k9Zc58wA31lGa6uN+JzpZynEcGBwMQ==", "dependencies": { - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0", - "lezer": "^0.13.4", - "lezer-tree": "^0.13.0" + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/common": "^0.15.0", + "@lezer/lr": "^0.15.0" } }, "node_modules/@codemirror/legacy-modes": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-0.18.1.tgz", - "integrity": "sha512-Y5ST1K6v+8uK6BxLOtfS38LeOS+rzOCGs91+t6k2hsWwZq3w7LS17I5w1Es2SIuq+7c4GjpVTrijCF2kMxd5ZA==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-0.19.0.tgz", + "integrity": "sha512-GSPdBNUeyF3nxJ2lztXGp2UoQjn+ggK5z+Kd4tflziecCG1+8mcdudDgFvxDuaTGWyM34S7Ldb4Xv7/XodZtBA==", + "license": "MIT", "dependencies": { - "@codemirror/stream-parser": "^0.18.0" + "@codemirror/stream-parser": "^0.19.0" } }, "node_modules/@codemirror/lint": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-0.18.4.tgz", - "integrity": "sha512-H77qYfZOmo1kKf0ZQagzk/JRGVhIpwP0hq1TSO6DFC1WLjW6gcsFJO5NDMS86enm0KX0w4/IkA7PItz2mjmHhQ==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-0.19.0.tgz", + "integrity": "sha512-XjCIVJi2cUNlppwz0eGu0F93uFKJq1t2fupBQlDMr3hLmIxIRWjhvy66+Pw/ziH98XA8meLEGQX29umBAvym4w==", "dependencies": { - "@codemirror/panel": "^0.18.1", - "@codemirror/state": "^0.18.0", - "@codemirror/tooltip": "^0.18.4", - "@codemirror/view": "^0.18.0", + "@codemirror/panel": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/tooltip": "^0.19.0", + "@codemirror/view": "^0.19.0", "crelt": "^1.0.5" } }, "node_modules/@codemirror/matchbrackets": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@codemirror/matchbrackets/-/matchbrackets-0.18.0.tgz", - "integrity": "sha512-dPDopnZVkD54sSYdmQbyQbPdiuIA83p7XxX6Hp1ScEkOjukwCiFXiA/84x10FUTsQpUYp8bDzm7gwII119bGIw==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/matchbrackets/-/matchbrackets-0.19.1.tgz", + "integrity": "sha512-jBEW2Uu3hWcrrkwkauaikCAE7s5liCwbccFa6rLK6DzwaynOqCKJGyDsbkfrhikofNRc1yh4V3vwUuxt2u4QbA==", "dependencies": { - "@codemirror/language": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0", - "lezer-tree": "^0.13.0" + "@codemirror/language": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/common": "^0.15.0" } }, "node_modules/@codemirror/panel": { - "version": "0.18.2", - "resolved": "https://registry.npmjs.org/@codemirror/panel/-/panel-0.18.2.tgz", - "integrity": "sha512-ea/g2aAKtfmie1kD7C8GDutD/5u+uzRJr/varUiAbHKr1sAdjtz5xYvC3GBAMYMan1GOh0vD5zP1yEupJl3b3Q==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/panel/-/panel-0.19.0.tgz", + "integrity": "sha512-LJuu49xnuhaAztlhnLJQ57ddOirSyf8/lnl7twsQUG/05RkxodBZ9F7q8r5AOLqOkaQOy9WySEKX1Ur8lD9Q5w==", "dependencies": { - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "node_modules/@codemirror/rangeset": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/rangeset/-/rangeset-0.18.4.tgz", - "integrity": "sha512-HHAebb85KoNrnzKG7Z3bOK3HirstPFFB5tu70QfSaUgSZeWnsSgcmGk033rMLGYV9GNTiibWKpqRPaCuyOUk7w==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/rangeset/-/rangeset-0.19.1.tgz", + "integrity": "sha512-WaKTEw8JB/3QFlQzpdgRoklopcWvG8O/Xp+rxxOfFKYTaeaejpY/tjpyBBg+Ea65Ka3m7+pPp9d5j/oR2rd9NA==", "dependencies": { - "@codemirror/state": "^0.18.0" + "@codemirror/state": "^0.19.0" } }, "node_modules/@codemirror/rectangular-selection": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@codemirror/rectangular-selection/-/rectangular-selection-0.18.0.tgz", - "integrity": "sha512-BQ4pp2zhXCVZNqct5LtLR3AOWVseENBF/3oOgBmwsCKH7c11NfTqIqgWG5EW8NLOXp8HP8cDm3np8eWez0VkGQ==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/rectangular-selection/-/rectangular-selection-0.19.0.tgz", + "integrity": "sha512-KdvoEweBgVsOcqdYFEinYGroS028pwUPkO3REzQC7Z/hT1KNqZUlyfoi6WBv3Gzp8b6l8NNA+rLnnYMSHlcGYA==", "dependencies": { - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "node_modules/@codemirror/search": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-0.18.4.tgz", - "integrity": "sha512-3chVkMPzl+pTUSqtimTicebhti4SLpvkj03pQx2aPZScXxIiYuDk4cLdIJK9omjmO1+oycRKbOrqvG7iZJJwMg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-0.19.0.tgz", + "integrity": "sha512-9yFHX3XENso1dzUPkHNZU96IMCs/cjDg3JTF6qiInaCOxo5cwuRn95NIem+jlpvx6fQsjstzSR55HIb5R5fb7A==", "dependencies": { - "@codemirror/panel": "^0.18.1", - "@codemirror/rangeset": "^0.18.0", - "@codemirror/state": "^0.18.6", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0", + "@codemirror/panel": "^0.19.0", + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0", "crelt": "^1.0.5" } }, "node_modules/@codemirror/state": { - "version": "0.18.7", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-0.18.7.tgz", - "integrity": "sha512-cVyTiAC9vv90NKmGOfNtBjyIem3BqKui1L5Hfcxurp8K9votQj2oH9COcgWPnQ2Xs64yC70tEuTt9DF1pj5PFQ==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-0.19.1.tgz", + "integrity": "sha512-5NR6/h+pVp7d77F4rLpNWcYvARCvqXa1uayoNx06d1aEm6wy/K+3lxTg7taB/qaEKd+oCsSHjRL8oSE1Fm+nsw==", + "license": "MIT", "dependencies": { - "@codemirror/text": "^0.18.0" + "@codemirror/text": "^0.19.0" } }, "node_modules/@codemirror/stream-parser": { - "version": "0.18.2", - "resolved": "https://registry.npmjs.org/@codemirror/stream-parser/-/stream-parser-0.18.2.tgz", - "integrity": "sha512-3RTRmhIixcC2ps/G8So+BL0qJkwaspjyYt4smVYlSn4eNbxGK9K2RCnSmOPRv0SkuQMu3oUFbprFI/SbtZrPKg==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/stream-parser/-/stream-parser-0.19.1.tgz", + "integrity": "sha512-ZoQR8oIDUaKyGm94lYSUAkfrFw7Cqr12MaIC6UAQter7GHYcN1A+Xa1z8rY0wd9Yv+w1yoDLY0XvpPMt2CEBzw==", + "license": "MIT", "dependencies": { - "@codemirror/highlight": "^0.18.0", - "@codemirror/language": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "lezer": "^0.13.0", - "lezer-tree": "^0.13.0" + "@codemirror/highlight": "^0.19.0", + "@codemirror/language": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@lezer/common": "^0.15.0", + "@lezer/lr": "^0.15.0" } }, "node_modules/@codemirror/text": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@codemirror/text/-/text-0.18.1.tgz", - "integrity": "sha512-vjXs6mi1F418kucTPlFvnCt9glKnjtYssdXb8mm1oaY/F5O+tgGVepm9Z8F7AKWCQvW8Bns1D3uLz/DOIEywIw==" + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/text/-/text-0.19.0.tgz", + "integrity": "sha512-SxXmPitnMxbFriiJu3yYAq0V7I71SXVbOqFuoJ8BjXUml7DajgXIia9YeXTHovjlGSfisXTnYFyP6kVyRp7TMw==" }, "node_modules/@codemirror/tooltip": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/tooltip/-/tooltip-0.18.4.tgz", - "integrity": "sha512-LDlDOSEfjoG24uapLN7exK3Z3JchYFKUwWqo1x/9YdlAkmD1ik7cMSQZboCquP1uJVcXhtbpKmaO6vENGVaarg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/tooltip/-/tooltip-0.19.0.tgz", + "integrity": "sha512-JMe5ubrH+5eqjrORfgVUwccoARg/dfjPzuW0vmbjmFWu/c7RQQIbptmRBl1aa7qzdauQA2N49YUW4w67IaMIGA==", "dependencies": { - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "node_modules/@codemirror/view": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-0.18.19.tgz", - "integrity": "sha512-TmazVl8H3L+aYwlNb8xk6qADRb8KiYOO047pz51R4mGCg4Ja2siSjXktZgUvklsyWbUY7h9q+oAf4piH+mQZTw==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-0.19.1.tgz", + "integrity": "sha512-CxSM5Q9hK89CSX6mpT1ZPDq3kjzE1Ynx02l12M/MVTLvExge/8Ly8L+NYbKHpsR/uRtNc4E9V+dep+JXYOJYqQ==", "license": "MIT", "dependencies": { - "@codemirror/rangeset": "^0.18.2", - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.1", + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", "style-mod": "^4.0.0", "w3c-keyname": "^2.2.4" } @@ -1750,6 +1781,35 @@ "webpack": "^4.0.0" } }, + "node_modules/@lezer/common": { + "version": "0.15.3", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-0.15.3.tgz", + "integrity": "sha512-TLDp0BX/XAXhR2tleyWM7TjQ6LXVkkh2PcAHPu+fgi0xcT9JmI56Gh8zgMhoztDJAzH2ItMmufzVPVeBwz9VDw==" + }, + "node_modules/@lezer/javascript": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-0.15.0.tgz", + "integrity": "sha512-euFjbbyYmxpBls9FyBAKnGLEjaMFqfHvhfueA7M1PitZdieHu8KSblutmcwjpWKIV4eH4uElMZO2cPVe0aFxXA==", + "dependencies": { + "@lezer/lr": "^0.15.0" + } + }, + "node_modules/@lezer/json": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@lezer/json/-/json-0.15.0.tgz", + "integrity": "sha512-OsMjjBkTkeQ15iMCu5U1OiBubRC4V9Wm03zdIlUgNZ20aUPx5DWDRqUc5wG41JXVSj7Lxmo+idlFCfBBdxB8sw==", + "dependencies": { + "@lezer/lr": "^0.15.0" + } + }, + "node_modules/@lezer/lr": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-0.15.1.tgz", + "integrity": "sha512-NnFhj1zyiyFqrZWFEBdxHoqtlFLTbXumMXLTO8oFSfR0jUaRSW+bQKwLqfNig1twyKEuSGpvkk2D27oEPFzFog==", + "dependencies": { + "@lezer/common": "^0.15.0" + } + }, "node_modules/@mdi/font": { "version": "5.9.55", "resolved": "https://registry.npmjs.org/@mdi/font/-/font-5.9.55.tgz", @@ -10574,19 +10634,6 @@ "node": ">= 0.8.0" } }, - "node_modules/lezer": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/lezer/-/lezer-0.13.5.tgz", - "integrity": "sha512-cAiMQZGUo2BD8mpcz7Nv1TlKzWP7YIdIRrX41CiP5bk5t4GHxskOxWUx2iAOuHlz8dO+ivbuXr0J1bfHsWD+lQ==", - "dependencies": { - "lezer-tree": "^0.13.2" - } - }, - "node_modules/lezer-tree": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/lezer-tree/-/lezer-tree-0.13.2.tgz", - "integrity": "sha512-15ZxW8TxVNAOkHIo43Iouv4zbSkQQ5chQHBpwXcD2bBFz46RB4jYLEEww5l1V0xyIx9U2clSyyrLes+hAUFrGQ==" - }, "node_modules/lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", @@ -20480,245 +20527,269 @@ } }, "@codemirror/autocomplete": { - "version": "0.18.8", - "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-0.18.8.tgz", - "integrity": "sha512-Va1Q763Vu/rVmIazru/ZnO2kkWVq6SlmMEjeD0qmxLAypyP6j/QNdpmaPDI1qb/+Mb9VFZBbac6a0aLTTi8qxQ==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-0.19.1.tgz", + "integrity": "sha512-xc7BqgTrul+kW9RpM1zB9hmmILF6GOgmz2B6UQkTv3bbH+sQ9LV0edvCJf/QUphep0mpsjLu/e2cAhkVdy6kZw==", "requires": { - "@codemirror/language": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/tooltip": "^0.18.4", - "@codemirror/view": "^0.18.0", - "lezer-tree": "^0.13.0" + "@codemirror/language": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/tooltip": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/common": "^0.15.0" } }, "@codemirror/basic-setup": { - "version": "0.18.2", - "resolved": "https://registry.npmjs.org/@codemirror/basic-setup/-/basic-setup-0.18.2.tgz", - "integrity": "sha512-4UNFQ4jhU7wKxJH23AJcZW6Ho54VXUpmbtFnN5amIdtGci4ZLvci4M7JKgKFraHmKfDIYQnSzN8d8ohXR7CRhw==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/basic-setup/-/basic-setup-0.19.0.tgz", + "integrity": "sha512-Yhrf7fIz8+INHWOhpWeRwbs8fpc0KsydX9baD7TyYqniLVWyTi0Hwm52mr0f5O+k4YaJPeHAgT3x9gzDXZIvOw==", "requires": { - "@codemirror/autocomplete": "^0.18.0", - "@codemirror/closebrackets": "^0.18.0", - "@codemirror/commands": "^0.18.0", - "@codemirror/comment": "^0.18.0", - "@codemirror/fold": "^0.18.0", - "@codemirror/gutter": "^0.18.3", - "@codemirror/highlight": "^0.18.0", - "@codemirror/history": "^0.18.0", - "@codemirror/language": "^0.18.0", - "@codemirror/lint": "^0.18.0", - "@codemirror/matchbrackets": "^0.18.0", - "@codemirror/rectangular-selection": "^0.18.0", - "@codemirror/search": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/autocomplete": "^0.19.0", + "@codemirror/closebrackets": "^0.19.0", + "@codemirror/commands": "^0.19.0", + "@codemirror/comment": "^0.19.0", + "@codemirror/fold": "^0.19.0", + "@codemirror/gutter": "^0.19.0", + "@codemirror/highlight": "^0.19.0", + "@codemirror/history": "^0.19.0", + "@codemirror/language": "^0.19.0", + "@codemirror/lint": "^0.19.0", + "@codemirror/matchbrackets": "^0.19.0", + "@codemirror/rectangular-selection": "^0.19.0", + "@codemirror/search": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "@codemirror/closebrackets": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@codemirror/closebrackets/-/closebrackets-0.18.0.tgz", - "integrity": "sha512-O1RAgUkzF4nq/B8IyXenZKZ1rJi2Mc7I6y4IhWhELiTnjyQy7YdAthTsJ40mNr8kZ6gRbasYe3K7TraITElZJA==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/closebrackets/-/closebrackets-0.19.0.tgz", + "integrity": "sha512-dFWX5OEVYWRNtGaifSbwIAlymnRRjxWMiMbffbAjF7p0zfGHDbdGkiT56q3Xud63h5/tQdSo5dK1iyNTzHz5vg==", "requires": { - "@codemirror/language": "^0.18.0", - "@codemirror/rangeset": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/language": "^0.19.0", + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "@codemirror/commands": { - "version": "0.18.3", - "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-0.18.3.tgz", - "integrity": "sha512-nHYDG13qOirioXTAKmjl10W2L0eZ1ftvmTwvUTNY27UWVBPFSpk5zDXP3WqJ0mgMhQ4AOFLJaTjJEO3hmPComg==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-0.19.1.tgz", + "integrity": "sha512-6c9MlBW3UI13rCEqZkhD4etzWpxQKqeYKVn7CygsQ3LRtVprhfQxRts/K4vOcefC/Qq0VeRzYQt6crUPsOpaVA==", "requires": { - "@codemirror/language": "^0.18.0", - "@codemirror/matchbrackets": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0", - "lezer-tree": "^0.13.0" + "@codemirror/language": "^0.19.0", + "@codemirror/matchbrackets": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/common": "^0.15.0" } }, "@codemirror/comment": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@codemirror/comment/-/comment-0.18.1.tgz", - "integrity": "sha512-Inhqs0F24WE28Fcp1dBZghwixBGv1HDwY9MjE0d5tpMY/IPGI6uT30fGyHAXrir6hUqk7eJRkO4UYnODGOnoIA==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/comment/-/comment-0.19.0.tgz", + "integrity": "sha512-3hqAd0548fxqOBm4khFMcXVIivX8p0bSlbAuZJ6PNoUn/0wXhxkxowPp0FmFzU2+y37Z+ZQF5cRB5EREWPRIiQ==", "requires": { - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "@codemirror/fold": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@codemirror/fold/-/fold-0.18.1.tgz", - "integrity": "sha512-vvMUgDeSmeVow7/75YoNTERxPsdnIBeEw1JL2YVpLyscsUlalqwuxdhiHDLT5zjAu6JvMoTC103mwqgAYwM9tA==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/fold/-/fold-0.19.0.tgz", + "integrity": "sha512-cHbr2hqKe2pMls1Ia1a4IwXly87ljpmvPUKkul6H/Uv9kCwpQLOP3dGMPXbMGm/1hGjBF/0wnc+m2iba9iJBTQ==", "requires": { - "@codemirror/gutter": "^0.18.0", - "@codemirror/language": "^0.18.0", - "@codemirror/rangeset": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/gutter": "^0.19.0", + "@codemirror/language": "^0.19.0", + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "@codemirror/gutter": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/gutter/-/gutter-0.18.4.tgz", - "integrity": "sha512-Sf2IWshMi9zwVVqpGmd2NRplY0qfrE2IiBEII9n2gB9M8hgIMg5GCyhdnsUDsOm0gcSut65W62vV7/DfYJHQCA==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/gutter/-/gutter-0.19.1.tgz", + "integrity": "sha512-lPZJt7m3s1EIaUzkqYIr0vARnhh4ZcgzaLFaSweDn2IFIFq10TOnYzsuXJrgD7KfeU0Epjgznyg3VC0utHX7uA==", "requires": { - "@codemirror/rangeset": "^0.18.3", - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "@codemirror/highlight": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/highlight/-/highlight-0.18.4.tgz", - "integrity": "sha512-3azJntqWrShOIq/0kVcdMc9k7ACL0LQErgK+A6aWXmCj5Mx0gShq+Iajy8AMQ2zB0v3nhCBgFaniL1LLD5m5hQ==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@codemirror/highlight/-/highlight-0.19.2.tgz", + "integrity": "sha512-SSbGFCZMXeWhhG3sQ+YiN1ChONiXrx3vA1uYddgrglqdyFakotVe7mwiWOW0e7TKO5JfQKYdVJx0SIRXTIomXg==", "requires": { - "@codemirror/language": "^0.18.0", - "@codemirror/rangeset": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0", - "lezer-tree": "^0.13.0", + "@codemirror/language": "^0.19.0", + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/common": "^0.15.0", "style-mod": "^4.0.0" } }, "@codemirror/history": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@codemirror/history/-/history-0.18.1.tgz", - "integrity": "sha512-Aad3p4zs6UYKCUMXYjh7cvPK0ajuL+rMib9yBZ61w81LLl6OkM31Xrn9J6CLJmPxCwP3OJFiqBmNSBQ05oIsTw==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/history/-/history-0.19.0.tgz", + "integrity": "sha512-E0H+lncH66IMDhaND9jgkjE7s0dhYfjCPmS+Ig2Yes9I8+UIEecIdObj8c8HPCFGctGg3fxXqRAw2mdHl2Wouw==", "requires": { - "@codemirror/state": "^0.18.3", - "@codemirror/view": "^0.18.0" + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" + } + }, + "@codemirror/lang-javascript": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/lang-javascript/-/lang-javascript-0.19.1.tgz", + "integrity": "sha512-fFAP4nkfU36c14K8f6ytVYYeuX/2E7dJ+bD7UCZPWavXYjwdHAgDCJGH84MjhBSh0lMc908We80vyYg1j3MnRQ==", + "requires": { + "@codemirror/autocomplete": "^0.19.0", + "@codemirror/highlight": "^0.19.0", + "@codemirror/language": "^0.19.0", + "@codemirror/lint": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/javascript": "^0.15.0" + } + }, + "@codemirror/lang-json": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/lang-json/-/lang-json-0.19.1.tgz", + "integrity": "sha512-66K5TT9HO0ODtpjY+3Ub6t3r0OB1d27P+Kl5oygk4tDavHUBpsyHTJRFw/CdeRM2VwjbpBfctGm/cTrSthFDZg==", + "requires": { + "@codemirror/highlight": "^0.19.0", + "@codemirror/language": "^0.19.0", + "@lezer/json": "^0.15.0" } }, "@codemirror/language": { - "version": "0.18.2", - "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-0.18.2.tgz", - "integrity": "sha512-2Kz0Xyfvt1Ex2KfTUcYZ3IBxpnFCqHaJijwZknGBT7JXv9dwbOPs9SfPfL4oxVuDIHZx8JTPfoV3LTTJrm8M3Q==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-0.19.2.tgz", + "integrity": "sha512-Zz/gVezTknHhH2HcaMsYauxz06+3+IFU0nhhZmdTMcGbDL/ryQI2R543k9Zc58wA31lGa6uN+JzpZynEcGBwMQ==", "requires": { - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0", - "lezer": "^0.13.4", - "lezer-tree": "^0.13.0" + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/common": "^0.15.0", + "@lezer/lr": "^0.15.0" } }, "@codemirror/legacy-modes": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-0.18.1.tgz", - "integrity": "sha512-Y5ST1K6v+8uK6BxLOtfS38LeOS+rzOCGs91+t6k2hsWwZq3w7LS17I5w1Es2SIuq+7c4GjpVTrijCF2kMxd5ZA==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/legacy-modes/-/legacy-modes-0.19.0.tgz", + "integrity": "sha512-GSPdBNUeyF3nxJ2lztXGp2UoQjn+ggK5z+Kd4tflziecCG1+8mcdudDgFvxDuaTGWyM34S7Ldb4Xv7/XodZtBA==", "requires": { - "@codemirror/stream-parser": "^0.18.0" + "@codemirror/stream-parser": "^0.19.0" } }, "@codemirror/lint": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-0.18.4.tgz", - "integrity": "sha512-H77qYfZOmo1kKf0ZQagzk/JRGVhIpwP0hq1TSO6DFC1WLjW6gcsFJO5NDMS86enm0KX0w4/IkA7PItz2mjmHhQ==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-0.19.0.tgz", + "integrity": "sha512-XjCIVJi2cUNlppwz0eGu0F93uFKJq1t2fupBQlDMr3hLmIxIRWjhvy66+Pw/ziH98XA8meLEGQX29umBAvym4w==", "requires": { - "@codemirror/panel": "^0.18.1", - "@codemirror/state": "^0.18.0", - "@codemirror/tooltip": "^0.18.4", - "@codemirror/view": "^0.18.0", + "@codemirror/panel": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/tooltip": "^0.19.0", + "@codemirror/view": "^0.19.0", "crelt": "^1.0.5" } }, "@codemirror/matchbrackets": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@codemirror/matchbrackets/-/matchbrackets-0.18.0.tgz", - "integrity": "sha512-dPDopnZVkD54sSYdmQbyQbPdiuIA83p7XxX6Hp1ScEkOjukwCiFXiA/84x10FUTsQpUYp8bDzm7gwII119bGIw==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/matchbrackets/-/matchbrackets-0.19.1.tgz", + "integrity": "sha512-jBEW2Uu3hWcrrkwkauaikCAE7s5liCwbccFa6rLK6DzwaynOqCKJGyDsbkfrhikofNRc1yh4V3vwUuxt2u4QbA==", "requires": { - "@codemirror/language": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0", - "lezer-tree": "^0.13.0" + "@codemirror/language": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0", + "@lezer/common": "^0.15.0" } }, "@codemirror/panel": { - "version": "0.18.2", - "resolved": "https://registry.npmjs.org/@codemirror/panel/-/panel-0.18.2.tgz", - "integrity": "sha512-ea/g2aAKtfmie1kD7C8GDutD/5u+uzRJr/varUiAbHKr1sAdjtz5xYvC3GBAMYMan1GOh0vD5zP1yEupJl3b3Q==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/panel/-/panel-0.19.0.tgz", + "integrity": "sha512-LJuu49xnuhaAztlhnLJQ57ddOirSyf8/lnl7twsQUG/05RkxodBZ9F7q8r5AOLqOkaQOy9WySEKX1Ur8lD9Q5w==", "requires": { - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "@codemirror/rangeset": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/rangeset/-/rangeset-0.18.4.tgz", - "integrity": "sha512-HHAebb85KoNrnzKG7Z3bOK3HirstPFFB5tu70QfSaUgSZeWnsSgcmGk033rMLGYV9GNTiibWKpqRPaCuyOUk7w==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/rangeset/-/rangeset-0.19.1.tgz", + "integrity": "sha512-WaKTEw8JB/3QFlQzpdgRoklopcWvG8O/Xp+rxxOfFKYTaeaejpY/tjpyBBg+Ea65Ka3m7+pPp9d5j/oR2rd9NA==", "requires": { - "@codemirror/state": "^0.18.0" + "@codemirror/state": "^0.19.0" } }, "@codemirror/rectangular-selection": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/@codemirror/rectangular-selection/-/rectangular-selection-0.18.0.tgz", - "integrity": "sha512-BQ4pp2zhXCVZNqct5LtLR3AOWVseENBF/3oOgBmwsCKH7c11NfTqIqgWG5EW8NLOXp8HP8cDm3np8eWez0VkGQ==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/rectangular-selection/-/rectangular-selection-0.19.0.tgz", + "integrity": "sha512-KdvoEweBgVsOcqdYFEinYGroS028pwUPkO3REzQC7Z/hT1KNqZUlyfoi6WBv3Gzp8b6l8NNA+rLnnYMSHlcGYA==", "requires": { - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "@codemirror/search": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-0.18.4.tgz", - "integrity": "sha512-3chVkMPzl+pTUSqtimTicebhti4SLpvkj03pQx2aPZScXxIiYuDk4cLdIJK9omjmO1+oycRKbOrqvG7iZJJwMg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-0.19.0.tgz", + "integrity": "sha512-9yFHX3XENso1dzUPkHNZU96IMCs/cjDg3JTF6qiInaCOxo5cwuRn95NIem+jlpvx6fQsjstzSR55HIb5R5fb7A==", "requires": { - "@codemirror/panel": "^0.18.1", - "@codemirror/rangeset": "^0.18.0", - "@codemirror/state": "^0.18.6", - "@codemirror/text": "^0.18.0", - "@codemirror/view": "^0.18.0", + "@codemirror/panel": "^0.19.0", + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@codemirror/view": "^0.19.0", "crelt": "^1.0.5" } }, "@codemirror/state": { - "version": "0.18.7", - "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-0.18.7.tgz", - "integrity": "sha512-cVyTiAC9vv90NKmGOfNtBjyIem3BqKui1L5Hfcxurp8K9votQj2oH9COcgWPnQ2Xs64yC70tEuTt9DF1pj5PFQ==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-0.19.1.tgz", + "integrity": "sha512-5NR6/h+pVp7d77F4rLpNWcYvARCvqXa1uayoNx06d1aEm6wy/K+3lxTg7taB/qaEKd+oCsSHjRL8oSE1Fm+nsw==", "requires": { - "@codemirror/text": "^0.18.0" + "@codemirror/text": "^0.19.0" } }, "@codemirror/stream-parser": { - "version": "0.18.2", - "resolved": "https://registry.npmjs.org/@codemirror/stream-parser/-/stream-parser-0.18.2.tgz", - "integrity": "sha512-3RTRmhIixcC2ps/G8So+BL0qJkwaspjyYt4smVYlSn4eNbxGK9K2RCnSmOPRv0SkuQMu3oUFbprFI/SbtZrPKg==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/stream-parser/-/stream-parser-0.19.1.tgz", + "integrity": "sha512-ZoQR8oIDUaKyGm94lYSUAkfrFw7Cqr12MaIC6UAQter7GHYcN1A+Xa1z8rY0wd9Yv+w1yoDLY0XvpPMt2CEBzw==", "requires": { - "@codemirror/highlight": "^0.18.0", - "@codemirror/language": "^0.18.0", - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.0", - "lezer": "^0.13.0", - "lezer-tree": "^0.13.0" + "@codemirror/highlight": "^0.19.0", + "@codemirror/language": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", + "@lezer/common": "^0.15.0", + "@lezer/lr": "^0.15.0" } }, "@codemirror/text": { - "version": "0.18.1", - "resolved": "https://registry.npmjs.org/@codemirror/text/-/text-0.18.1.tgz", - "integrity": "sha512-vjXs6mi1F418kucTPlFvnCt9glKnjtYssdXb8mm1oaY/F5O+tgGVepm9Z8F7AKWCQvW8Bns1D3uLz/DOIEywIw==" + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/text/-/text-0.19.0.tgz", + "integrity": "sha512-SxXmPitnMxbFriiJu3yYAq0V7I71SXVbOqFuoJ8BjXUml7DajgXIia9YeXTHovjlGSfisXTnYFyP6kVyRp7TMw==" }, "@codemirror/tooltip": { - "version": "0.18.4", - "resolved": "https://registry.npmjs.org/@codemirror/tooltip/-/tooltip-0.18.4.tgz", - "integrity": "sha512-LDlDOSEfjoG24uapLN7exK3Z3JchYFKUwWqo1x/9YdlAkmD1ik7cMSQZboCquP1uJVcXhtbpKmaO6vENGVaarg==", + "version": "0.19.0", + "resolved": "https://registry.npmjs.org/@codemirror/tooltip/-/tooltip-0.19.0.tgz", + "integrity": "sha512-JMe5ubrH+5eqjrORfgVUwccoARg/dfjPzuW0vmbjmFWu/c7RQQIbptmRBl1aa7qzdauQA2N49YUW4w67IaMIGA==", "requires": { - "@codemirror/state": "^0.18.0", - "@codemirror/view": "^0.18.0" + "@codemirror/state": "^0.19.0", + "@codemirror/view": "^0.19.0" } }, "@codemirror/view": { - "version": "0.18.19", - "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-0.18.19.tgz", - "integrity": "sha512-TmazVl8H3L+aYwlNb8xk6qADRb8KiYOO047pz51R4mGCg4Ja2siSjXktZgUvklsyWbUY7h9q+oAf4piH+mQZTw==", + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-0.19.1.tgz", + "integrity": "sha512-CxSM5Q9hK89CSX6mpT1ZPDq3kjzE1Ynx02l12M/MVTLvExge/8Ly8L+NYbKHpsR/uRtNc4E9V+dep+JXYOJYqQ==", "requires": { - "@codemirror/rangeset": "^0.18.2", - "@codemirror/state": "^0.18.0", - "@codemirror/text": "^0.18.1", + "@codemirror/rangeset": "^0.19.0", + "@codemirror/state": "^0.19.0", + "@codemirror/text": "^0.19.0", "style-mod": "^4.0.0", "w3c-keyname": "^2.2.4" } @@ -20773,6 +20844,35 @@ "postcss": "^7.0.0" } }, + "@lezer/common": { + "version": "0.15.3", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-0.15.3.tgz", + "integrity": "sha512-TLDp0BX/XAXhR2tleyWM7TjQ6LXVkkh2PcAHPu+fgi0xcT9JmI56Gh8zgMhoztDJAzH2ItMmufzVPVeBwz9VDw==" + }, + "@lezer/javascript": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@lezer/javascript/-/javascript-0.15.0.tgz", + "integrity": "sha512-euFjbbyYmxpBls9FyBAKnGLEjaMFqfHvhfueA7M1PitZdieHu8KSblutmcwjpWKIV4eH4uElMZO2cPVe0aFxXA==", + "requires": { + "@lezer/lr": "^0.15.0" + } + }, + "@lezer/json": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@lezer/json/-/json-0.15.0.tgz", + "integrity": "sha512-OsMjjBkTkeQ15iMCu5U1OiBubRC4V9Wm03zdIlUgNZ20aUPx5DWDRqUc5wG41JXVSj7Lxmo+idlFCfBBdxB8sw==", + "requires": { + "@lezer/lr": "^0.15.0" + } + }, + "@lezer/lr": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-0.15.1.tgz", + "integrity": "sha512-NnFhj1zyiyFqrZWFEBdxHoqtlFLTbXumMXLTO8oFSfR0jUaRSW+bQKwLqfNig1twyKEuSGpvkk2D27oEPFzFog==", + "requires": { + "@lezer/common": "^0.15.0" + } + }, "@mdi/font": { "version": "5.9.55", "resolved": "https://registry.npmjs.org/@mdi/font/-/font-5.9.55.tgz", @@ -27735,19 +27835,6 @@ "type-check": "~0.3.2" } }, - "lezer": { - "version": "0.13.5", - "resolved": "https://registry.npmjs.org/lezer/-/lezer-0.13.5.tgz", - "integrity": "sha512-cAiMQZGUo2BD8mpcz7Nv1TlKzWP7YIdIRrX41CiP5bk5t4GHxskOxWUx2iAOuHlz8dO+ivbuXr0J1bfHsWD+lQ==", - "requires": { - "lezer-tree": "^0.13.2" - } - }, - "lezer-tree": { - "version": "0.13.2", - "resolved": "https://registry.npmjs.org/lezer-tree/-/lezer-tree-0.13.2.tgz", - "integrity": "sha512-15ZxW8TxVNAOkHIo43Iouv4zbSkQQ5chQHBpwXcD2bBFz46RB4jYLEEww5l1V0xyIx9U2clSyyrLes+hAUFrGQ==" - }, "lines-and-columns": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", diff --git a/package.json b/package.json index b6edc4ac..62d32cf0 100644 --- a/package.json +++ b/package.json @@ -14,11 +14,14 @@ "i18n-extract": "vue-i18n-extract use-config" }, "dependencies": { - "@codemirror/basic-setup": "^0.18.2", - "@codemirror/legacy-modes": "^0.18.1", - "@codemirror/state": "^0.18.7", - "@codemirror/stream-parser": "^0.18.2", - "@codemirror/view": "^0.18.19", + "@codemirror/basic-setup": "^0.19.0", + "@codemirror/highlight": "^0.19.2", + "@codemirror/lang-javascript": "^0.19.1", + "@codemirror/lang-json": "^0.19.1", + "@codemirror/legacy-modes": "^0.19.0", + "@codemirror/state": "^0.19.1", + "@codemirror/stream-parser": "^0.19.1", + "@codemirror/view": "^0.19.1", "axios": "^0.21.1", "core-js": "^3.16.0", "echarts": "^5.1.2", diff --git a/src/components/inputs/Codemirror.vue b/src/components/inputs/Codemirror.vue index 0cf3a2e8..6491510e 100644 --- a/src/components/inputs/Codemirror.vue +++ b/src/components/inputs/Codemirror.vue @@ -21,8 +21,8 @@ import {StreamLanguage} from "@codemirror/stream-parser"; import { klipper_config } from "@/plugins/StreamParserKlipperConfig"; import { gcode } from "@/plugins/StreamParserGcode"; import {EditorView, keymap} from "@codemirror/view"; -import {defaultTabBinding} from "@codemirror/commands"; -import {yaml} from "@/plugins/StreamParserYaml"; +import {insertTab, indentWithTab} from "@codemirror/commands"; +import {json} from "@codemirror/lang-json"; @Component export default class Codemirror extends Mixins(BaseMixin) { @@ -87,20 +87,22 @@ export default class Codemirror extends Mixins(BaseMixin) { get cmExtensions() { const extensions = [ basicSetup, - keymap.of([defaultTabBinding]), + keymap.of([insertTab, indentWithTab]), mainsailTheme, EditorView.updateListener.of(update => { this.content = update.state?.doc.toString() if (this.$emit) { this.$emit('input', this.content) } - }) + }), ] if (['cfg', 'conf'].includes(this.fileExtension)) extensions.push(StreamLanguage.define(klipper_config)) else if (['gcode'].includes(this.fileExtension)) extensions.push(StreamLanguage.define(gcode)) + else if (['json'].includes(this.fileExtension)) + extensions.push(json()) return extensions } diff --git a/src/store/printer/getters.ts b/src/store/printer/getters.ts index 6afcf427..bb321b1a 100644 --- a/src/store/printer/getters.ts +++ b/src/store/printer/getters.ts @@ -700,4 +700,4 @@ export const getters: GetterTree = { return 0 } -} +} \ No newline at end of file