From 3bcfef95f6c9e08b4429fd6b3fb9a67d7075b1aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Mon, 8 Apr 2024 16:31:52 +0200 Subject: [PATCH] fix(editor): Expand range of allowed characters in expressions (#9083) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ --- packages/editor-ui/package.json | 2 +- .../codemirror/resolvableHighlighter.ts | 5 ----- pnpm-lock.yaml | 19 +++++++------------ 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json index 6aaf9ef007471..b7fd022f3b8d0 100644 --- a/packages/editor-ui/package.json +++ b/packages/editor-ui/package.json @@ -50,7 +50,7 @@ "axios": "1.6.7", "chart.js": "^4.4.0", "codemirror-lang-html-n8n": "^1.0.0", - "codemirror-lang-n8n-expression": "^0.2.0", + "codemirror-lang-n8n-expression": "^0.3.0", "dateformat": "^3.0.3", "email-providers": "^2.0.1", "esprima-next": "5.8.4", diff --git a/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts b/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts index 4ad38305bcb00..6bbe3dcf4233a 100644 --- a/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts +++ b/packages/editor-ui/src/plugins/codemirror/resolvableHighlighter.ts @@ -15,7 +15,6 @@ const cssClasses = { validResolvable: 'cm-valid-resolvable', invalidResolvable: 'cm-invalid-resolvable', pendingResolvable: 'cm-pending-resolvable', - brokenResolvable: 'cm-broken-resolvable', plaintext: 'cm-plaintext', }; @@ -129,10 +128,6 @@ const resolvableStyle = syntaxHighlighting( tag: tags.content, class: cssClasses.plaintext, }, - { - tag: tags.className, - class: cssClasses.brokenResolvable, - }, /** * CSS classes for valid and invalid resolvables * dynamically applied based on state fields diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index a7abbcb9eee3d..81793966a6941 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1069,8 +1069,8 @@ importers: specifier: ^1.0.0 version: 1.0.0 codemirror-lang-n8n-expression: - specifier: ^0.2.0 - version: 0.2.0(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0) + specifier: ^0.3.0 + version: 0.3.0(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0) dateformat: specifier: ^3.0.3 version: 3.0.3 @@ -8985,7 +8985,7 @@ packages: ts-dedent: 2.2.0 type-fest: 2.19.0 vue: 3.4.21(typescript@5.4.2) - vue-component-type-helpers: 2.0.7 + vue-component-type-helpers: 2.0.11 transitivePeerDependencies: - encoding - supports-color @@ -12510,8 +12510,8 @@ packages: '@lezer/lr': 1.2.3 dev: false - /codemirror-lang-n8n-expression@0.2.0(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0): - resolution: {integrity: sha512-kdlpzevdCpWcpbNcwES9YZy+rDFwWOdO6Z78SWxT6jMhCPmdHQmO+gJ39aXAXlUI7OGLfOBtg1/ONxPjRpEIYQ==} + /codemirror-lang-n8n-expression@0.3.0(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0): + resolution: {integrity: sha512-lY3qD+FB0/JCotK9hV40YhE+jC98iyC8L667pnguq7gxgIU3Kgy2RHy+PAxz/GpLR7BYtUMyVumZU7dJnjiXbw==} dependencies: '@codemirror/autocomplete': 6.11.1(@codemirror/language@6.9.3)(@codemirror/state@6.3.3)(@codemirror/view@6.22.3)(@lezer/common@1.1.0) '@codemirror/language': 6.9.3 @@ -12804,11 +12804,6 @@ packages: dependencies: safe-buffer: 5.2.1 - /content-type@1.0.4: - resolution: {integrity: sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==} - engines: {node: '>= 0.6'} - dev: false - /content-type@1.0.5: resolution: {integrity: sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==} engines: {node: '>= 0.6'} @@ -25663,8 +25658,8 @@ packages: resolution: {integrity: sha512-0vOfAtI67UjeO1G6UiX5Kd76CqaQ67wrRZiOe7UAb9Jm6GzlUr/fC7CV90XfwapJRjpCMaZFhv1V0ajWRmE9Dg==} dev: true - /vue-component-type-helpers@2.0.7: - resolution: {integrity: sha512-7e12Evdll7JcTIocojgnCgwocX4WzIYStGClBQ+QuWPinZo/vQolv2EMq4a3lg16TKfwWafLimG77bxb56UauA==} + /vue-component-type-helpers@2.0.11: + resolution: {integrity: sha512-8aluKz5oVC8PvVQAYgyIefOlqzKVmAOTCx2imbrFBVLbF7mnJvyMsE2A7rqX/4f4uT6ee9o8u3GcoRpUWc0xsw==} dev: true /vue-demi@0.14.5(vue@3.4.21):