From dd573238894b692e0b0a4b903c231c310b8d3a39 Mon Sep 17 00:00:00 2001 From: GogoVega <92022724+GogoVega@users.noreply.github.com> Date: Fri, 19 Jan 2024 10:00:32 +0100 Subject: [PATCH 1/7] Do not translate the list of available languages --- .../@node-red/editor-client/locales/de/editor.json | 11 ----------- .../editor-client/locales/en-US/editor.json | 14 +++++++------- .../@node-red/editor-client/locales/fr/editor.json | 11 ----------- .../@node-red/editor-client/locales/ja/editor.json | 11 ----------- .../editor-client/locales/pt-BR/editor.json | 10 ---------- .../@node-red/editor-client/locales/ru/editor.json | 11 ----------- .../editor-client/locales/zh-CN/editor.json | 11 ----------- .../editor-client/locales/zh-TW/editor.json | 11 ----------- 8 files changed, 7 insertions(+), 83 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/locales/de/editor.json b/packages/node_modules/@node-red/editor-client/locales/de/editor.json index bb811eae4..1ac2958ae 100644 --- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json @@ -1171,17 +1171,6 @@ "diagnostics": { "title": "System-Informationen" }, - "languages": { - "de": "Deutsch", - "en-US": "Englisch", - "fr": "Französisch", - "ja": "Japanisch", - "ko": "Koreanisch", - "pt-BR":"Portugiesisch", - "ru": "Russisch", - "zh-CN": "Chinesisch (Vereinfacht)", - "zh-TW": "Chinesisch (Traditionell)" - }, "validator": { "errors": { "invalid-json": "Ungültige JSON-Daten: __error__", diff --git a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json index 50798390d..b4a858896 100644 --- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json @@ -1206,15 +1206,15 @@ "title": "System Info" }, "languages": { - "de": "German", + "de": "Deutsch", "en-US": "English", - "fr": "French", - "ja": "Japanese", + "fr": "Français", + "ja": "日本語", "ko": "Korean", - "pt-BR":"Portuguese", - "ru": "Russian", - "zh-CN": "Chinese(Simplified)", - "zh-TW": "Chinese(Traditional)" + "pt-BR": "Português (Brasil)", + "ru": "Русский", + "zh-CN": "简体中文", + "zh-TW": "繁體中文" }, "validator": { "errors": { diff --git a/packages/node_modules/@node-red/editor-client/locales/fr/editor.json b/packages/node_modules/@node-red/editor-client/locales/fr/editor.json index 3503c883f..3c90fc67c 100644 --- a/packages/node_modules/@node-red/editor-client/locales/fr/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/fr/editor.json @@ -1200,17 +1200,6 @@ "diagnostics": { "title": "Information système" }, - "languages": { - "de": "Allemand", - "en-US": "Anglais", - "fr": "Français", - "ja": "Japonais", - "ko": "Coréen", - "pt-BR": "Portugais brésilien", - "ru": "Russe", - "zh-CN": "Chinois (Simplifié)", - "zh-TW": "Chinois (Traditionnel)" - }, "validator": { "errors": { "invalid-json": "Données JSON invalides : __error__", diff --git a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json index dfb3c2a04..5d988c68a 100644 --- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json @@ -1205,17 +1205,6 @@ "diagnostics": { "title": "システム情報" }, - "languages": { - "de": "ドイツ語", - "en-US": "英語", - "fr": "フランス語", - "ja": "日本語", - "ko": "韓国語", - "pt-BR": "ポルトガル語", - "ru": "ロシア語", - "zh-CN": "中国語(簡体)", - "zh-TW": "中国語(繁体)" - }, "validator": { "errors": { "invalid-json": "JSONデータが不正: __error__", diff --git a/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json b/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json index 8b5367f29..fe7ca27ba 100644 --- a/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json @@ -1172,16 +1172,6 @@ "diagnostics": { "title": "informações do Sistema" }, - "languages": { - "de": "Alemão", - "en-US": "Inglês", - "ja": "Japonês", - "ko": "Coreano", - "pt-BR": "Português(Brasil)", - "ru": "Russo", - "zh-CN": "Chinês(Simplificado)", - "zh-TW": "Chinês(Tradicional)" - }, "validator": { "errors": { "invalid-json": "Dados JSON inválidos: __error__", diff --git a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json index 69562f806..326fbe55f 100644 --- a/packages/node_modules/@node-red/editor-client/locales/ru/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/ru/editor.json @@ -1128,16 +1128,5 @@ "appearance": "Внешний вид", "preview": "Предпросмотр редактора", "defaultValue": "Значение по умолчанию" - }, - "languages" : { - "de": "Немецкий", - "en-US": "Английский", - "fr": "Французский", - "ja": "Японский", - "ko": "Корейский", - "pt-BR":"португальский", - "ru": "Русский", - "zh-CN": "Китайский (упрощенный)", - "zh-TW": "Китайский (традиционный)" } } diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json index 51efee65e..15d126e75 100644 --- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json @@ -1203,17 +1203,6 @@ "diagnostics": { "title": "系统信息" }, - "languages": { - "de": "德语", - "en-US": "英文", - "fr": "法语", - "ja": "日语", - "ko": "韩文", - "pt-BR":"葡萄牙语", - "ru":"俄語", - "zh-CN": "简体中文", - "zh-TW": "繁体中文" - }, "validator": { "errors": { "invalid-json": "无效的 JSON 数据： __error__", diff --git a/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json b/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json index 485ce3c2f..808f83c19 100644 --- a/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/zh-TW/editor.json @@ -1203,17 +1203,6 @@ "diagnostics": { "title": "系统信息" }, - "languages": { - "de": "德語", - "en-US": "英語", - "fr": "法語", - "ja": "日語", - "ko": "韓語", - "pt-BR":"葡萄牙语", - "ru":"俄語", - "zh-CN": "簡體中文", - "zh-TW": "繁體中文" - }, "validator": { "errors": { "invalid-json": "無效的 JSON 數據： __error__", From d2dc1fcc80260e3efc84842951d0ebac943f75e5 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 22 Jan 2024 16:28:22 +0000 Subject: [PATCH 2/7] Ensure subflow instance node has g property set --- packages/node_modules/@node-red/runtime/lib/flows/Subflow.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js b/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js index 031e75c36..62948d203 100644 --- a/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js +++ b/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js @@ -212,6 +212,7 @@ class Subflow extends Flow { var subflowInstanceConfig = { id: this.subflowInstance.id, type: this.subflowInstance.type, + g: this.subflowInstance.g, z: this.subflowInstance.z, name: this.subflowInstance.name, wires: [], From c24f05c2cd0df436d538ee4f9e34f5683a1a0c35 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Mon, 22 Jan 2024 16:54:51 +0000 Subject: [PATCH 3/7] Handle undefined default export when importing module Fixes #4536 --- .../node_modules/@node-red/nodes/core/function/10-function.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.js b/packages/node_modules/@node-red/nodes/core/function/10-function.js index 7f2250008..a915a1623 100644 --- a/packages/node_modules/@node-red/nodes/core/function/10-function.js +++ b/packages/node_modules/@node-red/nodes/core/function/10-function.js @@ -315,7 +315,7 @@ module.exports = function(RED) { var spec = module.module; if (spec && (spec !== "")) { moduleLoadPromises.push(RED.import(module.module).then(lib => { - sandbox[vname] = lib.default; + sandbox[vname] = lib.default || lib; }).catch(err => { node.error(RED._("function.error.moduleLoadError",{module:module.spec, error:err.toString()})) throw err; From 14811b5aec73f71c7e112c8e7b72f75e451c9f19 Mon Sep 17 00:00:00 2001 From: GogoVega <92022724+GogoVega@users.noreply.github.com> Date: Thu, 25 Jan 2024 15:35:40 +0100 Subject: [PATCH 4/7] Do not create the credentials object if not exported --- packages/node_modules/@node-red/editor-client/src/js/nodes.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js index bf1faf0a4..f7c91e2dd 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js +++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js @@ -1228,7 +1228,6 @@ RED.nodes = (function() { } } } else if (n.credentials) { - node.credentials = {}; // All other nodes have a well-defined list of possible credentials for (var cred in n._def.credentials) { if (n._def.credentials.hasOwnProperty(cred)) { From f7b726372fb6fac47c8f555a29c07a83628e1029 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 25 Jan 2024 17:26:52 +0000 Subject: [PATCH 5/7] Handle importing flow with existing subflow and instance node Fixes #4545 --- packages/node_modules/@node-red/editor-client/src/js/nodes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js index bf1faf0a4..9059c427e 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js +++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js @@ -2217,7 +2217,7 @@ RED.nodes = (function() { set: registry.getNodeSet("node-red/unknown") } } else { - if (createNewIds || options.importMap[n.id] === "copy") { + if (subflow_denylist[parentId] || createNewIds || options.importMap[n.id] === "copy") { parentId = subflow.id; node.type = "subflow:"+parentId; node._def = registry.getNodeType(node.type); From 861c89a0cc219915caba7371534dda9ef09c00cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20M=C3=BClller=20=28Guido=20Mueller=29?= Date: Tue, 30 Jan 2024 10:35:54 +0100 Subject: [PATCH 6/7] Update editor.json fix typo in German translation --- .../node_modules/@node-red/editor-client/locales/de/editor.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/locales/de/editor.json b/packages/node_modules/@node-red/editor-client/locales/de/editor.json index bb811eae4..937688681 100644 --- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json @@ -1075,7 +1075,7 @@ "git-auth-error": "Git-Authentifizierungsfehler" }, "create-success": { - "success": "Sie haben Ihr erstes Projekt erfolgreich erstduellt!", + "success": "Sie haben Ihr erstes Projekt erfolgreich erstellt!", "desc0": "Sie können jetzt Node-RED wie bisher verwenden.", "desc1": "Im Tab 'Info' in der Seitenleiste wird angezeigt, welches das aktuelle Projekt ist. Über die Schaltfläche rechts neben dem Projektnamen gelangt man zu 'Projekteinstellungen'.", "desc2": "Im Tab 'Commit-Historie' in der Seitenleiste werden alle Dateien angezeigt, die sich in Ihrem Projekt geändert haben, und um sie ins lokale Repository zu übertragen (commit). Es zeigt Ihnen eine vollständige Historie Ihrer Commits an und ermöglicht es Ihnen, Ihre Commits in ein (remote) Server-Repository zu schieben (push)." From b54e9d8d559768bdf07ec148380f0ecbb9035d41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 1 Feb 2024 07:29:17 +0000 Subject: [PATCH 7/7] Bump the github-actions group with 1 update Bumps the github-actions group with 1 update: [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request). Updates `peter-evans/create-pull-request` from 5 to 6 - [Release notes](https://github.com/peter-evans/create-pull-request/releases) - [Commits](https://github.com/peter-evans/create-pull-request/compare/v5...v6) --- updated-dependencies: - dependency-name: peter-evans/create-pull-request dependency-type: direct:production update-type: version-update:semver-major dependency-group: github-actions ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5c34dee54..84140e311 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,7 @@ jobs: node-version: '16' - run: node ./node-red/.github/scripts/update-node-red-docker.js - name: Create Docker Pull Request - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.NR_REPO_TOKEN }} committer: GitHub @@ -48,7 +48,7 @@ jobs: This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary - run: node ./node-red/.github/scripts/update-node-red-website.js - name: Create Website Pull Request - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v6 with: token: ${{ secrets.NR_REPO_TOKEN }} committer: GitHub