diff --git a/package.json b/package.json index b05bd3e7..183dad15 100644 --- a/package.json +++ b/package.json @@ -106,6 +106,8 @@ "moment": "2.30.1", "@ant-design/icons": "^4.7.0", "@ant-design/pro-layout": "6.38.22", + "@codemirror/view": "^6.34.1", + "@codemirror/state": "^6.4.1", "@monaco-editor/react": "4.2.1", "@react-hook/resize-observer": "^1.2.6", "react-router-dom": "6.26.1", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e27dd14b..eca924cf 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -145,6 +145,12 @@ devDependencies: '@ant-design/pro-layout': specifier: 6.38.22 version: 6.38.22(prop-types@15.8.1)(react-dom@18.2.0)(react@18.2.0) + '@codemirror/state': + specifier: ^6.4.1 + version: 6.4.1 + '@codemirror/view': + specifier: ^6.34.1 + version: 6.34.1 '@monaco-editor/react': specifier: 4.2.1 version: 4.2.1(monaco-editor@0.33.0)(react-dom@18.2.0)(react@18.2.0) @@ -225,10 +231,10 @@ devDependencies: version: 8.3.4 '@uiw/codemirror-extensions-langs': specifier: ^4.21.9 - version: 4.21.9(@codemirror/autocomplete@6.9.0)(@codemirror/language-data@6.3.1)(@codemirror/language@6.9.0)(@codemirror/legacy-modes@6.3.3)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4)(@lezer/highlight@1.1.6)(@lezer/javascript@1.4.5)(@lezer/lr@1.3.10) + version: 4.21.9(@codemirror/autocomplete@6.9.0)(@codemirror/language-data@6.3.1)(@codemirror/language@6.10.3)(@codemirror/legacy-modes@6.3.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(@lezer/highlight@1.2.1)(@lezer/javascript@1.4.5)(@lezer/lr@1.3.10) '@uiw/react-codemirror': specifier: ^4.21.9 - version: 4.21.9(@babel/runtime@7.23.1)(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.9.0)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.2.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.16.0)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0) + version: 4.21.9(@babel/runtime@7.23.1)(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.10.3)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.4.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.34.1)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0) '@umijs/max': specifier: ^4.0.72 version: 4.0.72(@types/node@17.0.45)(@types/react-dom@18.2.4)(@types/react@18.2.8)(prettier@2.8.8)(react-dom@18.2.0)(react@18.2.0)(sockjs-client@1.6.1)(typescript@5.2.2)(webpack@5.85.1) @@ -2814,7 +2820,7 @@ packages: tinycolor2: 1.6.0 dev: true - /@codemirror/autocomplete@6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4): + /@codemirror/autocomplete@6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.0.4): resolution: {integrity: sha512-Fbwm0V/Wn3BkEJZRhr0hi5BhCo5a7eBL6LYaliPjOSwCyfOpnjXY59HruSxOUNV+1OYer0Tgx1zRNQttjXyDog==} peerDependencies: '@codemirror/language': ^6.0.0 @@ -2822,18 +2828,32 @@ packages: '@codemirror/view': ^6.0.0 '@lezer/common': ^1.0.0 dependencies: - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 '@lezer/common': 1.0.4 dev: true + /@codemirror/autocomplete@6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3): + resolution: {integrity: sha512-Fbwm0V/Wn3BkEJZRhr0hi5BhCo5a7eBL6LYaliPjOSwCyfOpnjXY59HruSxOUNV+1OYer0Tgx1zRNQttjXyDog==} + peerDependencies: + '@codemirror/language': ^6.0.0 + '@codemirror/state': ^6.0.0 + '@codemirror/view': ^6.0.0 + '@lezer/common': ^1.0.0 + dependencies: + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 + '@lezer/common': 1.2.3 + dev: true + /@codemirror/commands@6.2.4: resolution: {integrity: sha512-42lmDqVH0ttfilLShReLXsDfASKLXzfyC36bzwcqzox9PlHulMcsUOfHXNo2X2aFMVNUoQ7j+d4q5bnfseYoOA==} dependencies: - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 '@lezer/common': 1.0.4 dev: true @@ -2842,25 +2862,25 @@ packages: dependencies: '@codemirror/lang-html': 6.4.5 '@codemirror/lang-javascript': 6.1.9 - '@codemirror/language': 6.9.0 + '@codemirror/language': 6.10.3 '@lezer/common': 1.0.4 - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@codemirror/lang-cpp@6.0.2: resolution: {integrity: sha512-6oYEYUKHvrnacXxWxYa6t4puTlbN3dgV662BDfSH8+MfjQjVmP697/KYTDOqpxgerkvoNm7q5wlFMBeX8ZMocg==} dependencies: - '@codemirror/language': 6.9.0 + '@codemirror/language': 6.10.3 '@lezer/cpp': 1.1.1 dev: true - /@codemirror/lang-css@6.2.1(@codemirror/view@6.16.0): + /@codemirror/lang-css@6.2.1(@codemirror/view@6.34.1): resolution: {integrity: sha512-/UNWDNV5Viwi/1lpr/dIXJNWiwDxpw13I4pTUAsNxZdg6E0mI2kTQb0P2iHczg1Tu+H4EBgJR+hYhKiHKko7qg==} dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.0.4) + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 '@lezer/common': 1.0.4 '@lezer/css': 1.1.3 transitivePeerDependencies: @@ -2870,12 +2890,12 @@ packages: /@codemirror/lang-html@6.4.5: resolution: {integrity: sha512-dUCSxkIw2G+chaUfw3Gfu5kkN83vJQN8gfQDp9iEHsIZluMJA0YJveT12zg/28BJx+uPsbQ6VimKCgx3oJrZxA==} dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) - '@codemirror/lang-css': 6.2.1(@codemirror/view@6.16.0) + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.0.4) + '@codemirror/lang-css': 6.2.1(@codemirror/view@6.34.1) '@codemirror/lang-javascript': 6.1.9 - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 '@lezer/common': 1.0.4 '@lezer/css': 1.1.3 '@lezer/html': 1.3.6 @@ -2884,18 +2904,18 @@ packages: /@codemirror/lang-java@6.0.1: resolution: {integrity: sha512-OOnmhH67h97jHzCuFaIEspbmsT98fNdhVhmA3zCxW0cn7l8rChDhZtwiwJ/JOKXgfm4J+ELxQihxaI7bj7mJRg==} dependencies: - '@codemirror/language': 6.9.0 + '@codemirror/language': 6.10.3 '@lezer/java': 1.0.4 dev: true /@codemirror/lang-javascript@6.1.9: resolution: {integrity: sha512-z3jdkcqOEBT2txn2a87A0jSy6Te3679wg/U8QzMeftFt+4KA6QooMwfdFzJiuC3L6fXKfTXZcDocoaxMYfGz0w==} dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) - '@codemirror/language': 6.9.0 + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.0.4) + '@codemirror/language': 6.10.3 '@codemirror/lint': 6.4.0 - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 '@lezer/common': 1.0.4 '@lezer/javascript': 1.4.5 dev: true @@ -2903,16 +2923,16 @@ packages: /@codemirror/lang-json@6.0.1: resolution: {integrity: sha512-+T1flHdgpqDDlJZ2Lkil/rLiRy684WMLc74xUnjJH48GQdfJo/pudlTRreZmKwzP8/tGdKf83wlbAdOCzlJOGQ==} dependencies: - '@codemirror/language': 6.9.0 + '@codemirror/language': 6.10.3 '@lezer/json': 1.0.1 dev: true - /@codemirror/lang-less@6.0.1(@codemirror/view@6.16.0): + /@codemirror/lang-less@6.0.1(@codemirror/view@6.34.1): resolution: {integrity: sha512-ABcsKBjLbyPZwPR5gePpc8jEKCQrFF4pby2WlMVdmJOOr7OWwwyz8DZonPx/cKDE00hfoSLc8F7yAcn/d6+rTQ==} dependencies: - '@codemirror/lang-css': 6.2.1(@codemirror/view@6.16.0) - '@codemirror/language': 6.9.0 - '@lezer/highlight': 1.1.6 + '@codemirror/lang-css': 6.2.1(@codemirror/view@6.34.1) + '@codemirror/language': 6.10.3 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 transitivePeerDependencies: - '@codemirror/view' @@ -2921,8 +2941,8 @@ packages: /@codemirror/lang-lezer@6.0.1: resolution: {integrity: sha512-WHwjI7OqKFBEfkunohweqA5B/jIlxaZso6Nl3weVckz8EafYbPZldQEKSDb4QQ9H9BUkle4PVELP4sftKoA0uQ==} dependencies: - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 '@lezer/common': 1.0.4 '@lezer/lezer': 1.1.2 dev: true @@ -2930,11 +2950,11 @@ packages: /@codemirror/lang-markdown@6.2.0: resolution: {integrity: sha512-deKegEQVzfBAcLPqsJEa+IxotqPVwWZi90UOEvQbfa01NTAw8jNinrykuYPTULGUj+gha0ZG2HBsn4s5d64Qrg==} dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.0.4) '@codemirror/lang-html': 6.4.5 - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 '@lezer/common': 1.0.4 '@lezer/markdown': 1.1.0 dev: true @@ -2943,17 +2963,17 @@ packages: resolution: {integrity: sha512-ublojMdw/PNWa7qdN5TMsjmqkNuTBD3k6ndZ4Z0S25SBAiweFGyY68AS3xNcIOlb6DDFDvKlinLQ40vSLqf8xA==} dependencies: '@codemirror/lang-html': 6.4.5 - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 '@lezer/common': 1.0.4 '@lezer/php': 1.0.1 dev: true - /@codemirror/lang-python@6.1.3(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4): + /@codemirror/lang-python@6.1.3(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3): resolution: {integrity: sha512-S9w2Jl74hFlD5nqtUMIaXAq9t5WlM0acCkyuQWUUSvZclk1sV+UfnpFiZzuZSG+hfEaOmxKR5UxY/Uxswn7EhQ==} dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) - '@codemirror/language': 6.9.0 + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) + '@codemirror/language': 6.10.3 '@lezer/python': 1.1.8 transitivePeerDependencies: - '@codemirror/state' @@ -2964,29 +2984,29 @@ packages: /@codemirror/lang-rust@6.0.1: resolution: {integrity: sha512-344EMWFBzWArHWdZn/NcgkwMvZIWUR1GEBdwG8FEp++6o6vT6KL9V7vGs2ONsKxxFUPXKI0SPcWhyYyl2zPYxQ==} dependencies: - '@codemirror/language': 6.9.0 + '@codemirror/language': 6.10.3 '@lezer/rust': 1.0.1 dev: true - /@codemirror/lang-sass@6.0.2(@codemirror/view@6.16.0): + /@codemirror/lang-sass@6.0.2(@codemirror/view@6.34.1): resolution: {integrity: sha512-l/bdzIABvnTo1nzdY6U+kPAC51czYQcOErfzQ9zSm9D8GmNPD0WTW8st/CJwBTPLO8jlrbyvlSEcN20dc4iL0Q==} dependencies: - '@codemirror/lang-css': 6.2.1(@codemirror/view@6.16.0) - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 + '@codemirror/lang-css': 6.2.1(@codemirror/view@6.34.1) + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 '@lezer/common': 1.0.4 '@lezer/sass': 1.0.3 transitivePeerDependencies: - '@codemirror/view' dev: true - /@codemirror/lang-sql@6.5.4(@codemirror/view@6.16.0)(@lezer/common@1.0.4): + /@codemirror/lang-sql@6.5.4(@codemirror/view@6.34.1)(@lezer/common@1.2.3): resolution: {integrity: sha512-5Gq7fYtT/5HbNyIG7a8vYaqOYQU3JbgtBe3+derkrFUXRVcjkf8WVgz++PIbMFAQsOFMDdDR+uiNM8ZRRuXH+w==} dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 - '@lezer/highlight': 1.1.6 + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 transitivePeerDependencies: - '@codemirror/view' @@ -2998,53 +3018,53 @@ packages: dependencies: '@codemirror/lang-html': 6.4.5 '@codemirror/lang-javascript': 6.1.9 - '@codemirror/language': 6.9.0 + '@codemirror/language': 6.10.3 '@lezer/common': 1.0.4 - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@codemirror/lang-wast@6.0.1: resolution: {integrity: sha512-sQLsqhRjl2MWG3rxZysX+2XAyed48KhLBHLgq9xcKxIJu3npH/G+BIXW5NM5mHeDUjG0jcGh9BcjP0NfMStuzA==} dependencies: - '@codemirror/language': 6.9.0 - '@lezer/highlight': 1.1.6 + '@codemirror/language': 6.10.3 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true - /@codemirror/lang-xml@6.0.2(@codemirror/view@6.16.0): + /@codemirror/lang-xml@6.0.2(@codemirror/view@6.34.1): resolution: {integrity: sha512-JQYZjHL2LAfpiZI2/qZ/qzDuSqmGKMwyApYmEUUCTxLM4MWS7sATUEfIguZQr9Zjx/7gcdnewb039smF6nC2zw==} dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.0.4) + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 '@lezer/common': 1.0.4 '@lezer/xml': 1.0.2 transitivePeerDependencies: - '@codemirror/view' dev: true - /@codemirror/language-data@6.3.1(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4): + /@codemirror/language-data@6.3.1(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3): resolution: {integrity: sha512-p6jhJmvhGe1TG1EGNhwH7nFWWFSTJ8NDKnB2fVx5g3t+PpO0+63R7GJNxjS0TmmH3cdMxZbzejsik+rlEh1EyQ==} dependencies: '@codemirror/lang-angular': 0.1.2 '@codemirror/lang-cpp': 6.0.2 - '@codemirror/lang-css': 6.2.1(@codemirror/view@6.16.0) + '@codemirror/lang-css': 6.2.1(@codemirror/view@6.34.1) '@codemirror/lang-html': 6.4.5 '@codemirror/lang-java': 6.0.1 '@codemirror/lang-javascript': 6.1.9 '@codemirror/lang-json': 6.0.1 - '@codemirror/lang-less': 6.0.1(@codemirror/view@6.16.0) + '@codemirror/lang-less': 6.0.1(@codemirror/view@6.34.1) '@codemirror/lang-markdown': 6.2.0 '@codemirror/lang-php': 6.0.1 - '@codemirror/lang-python': 6.1.3(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) + '@codemirror/lang-python': 6.1.3(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) '@codemirror/lang-rust': 6.0.1 - '@codemirror/lang-sass': 6.0.2(@codemirror/view@6.16.0) - '@codemirror/lang-sql': 6.5.4(@codemirror/view@6.16.0)(@lezer/common@1.0.4) + '@codemirror/lang-sass': 6.0.2(@codemirror/view@6.34.1) + '@codemirror/lang-sql': 6.5.4(@codemirror/view@6.34.1)(@lezer/common@1.2.3) '@codemirror/lang-vue': 0.1.2 '@codemirror/lang-wast': 6.0.1 - '@codemirror/lang-xml': 6.0.2(@codemirror/view@6.16.0) - '@codemirror/language': 6.9.0 + '@codemirror/lang-xml': 6.0.2(@codemirror/view@6.34.1) + '@codemirror/language': 6.10.3 '@codemirror/legacy-modes': 6.3.3 transitivePeerDependencies: - '@codemirror/state' @@ -3052,13 +3072,13 @@ packages: - '@lezer/common' dev: true - /@codemirror/language@6.9.0: - resolution: {integrity: sha512-nFu311/0ne/qGuGCL3oKuktBgzVOaxCHZPZv1tLSZkNjPYxxvkjSbzno3MlErG2tgw1Yw1yF8BxMCegeMXqpiw==} + /@codemirror/language@6.10.3: + resolution: {integrity: sha512-kDqEU5sCP55Oabl6E7m5N+vZRoc0iWqgDVhEKifcHzPzjqCegcO4amfrYVL9PmPZpl4G0yjkpTpUO/Ui8CzO8A==} dependencies: - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 - '@lezer/common': 1.0.4 - '@lezer/highlight': 1.1.6 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 + '@lezer/common': 1.2.3 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 style-mod: 4.0.3 dev: true @@ -3066,43 +3086,43 @@ packages: /@codemirror/legacy-modes@6.3.3: resolution: {integrity: sha512-X0Z48odJ0KIoh/HY8Ltz75/4tDYc9msQf1E/2trlxFaFFhgjpVHjZ/BCXe1Lk7s4Gd67LL/CeEEHNI+xHOiESg==} dependencies: - '@codemirror/language': 6.9.0 + '@codemirror/language': 6.10.3 dev: true /@codemirror/lint@6.4.0: resolution: {integrity: sha512-6VZ44Ysh/Zn07xrGkdtNfmHCbGSHZzFBdzWi0pbd7chAQ/iUcpLGX99NYRZTa7Ugqg4kEHCqiHhcZnH0gLIgSg==} dependencies: - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 crelt: 1.0.6 dev: true /@codemirror/search@6.5.1: resolution: {integrity: sha512-4jupk4JwkeVbrN2pStY74q6OJEYqwosB4koA66nyLeVedadtX9MHI38j2vbYmnfDGurDApP3OZO46MrWalcjiQ==} dependencies: - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 crelt: 1.0.6 dev: true - /@codemirror/state@6.2.1: - resolution: {integrity: sha512-RupHSZ8+OjNT38zU9fKH2sv+Dnlr8Eb8sl4NOnnqz95mCFTZUaiRP8Xv5MeeaG0px2b8Bnfe7YGwCV3nsBhbuw==} + /@codemirror/state@6.4.1: + resolution: {integrity: sha512-QkEyUiLhsJoZkbumGZlswmAhA7CBU02Wrz7zvH4SrcifbsqwlXShVXg65f3v/ts57W3dqyamEriMhij1Z3Zz4A==} dev: true /@codemirror/theme-one-dark@6.1.2: resolution: {integrity: sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==} dependencies: - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 - '@lezer/highlight': 1.1.6 + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 + '@lezer/highlight': 1.2.1 dev: true - /@codemirror/view@6.16.0: - resolution: {integrity: sha512-1Z2HkvkC3KR/oEZVuW9Ivmp8TWLzGEd8T8TA04TTwPvqogfkHBdYSlflytDOqmkUxM2d1ywTg7X2dU5mC+SXvg==} + /@codemirror/view@6.34.1: + resolution: {integrity: sha512-t1zK/l9UiRqwUNPm+pdIT0qzJlzuVckbTEMVNFhfWkGiBQClstzg+78vedCvLSX0xJEZ6lwZbPpnljL7L6iwMQ==} dependencies: - '@codemirror/state': 6.2.1 - style-mod: 4.0.3 + '@codemirror/state': 6.4.1 + style-mod: 4.1.2 w3c-keyname: 2.2.8 dev: true @@ -3911,22 +3931,26 @@ packages: resolution: {integrity: sha512-lZHlk8p67x4aIDtJl6UQrXSOP6oi7dQR3W/geFVrENdA1JDaAJWldnVqVjPMJupbTKbzDfFcePfKttqVidS/dg==} dev: true + /@lezer/common@1.2.3: + resolution: {integrity: sha512-w7ojc8ejBqr2REPsWxJjrMFsA/ysDCFICn8zEOR9mrqzOu2amhITYuLD8ag6XZf0CFXDrhKqw7+tW8cX66NaDA==} + dev: true + /@lezer/cpp@1.1.1: resolution: {integrity: sha512-eS1M3L3U2mDowoFVPG7tEp01SWu9/68Nx3HEBgLJVn3N9ku7g5S7WdFv0jzmcTipAyONYfZJ+7x4WRkfdB2Ung==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@lezer/css@1.1.3: resolution: {integrity: sha512-SjSM4pkQnQdJDVc80LYzEaMiNy9txsFbI7HsMgeVF28NdLaAdHNtQ+kB/QqDUzRBV/75NTXjJ/R5IdC8QQGxMg==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true - /@lezer/highlight@1.1.6: - resolution: {integrity: sha512-cmSJYa2us+r3SePpRCjN5ymCqCPv+zyXmDl0ciWtVaNiORT/MxM7ZgOMQZADD0o51qOaOg24qc/zBViOIwAjJg==} + /@lezer/highlight@1.2.1: + resolution: {integrity: sha512-Z5duk4RN/3zuVO7Jq0pGLJ3qynpxUVsh7IbUbGj88+uV2ApSAn6kWg2au3iJb+0Zi7kKtqffIESgNcRXWZWmSA==} dependencies: '@lezer/common': 1.0.4 dev: true @@ -3935,83 +3959,83 @@ packages: resolution: {integrity: sha512-Kk9HJARZTc0bAnMQUqbtuhFVsB4AnteR2BFUWfZV7L/x1H0aAKz6YabrfJ2gk/BEgjh9L3hg5O4y2IDZRBdzuQ==} dependencies: '@lezer/common': 1.0.4 - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@lezer/java@1.0.4: resolution: {integrity: sha512-POc53LHf2AuNeRXjqZbXNu88GKj0KZTjjSx0L7tYeXlrEHF+3NAQx+dEwKVuCbkl0ZMtpRy2VsDYOV7KKV0oyg==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@lezer/javascript@1.4.5: resolution: {integrity: sha512-FmBUHz8K1V22DgjTd6SrIG9owbzOYZ1t3rY6vGEmw+e2RVBd7sqjM8uXEVRFmfxKFn1Mx2ABJehHjrN3G2ZpmA==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@lezer/json@1.0.1: resolution: {integrity: sha512-nkVC27qiEZEjySbi6gQRuMwa2sDu2PtfjSgz0A4QF81QyRGm3kb2YRzLcOPcTEtmcwvrX/cej7mlhbwViA4WJw==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@lezer/lezer@1.1.2: resolution: {integrity: sha512-O8yw3CxPhzYHB1hvwbdozjnAslhhR8A5BH7vfEMof0xk3p+/DFDfZkA9Tde6J+88WgtwaHy4Sy6ThZSkaI0Evw==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@lezer/lr@1.3.10: resolution: {integrity: sha512-BZfVvf7Re5BIwJHlZXbJn9L8lus5EonxQghyn+ih8Wl36XMFBPTXC0KM0IdUtj9w/diPHsKlXVgL+AlX2jYJ0Q==} dependencies: - '@lezer/common': 1.0.4 + '@lezer/common': 1.2.3 dev: true /@lezer/markdown@1.1.0: resolution: {integrity: sha512-JYOI6Lkqbl83semCANkO3CKbKc0pONwinyagBufWBm+k4yhIcqfCF8B8fpEpvJLmIy7CAfwiq7dQ/PzUZA340g==} dependencies: '@lezer/common': 1.0.4 - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 dev: true /@lezer/php@1.0.1: resolution: {integrity: sha512-aqdCQJOXJ66De22vzdwnuC502hIaG9EnPK2rSi+ebXyUd+j7GAX1mRjWZOVOmf3GST1YUfUCu6WXDiEgDGOVwA==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@lezer/python@1.1.8: resolution: {integrity: sha512-1T/XsmeF57ijrjpC0Zmrf9YeO5mn2zC1XeSNrOnc0KB+6PgxJ5m7kWKt0CnwyS74oHQXbJxUUL+QDQJR26c1Gw==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@lezer/rust@1.0.1: resolution: {integrity: sha512-j+ToFKM6Wpglv3OQ4ebHYdYIMT2dh0ziCCV0rTf47AWiHOVhR0WjaKrBq+yuvDQNEhr5sxPxVI7+naJIgpqcsQ==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@lezer/sass@1.0.3: resolution: {integrity: sha512-n4l2nVOB7gWiGU/Cg2IVxpt2Ic9Hgfgy/7gk+p/XJibAsPXs0lSbsfGwQgwsAw9B/euYo3oS6lEFr9WytoqcZg==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true /@lezer/xml@1.0.2: resolution: {integrity: sha512-dlngsWceOtQBMuBPw5wtHpaxdPJ71aVntqjbpGkFtWsp4WtQmCnuTjQGocviymydN6M18fhj6UQX3oiEtSuY7w==} dependencies: - '@lezer/highlight': 1.1.6 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true @@ -4100,7 +4124,7 @@ packages: /@nextjournal/lang-clojure@1.0.0: resolution: {integrity: sha512-gOCV71XrYD0DhwGoPMWZmZ0r92/lIHsqQu9QWdpZYYBwiChNwMO4sbVMP7eTuAqffFB2BTtCSC+1skSH9d3bNg==} dependencies: - '@codemirror/language': 6.9.0 + '@codemirror/language': 6.10.3 '@nextjournal/lezer-clojure': 1.0.0 dev: true @@ -4706,7 +4730,7 @@ packages: engines: {node: '>=14.0.0'} dev: true - /@replit/codemirror-lang-csharp@6.1.0(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4)(@lezer/highlight@1.1.6)(@lezer/lr@1.3.10): + /@replit/codemirror-lang-csharp@6.1.0(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(@lezer/highlight@1.2.1)(@lezer/lr@1.3.10): resolution: {integrity: sha512-Dtyk9WVrdPPgkgTp8MUX9HyXd87O7UZnFrE647gjHUZY8p0UN+z0m6dPfk6rJMsTTvMcl7YbDUykxfeqB6EQOQ==} peerDependencies: '@codemirror/autocomplete': ^6.0.0 @@ -4717,16 +4741,16 @@ packages: '@lezer/highlight': ^1.0.0 '@lezer/lr': ^1.0.0 dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 - '@lezer/common': 1.0.4 - '@lezer/highlight': 1.1.6 + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 + '@lezer/common': 1.2.3 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true - /@replit/codemirror-lang-nix@6.0.1(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4)(@lezer/highlight@1.1.6)(@lezer/lr@1.3.10): + /@replit/codemirror-lang-nix@6.0.1(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(@lezer/highlight@1.2.1)(@lezer/lr@1.3.10): resolution: {integrity: sha512-lvzjoYn9nfJzBD5qdm3Ut6G3+Or2wEacYIDJ49h9+19WSChVnxv4ojf+rNmQ78ncuxIt/bfbMvDLMeMP0xze6g==} peerDependencies: '@codemirror/autocomplete': ^6.0.0 @@ -4737,24 +4761,24 @@ packages: '@lezer/highlight': ^1.0.0 '@lezer/lr': ^1.0.0 dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 - '@lezer/common': 1.0.4 - '@lezer/highlight': 1.1.6 + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 + '@lezer/common': 1.2.3 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true - /@replit/codemirror-lang-solidity@6.0.1(@codemirror/language@6.9.0): + /@replit/codemirror-lang-solidity@6.0.1(@codemirror/language@6.10.3): resolution: {integrity: sha512-kDnak0xZelGmvzJwKTpMTl6gYSfFq9hnxrkbLaMV0CARq/MFvDQJmcmYon/k8uZqXy6DfzewKDV8tx9kY2WUZg==} peerDependencies: '@codemirror/language': ^6.0.0 dependencies: - '@codemirror/language': 6.9.0 + '@codemirror/language': 6.10.3 dev: true - /@replit/codemirror-lang-svelte@6.0.0(@codemirror/autocomplete@6.9.0)(@codemirror/lang-css@6.2.1)(@codemirror/lang-html@6.4.5)(@codemirror/lang-javascript@6.1.9)(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4)(@lezer/highlight@1.1.6)(@lezer/javascript@1.4.5)(@lezer/lr@1.3.10): + /@replit/codemirror-lang-svelte@6.0.0(@codemirror/autocomplete@6.9.0)(@codemirror/lang-css@6.2.1)(@codemirror/lang-html@6.4.5)(@codemirror/lang-javascript@6.1.9)(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(@lezer/highlight@1.2.1)(@lezer/javascript@1.4.5)(@lezer/lr@1.3.10): resolution: {integrity: sha512-U2OqqgMM6jKelL0GNWbAmqlu1S078zZNoBqlJBW+retTc5M4Mha6/Y2cf4SVg6ddgloJvmcSpt4hHrVoM4ePRA==} peerDependencies: '@codemirror/autocomplete': ^6.0.0 @@ -4769,15 +4793,15 @@ packages: '@lezer/javascript': ^1.2.0 '@lezer/lr': ^1.0.0 dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) - '@codemirror/lang-css': 6.2.1(@codemirror/view@6.16.0) + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) + '@codemirror/lang-css': 6.2.1(@codemirror/view@6.34.1) '@codemirror/lang-html': 6.4.5 '@codemirror/lang-javascript': 6.1.9 - '@codemirror/language': 6.9.0 - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 - '@lezer/common': 1.0.4 - '@lezer/highlight': 1.1.6 + '@codemirror/language': 6.10.3 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 + '@lezer/common': 1.2.3 + '@lezer/highlight': 1.2.1 '@lezer/javascript': 1.4.5 '@lezer/lr': 1.3.10 dev: true @@ -5816,7 +5840,7 @@ packages: eslint-visitor-keys: 3.4.1 dev: true - /@uiw/codemirror-extensions-basic-setup@4.21.9(@codemirror/autocomplete@6.9.0)(@codemirror/commands@6.2.4)(@codemirror/language@6.9.0)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0): + /@uiw/codemirror-extensions-basic-setup@4.21.9(@codemirror/autocomplete@6.9.0)(@codemirror/commands@6.2.4)(@codemirror/language@6.10.3)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1): resolution: {integrity: sha512-TQT6aF8brxZpFnk/K4fm/K/9k9eF3PMav/KKjHlYrGUT8BTNk/qL+ximLtIzvTUhmBFchjM1lrqSJdvpVom7/w==} peerDependencies: '@codemirror/autocomplete': '>=6.0.0' @@ -5827,16 +5851,16 @@ packages: '@codemirror/state': '>=6.0.0' '@codemirror/view': '>=6.0.0' dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) '@codemirror/commands': 6.2.4 - '@codemirror/language': 6.9.0 + '@codemirror/language': 6.10.3 '@codemirror/lint': 6.4.0 '@codemirror/search': 6.5.1 - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 dev: true - /@uiw/codemirror-extensions-langs@4.21.9(@codemirror/autocomplete@6.9.0)(@codemirror/language-data@6.3.1)(@codemirror/language@6.9.0)(@codemirror/legacy-modes@6.3.3)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4)(@lezer/highlight@1.1.6)(@lezer/javascript@1.4.5)(@lezer/lr@1.3.10): + /@uiw/codemirror-extensions-langs@4.21.9(@codemirror/autocomplete@6.9.0)(@codemirror/language-data@6.3.1)(@codemirror/language@6.10.3)(@codemirror/legacy-modes@6.3.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(@lezer/highlight@1.2.1)(@lezer/javascript@1.4.5)(@lezer/lr@1.3.10): resolution: {integrity: sha512-s1VT1rss0iyvrtRl7BZtC5H7U5uQtCKTaD8wxjQrgZz5un9wHVvy9twU97aJGQR0FwbKWqK8/1iiICRJTRCoZA==} peerDependencies: '@codemirror/language-data': '>=6.0.0' @@ -5844,29 +5868,29 @@ packages: dependencies: '@codemirror/lang-angular': 0.1.2 '@codemirror/lang-cpp': 6.0.2 - '@codemirror/lang-css': 6.2.1(@codemirror/view@6.16.0) + '@codemirror/lang-css': 6.2.1(@codemirror/view@6.34.1) '@codemirror/lang-html': 6.4.5 '@codemirror/lang-java': 6.0.1 '@codemirror/lang-javascript': 6.1.9 '@codemirror/lang-json': 6.0.1 - '@codemirror/lang-less': 6.0.1(@codemirror/view@6.16.0) + '@codemirror/lang-less': 6.0.1(@codemirror/view@6.34.1) '@codemirror/lang-lezer': 6.0.1 '@codemirror/lang-markdown': 6.2.0 '@codemirror/lang-php': 6.0.1 - '@codemirror/lang-python': 6.1.3(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) + '@codemirror/lang-python': 6.1.3(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) '@codemirror/lang-rust': 6.0.1 - '@codemirror/lang-sass': 6.0.2(@codemirror/view@6.16.0) - '@codemirror/lang-sql': 6.5.4(@codemirror/view@6.16.0)(@lezer/common@1.0.4) + '@codemirror/lang-sass': 6.0.2(@codemirror/view@6.34.1) + '@codemirror/lang-sql': 6.5.4(@codemirror/view@6.34.1)(@lezer/common@1.2.3) '@codemirror/lang-vue': 0.1.2 '@codemirror/lang-wast': 6.0.1 - '@codemirror/lang-xml': 6.0.2(@codemirror/view@6.16.0) - '@codemirror/language-data': 6.3.1(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) + '@codemirror/lang-xml': 6.0.2(@codemirror/view@6.34.1) + '@codemirror/language-data': 6.3.1(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) '@codemirror/legacy-modes': 6.3.3 '@nextjournal/lang-clojure': 1.0.0 - '@replit/codemirror-lang-csharp': 6.1.0(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4)(@lezer/highlight@1.1.6)(@lezer/lr@1.3.10) - '@replit/codemirror-lang-nix': 6.0.1(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4)(@lezer/highlight@1.1.6)(@lezer/lr@1.3.10) - '@replit/codemirror-lang-solidity': 6.0.1(@codemirror/language@6.9.0) - '@replit/codemirror-lang-svelte': 6.0.0(@codemirror/autocomplete@6.9.0)(@codemirror/lang-css@6.2.1)(@codemirror/lang-html@6.4.5)(@codemirror/lang-javascript@6.1.9)(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4)(@lezer/highlight@1.1.6)(@lezer/javascript@1.4.5)(@lezer/lr@1.3.10) + '@replit/codemirror-lang-csharp': 6.1.0(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(@lezer/highlight@1.2.1)(@lezer/lr@1.3.10) + '@replit/codemirror-lang-nix': 6.0.1(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(@lezer/highlight@1.2.1)(@lezer/lr@1.3.10) + '@replit/codemirror-lang-solidity': 6.0.1(@codemirror/language@6.10.3) + '@replit/codemirror-lang-svelte': 6.0.0(@codemirror/autocomplete@6.9.0)(@codemirror/lang-css@6.2.1)(@codemirror/lang-html@6.4.5)(@codemirror/lang-javascript@6.1.9)(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3)(@lezer/highlight@1.2.1)(@lezer/javascript@1.4.5)(@lezer/lr@1.3.10) codemirror-lang-mermaid: 0.2.2 transitivePeerDependencies: - '@codemirror/autocomplete' @@ -5879,7 +5903,7 @@ packages: - '@lezer/lr' dev: true - /@uiw/react-codemirror@4.21.9(@babel/runtime@7.23.1)(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.9.0)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.2.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.16.0)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0): + /@uiw/react-codemirror@4.21.9(@babel/runtime@7.23.1)(@codemirror/autocomplete@6.9.0)(@codemirror/language@6.10.3)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.4.1)(@codemirror/theme-one-dark@6.1.2)(@codemirror/view@6.34.1)(codemirror@6.0.1)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-aeLegPz2iCvqJjhzXp2WUMqpMZDqxsTnF3rX9kGRlfY6vQLsrjoctj0cQ29uxEtFYJChOVjtCOtnQUlyIuNAHQ==} peerDependencies: '@babel/runtime': '>=7.11.0' @@ -5897,11 +5921,11 @@ packages: dependencies: '@babel/runtime': 7.23.1 '@codemirror/commands': 6.2.4 - '@codemirror/state': 6.2.1 + '@codemirror/state': 6.4.1 '@codemirror/theme-one-dark': 6.1.2 - '@codemirror/view': 6.16.0 - '@uiw/codemirror-extensions-basic-setup': 4.21.9(@codemirror/autocomplete@6.9.0)(@codemirror/commands@6.2.4)(@codemirror/language@6.9.0)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0) - codemirror: 6.0.1(@lezer/common@1.0.4) + '@codemirror/view': 6.34.1 + '@uiw/codemirror-extensions-basic-setup': 4.21.9(@codemirror/autocomplete@6.9.0)(@codemirror/commands@6.2.4)(@codemirror/language@6.10.3)(@codemirror/lint@6.4.0)(@codemirror/search@6.5.1)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1) + codemirror: 6.0.1(@lezer/common@1.2.3) react: 18.2.0 react-dom: 18.2.0(react@18.2.0) transitivePeerDependencies: @@ -7755,21 +7779,21 @@ packages: /codemirror-lang-mermaid@0.2.2: resolution: {integrity: sha512-AqSzkQgfWsjBbifio3dy/zDj6WXEw4g52Mq6bltIWLMWryWWRMpFwjQSlHtCGOol1FENYObUF5KI4ofiv8bjXA==} dependencies: - '@codemirror/language': 6.9.0 - '@lezer/highlight': 1.1.6 + '@codemirror/language': 6.10.3 + '@lezer/highlight': 1.2.1 '@lezer/lr': 1.3.10 dev: true - /codemirror@6.0.1(@lezer/common@1.0.4): + /codemirror@6.0.1(@lezer/common@1.2.3): resolution: {integrity: sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==} dependencies: - '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.9.0)(@codemirror/state@6.2.1)(@codemirror/view@6.16.0)(@lezer/common@1.0.4) + '@codemirror/autocomplete': 6.9.0(@codemirror/language@6.10.3)(@codemirror/state@6.4.1)(@codemirror/view@6.34.1)(@lezer/common@1.2.3) '@codemirror/commands': 6.2.4 - '@codemirror/language': 6.9.0 + '@codemirror/language': 6.10.3 '@codemirror/lint': 6.4.0 '@codemirror/search': 6.5.1 - '@codemirror/state': 6.2.1 - '@codemirror/view': 6.16.0 + '@codemirror/state': 6.4.1 + '@codemirror/view': 6.34.1 transitivePeerDependencies: - '@lezer/common' dev: true @@ -15670,6 +15694,10 @@ packages: resolution: {integrity: sha512-78Jv8kYJdjbvRwwijtCevYADfsI0lGzYJe4mMFdceO8l75DFFDoqBhR1jVDicDRRaX4//g1u9wKeo+ztc2h1Rw==} dev: true + /style-mod@4.1.2: + resolution: {integrity: sha512-wnD1HyVqpJUI2+eKZ+eo1UwghftP6yuFheBqqe+bWCotBjC2K1YnteJILRMs3SM4V/0dLEW1SC27MWP5y+mwmw==} + dev: true + /style-search@0.1.0: resolution: {integrity: sha512-Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==} dev: true diff --git a/shell/share.sh b/shell/share.sh index b1850e6a..8de4ca16 100755 --- a/shell/share.sh +++ b/shell/share.sh @@ -453,7 +453,7 @@ run_task_before() { if [[ ${task_before:=} ]]; then echo -e "执行前置命令\n" - eval "${task_before%;}" "$@" + eval "${task_before%;}" echo -e "\n执行前置命令结束\n" fi } @@ -463,7 +463,7 @@ run_task_after() { if [[ ${task_after:=} ]]; then echo -e "\n执行后置命令\n" - eval "${task_after%;}" "$@" + eval "${task_after%;}" echo -e "\n执行后置命令结束" fi } diff --git a/src/pages/setting/systemLog.tsx b/src/pages/setting/systemLog.tsx index 5db2b7d3..2e710d83 100644 --- a/src/pages/setting/systemLog.tsx +++ b/src/pages/setting/systemLog.tsx @@ -1,3 +1,4 @@ +import intl from 'react-intl-universal'; import React, { useRef, useState } from 'react'; import CodeMirror from '@uiw/react-codemirror'; import { Button, DatePicker, Empty, message, Spin } from 'antd'; @@ -9,6 +10,13 @@ import { request } from '@/utils/http'; import config from '@/utils/config'; import { useRequest } from 'ahooks'; import moment from 'moment'; +import { + systemLogDebugHighlightPlugin, + systemLogErrorHighlightPlugin, + systemLogInfoHighlightPlugin, + systemLogTheme, + systemLogWarnHighlightPlugin, +} from '@/utils/codemirror/systemLog'; const { RangePicker } = DatePicker; @@ -83,7 +91,7 @@ const SystemLog = ({ height, theme }: any) => { deleteLog(); }} > - 清空日志 + {intl.get('清空日志')} {systemLogData ? ( @@ -94,6 +102,13 @@ const SystemLog = ({ height, theme }: any) => { onCreateEditor={(view) => { editorRef.current = view; }} + extensions={[ + systemLogDebugHighlightPlugin, + systemLogErrorHighlightPlugin, + systemLogInfoHighlightPlugin, + systemLogWarnHighlightPlugin, + systemLogTheme, + ]} readOnly={true} theme={theme.includes('dark') ? 'dark' : 'light'} /> diff --git a/src/utils/codemirror/systemLog.ts b/src/utils/codemirror/systemLog.ts new file mode 100644 index 00000000..4d4af67e --- /dev/null +++ b/src/utils/codemirror/systemLog.ts @@ -0,0 +1,174 @@ +import { + Decoration, + EditorView, + ViewPlugin, + ViewUpdate, +} from '@codemirror/view'; +import { RangeSet, RangeSetBuilder } from '@codemirror/state'; + +const infoWord = /\[\ue6f5info\]/g; +const debugWord = /\[\ue67fdebug\]/g; +const warnWord = /\[\ue880warn\]/g; +const errorWord = /\[\ue602error\]/g; + +const customWordClassMap = { + info: 'system-log-info', + warn: 'system-warn-info', + error: 'system-error-info', + debug: 'system-debug-info', +}; + +export const systemLogInfoHighlightPlugin = ViewPlugin.fromClass( + class { + decorations: RangeSet; + + constructor(view: EditorView) { + this.decorations = this.getDecorations(view); + } + + update(update: ViewUpdate) { + if (update.docChanged) { + this.decorations = this.getDecorations(update.view); + } + } + + getDecorations(view: EditorView) { + const builder = new RangeSetBuilder(); + const doc = view.state.doc.toString(); + let match; + + while ((match = infoWord.exec(doc)) !== null) { + const deco = Decoration.mark({ + class: customWordClassMap.info, + }); + + builder.add(match.index, match.index + match[0].length, deco); + } + + return builder.finish(); + } + }, + { + decorations: (v) => v.decorations, + }, +); + +export const systemLogWarnHighlightPlugin = ViewPlugin.fromClass( + class { + decorations: RangeSet; + + constructor(view: EditorView) { + this.decorations = this.getDecorations(view); + } + + update(update: ViewUpdate) { + if (update.docChanged) { + this.decorations = this.getDecorations(update.view); + } + } + + getDecorations(view: EditorView) { + const builder = new RangeSetBuilder(); + const doc = view.state.doc.toString(); + let match; + + while ((match = warnWord.exec(doc)) !== null) { + const deco = Decoration.mark({ + class: customWordClassMap.warn, + }); + + builder.add(match.index, match.index + match[0].length, deco); + } + + return builder.finish(); + } + }, + { + decorations: (v) => v.decorations, + }, +); + +export const systemLogDebugHighlightPlugin = ViewPlugin.fromClass( + class { + decorations: RangeSet; + + constructor(view: EditorView) { + this.decorations = this.getDecorations(view); + } + + update(update: ViewUpdate) { + if (update.docChanged) { + this.decorations = this.getDecorations(update.view); + } + } + + getDecorations(view: EditorView) { + const builder = new RangeSetBuilder(); + const doc = view.state.doc.toString(); + let match; + + while ((match = debugWord.exec(doc)) !== null) { + const deco = Decoration.mark({ + class: customWordClassMap.debug, + }); + + builder.add(match.index, match.index + match[0].length, deco); + } + + return builder.finish(); + } + }, + { + decorations: (v) => v.decorations, + }, +); + +export const systemLogErrorHighlightPlugin = ViewPlugin.fromClass( + class { + decorations: RangeSet; + + constructor(view: EditorView) { + this.decorations = this.getDecorations(view); + } + + update(update: ViewUpdate) { + if (update.docChanged) { + this.decorations = this.getDecorations(update.view); + } + } + + getDecorations(view: EditorView) { + const builder = new RangeSetBuilder(); + const doc = view.state.doc.toString(); + let match; + + while ((match = errorWord.exec(doc)) !== null) { + const deco = Decoration.mark({ + class: customWordClassMap.error, + }); + + builder.add(match.index, match.index + match[0].length, deco); + } + + return builder.finish(); + } + }, + { + decorations: (v) => v.decorations, + }, +); + +export const systemLogTheme = EditorView.baseTheme({ + '.system-log-info': { + color: '#2196F3', + }, + '.system-warn-info': { + color: '#FFB827', + }, + '.system-error-info': { + color: '#FA5151', + }, + '.system-debug-info': { + color: '#009A29', + }, +});