From 4c623204a7dbdf449716efdc9a586437f3990863 Mon Sep 17 00:00:00 2001 From: Jason Altekruse Date: Fri, 15 Sep 2023 11:25:24 -0500 Subject: [PATCH] Upgrade codemirror and lezer (#31) --- package-lock.json | 627 +++++++----------- packages/codemirror/package.json | 19 +- packages/codemirror/src/CodeMirror.tsx | 6 +- packages/parser/package.json | 6 +- .../src/generated-assets/lezer-doenet.ts | 9 +- packages/parser/src/parser.ts | 4 +- 6 files changed, 247 insertions(+), 424 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1a2fe7beb..6e69e18d0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1770,219 +1770,90 @@ } }, "node_modules/@codemirror/autocomplete": { - "version": "0.19.15", - "license": "MIT", - "dependencies": { - "@codemirror/language": "^0.19.0", - "@codemirror/state": "^0.19.4", - "@codemirror/text": "^0.19.2", - "@codemirror/tooltip": "^0.19.12", - "@codemirror/view": "^0.19.0", - "@lezer/common": "^0.15.0" - } - }, - "node_modules/@codemirror/basic-setup": { - "version": "0.19.3", - "license": "MIT", - "dependencies": { - "@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.2", - "@codemirror/search": "^0.19.0", - "@codemirror/state": "^0.19.0", - "@codemirror/view": "^0.19.31" - } - }, - "node_modules/@codemirror/closebrackets": { - "version": "0.19.2", - "license": "MIT", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.9.0.tgz", + "integrity": "sha512-Fbwm0V/Wn3BkEJZRhr0hi5BhCo5a7eBL6LYaliPjOSwCyfOpnjXY59HruSxOUNV+1OYer0Tgx1zRNQttjXyDog==", "dependencies": { - "@codemirror/language": "^0.19.0", - "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.2", - "@codemirror/text": "^0.19.0", - "@codemirror/view": "^0.19.44" + "@codemirror/language": "^6.0.0", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.6.0", + "@lezer/common": "^1.0.0" + }, + "peerDependencies": { + "@codemirror/language": "^6.0.0", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0" } }, "node_modules/@codemirror/commands": { - "version": "0.19.8", - "license": "MIT", - "dependencies": { - "@codemirror/language": "^0.19.0", - "@codemirror/matchbrackets": "^0.19.0", - "@codemirror/state": "^0.19.2", - "@codemirror/text": "^0.19.6", - "@codemirror/view": "^0.19.22", - "@lezer/common": "^0.15.0" - } - }, - "node_modules/@codemirror/comment": { - "version": "0.19.1", - "license": "MIT", - "dependencies": { - "@codemirror/state": "^0.19.9", - "@codemirror/text": "^0.19.0", - "@codemirror/view": "^0.19.0" - } - }, - "node_modules/@codemirror/fold": { - "version": "0.19.4", - "license": "MIT", - "dependencies": { - "@codemirror/gutter": "^0.19.0", - "@codemirror/language": "^0.19.0", - "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.0", - "@codemirror/view": "^0.19.22" - } - }, - "node_modules/@codemirror/gutter": { - "version": "0.19.9", - "license": "MIT", - "dependencies": { - "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.0", - "@codemirror/view": "^0.19.23" - } - }, - "node_modules/@codemirror/highlight": { - "version": "0.19.8", - "license": "MIT", + "version": "6.2.5", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.5.tgz", + "integrity": "sha512-dSi7ow2P2YgPBZflR9AJoaTHvqmeGIgkhignYMd5zK5y6DANTvxKxp6eMEpIDUJkRAaOY/TFZ4jP1ADIO/GLVA==", "dependencies": { - "@codemirror/language": "^0.19.0", - "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.3", - "@codemirror/view": "^0.19.39", - "@lezer/common": "^0.15.0", - "style-mod": "^4.0.0" - } - }, - "node_modules/@codemirror/history": { - "version": "0.19.2", - "license": "MIT", - "dependencies": { - "@codemirror/state": "^0.19.2", - "@codemirror/view": "^0.19.0" + "@codemirror/language": "^6.0.0", + "@codemirror/state": "^6.2.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0" } }, "node_modules/@codemirror/lang-xml": { - "version": "0.19.2", - "license": "MIT", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.0.2.tgz", + "integrity": "sha512-JQYZjHL2LAfpiZI2/qZ/qzDuSqmGKMwyApYmEUUCTxLM4MWS7sATUEfIguZQr9Zjx/7gcdnewb039smF6nC2zw==", "dependencies": { - "@codemirror/autocomplete": "^0.19.0", - "@codemirror/highlight": "^0.19.6", - "@codemirror/language": "^0.19.0", - "@codemirror/state": "^0.19.0", - "@lezer/common": "^0.15.0", - "@lezer/xml": "^0.15.0" + "@codemirror/autocomplete": "^6.0.0", + "@codemirror/language": "^6.4.0", + "@codemirror/state": "^6.0.0", + "@lezer/common": "^1.0.0", + "@lezer/xml": "^1.0.0" } }, "node_modules/@codemirror/language": { - "version": "0.19.10", - "license": "MIT", - "dependencies": { - "@codemirror/state": "^0.19.0", - "@codemirror/text": "^0.19.0", - "@codemirror/view": "^0.19.0", - "@lezer/common": "^0.15.5", - "@lezer/lr": "^0.15.0" + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.9.0.tgz", + "integrity": "sha512-nFu311/0ne/qGuGCL3oKuktBgzVOaxCHZPZv1tLSZkNjPYxxvkjSbzno3MlErG2tgw1Yw1yF8BxMCegeMXqpiw==", + "dependencies": { + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0", + "@lezer/highlight": "^1.0.0", + "@lezer/lr": "^1.0.0", + "style-mod": "^4.0.0" } }, "node_modules/@codemirror/lint": { - "version": "0.19.6", - "license": "MIT", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.1.tgz", + "integrity": "sha512-2Hx945qKX7FBan5/gUdTM8fsMYrNG9clIgEcPXestbLVFAUyQYFAuju/5BMNf/PwgpVaX5pvRm4+ovjbp9D9gQ==", "dependencies": { - "@codemirror/gutter": "^0.19.4", - "@codemirror/panel": "^0.19.0", - "@codemirror/rangeset": "^0.19.1", - "@codemirror/state": "^0.19.4", - "@codemirror/tooltip": "^0.19.16", - "@codemirror/view": "^0.19.22", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", "crelt": "^1.0.5" } }, - "node_modules/@codemirror/matchbrackets": { - "version": "0.19.4", - "license": "MIT", - "dependencies": { - "@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.19.1", - "license": "MIT", - "dependencies": { - "@codemirror/state": "^0.19.0", - "@codemirror/view": "^0.19.0" - } - }, - "node_modules/@codemirror/rangeset": { - "version": "0.19.9", - "license": "MIT", - "dependencies": { - "@codemirror/state": "^0.19.0" - } - }, - "node_modules/@codemirror/rectangular-selection": { - "version": "0.19.2", - "license": "MIT", - "dependencies": { - "@codemirror/state": "^0.19.0", - "@codemirror/text": "^0.19.4", - "@codemirror/view": "^0.19.48" - } - }, "node_modules/@codemirror/search": { - "version": "0.19.10", - "license": "MIT", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.2.tgz", + "integrity": "sha512-WRihpqd0l9cEh9J3IZe45Yi+Z5MfTsEXnyc3V7qXHP4ZYtIYpGOn+EJ7fyLIkyAm/8S6QIr7/mMISfAadf8zCg==", "dependencies": { - "@codemirror/panel": "^0.19.0", - "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.3", - "@codemirror/text": "^0.19.0", - "@codemirror/view": "^0.19.34", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", "crelt": "^1.0.5" } }, "node_modules/@codemirror/state": { - "version": "0.19.9", - "license": "MIT", - "dependencies": { - "@codemirror/text": "^0.19.0" - } - }, - "node_modules/@codemirror/text": { - "version": "0.19.6", - "license": "MIT" - }, - "node_modules/@codemirror/tooltip": { - "version": "0.19.16", - "license": "MIT", - "dependencies": { - "@codemirror/state": "^0.19.0", - "@codemirror/view": "^0.19.0" - } + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.1.tgz", + "integrity": "sha512-RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw==" }, "node_modules/@codemirror/view": { - "version": "0.19.48", - "license": "MIT", + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.18.1.tgz", + "integrity": "sha512-xcsXcMkIMd7l3WZEWoc4ljteAiqzxb5gVerRxk5132p5cLix6rTydWTQjsj2oxORepfsrwy1fC4r20iMa9plrg==", "dependencies": { - "@codemirror/rangeset": "^0.19.5", - "@codemirror/state": "^0.19.3", - "@codemirror/text": "^0.19.0", - "style-mod": "^4.0.0", + "@codemirror/state": "^6.1.4", + "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } }, @@ -3038,32 +2909,45 @@ } }, "node_modules/@lezer/common": { - "version": "0.15.12", - "license": "MIT" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.4.tgz", + "integrity": "sha512-lZHlk8p67x4aIDtJl6UQrXSOP6oi7dQR3W/geFVrENdA1JDaAJWldnVqVjPMJupbTKbzDfFcePfKttqVidS/dg==" }, "node_modules/@lezer/generator": { - "version": "0.15.4", - "license": "MIT", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.5.0.tgz", + "integrity": "sha512-RhZtwyAzsnqC+p6N4ptbBZ/PZR+0OxpYfHdB1OO5jJ6as05H+FXD+KMGXEtDq8LPZfoTuekJaJrXEcOeNrds2g==", "dependencies": { - "@lezer/common": "^0.15.0", - "@lezer/lr": "^0.15.0" + "@lezer/common": "^1.0.2", + "@lezer/lr": "^1.3.0" }, "bin": { - "lezer-generator": "dist/lezer-generator.cjs" + "lezer-generator": "src/lezer-generator.cjs" + } + }, + "node_modules/@lezer/highlight": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.6.tgz", + "integrity": "sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==", + "dependencies": { + "@lezer/common": "^1.0.0" } }, "node_modules/@lezer/lr": { - "version": "0.15.8", - "license": "MIT", + "version": "1.3.10", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.10.tgz", + "integrity": "sha512-BZfVvf7Re5BIwJHlZXbJn9L8lus5EonxQghyn+ih8Wl36XMFBPTXC0KM0IdUtj9w/diPHsKlXVgL+AlX2jYJ0Q==", "dependencies": { - "@lezer/common": "^0.15.0" + "@lezer/common": "^1.0.0" } }, "node_modules/@lezer/xml": { - "version": "0.15.1", - "license": "MIT", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.2.tgz", + "integrity": "sha512-dlngsWceOtQBMuBPw5wtHpaxdPJ71aVntqjbpGkFtWsp4WtQmCnuTjQGocviymydN6M18fhj6UQX3oiEtSuY7w==", "dependencies": { - "@lezer/lr": "^0.15.0" + "@lezer/highlight": "^1.0.0", + "@lezer/lr": "^1.0.0" } }, "node_modules/@microsoft/api-extractor": { @@ -5175,6 +5059,20 @@ "wrap-ansi": "^7.0.0" } }, + "node_modules/codemirror": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz", + "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==", + "dependencies": { + "@codemirror/autocomplete": "^6.0.0", + "@codemirror/commands": "^6.0.0", + "@codemirror/language": "^6.0.0", + "@codemirror/lint": "^6.0.0", + "@codemirror/search": "^6.0.0", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0" + } + }, "node_modules/collection-visit": { "version": "1.0.0", "license": "MIT", @@ -5400,8 +5298,9 @@ "dev": true }, "node_modules/crelt": { - "version": "1.0.5", - "license": "MIT" + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", + "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==" }, "node_modules/cross-spawn": { "version": "7.0.3", @@ -11937,8 +11836,9 @@ } }, "node_modules/style-mod": { - "version": "4.0.0", - "license": "MIT" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz", + "integrity": "sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA==" }, "node_modules/styled-components": { "version": "5.3.11", @@ -13453,15 +13353,16 @@ "version": "*", "license": "AGPL-3.0-or-later", "dependencies": { - "@codemirror/basic-setup": "^0.19.0", - "@codemirror/commands": "^0.19.5", - "@codemirror/gutter": "^0.19.9", - "@codemirror/highlight": "^0.19.6", - "@codemirror/lang-xml": "^0.19.2", - "@codemirror/language": "^0.19.7", - "@lezer/common": "^0.15.10", - "@lezer/lr": "^0.15.5", - "@lezer/xml": "^0.15.1" + "@codemirror/commands": "^6.2.5", + "@codemirror/lang-xml": "^6.0.2", + "@codemirror/language": "^6.9.0", + "@codemirror/state": "^6.2.1", + "@codemirror/view": "^6.18.1", + "@lezer/common": "^1.0.4", + "@lezer/highlight": "^1.1.6", + "@lezer/lr": "^1.3.10", + "@lezer/xml": "^1.0.2", + "codemirror": "6.0.1" }, "devDependencies": { "glob": "^10.3.3", @@ -13625,9 +13526,9 @@ "version": "*", "license": "AGPL-3.0-or-later", "dependencies": { - "@lezer/common": "^0.15.10", - "@lezer/generator": "^0.15.2", - "@lezer/lr": "^0.15.5", + "@lezer/common": "^1.0.4", + "@lezer/generator": "^1.5.0", + "@lezer/lr": "^1.3.10", "@types/xast": "^2.0.0", "xast-util-to-xml": "^4.0.0" }, @@ -15088,198 +14989,84 @@ "requires": {} }, "@codemirror/autocomplete": { - "version": "0.19.15", - "requires": { - "@codemirror/language": "^0.19.0", - "@codemirror/state": "^0.19.4", - "@codemirror/text": "^0.19.2", - "@codemirror/tooltip": "^0.19.12", - "@codemirror/view": "^0.19.0", - "@lezer/common": "^0.15.0" - } - }, - "@codemirror/basic-setup": { - "version": "0.19.3", - "requires": { - "@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.2", - "@codemirror/search": "^0.19.0", - "@codemirror/state": "^0.19.0", - "@codemirror/view": "^0.19.31" - } - }, - "@codemirror/closebrackets": { - "version": "0.19.2", - "requires": { - "@codemirror/language": "^0.19.0", - "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.2", - "@codemirror/text": "^0.19.0", - "@codemirror/view": "^0.19.44" - } - }, - "@codemirror/commands": { - "version": "0.19.8", - "requires": { - "@codemirror/language": "^0.19.0", - "@codemirror/matchbrackets": "^0.19.0", - "@codemirror/state": "^0.19.2", - "@codemirror/text": "^0.19.6", - "@codemirror/view": "^0.19.22", - "@lezer/common": "^0.15.0" - } - }, - "@codemirror/comment": { - "version": "0.19.1", - "requires": { - "@codemirror/state": "^0.19.9", - "@codemirror/text": "^0.19.0", - "@codemirror/view": "^0.19.0" - } - }, - "@codemirror/fold": { - "version": "0.19.4", - "requires": { - "@codemirror/gutter": "^0.19.0", - "@codemirror/language": "^0.19.0", - "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.0", - "@codemirror/view": "^0.19.22" - } - }, - "@codemirror/gutter": { - "version": "0.19.9", + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/@codemirror/autocomplete/-/autocomplete-6.9.0.tgz", + "integrity": "sha512-Fbwm0V/Wn3BkEJZRhr0hi5BhCo5a7eBL6LYaliPjOSwCyfOpnjXY59HruSxOUNV+1OYer0Tgx1zRNQttjXyDog==", "requires": { - "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.0", - "@codemirror/view": "^0.19.23" - } - }, - "@codemirror/highlight": { - "version": "0.19.8", - "requires": { - "@codemirror/language": "^0.19.0", - "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.3", - "@codemirror/view": "^0.19.39", - "@lezer/common": "^0.15.0", - "style-mod": "^4.0.0" + "@codemirror/language": "^6.0.0", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.6.0", + "@lezer/common": "^1.0.0" } }, - "@codemirror/history": { - "version": "0.19.2", + "@codemirror/commands": { + "version": "6.2.5", + "resolved": "https://registry.npmjs.org/@codemirror/commands/-/commands-6.2.5.tgz", + "integrity": "sha512-dSi7ow2P2YgPBZflR9AJoaTHvqmeGIgkhignYMd5zK5y6DANTvxKxp6eMEpIDUJkRAaOY/TFZ4jP1ADIO/GLVA==", "requires": { - "@codemirror/state": "^0.19.2", - "@codemirror/view": "^0.19.0" + "@codemirror/language": "^6.0.0", + "@codemirror/state": "^6.2.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0" } }, "@codemirror/lang-xml": { - "version": "0.19.2", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@codemirror/lang-xml/-/lang-xml-6.0.2.tgz", + "integrity": "sha512-JQYZjHL2LAfpiZI2/qZ/qzDuSqmGKMwyApYmEUUCTxLM4MWS7sATUEfIguZQr9Zjx/7gcdnewb039smF6nC2zw==", "requires": { - "@codemirror/autocomplete": "^0.19.0", - "@codemirror/highlight": "^0.19.6", - "@codemirror/language": "^0.19.0", - "@codemirror/state": "^0.19.0", - "@lezer/common": "^0.15.0", - "@lezer/xml": "^0.15.0" + "@codemirror/autocomplete": "^6.0.0", + "@codemirror/language": "^6.4.0", + "@codemirror/state": "^6.0.0", + "@lezer/common": "^1.0.0", + "@lezer/xml": "^1.0.0" } }, "@codemirror/language": { - "version": "0.19.10", - "requires": { - "@codemirror/state": "^0.19.0", - "@codemirror/text": "^0.19.0", - "@codemirror/view": "^0.19.0", - "@lezer/common": "^0.15.5", - "@lezer/lr": "^0.15.0" + "version": "6.9.0", + "resolved": "https://registry.npmjs.org/@codemirror/language/-/language-6.9.0.tgz", + "integrity": "sha512-nFu311/0ne/qGuGCL3oKuktBgzVOaxCHZPZv1tLSZkNjPYxxvkjSbzno3MlErG2tgw1Yw1yF8BxMCegeMXqpiw==", + "requires": { + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", + "@lezer/common": "^1.0.0", + "@lezer/highlight": "^1.0.0", + "@lezer/lr": "^1.0.0", + "style-mod": "^4.0.0" } }, "@codemirror/lint": { - "version": "0.19.6", - "requires": { - "@codemirror/gutter": "^0.19.4", - "@codemirror/panel": "^0.19.0", - "@codemirror/rangeset": "^0.19.1", - "@codemirror/state": "^0.19.4", - "@codemirror/tooltip": "^0.19.16", - "@codemirror/view": "^0.19.22", - "crelt": "^1.0.5" - } - }, - "@codemirror/matchbrackets": { - "version": "0.19.4", - "requires": { - "@codemirror/language": "^0.19.0", - "@codemirror/state": "^0.19.0", - "@codemirror/view": "^0.19.0", - "@lezer/common": "^0.15.0" - } - }, - "@codemirror/panel": { - "version": "0.19.1", - "requires": { - "@codemirror/state": "^0.19.0", - "@codemirror/view": "^0.19.0" - } - }, - "@codemirror/rangeset": { - "version": "0.19.9", + "version": "6.4.1", + "resolved": "https://registry.npmjs.org/@codemirror/lint/-/lint-6.4.1.tgz", + "integrity": "sha512-2Hx945qKX7FBan5/gUdTM8fsMYrNG9clIgEcPXestbLVFAUyQYFAuju/5BMNf/PwgpVaX5pvRm4+ovjbp9D9gQ==", "requires": { - "@codemirror/state": "^0.19.0" - } - }, - "@codemirror/rectangular-selection": { - "version": "0.19.2", - "requires": { - "@codemirror/state": "^0.19.0", - "@codemirror/text": "^0.19.4", - "@codemirror/view": "^0.19.48" + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", + "crelt": "^1.0.5" } }, "@codemirror/search": { - "version": "0.19.10", + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/@codemirror/search/-/search-6.5.2.tgz", + "integrity": "sha512-WRihpqd0l9cEh9J3IZe45Yi+Z5MfTsEXnyc3V7qXHP4ZYtIYpGOn+EJ7fyLIkyAm/8S6QIr7/mMISfAadf8zCg==", "requires": { - "@codemirror/panel": "^0.19.0", - "@codemirror/rangeset": "^0.19.0", - "@codemirror/state": "^0.19.3", - "@codemirror/text": "^0.19.0", - "@codemirror/view": "^0.19.34", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0", "crelt": "^1.0.5" } }, "@codemirror/state": { - "version": "0.19.9", - "requires": { - "@codemirror/text": "^0.19.0" - } - }, - "@codemirror/text": { - "version": "0.19.6" - }, - "@codemirror/tooltip": { - "version": "0.19.16", - "requires": { - "@codemirror/state": "^0.19.0", - "@codemirror/view": "^0.19.0" - } + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/@codemirror/state/-/state-6.2.1.tgz", + "integrity": "sha512-RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw==" }, "@codemirror/view": { - "version": "0.19.48", + "version": "6.18.1", + "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.18.1.tgz", + "integrity": "sha512-xcsXcMkIMd7l3WZEWoc4ljteAiqzxb5gVerRxk5132p5cLix6rTydWTQjsj2oxORepfsrwy1fC4r20iMa9plrg==", "requires": { - "@codemirror/rangeset": "^0.19.5", - "@codemirror/state": "^0.19.3", - "@codemirror/text": "^0.19.0", - "style-mod": "^4.0.0", + "@codemirror/state": "^6.1.4", + "style-mod": "^4.1.0", "w3c-keyname": "^2.2.4" } }, @@ -15355,15 +15142,16 @@ "@doenet/codemirror": { "version": "file:packages/codemirror", "requires": { - "@codemirror/basic-setup": "^0.19.0", - "@codemirror/commands": "^0.19.5", - "@codemirror/gutter": "^0.19.9", - "@codemirror/highlight": "^0.19.6", - "@codemirror/lang-xml": "^0.19.2", - "@codemirror/language": "^0.19.7", - "@lezer/common": "^0.15.10", - "@lezer/lr": "^0.15.5", - "@lezer/xml": "^0.15.1", + "@codemirror/commands": "^6.2.5", + "@codemirror/lang-xml": "^6.0.2", + "@codemirror/language": "^6.9.0", + "@codemirror/state": "^6.2.1", + "@codemirror/view": "^6.18.1", + "@lezer/common": "^1.0.4", + "@lezer/highlight": "^1.1.6", + "@lezer/lr": "^1.3.10", + "@lezer/xml": "^1.0.2", + "codemirror": "6.0.1", "glob": "^10.3.3", "vite": "^4.4.9", "vite-plugin-dts": "^3.5.2" @@ -15484,9 +15272,9 @@ "@doenet/parser": { "version": "file:packages/parser", "requires": { - "@lezer/common": "^0.15.10", - "@lezer/generator": "^0.15.2", - "@lezer/lr": "^0.15.5", + "@lezer/common": "^1.0.4", + "@lezer/generator": "^1.5.0", + "@lezer/lr": "^1.3.10", "@types/xast": "^2.0.0", "glob": "^10.3.3", "vite": "^4.4.9", @@ -16138,25 +15926,42 @@ } }, "@lezer/common": { - "version": "0.15.12" + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@lezer/common/-/common-1.0.4.tgz", + "integrity": "sha512-lZHlk8p67x4aIDtJl6UQrXSOP6oi7dQR3W/geFVrENdA1JDaAJWldnVqVjPMJupbTKbzDfFcePfKttqVidS/dg==" }, "@lezer/generator": { - "version": "0.15.4", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@lezer/generator/-/generator-1.5.0.tgz", + "integrity": "sha512-RhZtwyAzsnqC+p6N4ptbBZ/PZR+0OxpYfHdB1OO5jJ6as05H+FXD+KMGXEtDq8LPZfoTuekJaJrXEcOeNrds2g==", "requires": { - "@lezer/common": "^0.15.0", - "@lezer/lr": "^0.15.0" + "@lezer/common": "^1.0.2", + "@lezer/lr": "^1.3.0" + } + }, + "@lezer/highlight": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@lezer/highlight/-/highlight-1.1.6.tgz", + "integrity": "sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==", + "requires": { + "@lezer/common": "^1.0.0" } }, "@lezer/lr": { - "version": "0.15.8", + "version": "1.3.10", + "resolved": "https://registry.npmjs.org/@lezer/lr/-/lr-1.3.10.tgz", + "integrity": "sha512-BZfVvf7Re5BIwJHlZXbJn9L8lus5EonxQghyn+ih8Wl36XMFBPTXC0KM0IdUtj9w/diPHsKlXVgL+AlX2jYJ0Q==", "requires": { - "@lezer/common": "^0.15.0" + "@lezer/common": "^1.0.0" } }, "@lezer/xml": { - "version": "0.15.1", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@lezer/xml/-/xml-1.0.2.tgz", + "integrity": "sha512-dlngsWceOtQBMuBPw5wtHpaxdPJ71aVntqjbpGkFtWsp4WtQmCnuTjQGocviymydN6M18fhj6UQX3oiEtSuY7w==", "requires": { - "@lezer/lr": "^0.15.0" + "@lezer/highlight": "^1.0.0", + "@lezer/lr": "^1.0.0" } }, "@microsoft/api-extractor": { @@ -17691,6 +17496,20 @@ "wrap-ansi": "^7.0.0" } }, + "codemirror": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz", + "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==", + "requires": { + "@codemirror/autocomplete": "^6.0.0", + "@codemirror/commands": "^6.0.0", + "@codemirror/language": "^6.0.0", + "@codemirror/lint": "^6.0.0", + "@codemirror/search": "^6.0.0", + "@codemirror/state": "^6.0.0", + "@codemirror/view": "^6.0.0" + } + }, "collection-visit": { "version": "1.0.0", "requires": { @@ -17867,7 +17686,9 @@ "dev": true }, "crelt": { - "version": "1.0.5" + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/crelt/-/crelt-1.0.6.tgz", + "integrity": "sha512-VQ2MBenTq1fWZUH9DJNGti7kKv6EeAuYr3cLwxUWhIu1baTaXh4Ib5W2CqHVqib4/MqbYGJqiL3Zb8GJZr3l4g==" }, "cross-spawn": { "version": "7.0.3", @@ -22341,7 +22162,9 @@ } }, "style-mod": { - "version": "4.0.0" + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/style-mod/-/style-mod-4.1.0.tgz", + "integrity": "sha512-Ca5ib8HrFn+f+0n4N4ScTIA9iTOQ7MaGS1ylHcoVqW9J7w2w8PzN6g9gKmTYgGEBH8e120+RCmhpje6jC5uGWA==" }, "styled-components": { "version": "5.3.11", diff --git a/packages/codemirror/package.json b/packages/codemirror/package.json index acf2453dd..cbd8a3284 100644 --- a/packages/codemirror/package.json +++ b/packages/codemirror/package.json @@ -22,15 +22,16 @@ "build": "vite build" }, "dependencies": { - "@codemirror/basic-setup": "^0.19.0", - "@codemirror/commands": "^0.19.5", - "@codemirror/gutter": "^0.19.9", - "@codemirror/highlight": "^0.19.6", - "@codemirror/lang-xml": "^0.19.2", - "@codemirror/language": "^0.19.7", - "@lezer/common": "^0.15.10", - "@lezer/lr": "^0.15.5", - "@lezer/xml": "^0.15.1" + "codemirror": "6.0.1", + "@codemirror/commands": "^6.2.5", + "@codemirror/lang-xml": "^6.0.2", + "@codemirror/language": "^6.9.0", + "@codemirror/state": "^6.2.1", + "@codemirror/view": "^6.18.1", + "@lezer/common": "^1.0.4", + "@lezer/highlight": "^1.1.6", + "@lezer/lr": "^1.3.10", + "@lezer/xml": "^1.0.2" }, "devDependencies": { "glob": "^10.3.3", diff --git a/packages/codemirror/src/CodeMirror.tsx b/packages/codemirror/src/CodeMirror.tsx index 9fb74b836..64d1e56f0 100644 --- a/packages/codemirror/src/CodeMirror.tsx +++ b/packages/codemirror/src/CodeMirror.tsx @@ -5,12 +5,12 @@ import React, { useRef, useState, } from "react"; -import { basicSetup } from "@codemirror/basic-setup"; import { EditorState, Transaction, StateEffect } from "@codemirror/state"; import { selectLine, deleteLine, cursorLineUp } from "@codemirror/commands"; import { EditorView, keymap, Command } from "@codemirror/view"; -import { styleTags, tags as t } from "@codemirror/highlight"; -import { gutter, lineNumbers } from "@codemirror/gutter"; +import { basicSetup } from "codemirror"; +import { styleTags, tags as t } from "@lezer/highlight"; +import { lineNumbers } from "@codemirror/view"; import { LRLanguage, LanguageSupport, diff --git a/packages/parser/package.json b/packages/parser/package.json index 7fa637ae4..9a6198e1f 100644 --- a/packages/parser/package.json +++ b/packages/parser/package.json @@ -22,9 +22,9 @@ "compile_grammar": "npx lezer-generator --output src/generated-assets/lezer-doenet.ts src/doenet.grammar" }, "dependencies": { - "@lezer/common": "^0.15.10", - "@lezer/generator": "^0.15.2", - "@lezer/lr": "^0.15.5", + "@lezer/common": "^1.0.4", + "@lezer/generator": "^1.5.0", + "@lezer/lr": "^1.3.10", "@types/xast": "^2.0.0", "xast-util-to-xml": "^4.0.0" }, diff --git a/packages/parser/src/generated-assets/lezer-doenet.ts b/packages/parser/src/generated-assets/lezer-doenet.ts index 93e97b3d2..58c6338e0 100644 --- a/packages/parser/src/generated-assets/lezer-doenet.ts +++ b/packages/parser/src/generated-assets/lezer-doenet.ts @@ -1,9 +1,8 @@ // This file was generated by lezer-generator. You probably shouldn't edit it. import { LRParser } from "@lezer/lr"; import { startTag, commentContent, elementContext } from "../tokens"; -import { NodeProp } from "@lezer/common"; export const parser = LRParser.deserialize({ - version: 13, + version: 14, states: "*[OQOTOOO]OYO'#CdOeO`O'#CfO!OOTO'#CeOOOP'#Ce'#CeOOOP'#Cx'#CxOOOP'#Co'#CoQQOTOOOOOQ'#Cp'#CpO!VOYO,59OOOOP,59O,59OO!_OpO,59QO!mO`O'#ClOOOP'#DT'#DTOOOP'#Cu'#CuO!rOTO,59PO!yO`O'#CmOOOP,59P,59POOOP-E6m-E6mOOOQ-E6n-E6nOOOP1G.j1G.jOOOO'#Cq'#CqO#ROpO1G.lO#aOpO'#ChOOOO'#Cr'#CrO#rOpO1G.lOOOP1G.l1G.lOOOP1G.t1G.tO#}OWO,59WOOOP-E6s-E6sOOOP1G.k1G.kO$SO`O,59XO$[OWO,59XOOOO-E6o-E6oO$dOpO7+$WOOOP7+$W7+$WOOOP7+$`7+$`O$oOpO,59SO%QOWO,59SOOOO-E6p-E6pOOOP1G.r1G.rO%]OWO1G.sO%]OWO1G.sOOOP1G.s1G.sOOOP<