Fix importing connected link nodes into a subflow

Fixes #4055

.github/workflows/release.yml

@@ -5,6 +5,9 @@ on:
   release:
     types: [published]
 
+permissions:
+  contents: read
+
 jobs:
   generate:
     name: 'Update node-red-docker image'

.github/workflows/tests.yml

@@ -6,8 +6,14 @@ on:
   pull_request:
     branches: [ master, dev ]
 
+permissions:
+  contents: read
+
 jobs:
   build:
+    permissions:
+      checks: write  # for coverallsapp/github-action to create new checks
+      contents: read  # for actions/checkout to fetch code
     runs-on: ubuntu-latest
     strategy:
       matrix:

CHANGELOG.md

@@ -1,3 +1,128 @@
+#### 3.1.0-beta.1: Beta Release
+
+
+Editor
+
+ - NEW: Locking Flows (#3938) @knolleary
+ - NEW: Improve UX around hiding flows via context menu (#3930) @knolleary
+ - NEW: Add support for inline image in markdown editor by drag and drop of an image file (#4006) @HiroyasuNishiyama
+ - NEW: Add support for mermaid diagram to markdown editor (#4007) @HiroyasuNishiyama
+ - NEW: Support uri fragments for nodes and groups including edit support (#3870) @knolleary
+ - NEW: Add global environment variable feature (#3941) @HiroyasuNishiyama
+
+ - Remember compact/pretty flow export user choice (#3974) @Steve-Mcl
+ - fix .red-ui-notification class (#4035) @xiaobinqt
+ - Fix border radius on Modules list header (#4038) @bonanitech
+ - fix workspace reference error in case of empty tabs (#4029) @HiroyasuNishiyama
+ - Disable delete tab menu when single tab exists (#4030) @HiroyasuNishiyama
+ - Disable hide all menu if all tabs hidden (#4031) @HiroyasuNishiyama
+ - fix hide subflow tooltip (#4033) @HiroyasuNishiyama
+ - Fix disabled menu items in project feature (#4027) @kazuhitoyokoi
+ - Let themes change radialMenu text colors (#3995) @bonanitech
+ - Add Japanese translations for v3.0.3 (#4012) @kazuhitoyokoi
+ - Add Japanese translation for v3.1.0-beta.0 (#3997) @kazuhitoyokoi
+ - Add Japanese translation for v3.1.0-beta.0 (#3916) @kazuhitoyokoi
+ - Hide subflow category after deleting subflow (#3980) @kazuhitoyokoi
+ - Prevent dbl-click opening node edit dialog with text selected (#3970) @knolleary
+ - Handle replacing unknown node inside group or subflow (#3921) @knolleary
+ - Fix #3939, red border red-ui-typedInput-container (#3949) @Steveorevo
+ - i18n item URL copy notification & add Japanese message (#3946) @HiroyasuNishiyama
+ - add Japanese message for item url copy actions (#3947) @HiroyasuNishiyama
+ - Fix autocomplete entry for responseUrl (#3884) @knolleary
+ - Fix Japanese translation for JSONata editor (#3872) @HiroyasuNishiyama
+ - Fix search type with spaces (#3841) @Steve-Mcl
+ - Fix error hanndling of JSONata expression editor for extended functions (#3871) @HiroyasuNishiyama
+ - Add button type to the adding SSH key button (#3866) @kazuhitoyokoi
+ - Check radio button as default in project dialog (#3879) @kazuhitoyokoi
+ - Add $clone as supported function (#3874) @HiroyasuNishiyama
+ - Env var jsonata (#3807) @HiroyasuNishiyama
+ - Add Japanese translation for v3.0.2 (#3852) @kazuhitoyokoi
+
+Runtime
+
+ - Force IPv4 name resolution to have priority (#4019) @dceejay
+ - Fix async loading of modules containing both nodes and plugins (#3999) @knolleary
+ - Use main branch as default in project feature (#4036) @kazuhitoyokoi
+ - Rename package var to avoid strict mode error (#4020) @knolleary
+ - Fix typos in settings.js (#4013) @ypid
+ - Ensure credentials object is removed before returning node in getFlow request (#3971) @knolleary
+ - Ignore commit error in project feature (#3987) @kazuhitoyokoi
+ - Update dependencies (#3969) @knolleary
+ - Add check that node sends object rather than primitive type (#3909) @knolleary
+ - Ensure key_path is quoted in GIT_SSH_COMMAND in case of spaces in pathname (#3912) @knolleary
+ - Fix nodesDir scan when node package has js/html in sub dir to package.json (#3867) @Steve-Mcl
+ - Fix file permissions (#3917) @kazuhitoyokoi
+ - ci: add minimum GitHub token permissions for workflows (#3907) @boahc077
+
+Nodes
+
+ - Catch: fix typo in catch.html (#3965) @we11adam
+ - Change: Fix change node overwriting msg with itself (#3899) @dceejay
+ - Comment node: Clarify where the text will appear (#4004) @dirkjanfaber
+ - CSV: change replace to replaceAll (#3990) @dceejay
+ - CSV node: check header properties for ' and " (#3920) @dceejay
+ - CSV: Fix for CSV undefined property (#3906) @dceejay
+ - Delay: let delay node handle both flush then reset (#3898) @dceejay
+ - Function: Limit number of ports in function node (#3886) @kazuhitoyokoi
+ - Function: Remove dot from variable name for external module in function node (#3880) @kazuhitoyokoi
+ - Function: add function node monaco types util and promisify (#3868) @Steve-Mcl
+ - HTTP In: Ensure msg.req.headers is enumerable (#3908) @knolleary
+ - HTTP Request: Support form-data arrays (#3991) @hardillb
+ - HTTP Request: Fix httprequest tests to be more lenient on error message (#3922) @knolleary
+ - HTTP Request: Add missing property to node object HTTPRequest (#3842) @hardillb
+ - HTTP Request/Response: Support sortable list on property UI of http request and http response nodes (#3857) @kazuhitoyokoi
+ - HTTP Response: Ensure statusCode is a number (#3894) @hardillb
+ - Inject: Allow Inject node to work with async context stores (#4021) @knolleary
+ - Join/Batch: Add count to join and batch node labels (#4028) @dceejay
+ - MQTT: Fix birth topic handling in MQTT node (#3905) @Steve-Mcl
+ - MQTT: Fix pull-down menus of MQTT configuration node (#3890) @kazuhitoyokoi
+ - MQTT: Prevent invalid mqtt birth topic crashing node-red (#3869) @Steve-Mcl
+ - MQTT: ensure sessionExpiry(Interval) is applied (#3840) @Steve-Mcl
+ - MQTT: Fix mqtt nodes not reconnecting on modified-flows deploy (#3992) @knolleary
+ - MQTT: fix single subscription mqtt node status (#3966) @Steve-Mcl
+ - Range: Add drop mode to range node (#3935) @dceejay
+ - Remove done from describe (#3873) @HiroyasuNishiyama
+ - Split node: avoid duplicate done call for buffer split (#4000) @knolleary
+ - Status: Fix typo in 25-status.html (#3981) @kazuhitoyokoi
+ - TCP Node: ensure newline substitution applies to whole message (#4009) @dceejay
+ - Template: Add information about environment variable to template node (#3882) @kazuhitoyokoi
+ - Trigger: Hide trigger node repeat send option if sending nothing (#4023) @dceejay
+ - Watch: fix watch node test on MacOS/ARM (#3942) @HiroyasuNishiyama
+
+#### 3.0.2: Maintenance Release
+
+Editor
+
+ - Fix workspace chart bottom property (#3812) @bonanitech
+ - Update german translation (#3802) @Dennis14e
+ - Support color reset to the default in subflow and group (#3801) @kazuhitoyokoi
+ - Allow generateNodeNames to handle names containing regex control chars (#3817) @knolleary
+ - Hide scrollbars until they're needed (#3808) @bonanitech
+ - Include junctions/groups when exporting subflows plus related fixes (#3816) @knolleary
+ - remove console.log (#3820) @Steve-Mcl
+
+Runtime
+
+ - Register subflow module instance node with parent flow (#3818) @knolleary
+
+Nodes
+
+ - HTTP Request: Allow HTTP Headers not in spec (#3776) @hardillb
+
+#### 3.0.1: Maintenance Release
+
+Editor
+
+ - Allow codeEditor theme to be set even if `codeEditor` is not set in settings.js (#3794) @Steve-Mcl
+ - Sys info (diagnostics report) amendments (#3793) @Steve-Mcl
+ - Allow `mode` and `title` to be omitted in `options` argument for `createEditor` (#3791) @Steve-Mcl
+ - Fix focus issues (#3789) @Steve-Mcl
+ - Ensure all typedInput buttons have button type set (#3788) @knolleary
+ - Do not flag hasUsers=false nodes as unused in search (#3787) @knolleary
+ - Properly position quick-add dialog in all cases (#3786) @knolleary
+ - Ensure quick-add dialog does not obscure ghost node when shifted (#3785) @knolleary
+ - Remove use of Object.hasOwn (#3784) @knolleary
+
 #### 3.0.0: Milestone Release
 
 Editor

Gruntfile.js

@@ -151,6 +151,7 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/font-awesome.js",
                     "packages/node_modules/@node-red/editor-client/src/js/history.js",
                     "packages/node_modules/@node-red/editor-client/src/js/validators.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/mermaid.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/utils.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/common/treeList.js",
@@ -169,6 +170,7 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/src/js/ui/diagnostics.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/diff.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/keyboard.js",
+                    "packages/node_modules/@node-red/editor-client/src/js/ui/env-var.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/statusBar.js",
                     "packages/node_modules/@node-red/editor-client/src/js/ui/view.js",
@@ -224,7 +226,7 @@ module.exports = function(grunt) {
                         "node_modules/jsonata/jsonata-es5.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/ace/ace.js",
-                        "packages/node_modules/@node-red/editor-client/src/vendor/ace/ext-language_tools.js",
+                        "packages/node_modules/@node-red/editor-client/src/vendor/ace/ext-language_tools.js"
                     ],
                     // "packages/node_modules/@node-red/editor-client/public/vendor/vendor.css": [
                     //     // TODO: resolve relative resource paths in
@@ -233,6 +235,9 @@ module.exports = function(grunt) {
                     "packages/node_modules/@node-red/editor-client/public/vendor/ace/worker-jsonata.js": [
                         "node_modules/jsonata/jsonata-es5.min.js",
                         "packages/node_modules/@node-red/editor-client/src/vendor/jsonata/worker-jsonata.js"
+                    ],
+                    "packages/node_modules/@node-red/editor-client/public/vendor/mermaid/mermaid.min.js": [
+                        "node_modules/mermaid/dist/mermaid.min.js"
                     ]
                 }
             }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "3.1.0-beta.0",
+    "version": "3.1.0-beta.1",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -26,13 +26,13 @@
         }
     ],
     "dependencies": {
-        "acorn": "8.7.1",
+        "acorn": "8.8.1",
         "acorn-walk": "8.2.0",
-        "ajv": "8.11.0",
-        "async-mutex": "0.3.2",
+        "ajv": "8.11.2",
+        "async-mutex": "0.4.0",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.20.0",
+        "body-parser": "1.20.1",
         "cheerio": "1.0.0-rc.10",
         "clone": "2.1.2",
         "content-type": "1.0.4",
@@ -40,16 +40,16 @@
         "cookie-parser": "1.4.6",
         "cors": "2.8.5",
         "cronosjs": "1.7.1",
-        "denque": "2.0.1",
-        "express": "4.18.1",
+        "denque": "2.1.0",
+        "express": "4.18.2",
         "express-session": "1.17.3",
         "form-data": "4.0.0",
         "fs-extra": "10.1.0",
         "got": "11.8.5",
         "hash-sum": "2.0.0",
-        "hpagent": "1.0.0",
+        "hpagent": "1.2.0",
         "https-proxy-agent": "5.0.1",
-        "i18next": "21.8.14",
+        "i18next": "21.10.0",
         "iconv-lite": "0.6.3",
         "is-utf8": "0.2.1",
         "js-yaml": "4.1.0",
@@ -60,7 +60,7 @@
         "memorystore": "1.6.7",
         "mime": "3.0.0",
         "moment": "2.29.4",
-        "moment-timezone": "0.5.34",
+        "moment-timezone": "0.5.39",
         "mqtt": "4.3.7",
         "multer": "1.4.5-lts.1",
         "mustache": "4.2.0",
@@ -73,19 +73,19 @@
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
         "raw-body": "2.5.1",
-        "semver": "7.3.7",
-        "tar": "6.1.11",
-        "tough-cookie": "4.0.0",
-        "uglify-js": "3.16.2",
+        "semver": "7.3.8",
+        "tar": "6.1.12",
+        "tough-cookie": "4.1.2",
+        "uglify-js": "3.17.4",
         "uuid": "8.3.2",
         "ws": "7.5.6",
         "xml2js": "0.4.23"
     },
     "optionalDependencies": {
-        "bcrypt": "5.0.1"
+        "bcrypt": "5.1.0"
     },
     "devDependencies": {
-        "dompurify": "2.3.9",
+        "dompurify": "2.4.1",
         "grunt": "1.5.3",
         "grunt-chmod": "~1.1.1",
         "grunt-cli": "~1.4.3",
@@ -108,13 +108,14 @@
         "i18next-http-backend": "1.4.1",
         "jquery-i18next": "1.2.1",
         "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
-        "marked": "4.0.18",
+        "marked": "4.2.3",
+        "mermaid": "^9.3.0",
         "minami": "1.2.3",
         "mocha": "9.2.2",
         "node-red-node-test-helper": "^0.3.0",
-        "nodemon": "2.0.19",
+        "nodemon": "2.0.20",
         "proxy": "^1.0.2",
-        "sass": "1.53.0",
+        "sass": "1.56.1",
         "should": "13.2.3",
         "sinon": "11.1.2",
         "stoppable": "^1.1.0",

packages/node_modules/@node-red/editor-api/lib/editor/theme.js

@@ -327,9 +327,8 @@ module.exports = {
                         themeContext.header.url = themePlugin.header.url || themeContext.header.url
                     }
                 }
-                if(theme.codeEditor) {
-                    theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
-                }
+                theme.codeEditor = theme.codeEditor || {}
+                theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
             }
             activeThemeInitialised = true;
         }

packages/node_modules/@node-red/editor-api/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "3.1.0-beta.0",
+    "version": "3.1.0-beta.1",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,14 +16,14 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "3.1.0-beta.0",
-        "@node-red/editor-client": "3.1.0-beta.0",
+        "@node-red/util": "3.1.0-beta.1",
+        "@node-red/editor-client": "3.1.0-beta.1",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.20.0",
+        "body-parser": "1.20.1",
         "clone": "2.1.2",
         "cors": "2.8.5",
         "express-session": "1.17.3",
-        "express": "4.18.1",
+        "express": "4.18.2",
         "memorystore": "1.6.7",
         "mime": "3.0.0",
         "multer": "1.4.5-lts.1",
@@ -35,6 +35,6 @@
         "ws": "7.5.6"
     },
     "optionalDependencies": {
-        "bcrypt": "5.0.1"
+        "bcrypt": "5.1.0"
     }
 }

packages/node_modules/@node-red/editor-client/locales/de/editor.json

@@ -105,7 +105,7 @@
             "search": "Flows durchsuchen",
             "searchInput": "Flows durchsuchen",
             "subflows": "Subflow",
-            "createSubflow": "Subflow",
+            "createSubflow": "Hinzufügen",
             "selectionToSubflow": "Auswahl in Subflow umwandeln",
             "flows": "Flow",
             "add": "Hinzufügen",
@@ -152,7 +152,8 @@
         "zoom-in": "Vergrößern",
         "search-flows": "Flows durchsuchen",
         "search-prev": "Vorherige",
-        "search-next": "Nächste"
+        "search-next": "Nächste",
+        "search-counter": "\"__term__\" __result__ von __count__"
     },
     "user": {
         "loggedInAs": "Angemeldet als __name__",
@@ -168,7 +169,11 @@
         }
     },
     "notification": {
-        "warning": "<strong>Warnung:</strong> __message__",
+        "state": {
+            "flowsStopped": "Flows gestoppt",
+            "flowsStarted": "Flows gestartet"
+        },
+        "warning": "<strong>Warnung</strong>: __message__",
         "warnings": {
             "undeployedChanges": "Node hat nicht übernommene (deploy) Änderungen",
             "nodeActionDisabled": "Node-Aktionen deaktiviert",
@@ -177,15 +182,15 @@
             "missing-modules": "<p>Flows angehalten aufgrund fehlender Module</p>",
             "safe-mode": "<p>Flows sind im abgesicherten Modus gestoppt.</p><p>Flows können bearbeitet und übernommen (deploy) werden, um sie neu zu starten.</p>",
             "restartRequired": "Node-RED muss neu gestartet werden, damit die Module nach Upgrade aktiviert werden",
-            "credentials_load_failed": "<p>Flows gestoppt, da die Berechtigungen nicht entschlüsselt werden konnten.</p><p>Die Datei mit dem Flow-Berechtigungen ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p>",
-            "credentials_load_failed_reset": "<p>Die Berechtigungen konnten nicht entschlüsselt werden.</p><p>Die Datei mit den Flow-Berechtigungen ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p><p>Die Datei mit den Flow-Berechtigungen wird bei der nächsten Übernahme (deploy) zurückgesetzt. Alle vorhandenen Flow-Berechtigungen werden gelöscht.</p>",
+            "credentials_load_failed": "<p>Flows gestoppt, da die Credentials nicht entschlüsselt werden konnten.</p><p>Die Datei mit den Flow-Credentials ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p>",
+            "credentials_load_failed_reset": "<p>Die Credentials konnten nicht entschlüsselt werden.</p><p>Die Datei mit den Flow-Credentials ist verschlüsselt, aber der Schlüssel des Projekts fehlt oder ist ungültig.</p><p>Die Datei mit den Flow-Credentials wird bei der nächsten Übernahme (deploy) zurückgesetzt. Alle vorhandenen Flow-Credentials werden gelöscht.</p>",
             "missing_flow_file": "<p>Die Flow-Datei des Projekts wurde nicht gefunden.</p><p>Das Projekt ist nicht mit einer Flow-Datei konfiguriert.</p>",
             "missing_package_file": "<p>Die Paket-Datei des Projekts wurde nicht gefunden.</p><p>In dem Projekt fehlt die 'package.json'-Datei.</p>",
             "project_empty": "<p>Das Projekt ist leer.</p><p>Soll ein Standardsatz an Projektdateien erstellen werden?<br/>Andernfalls müssen die Dateien manuell außerhalb des Editors dem Projekt hinzugefügt werden.</p>",
             "project_not_found": "<p>Das Projekt '__project__' wurde nicht gefunden.</p>",
             "git_merge_conflict": "<p>Der automatische Merge der Änderungen ist fehlgeschlagen.</p><p>Die Merge-Konflikte müssen behoben und die Ergebnisse ins Repository übertragen werden (commit).</p>"
         },
-        "error": "<strong>Fehler:</strong> __message__",
+        "error": "<strong>Fehler</strong>: __message__",
         "errors": {
             "lostConnection": "Verbindung zum Server verloren. Verbindung wird erneut hergestellt ...",
             "lostConnectionReconnect": "Verbindung zum Server verloren. Wiederherstellung der Verbindung in __time__s.",
@@ -203,7 +208,7 @@
             "pull": "Projekt '__project__' erneut geladen",
             "revert": "Änderungen im Projekt '__project__' rückgängig gemacht",
             "merge-complete": "Git-Merge abgeschlossen",
-            "setupCredentials": "Berechtigungen einrichten",
+            "setupCredentials": "Credentials einrichten",
             "setupProjectFiles": "Projektdateien einrichten",
             "no": "Nein, Danke",
             "createDefault": "Standardprojektdateien erstellen",
@@ -211,7 +216,7 @@
         },
         "label": {
             "manage-project-dep": "Projektabhängigkeiten verwalten",
-            "setup-cred": "Berechtigungen einrichten",
+            "setup-cred": "Credentials einrichten",
             "setup-project": "Projektdateien einrichten",
             "create-default-package": "Standardpaketdatei erstellen",
             "no-thanks": "Nein, Danke",
@@ -295,6 +300,10 @@
         "modifiedFlowsDesc": "Übernimmt nur Flows, die geänderte Nodes enthalten",
         "modifiedNodes": "Geänderte Nodes",
         "modifiedNodesDesc": "Übernimmt nur Nodes, die sich geändert haben",
+        "startFlows": "Start",
+        "startFlowsDesc": "Flows starten",
+        "stopFlows": "Stop",
+        "stopFlowsDesc": "Flows stoppen",
         "restartFlows": "Flows neustarten",
         "restartFlowsDesc": "Startet die aktuell übernommenen Flows (ohne vorheriges Deploy)",
         "successfulDeploy": "Erfolgreich übernommen (deploy)",
@@ -376,7 +385,7 @@
         "confirmDelete": "Sind Sie sicher mit dem Löschen dieses Subflows?",
         "info": "Beschreibung",
         "category": "Kategorie",
-        "module": "Module",
+        "module": "Modul",
         "license": "Lizenz",
         "licenseNone": "Keine",
         "licenseOther": "Andere",
@@ -434,7 +443,7 @@
         "icon": "Icon",
         "inputType": "Eingangstyp",
         "selectType": "Wähle Typen ...",
-        "loadCredentials": "Lade Node-Berechtigungen",
+        "loadCredentials": "Lade Node-Credentials",
         "inputs": {
             "input": "Eingang",
             "select": "Auswahl",
@@ -450,7 +459,7 @@
             "json": "JSON",
             "bin": "buffer",
             "env": "Umgebungsvariable",
-            "cred": "Berechtigung"
+            "cred": "Credentials"
         },
         "menu": {
             "input": "Eingang",
@@ -470,7 +479,7 @@
         "errors": {
             "scopeChange": "Wenn Sie den Geltungsbereich (scope) ändern, wird er für Nodes in anderen Flows nicht verfügbar sein",
             "invalidProperties": "Ungültige Eigenschaften:",
-            "credentialLoadFailed": "Laden der Node-Berechtigungen fehlgeschlagen"
+            "credentialLoadFailed": "Laden der Node-Credentials fehlgeschlagen"
         }
     },
     "keyboard": {
@@ -683,7 +692,8 @@
             "showHelp": "Hilfe zeigen",
             "showInOutline": "Zeige im Editor",
             "showTopics": "Zeige Hilfethemen",
-            "noHelp": "Kein Hilfethema ausgewählt"
+            "noHelp": "Kein Hilfethema ausgewählt",
+            "changeLog": "Änderungsprotokoll"
         },
         "config": {
             "name": "Konfigurations-Node",
@@ -737,7 +747,7 @@
                 "addToProject": "Zu Projekt hinzufügen",
                 "files": "Dateien",
                 "flow": "Flow",
-                "credentials": "Berechtigungen",
+                "credentials": "Credentials",
                 "package": "Paket",
                 "packageCreate": "Datei wird erstellt beim Speichern der Änderungen",
                 "fileNotExist": "Datei existiert nicht",
@@ -750,7 +760,7 @@
                 "changeTheEncryptionKey": "Schlüssel ändern",
                 "currentKey": "Aktueller Schlüssel",
                 "newKey": "Neuer Schlüssel",
-                "credentialsAlert": "Dadurch werden alle vorhandenen Berechtigungen gelöscht",
+                "credentialsAlert": "Dadurch werden alle vorhandenen Credentials gelöscht",
                 "versionControl": "Versionsverwaltung (Git)",
                 "branches": "Branches",
                 "noBranches": "Keine Branches",
@@ -886,7 +896,7 @@
             "date": "timestamp",
             "jsonata": "JSONata",
             "env": "Umgebungsvariable",
-            "cred": "Berechtigung"
+            "cred": "Credentials"
         }
     },
     "editableList": {
@@ -1026,7 +1036,7 @@
             "passphrase": "Passphrase",
             "ssh-key-desc": "Bevor Sie ein Repository über SSH lokal klonen können, müssen Sie einen SSH-Schlüssel hinzufügen, um auf diesen zugreifen zu können",
             "ssh-key-add": "SSH-Schlüssel hinzufügen",
-            "credential-key": "Schlüssel für Berechtigungen",
+            "credential-key": "Schlüssel für Credentials",
             "cant-get-ssh-key": "Fehler! Der ausgewählte SSH-Schlüsselpfad kann nicht abgerufen werden",
             "already-exists2": "bereits vorhanden",
             "git-error": "Git-Fehler",
@@ -1038,27 +1048,27 @@
             "create": "Erstellen Sie Ihre Projektdateien",
             "desc0": "Ein Projekt enthält Ihre Flow-Dateien, eine README-Datei und die 'package.json'-Datei.",
             "desc1": "Es kann alle anderen Dateien enthalten, die im Git-Repository verwaltet werden sollen.",
-            "desc2": "Ihre vorhandenen Flow- und Berechtigungs-Dateien werden in das Projekt kopiert.",
+            "desc2": "Ihre vorhandenen Flow- und Credential-Dateien werden in das Projekt kopiert.",
             "flow-file": "Flow-Datei",
-            "credentials-file": "Datei mit Berechtigungen"
+            "credentials-file": "Datei mit Credentials"
         },
         "encryption-config": {
-            "setup": "Einrichtung der Verschlüsselung Ihrer Datei mit den Berechtigungen",
-            "desc0": "Die Datei mit den Flow-Berechtigungen kann verschlüsselt werden, um ihren Inhalt zu schützen.",
-            "desc1": "Wenn Sie diese Berechtigungen in einem öffentlichen Repository speichern möchten, müssen Sie sie mit einen geheimen Schlüsselausdruck verschlüsseln.",
-            "desc2": "Die Datei mit den Flow-Berechtigungen ist derzeit nicht verschlüsselt.",
+            "setup": "Einrichtung der Verschlüsselung Ihrer Datei mit den Credentials",
+            "desc0": "Die Datei mit den Flow-Credentials kann verschlüsselt werden, um ihren Inhalt zu schützen.",
+            "desc1": "Wenn Sie diese Credentials in einem öffentlichen Repository speichern möchten, müssen Sie sie mit einen geheimen Schlüsselausdruck verschlüsseln.",
+            "desc2": "Die Datei mit den Flow-Credentials ist derzeit nicht verschlüsselt.",
             "desc3": "D.h. ihr Inhalt (z.B. Passwörter und Zugriffs-Tokens) kann von jedem mit Zugriff auf die Datei gelesen werden.",
-            "desc4": "Wenn Sie diese Berechtigungen in einen öffentlichen Repository speichern möchten, müssen Sie diese verschlüsseln, indem Sie einen geheimen Schlüsselausdruck eingeben.",
-            "desc5": "Ihre Datei mit den Flow-Berechtigungen wird derzeit mit dem Eintrag 'credentialSecret' Ihrer Einstellungsdatei als Schlüssel verschlüsselt.",
-            "desc6": "Die Datei mit den Flow-Berechtigungen wird derzeit mit einem vom System generierten Schlüssel verschlüsselt. Sie sollten einen neuen geheimen Schlüssel für dieses Projekt vorgeben.",
+            "desc4": "Wenn Sie diese Credentials in einen öffentlichen Repository speichern möchten, müssen Sie diese verschlüsseln, indem Sie einen geheimen Schlüsselausdruck eingeben.",
+            "desc5": "Ihre Datei mit den Flow-Credentials wird derzeit mit dem Eintrag 'credentialSecret' Ihrer Einstellungsdatei als Schlüssel verschlüsselt.",
+            "desc6": "Die Datei mit den Flow-Credentials wird derzeit mit einem vom System generierten Schlüssel verschlüsselt. Sie sollten einen neuen geheimen Schlüssel für dieses Projekt vorgeben.",
             "desc7": "Der Schlüssel wird separat von den Projektdateien gespeichert. Sie müssen den Schlüssel angeben, damit dieses Projekt auch in einem anderen Node-RED-System verwendet werden kann.",
-            "credentials": "Berechtigung",
+            "credentials": "Credentials",
             "enable": "Verschlüsselung aktivieren",
             "disable": "Verschlüsselung deaktivieren",
             "disabled": "deaktiviert",
             "copy": "Vorhandenen Schlüssel ersetzen",
             "use-custom": "Eigenen Schlüssel verwenden",
-            "desc8": "Die Datei mit den Berechtigungen wird nicht verschlüsselt, und ihr Inhalt kann leicht gelesen werden",
+            "desc8": "Die Datei mit den Credentials wird nicht verschlüsselt und ihr Inhalt kann leicht gelesen werden",
             "create-project-files": "Projektdateien erstellen",
             "create-project": "Projekt erstellen",
             "already-exists": "bereits vorhanden",
@@ -1083,12 +1093,12 @@
             "desc": "Beschreibung",
             "opt": "Optional",
             "flow-file": "Flow-Datei",
-            "credentials": "Berechtigungen",
+            "credentials": "Credentials",
             "enable-encryption": "Verschlüsselung aktivieren",
             "disable-encryption": "Verschlüsselung deaktivieren",
             "encryption-key": "Schlüssel",
-            "desc0": "Eine Floskel, mit der Sie Ihre Berechtigungen schützen",
-            "desc1": "Die Datei mit den Berechtigungen wird nicht verschlüsselt, und ihr Inhalt kann leicht gelesen werden",
+            "desc0": "Eine Ausdruck, mit der Sie Ihre Credentials schützen",
+            "desc1": "Die Datei mit den Credentials wird nicht verschlüsselt und ihr Inhalt kann leicht gelesen werden",
             "git-url": "Git-Repository-URL",
             "protocols": "https://, ssh:// oder file://",
             "auth-failed": "Authentifizierung fehlgeschlagen",
@@ -1098,7 +1108,7 @@
             "passphrase": "Passphrase",
             "desc2": "Bevor Sie ein Repository über SSH klonen können, müssen Sie einen SSH-Schlüssel hinzufügen, um auf diesen zu zugreifen",
             "add-ssh-key": "Einen SSH-Schlüssel hinzufügen",
-            "credentials-encryption-key": "Schlüssel für Berechtigungen",
+            "credentials-encryption-key": "Schlüssel für Credentials",
             "already-exists-2": "bereits vorhanden",
             "git-error": "Git-Fehler",
             "con-failed": "Verbindung fehlgeschlagen",
@@ -1156,7 +1166,8 @@
     "tourGuide": {
         "takeATour": "Tour starten",
         "start": "Start",
-        "next": "Nächste"
+        "next": "Nächste",
+        "welcomeTours": "Welcome Tours"
     },
     "diagnostics": {
         "title": "System-Informationen"

packages/node_modules/@node-red/editor-client/locales/en-US/editor.json

@@ -23,7 +23,11 @@
             "position": "Position",
             "enable": "Enable",
             "disable": "Disable",
-            "upload": "Upload"
+            "upload": "Upload",
+            "lock": "Lock",
+            "unlock": "Unlock",
+            "locked": "Locked",
+            "unlocked": "Unlocked"
         },
         "type": {
             "string": "string",
@@ -53,8 +57,10 @@
         "confirmDelete": "Confirm delete",
         "delete": "Are you sure you want to delete '__label__'?",
         "dropFlowHere": "Drop the flow here",
+        "dropImageHere": "Drop the image here",
         "addFlow": "Add flow",
         "addFlowToRight": "Add flow to the right",
+        "closeFlow": "Close flow",
         "hideFlow": "Hide flow",
         "hideOtherFlows": "Hide other flows",
         "showAllFlows": "Show all flows (__count__ hidden)",
@@ -107,6 +113,7 @@
             "displayStatus": "Show node status",
             "displayConfig": "Configuration nodes",
             "import": "Import",
+            "importExample": "Import Example Flow",
             "export": "Export",
             "search": "Search flows",
             "searchInput": "search your flows",
@@ -503,6 +510,7 @@
         "addRemoveNode": "Add/remove node from selection",
         "editSelected": "Edit selected node",
         "deleteSelected": "Delete selected nodes or link",
+        "deleteReconnect": "Delete and Reconnect",
         "importNode": "Import nodes",
         "exportNode": "Export nodes",
         "nudgeNode": "Move selected nodes (1px)",
@@ -691,7 +699,9 @@
             "triggerAction": "Trigger action",
             "find": "Find in workspace",
             "copyItemUrl": "Copy item url",
-	    "copyURL2Clipboard": "Copied url to clipboard"
+	    "copyURL2Clipboard": "Copied url to clipboard",
+            "showFlow": "Show",
+            "hideFlow": "Hide"
         },
         "help": {
             "name": "Help",
@@ -944,6 +954,9 @@
             "invalid-expr": "Invalid JSONata expression:\n  __message__",
             "invalid-msg": "Invalid example JSON message:\n  __message__",
             "context-unsupported": "Cannot test context functions\n $flowContext or $globalContext",
+            "env-unsupported": "Cannot test $env function",
+            "moment-unsupported": "Cannot test $moment function",
+            "clone-unsupported": "Cannot test $clone function",
             "eval": "Error evaluating expression:\n  __message__"
         }
     },
@@ -989,7 +1002,10 @@
         "quote": "Quote",
         "link": "Link",
         "horizontal-rule": "Horizontal rule",
-        "toggle-preview": "Toggle preview"
+        "toggle-preview": "Toggle preview",
+        "mermaid": {
+            "summary": "Mermaid Diagram"
+        }
     },
     "bufferEditor": {
         "title": "Buffer editor",
@@ -1211,5 +1227,10 @@
         "node": "Node",
         "junction": "Junction",
         "linkNodes": "Link Nodes"
+    },
+    "env-var": {
+        "environment": "Environment",
+        "header": "Global Environment Variables",
+        "revert": "Revert"
     }
 }

packages/node_modules/@node-red/editor-client/locales/ja/editor.json

@@ -23,7 +23,11 @@
             "position": "配置",
             "enable": "有効",
             "disable": "無効",
-            "upload": "アップロード"
+            "upload": "アップロード",
+            "lock": "固定",
+            "unlock": "固定を解除",
+            "locked": "固定済み",
+            "unlocked": "固定なし"
         },
         "type": {
             "string": "文字列",
@@ -53,8 +57,10 @@
         "confirmDelete": "削除の確認",
         "delete": "本当に '__label__' を削除しますか？",
         "dropFlowHere": "ここにフローをドロップしてください",
+        "dropImageHere": "ここに画像ファイルをドロップしてください",
         "addFlow": "フローの追加",
         "addFlowToRight": "右側にフローを追加",
+        "closeFlow": "フローを閉じる",
         "hideFlow": "フローを非表示",
         "hideOtherFlows": "他のフローを非表示",
         "showAllFlows": "全てのフローを表示",
@@ -68,7 +74,13 @@
         "enabled": "有効",
         "disabled": "無効",
         "info": "詳細",
-        "selectNodes": "ノードをクリックして選択"
+        "selectNodes": "ノードをクリックして選択",
+        "enableFlow": "フローを有効化",
+        "disableFlow": "フローを無効化",
+        "lockFlow": "フローを固定",
+        "unlockFlow": "フローの固定を解除",
+        "moveToStart": "フローを先頭へ移動",
+        "moveToEnd": "フローを最後へ移動"
     },
     "menu": {
         "label": {
@@ -101,6 +113,7 @@
             "displayStatus": "ノードのステータスを表示",
             "displayConfig": "設定ノード",
             "import": "読み込み",
+            "importExample": "フロー例を読み込み",
             "export": "書き出し",
             "search": "ノードを検索",
             "searchInput": "ノードを検索",
@@ -497,6 +510,7 @@
         "addRemoveNode": "ノードの選択、選択解除",
         "editSelected": "選択したノードを編集",
         "deleteSelected": "選択したノードや接続を削除",
+        "deleteReconnect": "削除と再接続",
         "importNode": "フローの読み込み",
         "exportNode": "フローの書き出し",
         "nudgeNode": "選択したノードを移動(移動量小)",
@@ -684,7 +698,10 @@
             "globalConfig": "グローバル設定ノード",
             "triggerAction": "アクションを実行",
             "find": "ワークスペース内を検索",
-	    "copyURL2Clipboard": "URLをクリップボードにコピーしました"
+            "copyItemUrl": "要素のURLをコピー",
+            "copyURL2Clipboard": "URLをクリップボードにコピーしました",
+            "showFlow": "表示",
+            "hideFlow": "非表示"
         },
         "help": {
             "name": "ヘルプ",
@@ -936,8 +953,11 @@
         "errors": {
             "invalid-expr": "不正なJSONata式:\n  __message__",
             "invalid-msg": "不正なJSONメッセージ例:\n  __message__",
-            "context-unsupported": "$flowContext や $globalContextの\nコンテキスト機能をテストできません",
-            "eval": "表現評価エラー:\n  __message__"
+            "context-unsupported": "$flowContext や $globalContextの\nコンテキスト関数をテストできません",
+            "env-unsupported": "$env関数はテストできません",
+            "moment-unsupported": "$moment関数はテストできません",
+            "clone-unsupported": "$clone関数はテストできません",
+            "eval": "式評価エラー:\n  __message__"
         }
     },
     "monaco": {
@@ -982,7 +1002,10 @@
         "quote": "引用",
         "link": "リンク",
         "horizontal-rule": "区切り線",
-        "toggle-preview": "プレビュー表示切替え"
+        "toggle-preview": "プレビュー表示切替え",
+        "mermaid": {
+            "summary": "Mermaid図"
+        }
     },
     "bufferEditor": {
         "title": "バッファエディタ",
@@ -1169,8 +1192,7 @@
         "takeATour": "ツアーを開始",
         "start": "開始",
         "next": "次へ",
-        "welcomeTours": "ウェルカムツアー",
-        "tours": "ツアー"
+        "welcomeTours": "ウェルカムツアー"
     },
     "diagnostics": {
         "title": "システム情報"
@@ -1206,6 +1228,11 @@
         "junction": "分岐点",
         "linkNodes": "Linkノード"
     },
+    "env-var": {
+        "environment": "環境変数",
+        "header": "大域環境変数",
+        "revert": "破棄"
+    },
     "action-list": {
         "toggle-show-tips": "ヒント表示切替",
         "show-about": "Node-REDの説明を表示",
@@ -1290,6 +1317,7 @@
         "distribute-selection-vertically": "選択を上下に整列",
         "wire-series-of-nodes": "ノードを一続きに接続",
         "wire-node-to-multiple": "ノードを複数に接続",
+        "wire-multiple-to-node": "複数からノードへ接続",
         "split-wire-with-link-nodes": "ワイヤーをlinkノードで分割",
         "generate-node-names": "ノード名を生成",
         "show-user-settings": "ユーザ設定を表示",
@@ -1350,7 +1378,12 @@
         "show-version-control-tab": "バージョンコントロールタブを表示",
         "start-flows": "フローを開始",
         "stop-flows": "フローを停止",
-	"copy-item-url": "要素のURLをコピー",
-	"copy-item-edit-url": "要素の編集URLをコピー"
+        "copy-item-url": "要素のURLをコピー",
+        "copy-item-edit-url": "要素の編集URLをコピー",
+        "move-flow-to-start": "フローを先頭に移動",
+        "move-flow-to-end": "フローを末尾に移動",
+        "lock-flow": "フローを固定",
+        "unlock-flow": "フローの固定を解除",
+        "show-node-help": "ノードのヘルプを表示"
     }
 }

packages/node_modules/@node-red/editor-client/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "3.1.0-beta.0",
+    "version": "3.1.0-beta.1",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/@node-red/editor-client/src/js/nodes.js

@@ -902,14 +902,7 @@ RED.nodes = (function() {
             var node;
 
             if (allNodes.hasTab(id)) {
-                removedNodes = allNodes.getNodes(id).filter(n => {
-                    if (n.type === 'junction') {
-                        removedJunctions.push(n)
-                        return false
-                    } else {
-                        return true
-                    }
-                })
+                removedNodes = allNodes.getNodes(id).slice()
             }
             for (i in configNodes) {
                 if (configNodes.hasOwnProperty(i)) {
@@ -919,6 +912,7 @@ RED.nodes = (function() {
                     }
                 }
             }
+            removedJunctions = RED.nodes.junctions(id)
 
             for (i=0;i<removedNodes.length;i++) {
                 var result = removeNode(removedNodes[i].id);
@@ -1403,6 +1397,10 @@ RED.nodes = (function() {
                             exportedConfigNodes[n.id] = true;
                         }
                     });
+
+                    subflowSet = subflowSet.concat(RED.nodes.junctions(subflowId))
+                    subflowSet = subflowSet.concat(RED.nodes.groups(subflowId))
+
                     var exportableSubflow = createExportableNodeSet(subflowSet, exportedIds, exportedSubflows, exportedConfigNodes);
                     nns = exportableSubflow.concat(nns);
                 }
@@ -2004,7 +2002,7 @@ RED.nodes = (function() {
                         }
                     }
                 } else {
-                    const keepNodesCurrentZ = reimport && n.z && RED.workspaces.contains(n.z)
+                    const keepNodesCurrentZ = reimport && n.z && (RED.workspaces.contains(n.z) || RED.nodes.subflow(n.z))
                     if (!keepNodesCurrentZ && n.z && !workspace_map[n.z] && !subflow_map[n.z]) {
                         n.z = activeWorkspace;
                     }
@@ -2106,7 +2104,7 @@ RED.nodes = (function() {
                         node.id = getID();
                     } else {
                         node.id = n.id;
-                        const keepNodesCurrentZ = reimport && node.z && RED.workspaces.contains(node.z)
+                        const keepNodesCurrentZ = reimport && node.z && (RED.workspaces.contains(node.z) || RED.nodes.subflow(node.z))
                         if (!keepNodesCurrentZ && (node.z == null || (!workspace_map[node.z] && !subflow_map[node.z]))) {
                             if (createMissingWorkspace) {
                                 if (missingWorkspace === null) {
@@ -2304,7 +2302,7 @@ RED.nodes = (function() {
             // get added
             if (activeSubflow && /^link /.test(n.type) && n.links) {
                 n.links = n.links.filter(function(id) {
-                    var otherNode = RED.nodes.node(id);
+                    const otherNode = node_map[id] || RED.nodes.node(id);
                     return (otherNode && otherNode.z === activeWorkspace)
                 });
             }
@@ -2560,11 +2558,17 @@ RED.nodes = (function() {
         junctions = {};
         junctionsByZ = {};
 
+        var workspaceIds = Object.keys(workspaces);
+        // Ensure all workspaces are unlocked so we don't get any edit-protection
+        // preventing removal
+        workspaceIds.forEach(function(id) {
+            workspaces[id].locked = false
+        });
+
         var subflowIds = Object.keys(subflows);
         subflowIds.forEach(function(id) {
             RED.subflow.removeSubflow(id)
         });
-        var workspaceIds = Object.keys(workspaces);
         workspaceIds.forEach(function(id) {
             RED.workspaces.remove(workspaces[id]);
         });
@@ -2808,6 +2812,7 @@ RED.nodes = (function() {
                     }
                 });
 
+                const nodeGroupMap = {}
                 var replaceNodeIds = Object.keys(replaceNodes);
                 if (replaceNodeIds.length > 0) {
                     var reimportList = [];
@@ -2818,6 +2823,12 @@ RED.nodes = (function() {
                         } else {
                             allNodes.removeNode(n);
                         }
+                        if (n.g) {
+                            // reimporting a node *without* including its group object
+                            // will cause the g property to be cleared. Cache it
+                            // here so we can restore it
+                            nodeGroupMap[n.id] = n.g
+                        }
                         reimportList.push(convertNode(n));
                         RED.events.emit('nodes:remove',n);
                     });
@@ -2839,6 +2850,18 @@ RED.nodes = (function() {
                     var newNodeMap = {};
                     result.nodes.forEach(function(n) {
                         newNodeMap[n.id] = n;
+                        if (nodeGroupMap[n.id]) {
+                            // This node is in a group - need to substitute the
+                            // node reference inside the group
+                            n.g = nodeGroupMap[n.id]
+                            const group = RED.nodes.group(n.g)
+                            if (group) {
+                                var index = group.nodes.findIndex(gn => gn.id === n.id)
+                                if (index > -1) {
+                                    group.nodes[index] = n
+                                }
+                            }
+                        }
                     });
                     RED.nodes.eachLink(function(l) {
                         if (newNodeMap.hasOwnProperty(l.source.id)) {

packages/node_modules/@node-red/editor-client/src/js/red.js

@@ -348,6 +348,8 @@ var RED = (function() {
                         loader.end()
                         RED.notify($("<p>").text(message));
                         RED.sidebar.info.refresh()
+                        RED.menu.setDisabled('menu-item-projects-open',false);
+                        RED.menu.setDisabled('menu-item-projects-settings',false);
                     });
                 });
                 return;
@@ -775,6 +777,7 @@ var RED = (function() {
         RED.deploy.init(RED.settings.theme("deployButton",null));
 
         RED.keyboard.init(buildMainMenu);
+        RED.envVar.init();
 
         RED.nodes.init();
         RED.runtime.init()
@@ -793,7 +796,7 @@ var RED = (function() {
         $('<div id="red-ui-header-shade" class="hide"></div>').appendTo(header);
         $('<div id="red-ui-main-container" class="red-ui-sidebar-closed hide">'+
             '<div id="red-ui-workspace"></div>'+
-            '<div id="red-ui-editor-stack"></div>'+
+            '<div id="red-ui-editor-stack" tabindex="-1"></div>'+
             '<div id="red-ui-palette"></div>'+
             '<div id="red-ui-sidebar"></div>'+
             '<div id="red-ui-sidebar-separator"></div>'+

packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js

@@ -503,7 +503,7 @@ RED.clipboard = (function() {
         $("#red-ui-clipboard-dialog-import-text").on("keyup", validateImport);
         $("#red-ui-clipboard-dialog-import-text").on('paste',function() { setTimeout(validateImport,10)});
 
-        if (RED.workspaces.active() === 0 || RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.active() === 0 || RED.workspaces.isLocked()) {
             $("#red-ui-clipboard-dialog-import-opt-current").addClass('disabled').removeClass("selected");
             $("#red-ui-clipboard-dialog-import-opt-new").addClass("selected");
         } else {
@@ -656,7 +656,12 @@ RED.clipboard = (function() {
         $("#red-ui-clipboard-dialog-tab-library-name").val("flows.json").select();
 
         dialogContainer.i18n();
+        
         var format = RED.settings.flowFilePretty ? "red-ui-clipboard-dialog-export-fmt-full" : "red-ui-clipboard-dialog-export-fmt-mini";
+        const userFormat = RED.settings.get("editor.dialog.export.pretty")
+        if (userFormat === false || userFormat === true) {
+            format = userFormat ? "red-ui-clipboard-dialog-export-fmt-full" : "red-ui-clipboard-dialog-export-fmt-mini";
+        }
 
         $("#red-ui-clipboard-dialog-export-fmt-group > a").on("click", function(evt) {
             evt.preventDefault();
@@ -672,7 +677,8 @@ RED.clipboard = (function() {
                 var nodes = JSON.parse(flow);
 
                 format = $(this).attr('id');
-                if (format === 'red-ui-clipboard-dialog-export-fmt-full') {
+                const pretty = format === "red-ui-clipboard-dialog-export-fmt-full";
+                if (pretty) {
                     flow = JSON.stringify(nodes,null,4);
                 } else {
                     flow = JSON.stringify(nodes);
@@ -681,6 +687,7 @@ RED.clipboard = (function() {
                 setTimeout(function() { $("#red-ui-clipboard-dialog-export-text").scrollTop(0); },50);
 
                 $("#red-ui-clipboard-dialog-export-text").trigger("focus");
+                RED.settings.set("editor.dialog.export.pretty", pretty)
             }
         });
 
@@ -1271,7 +1278,7 @@ RED.clipboard = (function() {
             RED.keyboard.add("#red-ui-drop-target", "escape" ,hideDropTarget);
 
             $('#red-ui-workspace-chart').on("dragenter",function(event) {
-                if (!RED.workspaces.isActiveLocked() && (
+                if (!RED.workspaces.isLocked() && (
                     $.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
                      $.inArray("Files",event.originalEvent.dataTransfer.types) != -1)) {
                     $("#red-ui-drop-target").css({display:'table'}).focus();
@@ -1281,7 +1288,7 @@ RED.clipboard = (function() {
             $('#red-ui-drop-target').on("dragover",function(event) {
                 if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1 ||
                      $.inArray("Files",event.originalEvent.dataTransfer.types) != -1 ||
-                        RED.workspaces.isActiveLocked()) {
+                        RED.workspaces.isLocked()) {
                     event.preventDefault();
                 }
             })
@@ -1289,7 +1296,7 @@ RED.clipboard = (function() {
                 hideDropTarget();
             })
             .on("drop",function(event) {
-                if (!RED.workspaces.isActiveLocked()) {
+                if (!RED.workspaces.isLocked()) {
                     try {
                         if ($.inArray("text/plain",event.originalEvent.dataTransfer.types) != -1) {
                             var data = event.originalEvent.dataTransfer.getData("text/plain");

packages/node_modules/@node-red/editor-client/src/js/ui/common/editableList.js

@@ -160,7 +160,7 @@
                 this.element.css("maxHeight",null);
             }
             if (this.options.height !== 'auto') {
-                this.uiContainer.css("overflow-y","scroll");
+                this.uiContainer.css("overflow-y","auto");
                 if (!isNaN(this.options.height)) {
                     this.uiHeight = this.options.height;
                 }

packages/node_modules/@node-red/editor-client/src/js/ui/common/tabs.js

@@ -183,7 +183,7 @@ RED.tabs = (function() {
                     // Assume this is wheel event which might not trigger
                     // the scroll event, so do things manually
                     var sl = scrollContainer.scrollLeft();
-                    sl -= evt.originalEvent.deltaY;
+                    sl += evt.originalEvent.deltaY;
                     scrollContainer.scrollLeft(sl);
                 }
             })
@@ -829,7 +829,7 @@ RED.tabs = (function() {
                         event.preventDefault();
                         removeTab(tab.id);
                     });
-                    RED.popover.tooltip(closeLink,RED._("workspace.hideFlow"));
+                    RED.popover.tooltip(closeLink,RED._("workspace.closeFlow"));
                 }
                 // if (tab.hideable) {
                 //     li.addClass("red-ui-tabs-closeable")

packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js

@@ -90,10 +90,10 @@
                         optEl.append(generateSpans(srcMatch));
                         optEl.appendTo(element);
                     }
-                    matches.push({ 
-                        value: optVal, 
-                        label: element, 
-                        i: (valMatch.found ? valMatch.index : srcMatch.index) 
+                    matches.push({
+                        value: optVal,
+                        label: element,
+                        i: (valMatch.found ? valMatch.index : srcMatch.index)
                     });
                 }
             })
@@ -146,7 +146,7 @@
         { value: "reset", source: ["delay","trigger","join","rbe"] },
         { value: "responseCookies", source: ["http request"] },
         { value: "responseTopic", source: ["mqtt"] },
-        { value: "responseURL", source: ["http request"] },
+        { value: "responseUrl", source: ["http request"] },
         { value: "restartTimeout", source: ["join"] },
         { value: "retain", source: ["mqtt"] },
         { value: "schema", source: ["json"] },
@@ -501,7 +501,7 @@
                 this.options.types = this.options.types||Object.keys(allOptions);
             }
 
-            this.selectTrigger = $('<button class="red-ui-typedInput-type-select" tabindex="0"></button>').prependTo(this.uiSelect);
+            this.selectTrigger = $('<button type="button" class="red-ui-typedInput-type-select" tabindex="0"></button>').prependTo(this.uiSelect);
             $('<i class="red-ui-typedInput-icon fa fa-caret-down"></i>').toggle(this.options.types.length > 1).appendTo(this.selectTrigger);
 
             this.selectLabel = $('<span class="red-ui-typedInput-type-label"></span>').appendTo(this.selectTrigger);
@@ -570,7 +570,7 @@
             })
 
             // explicitly set optionSelectTrigger display to inline-block otherwise jQ sets it to 'inline'
-            this.optionSelectTrigger = $('<button tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-caret-down"></i></span></button>').appendTo(this.uiSelect);
+            this.optionSelectTrigger = $('<button type="button" tabindex="0" class="red-ui-typedInput-option-trigger" style="display:inline-block"><span class="red-ui-typedInput-option-caret"><i class="red-ui-typedInput-icon fa fa-caret-down"></i></span></button>').appendTo(this.uiSelect);
             this.optionSelectLabel = $('<span class="red-ui-typedInput-option-label"></span>').prependTo(this.optionSelectTrigger);
             // RED.popover.tooltip(this.optionSelectLabel,function() {
             //     return that.optionValue;
@@ -591,7 +591,7 @@
                 that.uiSelect.addClass('red-ui-typedInput-focus');
             });
 
-            this.optionExpandButton = $('<button tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
+            this.optionExpandButton = $('<button type="button" tabindex="0" class="red-ui-typedInput-option-expand" style="display:inline-block"></button>').appendTo(this.uiSelect);
             this.optionExpandButtonIcon = $('<i class="red-ui-typedInput-icon fa fa-ellipsis-h"></i>').appendTo(this.optionExpandButton);
 
             this.type(this.typeField.val() || this.options.default||this.typeList[0].value);

packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js

@@ -28,7 +28,7 @@ RED.contextMenu = (function () {
             const isMultipleLinks = !hasSelection && hasLinks && wireLinks.length > 1
             const canDelete = hasSelection || hasLinks
             const isGroup = hasSelection && selection.nodes.length === 1 && selection.nodes[0].type === 'group'
-            const canEdit = !RED.workspaces.isActiveLocked()
+            const canEdit = !RED.workspaces.isLocked()
             const canRemoveFromGroup = hasSelection && !!selection.nodes[0].g
             const isAllGroups = hasSelection && selection.nodes.filter(n => n.type !== 'group').length === 0
             const hasGroup = hasSelection && selection.nodes.filter(n => n.type === 'group' ).length > 0
@@ -101,7 +101,7 @@ RED.contextMenu = (function () {
                 },
                 null,
                 { onselect: 'core:show-import-dialog', label: RED._('common.label.import')},
-                { onselect: 'core:show-examples-import-dialog', label: 'Import Example Flow' }
+                { onselect: 'core:show-examples-import-dialog', label: RED._('menu.label.importExample') }
             )
             if (hasSelection && canEdit) {
                 const nodeOptions = []
@@ -119,11 +119,11 @@ RED.contextMenu = (function () {
                     { onselect: 'core:hide-selected-node-labels' }
                 )
                 menuItems.push({
-                    label: 'Node',
+                    label: RED._('sidebar.info.node'),
                     options: nodeOptions
                 })
                 menuItems.push({
-                    label: 'Group',
+                    label: RED._('sidebar.info.group'),
                     options: [
                         { onselect: 'core:group-selection' },
                         { onselect: 'core:ungroup-selection', disabled: !hasGroup },
@@ -141,7 +141,7 @@ RED.contextMenu = (function () {
             }
             if (canEdit && hasMultipleSelection) {
                 menuItems.push({
-                    label: 'Arrange',
+                    label: RED._('menu.label.arrange'),
                     options: [
                         { label:RED._("menu.label.alignLeft"), onselect: "core:align-selection-to-left"},
                         { label:RED._("menu.label.alignCenter"), onselect: "core:align-selection-to-center"},
@@ -167,7 +167,7 @@ RED.contextMenu = (function () {
                 { onselect: 'core:copy-selection-to-internal-clipboard', label: RED._("keyboard.copyNode"), disabled: !hasSelection },
                 { onselect: 'core:paste-from-internal-clipboard', label: RED._("keyboard.pasteNode"), disabled: !canEdit || !RED.view.clipboard() },
                 { onselect: 'core:delete-selection', disabled: !canEdit || !canDelete },
-                { onselect: 'core:delete-selection-and-reconnect', label: 'Delete and Reconnect', disabled: !canEdit || !canDelete },
+                { onselect: 'core:delete-selection-and-reconnect', label: RED._('keyboard.deleteReconnect'), disabled: !canEdit || !canDelete },
                 { onselect: 'core:show-export-dialog', label: RED._("menu.label.export") },
                 { onselect: 'core:select-all-nodes' },
             )

packages/node_modules/@node-red/editor-client/src/js/ui/editor.js

@@ -238,6 +238,7 @@ RED.editor = (function() {
             var valid = validateNodeProperty(node, defaults, property,value);
             if (((typeof valid) === "string") || !valid) {
                 input.addClass("input-error");
+                input.next(".red-ui-typedInput-container").addClass("input-error");
                 if ((typeof valid) === "string") {
                     var tooltip = input.data("tooltip");
                     if (tooltip) {
@@ -250,6 +251,7 @@ RED.editor = (function() {
                 }
             } else {
                 input.removeClass("input-error");
+                input.next(".red-ui-typedInput-container").removeClass("input-error");
                 var tooltip = input.data("tooltip");
                 if (tooltip) {
                     input.data("tooltip", null);
@@ -858,6 +860,7 @@ RED.editor = (function() {
     function showEditDialog(node, defaultTab) {
         if (buildingEditDialog) { return }
         buildingEditDialog = true;
+        if (node.z && RED.workspaces.isLocked(node.z)) { return }
         var editing_node = node;
         var removeInfoEditorOnClose = false;
         var skipInfoRefreshOnClose = false;
@@ -1043,6 +1046,13 @@ RED.editor = (function() {
 
                 var trayFooterLeft = $('<div class="red-ui-tray-footer-left"></div>').appendTo(trayFooter)
 
+                var helpButton = $('<button type="button" class="red-ui-button"><i class="fa fa-book"></button>').on("click", function(evt) {
+                    evt.preventDefault();
+                    evt.stopPropagation();
+                    RED.sidebar.help.show(editing_node.type);
+                }).appendTo(trayFooterLeft);
+                RED.popover.tooltip(helpButton, RED._("sidebar.help.showHelp"));
+
                 $('<input id="node-input-node-disabled" type="checkbox">').prop("checked",!!node.d).appendTo(trayFooterLeft).toggleButton({
                     enabledIcon: "fa-circle-thin",
                     disabledIcon: "fa-ban",
@@ -1105,6 +1115,10 @@ RED.editor = (function() {
                 if (editing_node) {
                     RED.sidebar.info.refresh(editing_node);
                     RED.sidebar.help.show(editing_node.type, false);
+                    //ensure focused element is NOT body (for keyboard scope to operate correctly)
+                    if (document.activeElement.tagName === 'BODY') {
+                        $('#red-ui-editor-stack').trigger('focus')
+                    }
                 }
             }
         }
@@ -1142,6 +1156,8 @@ RED.editor = (function() {
         var editing_config_node = RED.nodes.node(id);
         var activeEditPanes = [];
 
+        if (editing_config_node && editing_config_node.z && RED.workspaces.isLocked(editing_config_node.z)) { return }
+
         var configNodeScope = ""; // default to global
         var activeSubflow = RED.nodes.subflow(RED.workspaces.active());
         if (activeSubflow) {
@@ -1184,6 +1200,13 @@ RED.editor = (function() {
 
                 var trayFooterLeft = $('<div class="red-ui-tray-footer-left"></div>').appendTo(trayFooter)
 
+                var helpButton = $('<button type="button" class="red-ui-button"><i class="fa fa-book"></button>').on("click", function(evt) {
+                    evt.preventDefault();
+                    evt.stopPropagation();
+                    RED.sidebar.help.show(editing_config_node.type);
+                }).appendTo(trayFooterLeft);
+                RED.popover.tooltip(helpButton, RED._("sidebar.help.showHelp"));
+
                 $('<input id="node-config-input-node-disabled" type="checkbox">').prop("checked",!!editing_config_node.d).appendTo(trayFooterLeft).toggleButton({
                     enabledIcon: "fa-circle-thin",
                     disabledIcon: "fa-ban",
@@ -1688,6 +1711,7 @@ RED.editor = (function() {
     function showEditGroupDialog(group, defaultTab) {
         if (buildingEditDialog) { return }
         buildingEditDialog = true;
+        if (group.z && RED.workspaces.isLocked(group.z)) { return }
         var editing_node = group;
         editStack.push(group);
         RED.view.state(RED.state.EDITING);
@@ -1916,9 +1940,9 @@ RED.editor = (function() {
                     workspace.locked = false;
                 }
                 $('<input id="node-input-locked" type="checkbox">').prop("checked",workspace.locked).appendTo(trayFooterRight).toggleButton({
-                    enabledLabel: 'Unlocked',
+                    enabledLabel: RED._("common.label.unlocked"),
                     enabledIcon: "fa-unlock-alt",
-                    disabledLabel: 'Locked',
+                    disabledLabel: RED._("common.label.locked"),
                     disabledIcon: "fa-lock",
                     invertState: true
                 })

packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editor.js

@@ -45,6 +45,9 @@
             selectedCodeEditor = RED.editor.codeEditor[defaultEditor];
             initialised = selectedCodeEditor.init();
         }
+
+        $('<div id="red-ui-image-drop-target"><div data-i18n="[append]workspace.dropImageHere"><i class="fa fa-download"></i><br></div></div>').appendTo('#red-ui-editor');
+        $("#red-ui-image-drop-target").hide();
     }
 
     function create(options) {
@@ -64,6 +67,7 @@
             options = {};
         }
 
+        var editor = null;
         if (this.editor.type === MONACO) {
             // compatibility (see above note)
             if (!options.element && !options.id) {
@@ -74,10 +78,14 @@
                 console.warn("createEditor() options.element or options.id is not valid", options);
                 $("#dialog-form").append('<div id="' + options.id + '" style="display: none;" />');
             }
-            return this.editor.create(options);
+            editor = this.editor.create(options);
         } else {
-            return this.editor.create(options);//fallback to ACE
+            editor = this.editor.create(options);//fallback to ACE
         }
+        if (options.mode === "ace/mode/markdown") {
+            RED.editor.customEditTypes['_markdown'].postInit(editor, options);
+        }
+        return editor;
     }
 
     return {

packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js

@@ -100,7 +100,7 @@ RED.editor.codeEditor.monaco = (function() {
         "node-red-util": {package: "node-red", module: "util", path: "node-red/util.d.ts" },
         "node-red-func": {package: "node-red", module: "func", path: "node-red/func.d.ts" },
     }
-    const defaultServerSideTypes = [ knownModules["node-red-util"], knownModules["node-red-func"], knownModules["globals"], knownModules["console"], knownModules["buffer"] ];
+    const defaultServerSideTypes = [ knownModules["node-red-util"], knownModules["node-red-func"], knownModules["globals"], knownModules["console"], knownModules["buffer"] , knownModules["util"] ];
 
     const modulesCache = {};
 
@@ -764,7 +764,7 @@ RED.editor.codeEditor.monaco = (function() {
 
         
         if(!options.stateId && options.stateId !== false) {
-            options.stateId = RED.editor.generateViewStateId("monaco", options, (options.mode || options.title).split("/").pop());
+            options.stateId = RED.editor.generateViewStateId("monaco", options, (options.mode || options.title || "").split("/").pop());
         }
         var el = options.element || $("#"+options.id)[0];
         var toolbarRow = $("<div>").appendTo(el);

packages/node_modules/@node-red/editor-client/src/js/ui/editors/colorPicker.js

@@ -76,6 +76,9 @@ RED.editor.colorPicker = RED.colorPicker = (function() {
             var focusTarget = colorInput;
             colorInput.on("change", function (e) {
                 var color = colorInput.val();
+                if (options.defaultValue && !color.match(/^([a-z]+|#[0-9a-fA-F]{6}|#[0-9a-fA-F]{3})$/)) {
+                    color = options.defaultValue;
+                }
                 colorHiddenInput.val(color).trigger('change');
                 refreshDisplay(color);
             });

packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js

@@ -255,6 +255,9 @@
                         var currentExpression = expressionEditor.getValue();
                         var expr;
                         var usesContext = false;
+                        var usesEnv = false;
+                        var usesMoment = false;
+                        var usesClone = false;
                         var legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
                         $(".red-ui-editor-type-expression-legacy").toggle(legacyMode);
                         try {
@@ -267,6 +270,18 @@
                                 usesContext = true;
                                 return null;
                             });
+                            expr.assign("env", function(name) {
+                                usesEnv = true;
+                                return null;
+                            });
+                            expr.assign("moment", function(name) {
+                                usesMoment = true;
+                                return null;
+                            });
+                            expr.assign("clone", function(name) {
+                                usesClone = true;
+                                return null;
+                            });
                         } catch(err) {
                             testResultEditor.setValue(RED._("expressionEditor.errors.invalid-expr",{message:err.message}),-1);
                             return;
@@ -284,6 +299,18 @@
                                 testResultEditor.setValue(RED._("expressionEditor.errors.context-unsupported"),-1);
                                 return;
                             }
+                            if (usesEnv) {
+                                testResultEditor.setValue(RED._("expressionEditor.errors.env-unsupported"),-1);
+                                return;
+                            }
+                            if (usesMoment) {
+                                testResultEditor.setValue(RED._("expressionEditor.errors.moment-unsupported"),-1);
+                                return;
+                            }
+                            if (usesClone) {
+                                testResultEditor.setValue(RED._("expressionEditor.errors.clone-unsupported"),-1);
+                                return;
+                            }
 
                             var formattedResult;
                             if (result !== undefined) {

packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js

@@ -14,6 +14,61 @@
  * limitations under the License.
  **/
 (function() {
+    /**
+     * Converts dropped image file to date URL
+     */
+    function file2base64Image(file, cb) {
+        var reader = new FileReader();
+        reader.onload = (function (fd) {
+            return function (e) {
+                cb(e.target.result);
+            };
+        })(file);
+        reader.readAsDataURL(file);
+    }
+
+    var initialized = false;
+    var currentEditor = null;
+    /**
+     * Initialize handler for image file drag events
+     */
+    function initImageDrag(elem, editor) {
+        $(elem).on("dragenter", function (ev) {
+            ev.preventDefault();
+            $("#red-ui-image-drop-target").css({display:'table'}).focus();
+            currentEditor = editor;
+        });
+
+        if (!initialized) {
+            initialized = true;
+            $("#red-ui-image-drop-target").on("dragover", function (ev) {
+                ev.preventDefault();
+            }).on("dragleave", function (ev) {
+                $("#red-ui-image-drop-target").hide();
+            }).on("drop", function (ev) {
+                ev.preventDefault();
+                if ($.inArray("Files",ev.originalEvent.dataTransfer.types) != -1) {
+                    var files = ev.originalEvent.dataTransfer.files;
+                    if (files.length === 1) {
+                        var file = files[0];
+                        var name = file.name.toLowerCase();
+
+                        if (name.match(/\.(apng|avif|gif|jpeg|png|svg|webp)$/)) {
+                            file2base64Image(file, function (image) {
+                                var session = currentEditor.getSession();
+                                var img = `<img src="${image}"/>\n`;
+                                var pos = session.getCursorPosition();
+                                session.insert(pos, img);
+                                $("#red-ui-image-drop-target").hide();
+                            });
+                            return;
+                        }
+                    }
+                }
+                $("#red-ui-image-drop-target").hide();
+            });
+        }
+    }
 
     var toolbarTemplate = '<div style="margin-bottom: 5px">'+
         '<span class="button-group">'+
@@ -114,6 +169,7 @@
                             var currentScrollTop = $(".red-ui-editor-type-markdown-panel-preview").scrollTop();
                             $(".red-ui-editor-type-markdown-panel-preview").html(RED.utils.renderMarkdown(expressionEditor.getValue()));
                             $(".red-ui-editor-type-markdown-panel-preview").scrollTop(currentScrollTop);
+                            mermaid.init();
                         },200);
                     })
                     if (options.header) {
@@ -122,6 +178,7 @@
 
                     if (value) {
                         $(".red-ui-editor-type-markdown-panel-preview").html(RED.utils.renderMarkdown(expressionEditor.getValue()));
+                        mermaid.init();
                     }
                     panels = RED.panels.create({
                         id:"red-ui-editor-type-markdown-panels",
@@ -148,10 +205,14 @@
                     });
                     RED.popover.tooltip($("#node-btn-markdown-preview"), RED._("markdownEditor.toggle-preview"));
 
-                    if (options.cursor && !expressionEditor._initState) {
-                        expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);
-                    }
-
+                    if(!expressionEditor._initState) {
+                        if (options.cursor) {
+                            expressionEditor.gotoLine(options.cursor.row+1,options.cursor.column,false);
+                        }
+                        else {
+                            expressionEditor.gotoLine(0, 0, false);
+                        }
+                    }                        
                     dialogForm.i18n();
                 },
                 close: function() {
@@ -215,7 +276,11 @@
                 }
             })
             return toolbar;
-        }
+        },
+        postInit: function (editor, options) {
+            var elem = $("#"+options.id);
+            initImageDrag(elem, editor);
+         }
     }
     RED.editor.registerTypeEditor("_markdown", definition);
 })();

packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/appearance.js

@@ -235,6 +235,7 @@
             RED.editor.colorPicker.create({
                 id: "red-ui-editor-node-color",
                 value: color,
+                defaultValue: "#DDAA99",
                 palette: recommendedColors,
                 sortPalette: function (a, b) {return a.l - b.l;}
             }).appendTo(colorRow);

packages/node_modules/@node-red/editor-client/src/js/ui/env-var.js

@@ -0,0 +1,175 @@
+RED.envVar = (function() {
+    function saveEnvList(list) {
+        const items = list.editableList("items")
+        const new_env = [];
+        items.each(function (i,el) {
+            var data = el.data('data');
+            var item;
+            if (data.nameField && data.valueField) {
+                item = {
+                    name: data.nameField.val(),
+                    value: data.valueField.typedInput("value"),
+                    type: data.valueField.typedInput("type")
+                };
+                new_env.push(item);
+            }
+        });
+        return new_env;
+    }
+
+    function getGlobalConf(create) {
+        var gconf = null;
+        RED.nodes.eachConfig(function (conf) {
+            if (conf.type === "global-config") {
+                gconf = conf;
+            }
+        });
+        if ((gconf === null) && create) {
+            var cred = {
+                _ : {},
+                map: {}
+            };
+            gconf = {
+                id: RED.nodes.id(),
+                type: "global-config",
+                env: [],
+                name: "global-config",
+                label: "",
+                hasUsers: false,
+                users: [],
+                credentials: cred,
+                _def: RED.nodes.getType("global-config"),
+            };
+            RED.nodes.add(gconf);
+        }
+        return gconf;
+    }
+
+    function applyChanges(list) {
+        var gconf = getGlobalConf(false);
+        var new_env = [];
+        var items = list.editableList('items');
+        var credentials = gconf ? gconf.credentials : null;
+
+        if (!credentials) {
+            credentials = {
+                _ : {},
+                map: {}
+            };
+        }
+        items.each(function (i,el) {
+            var data = el.data('data');
+            if (data.nameField && data.valueField) {
+                var item = {
+                    name: data.nameField.val(),
+                    value: data.valueField.typedInput("value"),
+                    type: data.valueField.typedInput("type")
+                };
+                if (item.name.trim() !== "") {
+                    new_env.push(item);
+                    if ((item.type === "cred") && (item.value !== "__PWRD__")) {
+                        credentials.map[item.name] = item.value;
+                        credentials.map["has_"+item.name] = (item.value !== "");
+                        item.value = "__PWRD__";
+                    }
+                }
+            }
+        });
+        if (gconf === null) {
+            gconf = getGlobalConf(true);
+        }
+        if ((JSON.stringify(new_env) !== JSON.stringify(gconf.env)) ||
+            (JSON.stringify(credentials) !== JSON.stringify(gconf.credentials))) {
+            gconf.env = new_env;
+            gconf.credentials = credentials;
+            RED.nodes.dirty(true);
+        }
+    }
+
+    function getSettingsPane() {
+        var gconf = getGlobalConf(false);
+        var env = gconf ? gconf.env : [];
+        var cred = gconf ? gconf.credentials : null;
+        if (!cred) {
+            cred = {
+                _ : {},
+                map: {}
+            };
+        }
+
+        var pane = $("<div/>", {
+            id: "red-ui-settings-tab-envvar",
+            class: "form-horizontal"
+        });
+        var content = $("<div/>", {
+            class: "form-row node-input-env-container-row"
+        }).css({
+            "margin": "10px"
+        }).appendTo(pane);
+
+        var label = $("<label></label>").css({
+            width: "100%"
+        }).appendTo(content);
+        $("<i/>", {
+            class: "fa fa-list"
+        }).appendTo(label);
+        $("<span/>").text(" "+RED._("env-var.header")).appendTo(label);
+
+        var list = $("<ol/>", {
+            id: "node-input-env-container"
+        }).appendTo(content);
+        var node = {
+            type: "",
+            env: env,
+            credentials: cred.map,
+        };
+        RED.editor.envVarList.create(list, node);
+
+        var buttons = $("<div/>").css({
+            "text-align": "right",
+        }).appendTo(content);
+        var revertButton = $("<button/>", {
+            class: "red-ui-button"
+        }).css({
+        }).text(RED._("env-var.revert")).appendTo(buttons);
+
+        var items = saveEnvList(list);
+        revertButton.on("click", function (ev) {
+            list.editableList("empty");
+            list.editableList("addItems", items);
+        });
+
+        return pane;
+    }
+
+    function init(done) {
+        if (!RED.user.hasPermission("settings.write")) {
+            RED.notify(RED._("user.errors.settings"),"error");
+            return;
+        }
+        RED.userSettings.add({
+            id:'envvar',
+            title: RED._("env-var.environment"),
+            get: getSettingsPane,
+            focus: function() {
+                var height = $("#red-ui-settings-tab-envvar").parent().height();
+                $("#node-input-env-container").editableList("height", (height -100));
+            },
+            close: function() {
+                var list = $("#node-input-env-container");
+                try {
+                    applyChanges(list);
+                }
+                catch (e) {
+                    console.log(e);
+                    console.log(e.stack);
+                }
+            }
+        });
+    }
+
+    return {
+        init: init,
+    };
+
+})();

packages/node_modules/@node-red/editor-client/src/js/ui/group.js

@@ -101,6 +101,7 @@ RED.group = (function() {
             RED.editor.colorPicker.create({
                 id:"node-input-style-stroke",
                 value: style.stroke || defaultGroupStyle.stroke || "#a4a4a4",
+                defaultValue: "#a4a4a4",
                 palette: colorPalette,
                 cellPerRow: colorCount,
                 cellWidth: 16,
@@ -112,6 +113,7 @@ RED.group = (function() {
             RED.editor.colorPicker.create({
                 id:"node-input-style-fill",
                 value: style.fill || defaultGroupStyle.fill ||"none",
+                defaultValue: "none",
                 palette: colorPalette,
                 cellPerRow: colorCount,
                 cellWidth: 16,
@@ -129,6 +131,7 @@ RED.group = (function() {
             RED.editor.colorPicker.create({
                 id:"node-input-style-color",
                 value: style.color || defaultGroupStyle.color ||"#a4a4a4",
+                defaultValue: "#a4a4a4",
                 palette: colorPalette,
                 cellPerRow: colorCount,
                 cellWidth: 16,
@@ -185,7 +188,7 @@ RED.group = (function() {
             var activateMerge = false;
             var activateRemove = false;
             var singleGroupSelected = false;
-            var locked = RED.workspaces.isActiveLocked()
+            var locked = RED.workspaces.isLocked()
 
             if (activateGroup) {
                 singleGroupSelected = selection.nodes.length === 1 && selection.nodes[0].type === 'group';
@@ -263,7 +266,7 @@ RED.group = (function() {
         }
     }
     function pasteGroupStyle() {
-        if (RED.workspaces.isActiveLocked()) { return }
+        if (RED.workspaces.isLocked()) { return }
         if (RED.view.state() !== RED.state.DEFAULT) { return }
         if (groupStyleClipboard) {
             var selection = RED.view.selection();
@@ -298,7 +301,7 @@ RED.group = (function() {
     }
 
     function groupSelection() {
-        if (RED.workspaces.isActiveLocked()) { return }
+        if (RED.workspaces.isLocked()) { return }
         if (RED.view.state() !== RED.state.DEFAULT) { return }
         var selection = RED.view.selection();
         if (selection.nodes) {
@@ -317,7 +320,7 @@ RED.group = (function() {
         }
     }
     function ungroupSelection() {
-        if (RED.workspaces.isActiveLocked()) { return }
+        if (RED.workspaces.isLocked()) { return }
         if (RED.view.state() !== RED.state.DEFAULT) { return }
         var selection = RED.view.selection();
         if (selection.nodes) {
@@ -341,7 +344,7 @@ RED.group = (function() {
     }
 
     function ungroup(g) {
-        if (RED.workspaces.isActiveLocked()) { return }
+        if (RED.workspaces.isLocked()) { return }
         var nodes = [];
         var parentGroup = RED.nodes.group(g.g);
         g.nodes.forEach(function(n) {
@@ -368,7 +371,7 @@ RED.group = (function() {
     }
 
     function mergeSelection() {
-        if (RED.workspaces.isActiveLocked()) { return }
+        if (RED.workspaces.isLocked()) { return }
         if (RED.view.state() !== RED.state.DEFAULT) { return }
         var selection = RED.view.selection();
         if (selection.nodes) {
@@ -438,7 +441,7 @@ RED.group = (function() {
     }
 
     function removeSelection() {
-        if (RED.workspaces.isActiveLocked()) { return }
+        if (RED.workspaces.isLocked()) { return }
         if (RED.view.state() !== RED.state.DEFAULT) { return }
         var selection = RED.view.selection();
         if (selection.nodes) {
@@ -466,7 +469,7 @@ RED.group = (function() {
         }
     }
     function createGroup(nodes) {
-        if (RED.workspaces.isActiveLocked()) { return }
+        if (RED.workspaces.isLocked()) { return }
         if (nodes.length === 0) {
             return;
         }
@@ -572,7 +575,7 @@ RED.group = (function() {
         markDirty(group);
     }
     function removeFromGroup(group, nodes, reparent) {
-        if (RED.workspaces.isActiveLocked()) { return }
+        if (RED.workspaces.isLocked()) { return }
         if (!Array.isArray(nodes)) {
             nodes = [nodes];
         }

packages/node_modules/@node-red/editor-client/src/js/ui/mermaid.js

@@ -0,0 +1,46 @@
+// Mermaid diagram stub library for on-demand dynamic loading
+// Will be overwritten after script loading by $.getScript
+var mermaid = (function () {
+    var enabled /* = undefined */;
+    
+    var initializing = false;
+    var initCalled = false;
+
+    function initialize(opt) {
+        if (enabled === undefined) {
+            if (RED.settings.markdownEditor &&
+                RED.settings.markdownEditor.mermaid) {
+                enabled = RED.settings.markdownEditor.mermaid.enabled;
+            }
+            else {
+                enabled = true;
+            }
+        }
+        if (enabled) {
+            initializing = true;
+            $.getScript("vendor/mermaid/mermaid.min.js",
+                        function (data, stat, jqxhr) {
+                            $(".mermaid").show();
+                            // invoke loaded mermaid API
+                            initializing = false; 
+                            mermaid.initialize(opt);
+                            if (initCalled) {
+                                mermaid.init();
+                                initCalled = false;
+                            }
+                        });
+        }
+    }
+
+    function init() {
+        if (initializing) {
+            $(".mermaid").hide();
+            initCalled = true;
+        }
+    }
+    
+    return {
+        initialize: initialize,
+        init: init,
+    };
+})();

packages/node_modules/@node-red/editor-client/src/js/ui/palette.js

@@ -175,9 +175,19 @@ RED.palette = (function() {
                     $('<button type="button" onclick="RED.workspaces.show(\''+type.substring(8).replace(/'/g,"\\'")+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-pencil"></i></button>').appendTo(popOverContent)
                 }
 
-                var safeType = type.replace(/'/g,"\\'");
+                const safeType = type.replace(/'/g,"\\'");
+                const wrapStr = function (str) {
+                    if(str.indexOf(' ') >= 0) {
+                        return '"' + str + '"'
+                    }
+                    return str
+                }
 
-                $('<button type="button" onclick="RED.search.show(\'type:'+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>').appendTo(popOverContent)
+                $('<button type="button"; return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-search"></i></button>')
+                    .appendTo(popOverContent)
+                    .on('click', function() {
+                        RED.search.show('type:' + wrapStr(safeType))
+                    })
                 $('<button type="button" onclick="RED.sidebar.help.show(\''+safeType+'\'); return false;" class="red-ui-button red-ui-button-small" style="float: right; margin-left: 5px;"><i class="fa fa-book"></i></button>').appendTo(popOverContent)
 
                 $('<p>',{style:"font-size: 0.8em"}).text(metaData).appendTo(popOverContent);
@@ -290,7 +300,7 @@ RED.palette = (function() {
                 revertDuration: 200,
                 containment:'#red-ui-main-container',
                 start: function() {
-                    dropEnabled = !RED.nodes.workspace(RED.workspaces.active()).locked;
+                    dropEnabled = !(RED.nodes.workspace(RED.workspaces.active())?.locked);
                     paletteWidth = $("#red-ui-palette").width();
                     paletteTop = $("#red-ui-palette").parent().position().top + $("#red-ui-palette-container").position().top;
                     hoverGroup = null;
@@ -428,6 +438,7 @@ RED.palette = (function() {
                 categoryNode.find(".red-ui-palette-content").slideToggle();
                 categoryNode.find("i").toggleClass("expanded");
             }
+            categoryNode.hide();
         }
     }
 
@@ -506,6 +517,7 @@ RED.palette = (function() {
                     currentCategoryNode.find(".red-ui-palette-content").slideToggle();
                     currentCategoryNode.find("i").toggleClass("expanded");
                 }
+                currentCategoryNode.hide();
             }
         }
 

packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js

@@ -165,6 +165,9 @@ RED.projects.settings = (function() {
         }
         var description = addTargetToExternalLinks($('<span class="red-ui-text-bidi-aware" dir=\"'+RED.text.bidi.resolveBaseTextDir(desc)+'">'+desc+'</span>')).appendTo(container);
         description.find(".red-ui-text-bidi-aware").contents().filter(function() { return this.nodeType === 3 && this.textContent.trim() !== "" }).wrap( "<span></span>" );
+        setTimeout(function () {
+            mermaid.init();
+        }, 200);
     }
 
     function editSummary(activeProject, summary, container, version, versionContainer) {

packages/node_modules/@node-red/editor-client/src/js/ui/projects/projects.js

@@ -545,7 +545,7 @@ RED.projects = (function() {
                         var sshwarningRow = $('<div class="red-ui-projects-dialog-screen-create-row-auth-error-no-keys"></div>').hide().appendTo(subrow);
                         $('<div class="form-row"><i class="fa fa-warning"></i> '+RED._("projects.clone-project.ssh-key-desc")+'</div>').appendTo(sshwarningRow);
                         subrow = $('<div style="text-align: center">').appendTo(sshwarningRow);
-                        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.clone-project.ssh-key-add")+'</button>').appendTo(subrow).on("click", function(e) {
+                        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.clone-project.ssh-key-add")+'</button>').appendTo(subrow).on("click", function(e) {
                             e.preventDefault();
                             dialog.dialog( "close" );
                             RED.userSettings.show('gitconfig');
@@ -1171,11 +1171,11 @@ RED.projects = (function() {
 
                         row = $('<div class="form-row button-group"></div>').appendTo(container);
 
-                        var openProject = $('<button data-type="open" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-folder-open"></i><br/>'+RED._("projects.create.open")+'</button>').appendTo(row);
-                        var createAsEmpty = $('<button data-type="empty" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>'+RED._("projects.create.create")+'</button>').appendTo(row);
-                        // var createAsCopy = $('<button data-type="copy" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i class="fa fa-long-arrow-right fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Copy existing</button>').appendTo(row);
-                        var createAsClone = $('<button data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>'+RED._("projects.create.clone")+'</button>').appendTo(row);
-                        // var createAsClone = $('<button data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-git fa-2x"></i><i class="fa fa-arrows-h fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Clone Repository</button>').appendTo(row);
+                        var openProject = $('<button type="button" data-type="open" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-folder-open"></i><br/>'+RED._("projects.create.open")+'</button>').appendTo(row);
+                        var createAsEmpty = $('<button type="button" data-type="empty" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-asterisk"></i><br/>'+RED._("projects.create.create")+'</button>').appendTo(row);
+                        // var createAsCopy = $('<button type="button" data-type="copy" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i class="fa fa-long-arrow-right fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Copy existing</button>').appendTo(row);
+                        var createAsClone = $('<button type="button" data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-archive fa-2x"></i><i style="position: absolute;" class="fa fa-git"></i><br/>'+RED._("projects.create.clone")+'</button>').appendTo(row);
+                        // var createAsClone = $('<button type="button" data-type="clone" class="red-ui-button red-ui-projects-dialog-button red-ui-projects-dialog-screen-create-type toggle"><i class="fa fa-git fa-2x"></i><i class="fa fa-arrows-h fa-2x"></i><i class="fa fa-archive fa-2x"></i><br/>Clone Repository</button>').appendTo(row);
                         row.find(".red-ui-projects-dialog-screen-create-type").on("click", function(evt) {
                             evt.preventDefault();
                             container.find(".red-ui-projects-dialog-screen-create-type").removeClass('selected');
@@ -1271,7 +1271,7 @@ RED.projects = (function() {
                         var credentialsLeftBox = $('<div class="red-ui-projects-dialog-credentials-box-left">').appendTo(credentialsBox);
 
                         var credentialsEnabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-enabled"></div>').appendTo(credentialsLeftBox);
-                        $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="enabled"> <i class="fa fa-lock"></i> <span>'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
+                        $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="enabled" checked> <i class="fa fa-lock"></i> <span>'+RED._("projects.encryption-config.enable")+'</span></label>').appendTo(credentialsEnabledBox);
                         var credentialsDisabledBox = $('<div class="form-row red-ui-projects-dialog-credentials-box-disabled disabled"></div>').appendTo(credentialsLeftBox);
                         $('<label class="red-ui-projects-edit-form-inline-label"><input type="radio" name="projects-encryption-type" value="disabled"> <i class="fa fa-unlock"></i> <span>'+RED._("projects.encryption-config.disable")+'</span></label>').appendTo(credentialsDisabledBox);
 
@@ -1397,7 +1397,7 @@ RED.projects = (function() {
                         var sshwarningRow = $('<div class="red-ui-projects-dialog-screen-create-row-auth-error-no-keys"></div>').hide().appendTo(subrow);
                         $('<div class="form-row"><i class="fa fa-warning"></i> '+RED._("projects.create.desc2")+'</div>').appendTo(sshwarningRow);
                         subrow = $('<div style="text-align: center">').appendTo(sshwarningRow);
-                        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.create.add-ssh-key")+'</button>').appendTo(subrow).on("click", function(e) {
+                        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("projects.create.add-ssh-key")+'</button>').appendTo(subrow).on("click", function(e) {
                             e.preventDefault();
                             $('#red-ui-projects-dialog-cancel').trigger("click");
                             RED.userSettings.show('gitconfig');
@@ -1631,14 +1631,14 @@ RED.projects = (function() {
     function deleteProject(row,name,done) {
         var cover = $('<div class="red-ui-projects-dialog-project-list-entry-delete-confirm"></div>').on("click", function(evt) { evt.stopPropagation(); }).appendTo(row);
         $('<span>').text(RED._("projects.delete.confirm")).appendTo(cover);
-        $('<button class="red-ui-button red-ui-projects-dialog-button">'+RED._("common.label.cancel")+'</button>')
+        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button">'+RED._("common.label.cancel")+'</button>')
             .appendTo(cover)
             .on("click", function(e) {
                 e.stopPropagation();
                 cover.remove();
                 done(true);
             });
-        $('<button class="red-ui-button red-ui-projects-dialog-button primary">'+RED._("common.label.delete")+'</button>')
+        $('<button type="button" class="red-ui-button red-ui-projects-dialog-button primary">'+RED._("common.label.delete")+'</button>')
             .appendTo(cover)
             .on("click", function(e) {
                 e.stopPropagation();
@@ -1822,7 +1822,7 @@ RED.projects = (function() {
                 header.addClass("selectable");
 
                 var tools = $('<div class="red-ui-projects-dialog-project-list-entry-tools"></div>').appendTo(header);
-                $('<button class="red-ui-button red-ui-projects-dialog-button red-ui-button-small" style="float: right;"><i class="fa fa-trash"></i></button>')
+                $('<button type="button" class="red-ui-button red-ui-projects-dialog-button red-ui-button-small" style="float: right;"><i class="fa fa-trash"></i></button>')
                     .appendTo(tools)
                     .on("click", function(e) {
                         e.stopPropagation();

packages/node_modules/@node-red/editor-client/src/js/ui/search.js

@@ -106,38 +106,51 @@ RED.search = (function() {
         return val;
     }
 
-    function search(val) {
-        var results = [];
-        var typeFilter;
-        var m = /(?:^| )type:([^ ]+)/.exec(val);
-        if (m) {
-            val = val.replace(/(?:^| )type:[^ ]+/,"");
-            typeFilter = m[1];
+    function extractType(val, flags) {
+        // extracts:  type:XYZ  &  type:"X Y Z"
+        const regEx = /(?:type):\s*(?:"([^"]+)"|([^" ]+))/;
+        let m
+        while ((m = regEx.exec(val)) !== null) {
+            // avoid infinite loops with zero-width matches
+            if (m.index === regEx.lastIndex) {
+                regEx.lastIndex++;
+            }
+            val = val.replace(m[0]," ").trim()
+            const flag = m[2] || m[1] // quoted entries in capture group 1, unquoted in capture group 2
+            flags.type = flags.type || [];
+            flags.type.push(flag);
         }
-        var flags = {};
+        return val;
+    }
+
+    function search(val) {
+        const results = [];
+        const flags = {};
         val = extractFlag(val,"invalid",flags);
         val = extractFlag(val,"unused",flags);
         val = extractFlag(val,"config",flags);
         val = extractFlag(val,"subflow",flags);
         val = extractFlag(val,"hidden",flags);
         val = extractFlag(val,"modified",flags);
-        val = extractValue(val,"flow",flags);// flow:active or flow:<flow-id>
+        val = extractValue(val,"flow",flags);// flow:current or flow:<flow-id>
         val = extractValue(val,"uses",flags);// uses:<node-id>
+        val = extractType(val,flags);// type:<node-type>
         val = val.trim();
-        var hasFlags = Object.keys(flags).length > 0;
+        const hasFlags = Object.keys(flags).length > 0;
+        const hasTypeFilter = flags.type && flags.type.length > 0
         if (flags.flow && flags.flow.indexOf("current") >= 0) {
             let idx = flags.flow.indexOf("current");
-            flags.flow[idx] = RED.workspaces.active();//convert active to flow ID
+            flags.flow[idx] = RED.workspaces.active();//convert 'current' to active flow ID
         }
         if (flags.flow && flags.flow.length) {
             flags.flow = [ ...new Set(flags.flow) ]; //deduplicate
         }
-        if (val.length > 0 || typeFilter || hasFlags) {
+        if (val.length > 0 || hasFlags) {
             val = val.toLowerCase();
-            var i;
-            var j;
-            var list = [];
-            var nodes = {};
+            let i;
+            let j;
+            let list = [];
+            const nodes = {};
             let keys = [];
             if (flags.uses) {
                 keys = flags.uses;
@@ -145,10 +158,10 @@ RED.search = (function() {
                 keys = Object.keys(index);
             }
             for (i=0;i<keys.length;i++) {
-                var key = keys[i];
-                var kpos = keys[i].indexOf(val);
-                if (kpos > -1) {
-                    var ids = Object.keys(index[key]||{});
+                const key = keys[i];
+                const kpos = val ? keys[i].indexOf(val) : -1;
+                if (kpos > -1 || (val === "" && hasFlags)) {
+                    const ids = Object.keys(index[key]||{});
                     for (j=0;j<ids.length;j++) {
                         var node = index[key][ids[j]];
                         var isConfigNode = node.node._def.category === "config" && node.node.type !== 'group';
@@ -156,7 +169,7 @@ RED.search = (function() {
                             continue;
                         }
                         if (flags.hasOwnProperty("invalid")) {
-                            var nodeIsValid = !node.node.hasOwnProperty("valid") || node.node.valid;
+                            const nodeIsValid = !node.node.hasOwnProperty("valid") || node.node.valid;
                             if (flags.invalid === nodeIsValid) {
                                 continue;
                             }
@@ -186,8 +199,8 @@ RED.search = (function() {
                             }
                         }
                         if (flags.hasOwnProperty("unused")) {
-                            var isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
-                                           (isConfigNode && node.node.users.length === 0)
+                            const isUnused = (node.node.type === 'subflow' && node.node.instances.length === 0) ||
+                                           (isConfigNode && node.node.users.length === 0 && node.node._def.hasUsers !== false)
                             if (flags.unused !== isUnused) {
                                 continue;
                             }
@@ -197,12 +210,16 @@ RED.search = (function() {
                                 continue;
                             }
                         }
-                        if (!typeFilter || node.node.type === typeFilter) {
-                            nodes[node.node.id] = nodes[node.node.id] = {
+                        let typeIndex = -1
+                        if(hasTypeFilter) {
+                            typeIndex = flags.type.indexOf(node.node.type)
+                        }
+                        if (!hasTypeFilter || typeIndex > -1) {
+                            nodes[node.node.id] = nodes[node.node.id] || {
                                 node: node.node,
                                 label: node.label
                             };
-                            nodes[node.node.id].index = Math.min(nodes[node.node.id].index||Infinity,kpos);
+                            nodes[node.node.id].index = Math.min(nodes[node.node.id].index || Infinity, typeIndex > -1 ? typeIndex : kpos);
                         }
                     }
                 }
@@ -538,7 +555,7 @@ RED.search = (function() {
                 $(previousActiveElement).trigger("focus");
             }
             previousActiveElement = null;
-        } 
+        }
         if(!keepSearchToolbar) {
             clearActiveSearch();
         }
@@ -630,7 +647,7 @@ RED.search = (function() {
         $("#red-ui-sidebar-shade").on('mousedown',hide);
 
         $("#red-ui-view-searchtools-close").on("click", function close() {
-            clearActiveSearch();            
+            clearActiveSearch();
             updateSearchToolbar();
         });
         $("#red-ui-view-searchtools-close").trigger("click");

packages/node_modules/@node-red/editor-client/src/js/ui/subflow.js

@@ -273,6 +273,11 @@ RED.subflow = (function() {
         var subflowInstances = [];
         if (activeSubflow) {
             RED.nodes.filterNodes({type:"subflow:"+activeSubflow.id}).forEach(function(n) {
+                const parentFlow = RED.nodes.workspace(n.z)
+                const wasLocked = parentFlow && parentFlow.locked
+                if (wasLocked) {
+                    parentFlow.locked = false
+                }
                 subflowInstances.push({
                     id: n.id,
                     changed: n.changed
@@ -285,6 +290,9 @@ RED.subflow = (function() {
                 n.resize = true;
                 n.dirty = true;
                 RED.editor.updateNodeProperties(n);
+                if (wasLocked) {
+                    parentFlow.locked = true
+                }
             });
             RED.editor.validateNode(activeSubflow);
             return {
@@ -513,6 +521,13 @@ RED.subflow = (function() {
         RED.nodes.groups(id).forEach(function(n) {
             removedGroups.push(n);
         })
+
+        var removedJunctions = RED.nodes.junctions(id)
+        for (var i=0;i<removedJunctions.length;i++) {
+            var removedEntities = RED.nodes.removeJunction(removedJunctions[i])
+            removedLinks = removedLinks.concat(removedEntities.links)
+        }
+
         var removedConfigNodes = [];
         for (var i=0;i<removedNodes.length;i++) {
             var removedEntities = RED.nodes.remove(removedNodes[i].id);
@@ -543,6 +558,7 @@ RED.subflow = (function() {
             nodes:removedNodes,
             links:removedLinks,
             groups: removedGroups,
+            junctions: removedJunctions,
             subflows: [activeSubflow]
         }
     }
@@ -557,7 +573,7 @@ RED.subflow = (function() {
             }
         });
         RED.events.on("view:selection-changed",function(selection) {
-            if (!selection.nodes || RED.workspaces.isActiveLocked()) {
+            if (!selection.nodes || RED.workspaces.isLocked()) {
                 RED.menu.setDisabled("menu-item-subflow-convert",true);
             } else {
                 RED.menu.setDisabled("menu-item-subflow-convert",false);
@@ -620,7 +636,7 @@ RED.subflow = (function() {
     }
 
     function convertToSubflow() {
-        if (RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.isLocked()) {
             return
         }
         var selection = RED.view.selection();
@@ -942,7 +958,6 @@ RED.subflow = (function() {
 
 
     function buildEnvUIRow(row, tenv, ui, node) {
-        console.log(tenv, ui)
         ui.label = ui.label||{};
         if ((tenv.type === "cred" || (tenv.parent && tenv.parent.type === "cred")) && !ui.type) {
             ui.type = "cred";

packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js

@@ -50,7 +50,7 @@ RED.sidebar.help = (function() {
 
         tocPanel = $("<div>", {class: "red-ui-sidebar-help-toc"}).appendTo(stackContainer);
         var helpPanel = $("<div>").css({
-            "overflow-y": "scroll"
+            "overflow-y": "auto"
         }).appendTo(stackContainer);
 
         panels = RED.panels.create({

packages/node_modules/@node-red/editor-client/src/js/ui/tab-info-outliner.js

@@ -135,6 +135,10 @@ RED.sidebar.info.outliner = (function() {
                     RED.workspaces.show(n.id, null, true);
                 }
             });
+            RED.popover.tooltip(toggleVisibleButton, function () {
+                var isHidden = !div.hasClass("red-ui-info-outline-item-hidden");
+                return RED._("sidebar.info." + (isHidden ? "hideFlow" : "showFlow"));
+            });
         }
         if (n.type !== 'subflow') {
             var toggleButton = $('<button type="button" class="red-ui-info-outline-item-control-disable red-ui-button red-ui-button-small"><i class="fa fa-circle-thin"></i><i class="fa fa-ban"></i></button>').appendTo(controls).on("click",function(evt) {
@@ -633,6 +637,9 @@ RED.sidebar.info.outliner = (function() {
                 objects[n.id].children = missingParents[n.id];
                 delete missingParents[n.id]
             }
+            if (objects[n.id].children.length === 0) {
+                objects[n.id].children.push(getEmptyItem(n.id));
+            }
         }
         var parent = n.g||n.z||"__global__";
 

packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js

@@ -108,7 +108,7 @@ RED.sidebar.info = (function() {
 
         propertiesPanelContent = $("<div>").css({
             "flex":"1 1 auto",
-            "overflow-y":"scroll",
+            "overflow-y":"auto",
         }).appendTo(propertiesPanel);
 
 
@@ -463,7 +463,8 @@ RED.sidebar.info = (function() {
                     el = el.next();
                 }
                 $(this).toggleClass('expanded',!isExpanded);
-            })
+            });
+        mermaid.init();
     }
 
     var tips = (function() {

packages/node_modules/@node-red/editor-client/src/js/ui/tour/tourGuide.js

@@ -435,10 +435,15 @@ RED.tourGuide = (function() {
 
     function listTour() {
         return [
+            {
+                id: "3_1",
+                label: "3.1",
+                path: "./tours/welcome.js"
+            },
             {
                 id: "3_0",
                 label: "3.0",
-                path: "./tours/welcome.js"
+                path: "./tours/3.0/welcome.js"
             },
             {
                 id: "2_2",

packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js

@@ -269,8 +269,8 @@ RED.typeSearch = (function() {
         moveCallback = opts.move;
         RED.events.emit("type-search:open");
         //shade.show();
-        if ($("#red-ui-main-container").height() - opts.y - 150 < 0) {
-            opts.y = opts.y - 235;
+        if ($("#red-ui-main-container").height() - opts.y - 195 < 0) {
+            opts.y = opts.y - 275;
         }
         dialog.css({left:opts.x+"px",top:opts.y+"px"}).show();
         searchResultsDiv.slideDown(300);

packages/node_modules/@node-red/editor-client/src/js/ui/utils.js

@@ -96,6 +96,37 @@ RED.utils = (function() {
         }
     }
 
+    var mermaidIsInitialized = false;
+    var mermaidIsEnabled /* = undefined */;
+
+    renderer.code = function (code, lang) {
+        if(lang === "mermaid") {
+            // mermaid diagram rendering 
+            if (mermaidIsEnabled === undefined) {
+                if (RED.settings.markdownEditor &&
+                    RED.settings.markdownEditor.mermaid) {
+                    mermaidIsEnabled = RED.settings.markdownEditor.mermaid.enabled;
+                }
+                else {
+                    mermaidIsEnabled = true;
+                }
+            }
+            if (mermaidIsEnabled) {
+                if (!mermaidIsInitialized) {
+                    mermaidIsInitialized = true;
+                    mermaid.initialize({startOnLoad:false});
+                }
+                return `<pre class='mermaid'>${code}</pre>`;
+            }
+            else {
+                return `<details><summary>${RED._("markdownEditor.mermaid.summary")}</summary><pre><code>${code}</code></pre></details>`;
+            }
+        }
+        else {
+            return "<pre><code>" +code +"</code></pre>";
+        }
+    };
+
     window._marked.setOptions({
         renderer: renderer,
         gfm: true,

packages/node_modules/@node-red/editor-client/src/js/ui/view-tools.js

@@ -39,7 +39,7 @@ RED.view.tools = (function() {
     }
 
     function alignToGrid() {
-        if (RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.isLocked()) {
             return
         }
         var selection = RED.view.selection();
@@ -90,7 +90,7 @@ RED.view.tools = (function() {
     }
 
     function moveSelection(dx,dy) {
-        if (RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.isLocked()) {
             return
         }
         if (moving_set === null) {
@@ -159,7 +159,7 @@ RED.view.tools = (function() {
     }
 
     function setSelectedNodeLabelState(labelShown) {
-        if (RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.isLocked()) {
             return
         }
         var selection = RED.view.selection();
@@ -448,7 +448,7 @@ RED.view.tools = (function() {
     }
 
     function alignSelectionToEdge(direction) {
-        // if (RED.workspaces.isActiveLocked()) {
+        // if (RED.workspaces.isLocked()) {
         //     return
         // }
         var selection = RED.view.selection();
@@ -552,7 +552,7 @@ RED.view.tools = (function() {
     }
 
     function distributeSelection(direction) {
-        if (RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.isLocked()) {
             return
         }
         var selection = RED.view.selection();
@@ -713,7 +713,7 @@ RED.view.tools = (function() {
     }
 
     function reorderSelection(dir) {
-        if (RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.isLocked()) {
             return
         }
         var selection = RED.view.selection();
@@ -752,7 +752,7 @@ RED.view.tools = (function() {
     }
 
     function wireSeriesOfNodes() {
-        if (RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.isLocked()) {
             return
         }
         var selection = RED.view.selection();
@@ -795,7 +795,7 @@ RED.view.tools = (function() {
     }
 
     function wireNodeToMultiple() {
-        if (RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.isLocked()) {
             return
         }
         var selection = RED.view.selection();
@@ -840,12 +840,70 @@ RED.view.tools = (function() {
         }
     }
 
+    function wireMultipleToNode() {
+        if (RED.workspaces.isLocked()) {
+            return
+        }
+        var selection = RED.view.selection();
+        if (selection.nodes) {
+            if (selection.nodes.length > 1) {
+                var targetNode = selection.nodes[selection.nodes.length - 1];
+                if (targetNode.inputs === 0) {
+                    return;
+                }
+                var i = 0;
+                var newLinks = [];
+                for (i = 0; i < selection.nodes.length - 1; i++) {
+                    var sourceNode = selection.nodes[i];
+                    if (sourceNode.outputs > 0) {
+                        
+                        // Wire the first output to the target that has no link to the target yet.
+                        // This allows for connecting all combinations of inputs/outputs. 
+                        // The user may then delete links quickly that aren't needed.
+                        var sourceConnectedOutports = RED.nodes.filterLinks({
+                            source: sourceNode,
+                            target: targetNode
+                        });
+
+                        // Get outport indices that have no link yet
+                        var sourceOutportIndices = Array.from({ length: sourceNode.outputs }, (_, i) => i);
+                        var sourceConnectedOutportIndices = sourceConnectedOutports.map( x => x.sourcePort );
+                        var sourceFreeOutportIndices = sourceOutportIndices.filter(x => !sourceConnectedOutportIndices.includes(x));
+
+                        // Does an unconnected source port exist?
+                        if (sourceFreeOutportIndices.length == 0) {
+                            continue;
+                        }
+                        
+                        // Connect the first free outport to the target
+                        var newLink = {
+                            source: sourceNode,
+                            target: targetNode,
+                            sourcePort: sourceFreeOutportIndices[0]
+                        }
+                        RED.nodes.addLink(newLink);
+                        newLinks.push(newLink);
+                    }
+                }
+                if (newLinks.length > 0) {
+                    RED.history.push({
+                        t: 'add',
+                        links: newLinks,
+                        dirty: RED.nodes.dirty()
+                    })
+                    RED.nodes.dirty(true);
+                    RED.view.redraw(true);
+                }
+            }
+        }
+    }
+
     /**
      * Splits selected wires and re-joins them with link-out+link-in
      * @param {Object || Object[]} wires The wire(s) to split and replace with link-out, link-in nodes.
      */
     function splitWiresWithLinkNodes(wires) {
-        if (RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.isLocked()) {
             return
         }
         let wiresToSplit = wires || (RED.view.selection().links && RED.view.selection().links.filter(e => !e.link));
@@ -1016,7 +1074,7 @@ RED.view.tools = (function() {
      * @param {{ renameBlank: boolean, renameClash: boolean, generateHistory: boolean }} options Possible options are `renameBlank`, `renameClash` and `generateHistory`
      */
     function generateNodeNames(node, options) {
-        if (RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.isLocked()) {
             return
         }
         options = Object.assign({
@@ -1043,7 +1101,7 @@ RED.view.tools = (function() {
                 const nodeDef = n._def || RED.nodes.getType(n.type)
                 if (nodeDef && nodeDef.defaults && nodeDef.defaults.name) {
                     const paletteLabel = RED.utils.getPaletteLabel(n.type, nodeDef)
-                    const defaultNodeNameRE = new RegExp('^'+paletteLabel+' (\\d+)$')
+                    const defaultNodeNameRE = new RegExp('^'+paletteLabel.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')+' (\\d+)$')
                     if (!typeIndex.hasOwnProperty(n.type)) {
                         const existingNodes = RED.nodes.filterNodes({type: n.type})
                         let maxNameNumber = 0;
@@ -1089,7 +1147,7 @@ RED.view.tools = (function() {
     }
 
     function addJunctionsToWires(wires) {
-        if (RED.workspaces.isActiveLocked()) {
+        if (RED.workspaces.isLocked()) {
             return
         }
         let wiresToSplit = wires || (RED.view.selection().links && RED.view.selection().links.filter(e => !e.link));
@@ -1307,6 +1365,7 @@ RED.view.tools = (function() {
 
             RED.actions.add("core:wire-series-of-nodes", function() { wireSeriesOfNodes() })
             RED.actions.add("core:wire-node-to-multiple", function() { wireNodeToMultiple() })
+            RED.actions.add("core:wire-multiple-to-node", function() { wireMultipleToNode() })
 
             RED.actions.add("core:split-wire-with-link-nodes", function () { splitWiresWithLinkNodes() });
             RED.actions.add("core:split-wires-with-junctions", function () { addJunctionsToWires() });

packages/node_modules/@node-red/editor-client/src/js/ui/view.js

@@ -609,11 +609,28 @@ RED.view = (function() {
 
                 var group = $(ui.helper).data("group");
                 if (group) {
+                    var oldX = group.x; 
+                    var oldY = group.y; 
                     RED.group.addToGroup(group, nn);
+                    var moveEvent = null;
+                    if ((group.x !== oldX) ||
+                        (group.y !== oldY)) {
+                        moveEvent = {
+                            t: "move",
+                            nodes: [{n: group,
+                                     ox: oldX, oy: oldY,
+                                     dx: group.x -oldX,
+                                     dy: group.y -oldY}],
+                            dirty: true
+                        };
+                    }
                     historyEvent = {
                         t: 'multi',
                         events: [historyEvent],
 
+                    };
+                    if (moveEvent) {
+                        historyEvent.events.push(moveEvent)
                     }
                     historyEvent.events.push({
                         t: "addToGroup",
@@ -654,7 +671,7 @@ RED.view = (function() {
         RED.actions.add("core:copy-selection-to-internal-clipboard",copySelection);
         RED.actions.add("core:cut-selection-to-internal-clipboard",function(){copySelection(true);deleteSelection();});
         RED.actions.add("core:paste-from-internal-clipboard",function(){
-            if (RED.workspaces.isActiveLocked()) {
+            if (RED.workspaces.isLocked()) {
                 return
             }
             importNodes(clipboard,{generateIds: clipboardSource === 'copy', generateDefaultNames: clipboardSource === 'copy'});
@@ -1105,12 +1122,15 @@ RED.view = (function() {
             RED.view.redraw();
         }
 
+        // `point` is the place in the workspace the mouse has clicked.
+        //  This takes into account scrolling and scaling of the workspace.
         var ox = point[0];
         var oy = point[1];
 
+        // Need to map that to browser location to position the pop-up
         const offset = $("#red-ui-workspace-chart").offset()
-        var clientX = ox + offset.left - $("#red-ui-workspace-chart").scrollLeft()
-        var clientY = oy + offset.top - $("#red-ui-workspace-chart").scrollTop()
+        var clientX = (ox * scaleFactor) + offset.left - $("#red-ui-workspace-chart").scrollLeft()
+        var clientY = (oy * scaleFactor) + offset.top - $("#red-ui-workspace-chart").scrollTop()
 
         if (RED.settings.get("editor").view['view-snap-grid']) {
             // eventLayer.append("circle").attr("cx",point[0]).attr("cy",point[1]).attr("r","2").attr('fill','red')
@@ -1382,19 +1402,35 @@ RED.view = (function() {
                 RED.editor.validateNode(nn);
 
                 if (targetGroup) {
+                    var oldX = targetGroup.x; 
+                    var oldY = targetGroup.y; 
                     RED.group.addToGroup(targetGroup, nn);
+                    var moveEvent = null;
+                    if ((targetGroup.x !== oldX) ||
+                        (targetGroup.y !== oldY)) {
+                        moveEvent = {
+                            t: "move",
+                            nodes: [{n: targetGroup,
+                                     ox: oldX, oy: oldY,
+                                     dx: targetGroup.x -oldX,
+                                     dy: targetGroup.y -oldY}],
+                            dirty: true
+                        };
+                    }
                     if (historyEvent.t !== "multi") {
                         historyEvent = {
                             t:'multi',
                             events: [historyEvent]
-                        }
+                        };
                     }
                     historyEvent.events.push({
                         t: "addToGroup",
                         group: targetGroup,
                         nodes: nn
-                    })
-
+                    });
+                    if (moveEvent) {
+                        historyEvent.events.push(moveEvent);
+                    }
                 }
 
                 if (spliceLink) {
@@ -1732,6 +1768,7 @@ RED.view = (function() {
 
             // Check link splice or group-add
             if (movingSet.length() === 1 && movingSet.get(0).n.type !== "group") {
+            //}{//NIS
                 node = movingSet.get(0);
                 if (spliceActive) {
                     if (!spliceTimer) {
@@ -2091,11 +2128,25 @@ RED.view = (function() {
         if (mouse_mode == RED.state.MOVING_ACTIVE) {
             if (movingSet.length() > 0) {
                 var addedToGroup = null;
+                var moveEvent = null;
                 if (activeHoverGroup) {
+                    var oldX = activeHoverGroup.x; 
+                    var oldY = activeHoverGroup.y; 
                     for (var j=0;j<movingSet.length();j++) {
                         var n = movingSet.get(j);
                         RED.group.addToGroup(activeHoverGroup,n.n);
                     }
+                    if ((activeHoverGroup.x !== oldX) ||
+                        (activeHoverGroup.y !== oldY)) {
+                        moveEvent = {
+                            t: "move",
+                            nodes: [{n: activeHoverGroup,
+                                     ox: oldX, oy: oldY,
+                                     dx: activeHoverGroup.x -oldX,
+                                     dy: activeHoverGroup.y -oldY}],
+                            dirty: true
+                        };
+                    }
                     addedToGroup = activeHoverGroup;
 
                     activeHoverGroup.hovered = false;
@@ -2141,6 +2192,12 @@ RED.view = (function() {
                         historyEvent.addToGroup = addedToGroup;
                     }
                     RED.nodes.dirty(true);
+                    if (moveEvent) {
+                        historyEvent = {
+                            t: "multi",
+                            events: [moveEvent, historyEvent]
+                        };
+                    }
                     RED.history.push(historyEvent);
                 }
             }
@@ -2492,7 +2549,7 @@ RED.view = (function() {
     }
 
     function editSelection() {
-        if (RED.workspaces.isActiveLocked()) { return }
+        if (RED.workspaces.isLocked()) { return }
         if (movingSet.length() > 0) {
             var node = movingSet.get(0).n;
             if (node.type === "subflow") {
@@ -2826,7 +2883,7 @@ RED.view = (function() {
 
 
     function detachSelectedNodes() {
-        if (RED.workspaces.isActiveLocked()) { return }
+        if (RED.workspaces.isLocked()) { return }
         var selection = RED.view.selection();
         if (selection.nodes) {
             const {newLinks, removedLinks} = RED.nodes.detachNodes(selection.nodes);
@@ -3408,11 +3465,14 @@ RED.view = (function() {
         }
         if (dblClickPrimed && mousedown_node == d && clickElapsed > 0 && clickElapsed < dblClickInterval) {
             mouse_mode = RED.state.DEFAULT;
-            if (RED.workspaces.isActiveLocked()) {
+            if (RED.workspaces.isLocked()) {
                 clickElapsed = 0;
                 d3.event.stopPropagation();
                 return
             }
+            // Avoid dbl click causing text selection.
+            d3.event.preventDefault()
+            document.getSelection().removeAllRanges()
             if (d.type != "subflow") {
                 if (/^subflow:/.test(d.type) && (d3.event.ctrlKey || d3.event.metaKey)) {
                     RED.workspaces.show(d.type.substring(8));
@@ -3507,11 +3567,25 @@ RED.view = (function() {
                 updateActiveNodes();
             }
 
+            var moveEvent = null;
             if (activeHoverGroup) {
+                var oldX = activeHoverGroup.x; 
+                var oldY = activeHoverGroup.y; 
                 for (var j=0;j<movingSet.length();j++) {
                     var n = movingSet.get(j);
                     RED.group.addToGroup(activeHoverGroup,n.n);
                 }
+                if ((activeHoverGroup.x !== oldX) ||
+                    (activeHoverGroup.y !== oldY)) {
+                    moveEvent = {
+                        t: "move",
+                        nodes: [{n: activeHoverGroup,
+                                 ox: oldX, oy: oldY,
+                                 dx: activeHoverGroup.x -oldX,
+                                 dy: activeHoverGroup.y -oldY}],
+                        dirty: true
+                    };
+                }
                 historyEvent.addedToGroup = activeHoverGroup;
 
                 activeHoverGroup.hovered = false;
@@ -3520,7 +3594,6 @@ RED.view = (function() {
                 activeGroup.selected = true;
                 activeHoverGroup = null;
             }
-
             if (mouse_mode == RED.state.DETACHED_DRAGGING) {
                 var ns = [];
                 for (var j=0;j<movingSet.length();j++) {
@@ -3531,7 +3604,15 @@ RED.view = (function() {
                         n.n.moved = true;
                     }
                 }
-                RED.history.replace({t:"multi",events:[historyEvent,{t:"move",nodes:ns}],dirty: historyEvent.dirty})
+                var event = {t:"multi",events:[historyEvent,{t:"move",nodes:ns}],dirty: historyEvent.dirty};
+                if (moveEvent) {
+                    event.events.push(moveEvent);
+                }
+                RED.history.replace(event)
+            }
+            else if(moveEvent) {
+                var event = {t:"multi", events:[historyEvent, moveEvent], dirty: true};
+                RED.history.replace(event);
             }
 
             updateSelection();
@@ -3928,7 +4009,7 @@ RED.view = (function() {
         if (RED.view.DEBUG) {
             console.warn("groupMouseUp", { mouse_mode, event: d3.event });
         }
-        if (RED.workspaces.isActiveLocked()) { return }
+        if (RED.workspaces.isLocked()) { return }
         if (dblClickPrimed && mousedown_group == g && clickElapsed > 0 && clickElapsed < dblClickInterval) {
             mouse_mode = RED.state.DEFAULT;
             RED.editor.editGroup(g);
@@ -4152,7 +4233,7 @@ RED.view = (function() {
     function showTouchMenu(obj,pos) {
         var mdn = mousedown_node;
         var options = [];
-        const isActiveLocked = RED.workspaces.isActiveLocked()
+        const isActiveLocked = RED.workspaces.isLocked()
         options.push({name:"delete",disabled:(isActiveLocked || movingSet.length()===0 && selectedLinks.length() === 0),onselect:function() {deleteSelection();}});
         options.push({name:"cut",disabled:(isActiveLocked || movingSet.length()===0),onselect:function() {copySelection(true);deleteSelection();}});
         options.push({name:"copy",disabled:(isActiveLocked || movingSet.length()===0),onselect:function() {copySelection();}});
@@ -4954,7 +5035,7 @@ RED.view = (function() {
                         if (d._def.button) {
                             var buttonEnabled = isButtonEnabled(d);
                             this.__buttonGroup__.classList.toggle("red-ui-flow-node-button-disabled", !buttonEnabled);
-                            if (RED.runtime && Object.hasOwn(RED.runtime,'started')) {
+                            if (RED.runtime && RED.runtime.started !== undefined) {
                                 this.__buttonGroup__.classList.toggle("red-ui-flow-node-button-stopped", !RED.runtime.started);
                             }
 
@@ -5651,7 +5732,24 @@ RED.view = (function() {
             if (activeSubflow) {
                 activeSubflowChanged = activeSubflow.changed;
             }
-            var result = RED.nodes.import(nodesToImport,{generateIds:options.generateIds, addFlow: addNewFlow, importMap: options.importMap});
+            var filteredNodesToImport = nodesToImport;
+            var globalConfig = null;
+            var gconf = null;
+
+            RED.nodes.eachConfig(function (conf) {
+                if (conf.type === "global-config") {
+                    gconf = conf;
+                }
+            });
+            if (gconf) {
+                filteredNodesToImport = nodesToImport.filter(function (n) {
+                    return (n.type !== "global-config");
+                });
+                globalConfig = nodesToImport.find(function (n) {
+                    return (n.type === "global-config");
+                });
+            }
+            var result = RED.nodes.import(filteredNodesToImport,{generateIds:options.generateIds, addFlow: addNewFlow, importMap: options.importMap});
             if (result) {
                 var new_nodes = result.nodes;
                 var new_links = result.links;
@@ -5783,6 +5881,50 @@ RED.view = (function() {
                     }
                 }
 
+                if (globalConfig) {
+                    // merge global env to existing global-config
+                    var env0 = gconf.env;
+                    var env1 = globalConfig.env;
+                    var newEnv = Array.from(env0);
+                    var changed = false;
+
+                    env1.forEach(function (item1) {
+                        var index = newEnv.findIndex(function (item0) {
+                            return (item0.name === item1.name);
+                        });
+                        if (index >= 0) {
+                            var item0 = newEnv[index];
+                            if ((item0.type !== item1.type) ||
+                                (item0.value !== item1.value)) {
+                                newEnv[index] = item1;
+                                changed = true;
+                            }
+                        }
+                        else {
+                            newEnv.push(item1);
+                            changed = true;
+                        }
+                    });
+                    if(changed) {
+                        gconf.env = newEnv;
+                        var replaceEvent = {
+                            t: "edit",
+                            node: gconf,
+                            changed: true,
+                            changes: {
+                                env: env0
+                            }
+                        };
+                        historyEvent = {
+                            t:"multi",
+                            events: [
+                                replaceEvent,
+                                historyEvent,
+                            ]
+                        };
+                    }
+                }
+
                 RED.history.push(historyEvent);
 
                 updateActiveNodes();

packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js

@@ -152,8 +152,15 @@ RED.workspaces = (function() {
         const hiddenflowCount = hiddenFlows.size;
         let activeWorkspace = tab || RED.nodes.workspace(RED.workspaces.active()) || RED.nodes.subflow(RED.workspaces.active())
         let isFlowDisabled = activeWorkspace ? activeWorkspace.disabled : false
+        const currentTabs = workspace_tabs.listTabs();
+        let flowCount = 0;
+        currentTabs.forEach(tab => {
+            if (RED.nodes.workspace(tab)) {
+                flowCount++;
+            }
+        });
 
-        let isCurrentLocked = RED.workspaces.isActiveLocked()
+        let isCurrentLocked = RED.workspaces.isLocked()
         if (tab) {
             isCurrentLocked = tab.locked
         }
@@ -224,8 +231,7 @@ RED.workspaces = (function() {
                     null
                 )
             }
-            const currentTabs = workspace_tabs.listTabs()
-            const activeIndex = currentTabs.findIndex(id => id === activeWorkspace.id)
+            const activeIndex = currentTabs.findIndex(id => (activeWorkspace && (id === activeWorkspace.id)));
             menuItems.push(
                 {
                     label: RED._("workspace.moveToStart"),
@@ -267,11 +273,13 @@ RED.workspaces = (function() {
             )
 
         }
+        
         menuItems.push(
             {
                 id:"red-ui-tabs-menu-option-add-hide-all-flows",
                 label: RED._("workspace.hideAllFlows"),
-                onselect: "core:hide-all-flows"
+                onselect: "core:hide-all-flows",
+                disabled: (hiddenflowCount === flowCount)
             },
             {
                 id:"red-ui-tabs-menu-option-add-show-all-flows",
@@ -291,14 +299,14 @@ RED.workspaces = (function() {
                 null,
                 {
                     label: RED._("common.label.delete"),
-                    disabled: isCurrentLocked,
                     onselect: function() {
                         if (tab.type === 'tab') {
                             RED.workspaces.delete(tab)
                         } else if (tab.type === 'subflow') {
                             RED.subflow.delete(tab.id)
                         }
-                    }
+                    },
+                    disabled: isCurrentLocked || (workspaceTabCount === 1)
                 },
                 {
                     label: RED._("menu.label.export"),
@@ -825,8 +833,9 @@ RED.workspaces = (function() {
         active: function() {
             return activeWorkspace
         },
-        isActiveLocked: function() {
-            var ws = RED.nodes.workspace(activeWorkspace) || RED.nodes.subflow(activeWorkspace)
+        isLocked: function(id) {
+            id = id || activeWorkspace
+            var ws = RED.nodes.workspace(id) || RED.nodes.subflow(id)
             return ws && ws.locked
         },
         selection: function() {

packages/node_modules/@node-red/editor-client/src/sass/debug.scss

@@ -30,7 +30,7 @@
     bottom: 0px;
     left:0px;
     right: 0px;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .red-ui-debug-filter-box {
     position:absolute;

packages/node_modules/@node-red/editor-client/src/sass/dragdrop.scss

@@ -37,3 +37,27 @@
         }
     }
 }
+
+#red-ui-image-drop-target {
+    position: absolute;
+    top: 0; bottom: 0;
+    left: 0; right: 0;
+    background: var(--red-ui-dnd-background);
+    display:table;
+    width: 100%;
+    height: 100%;
+    display: none;
+    z-index:100;
+    div {
+        pointer-events: none;
+        display: table-cell;
+        vertical-align: middle;
+        text-align: center;
+        font-size: 40px;
+        color: var(--red-ui-dnd-color);
+        i {
+            pointer-events: none;
+            font-size: 80px;
+        }
+    }
+}

packages/node_modules/@node-red/editor-client/src/sass/editor.scss

@@ -87,16 +87,18 @@
         padding: 0px 8px;
         height: 26px;
         line-height: 26px;
-        &.toggle:not(.selected) {
+        &.toggle.selected {
             color: var(--red-ui-workspace-button-color-selected) !important;
-            background: var(--red-ui-workspace-button-background-active);
+            background: var(--red-ui-workspace-button-background) !important;
         }
     }
 
     .red-ui-tray-footer-left {
-        display:inline-block;
         margin-right: 20px;
         float:left;
+        & :not(:first-child) {
+            margin-left: 5px
+        }
     }
     .red-ui-tray-footer-right {
         float: right;
@@ -368,7 +370,7 @@ button.red-ui-button-small
     border:1px solid var(--red-ui-secondary-border-color);
     border-radius:5px;
     height: calc(100% - 21px);
-    overflow-y: scroll;
+    overflow-y: auto;
     background: var(--red-ui-secondary-background);
 }
 
@@ -562,7 +564,7 @@ div.red-ui-button-small.red-ui-color-picker-opacity-slider-handle {
 .red-ui-icon-list {
     width: 308px;
     height: 200px;
-    overflow-y: scroll;
+    overflow-y: auto;
     line-height: 0px;
     position: relative;
     &.red-ui-icon-list-dark {

packages/node_modules/@node-red/editor-client/src/sass/notifications.scss

@@ -32,7 +32,8 @@
     color: var(--red-ui-primary-text-color);
     border: 1px solid var(--red-ui-notification-border-default);
     border-left-width: 16px;
-    overflow: hidden;
+    overflow: auto;
+    max-height: 80vh;
     .ui-dialog-buttonset {
         margin-top: 20px;
         margin-bottom: 10px;

packages/node_modules/@node-red/editor-client/src/sass/projects.scss

@@ -26,7 +26,7 @@
     }
 }
 #red-ui-project-settings-tab-settings {
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .red-ui-sidebar-vc-shade {
     background: var(--red-ui-primary-background);
@@ -183,7 +183,7 @@
 }
 .red-ui-projects-dialog-project-list-inner-container {
     flex-grow: 1 ;
-    overflow-y: scroll;
+    overflow-y: auto;
     position:relative;
     .red-ui-editableList-border {
         border: none;

packages/node_modules/@node-red/editor-client/src/sass/radialMenu.scss

@@ -41,6 +41,7 @@
     height: 50px;
     background: var(--red-ui-secondary-background);
     border: 2px solid var(--red-ui-primary-border-color);
+    color: var(--red-ui-primary-text-color);
     text-align: center;
     line-height:50px;
 
@@ -51,7 +52,7 @@
 
 .red-ui-editor-radial-menu-opt-disabled {
     border-color: var(--red-ui-tertiary-border-color);
-    color: var(--red-ui-tertiary-border-color);
+    color: var(--red-ui-secondary-text-color-disabled);
 }
 .red-ui-editor-radial-menu-opt-active {
     background: var(--red-ui-secondary-background-hover);

packages/node_modules/@node-red/editor-client/src/sass/tab-context.scss

@@ -20,7 +20,7 @@
     bottom: 0;
     left: 0;
     right: 0;
-    overflow-y: scroll;
+    overflow-y: auto;
 
     .red-ui-palette-category {
         &:not(.expanded) button {

packages/node_modules/@node-red/editor-client/src/sass/userSettings.scss

@@ -67,7 +67,7 @@
     left: 0;
     bottom: 0;
     padding: 8px 20px 20px;
-    overflow-y: scroll;
+    overflow-y: auto;
 }
 .red-ui-settings-row {
     padding: 5px 10px 2px;

packages/node_modules/@node-red/editor-client/src/sass/workspace.scss

@@ -29,7 +29,7 @@
 #red-ui-workspace-chart {
    overflow: auto;
    position: absolute;
-   bottom:25px;
+   bottom:26px;
    top: 35px;
    left:0px;
    right:0px;

packages/node_modules/@node-red/editor-client/src/tours/3.0/welcome.js

@@ -0,0 +1,155 @@
+export default {
+    version: "3.0.0",
+    steps: [
+        {
+            titleIcon: "fa fa-map-o",
+            title: {
+                "en-US": "Welcome to Node-RED 3.0!",
+                "ja": "Node-RED 3.0へようこそ!"
+            },
+            description: {
+                "en-US": "<p>Let's take a moment to discover the new features in this release.</p>",
+                "ja": "<p>本リリースの新機能を見つけてみましょう。</p>"
+            }
+        },
+        {
+            title: {
+                "en-US": "Context Menu",
+                "ja": "コンテキストメニュー"
+            },
+            image: '3.0/images/context-menu.png',
+            description: {
+                "en-US": `<p>The editor now has its own context menu when you
+                          right-click in the workspace.</p>
+                          <p>This makes many of the built-in actions much easier
+                          to access.</p>`,
+                "ja": `<p>ワークスペースで右クリックすると、エディタに独自のコンテキストメニューが表示されるようになりました。</p>
+                       <p>これによって多くの組み込み動作を、より簡単に利用できます。</p>`
+            }
+        },
+        {
+            title: {
+                "en-US": "Wire Junctions",
+                "ja": "分岐点をワイヤーに追加"
+            },
+            image: '3.0/images/junction-slice.gif',
+            description: {
+                "en-US": `<p>To make it easier to route wires around your flows,
+                             it is now possible to add junction nodes that give
+                             you more control.</p>
+                          <p>Junctions can be added to wires by holding both the Alt key and the Shift key
+                          then click and drag the mouse across the wires.</p>`,
+                "ja": `<p>フローのワイヤーの経路をより制御しやすくするために、分岐点ノードを追加できるようになりました。</p>
+                       <p>Altキーとシフトキーを押しながらマウスをクリックし、ワイヤーを横切るようにドラッグすることで、分岐点を追加できます。</p>`
+            },
+        },
+        {
+            title: {
+                "en-US": "Wire Junctions",
+                "ja": "分岐点をワイヤーに追加"
+            },
+            image: '3.0/images/junction-quick-add.png',
+            description: {
+                "en-US": `<p>Junctions can also be added using the quick-add dialog.</p>
+                          <p>The dialog is opened by holding the Ctrl (or Cmd) key when
+                             clicking in the workspace.</p>`,
+                "ja": `<p>クイック追加ダイアログを用いて、分岐点を追加することもできます。</p>
+                       <p>本ダイアログを開くには、Ctrl(またはCmd)キーを押しながら、ワークスペース上でクリックします。</p>`
+            },
+        },
+        {
+            title: {
+                "en-US": "Debug Path Tooltip",
+                "ja": "デバッグパスのツールチップ"
+            },
+            image: '3.0/images/debug-path-tooltip.png',
+            description: {
+                "en-US": `<p>When hovering over a node name in the Debug sidebar, a
+                             new tooltip shows the full location of the node.</p>
+                          <p>This is useful when working with subflows, making it
+                             much easier to identify exactly which node generated
+                             the message.</p>
+                          <p>Clicking on any item in the list will reveal it in
+                             the workspace.</p>`,
+                "ja": `<p>デバックサイドバー内のノード名の上にマウスカーソルを乗せると、新たにツールチップが表示され、ノードの場所が分かるようになっています。</p>
+                       <p>これは、サブフローを用いる時に役立つ機能であり、メッセージがどのノードから出力されたかを正確に特定することが遥かに簡単になります。</p>
+                       <p>本リスト内の要素をクリックすると、ワークスペース内にその要素が表示されます。</p>`
+            },
+        },
+        {
+            title: {
+                "en-US": "Continuous Search",
+                "ja": "連続した検索"
+            },
+            image: '3.0/images/continuous-search.png',
+            description: {
+                "en-US": `<p>When searching for things in the editor, a new toolbar in
+                             the workspace provides options to quickly jump between
+                             the search results.</p>`,
+                "ja": `<p>ワークスペース内の新しいツールバーにあるオプションによって、エディタ内を検索する際に、検索結果の間を素早く移動できます。</p>`
+            },
+        },
+        {
+            title: {
+                "en-US": "New wiring actions",
+                "ja": "新しいワイヤー操作"
+            },
+            image: "3.0/images/split-wire-with-links.gif",
+            description: {
+                "en-US": `<p>A new action has been added that will replace a wire with a pair of connected Link nodes:</p>
+                          <ul>
+                          <li><b><code>Split Wire With Link Nodes</code></b></li>
+                          </ul>
+                          <p>Actions can be accessed from the Action List in the main menu.</p>`,
+                "ja": `<p>ワイヤーを、接続されたLinkノードのペアに置き換える動作が新たに追加されました:</p>
+                       <ul>
+                       <li><b><code>ワイヤーをlinkノードで分割</code></b></li>
+                       </ul>
+                       <p>本アクションは、メインメニュー内の動作一覧から呼び出せます。</p>`,
+            },
+        },
+        {
+            title: {
+                "en-US": "Default node names",
+                "ja": "標準ノードの名前"
+            },
+            // image: "images/",
+            description: {
+                "en-US": `<p>Some nodes have been updated to generate a unique name when
+                             new instances are added to the workspace. This applies to
+                             <code>Debug</code>, <code>Function</code> and <code>Link</code> nodes.</p>
+                          <p>A new action has also been added to generate default names for the selected
+                             nodes:</p>
+                             <ul>
+                             <li><b><code>Generate Node Names</code></b></li>
+                             </ul><p>Actions can be accessed from the Action List in the main menu.</p>
+                            `,
+                "ja": `<p>一部のノードは、ワークスペース上に新インスタンスとして追加した際に、一意の名前を付けるよう変更されました。この変更は、<code>Debug</code>、<code>Function</code>、<code>Link</code>ノードに適用されています。</p>
+                       <p>選択したノードに対して、標準の名前を生成する動作も新たに追加されました:</p>
+                          <ul>
+                          <li><b><code>ノード名を生成</code></b></li>
+                          </ul><p>本アクションは、メインメニュー内の動作一覧から呼び出せます。</p>
+                         `
+            }
+        },
+        {
+            title: {
+                "en-US": "Node Updates",
+                "ja": "ノードの更新"
+            },
+            // image: "images/",
+            description: {
+                "en-US": `<ul>
+                            <li>The Debug node can be configured to count messages it receives</li>
+                            <li>The Link Call node can use a message property to dynamically target the link it should call</li>
+                            <li>The HTTP Request node can be preconfigured with HTTP headers</li>
+                          </ul>`,
+                "ja": `<ul>
+                         <li>Debugノードは、受信したメッセージの数をカウントするよう設定できるようになりました。</li>
+                         <li>Link Callノードは、メッセージのプロパティによって、呼び出し対象のlinkを動的に指定できるようになりました。</li>
+                         <li>HTTP Requestノードは、HTTPヘッダを事前設定できるようになりました。</li>
+                       </ul>`
+            }
+        }
+    ]
+}

packages/node_modules/@node-red/editor-client/src/tours/welcome.js

@@ -1,137 +1,105 @@
 export default {
-    version: "3.0.0",
+    version: "3.1.0-beta.1",
     steps: [
         {
             titleIcon: "fa fa-map-o",
             title: {
-                "en-US": "Welcome to Node-RED 3.0!",
-                "ja": "Node-RED 3.0へようこそ!"
+                "en-US": "Welcome to Node-RED 3.1 Beta 1!",
+                "ja": "Node-RED 3.1 ベータ1へようこそ!"
             },
             description: {
-                "en-US": "<p>Let's take a moment to discover the new features in this release.</p>",
-                "ja": "<p>本リリースの新機能を見つけてみましょう。</p>"
+                "en-US": "<p>This is the first beta release for 3.1.0 and we have a few new features to tell you about.</p>",
+                "ja": "<p>これは3.1.0の最初のベータリリースです。いくつかの新機能について説明します。</p>"
             }
         },
         {
             title: {
-                "en-US": "Context Menu",
-                "ja": "コンテキストメニュー"
+                "en-US": "Improved Context Menu",
+                "ja": "コンテキストメニューの改善"
             },
             image: 'images/context-menu.png',
             description: {
-                "en-US": `<p>The editor now has its own context menu when you
-                          right-click in the workspace.</p>
-                          <p>This makes many of the built-in actions much easier
-                          to access.</p>`,
-                "ja": `<p>ワークスペースで右クリックすると、エディタに独自のコンテキストメニューが表示されるようになりました。</p>
-                       <p>これによって多くの組み込み動作を、より簡単に利用できます。</p>`
+                "en-US": `<p>The editor's context menu has been expanded to make lots more of
+                        the built-in actions available.</p>
+                        <p>Adding nodes, working with groups and plenty
+                        of other useful tools are now just a click away.</p>
+                        <p>The flow tab bar also has its own context menu to make working
+                        with your flows much easier.</p>`,
+                "ja": `<p>より多くの組み込み動作を利用できるように、エディタのコンテキストメニューが拡張されました。</p>
+                       <p>ノードの追加、グループの操作、その他の便利なツールをクリックするだけで実行できるようになりました。</p>
+                       <p>フローのタブバーには、フローの操作をより簡単にする独自のコンテキストメニューもあります。</p>`
             }
         },
         {
             title: {
-                "en-US": "Wire Junctions",
-                "ja": "分岐点をワイヤーに追加"
+                "en-US": "Hiding Flows",
+                "ja": "フローを非表示"
             },
-            image: 'images/junction-slice.gif',
+            image: 'images/hiding-flows.png',
             description: {
-                "en-US": `<p>To make it easier to route wires around your flows,
-                             it is now possible to add junction nodes that give
-                             you more control.</p>
-                          <p>Junctions can be added to wires by holding both the Alt key and the Shift key
-                          then click and drag the mouse across the wires.</p>`,
-                "ja": `<p>フローのワイヤーの経路をより制御しやすくするために、分岐点ノードを追加できるようになりました。</p>
-                       <p>Altキーとシフトキーを押しながらマウスをクリックし、ワイヤーを横切るようにドラッグすることで、分岐点を追加できます。</p>`
+                "en-US": `<p>Hiding flows is now done through the flow context menu.</p>
+                          <p>The 'hide' button in previous releases has been removed from the tabs
+                             as they were being clicked accidentally too often.</p>`,
+                "ja": `<p>フローを非表示にする機能は、フローのコンテキストメニューから実行するようになりました。</p>
+                       <p>これまでのリリースでタブに存在していた「非表示」ボタンは、よく誤ってクリックされていたため、削除されました。</p>`
             },
         },
         {
             title: {
-                "en-US": "Wire Junctions",
-                "ja": "分岐点をワイヤーに追加"
+                "en-US": "Locking Flows",
+                "ja": "フローを固定"
             },
-            image: 'images/junction-quick-add.png',
+            image: 'images/locking-flows.png',
             description: {
-                "en-US": `<p>Junctions can also be added using the quick-add dialog.</p>
-                          <p>The dialog is opened by holding the Ctrl (or Cmd) key when
-                             clicking in the workspace.</p>`,
-                "ja": `<p>クイック追加ダイアログを用いて、分岐点を追加することもできます。</p>
-                       <p>本ダイアログを開くには、Ctrl(またはCmd)キーを押しながら、ワークスペース上でクリックします。</p>`
+                "en-US": `<p>Flows can now be locked to prevent accidental changes being made.</p>
+                          <p>When locked you cannot modify the nodes in any way.</p>
+                          <p>The flow context menu provides the options to lock and unlock flows,
+                             as well as in the Info sidebar explorer.</p>`,
+                "ja": `<p>誤ってフローに変更が加えられてしまうのを防ぐために、フローを固定できるようになりました。</p>
+                       <p>固定されている時は、ノードを修正することはできません。</p>
+                       <p>フローのコンテキストメニューと、情報サイドバーのエクスプローラには、フローの固定や解除をするためのオプションが用意されています。</p>`
             },
         },
         {
             title: {
-                "en-US": "Debug Path Tooltip",
-                "ja": "デバッグパスのツールチップ"
+                "en-US": "Adding Images to node/flow descriptions",
+                "ja": "ノードやフローの説明へ画像を追加"
             },
-            image: 'images/debug-path-tooltip.png',
+            // image: 'images/debug-path-tooltip.png',
             description: {
-                "en-US": `<p>When hovering over a node name in the Debug sidebar, a
-                             new tooltip shows the full location of the node.</p>
-                          <p>This is useful when working with subflows, making it
-                             much easier to identify exactly which node generated
-                             the message.</p>
-                          <p>Clicking on any item in the list will reveal it in
-                             the workspace.</p>`,
-                "ja": `<p>デバックサイドバー内のノード名の上にマウスカーソルを乗せると、新たにツールチップが表示され、ノードの場所が分かるようになっています。</p>
-                       <p>これは、サブフローを用いる時に役立つ機能であり、メッセージがどのノードから出力されたかを正確に特定することが遥かに簡単になります。</p>
-                       <p>本リスト内の要素をクリックすると、ワークスペース内にその要素が表示されます。</p>`
+                "en-US": `<p>You can now add images to a node's or flows's description.</p>
+                          <p>Simply drag the image into the text editor and it will get added inline.</p>
+                          <p>When the description is shown in the Info sidebar, the image will be displayed.</p>`,
+                "ja": `<p>ノードまたはフローの説明に、画像を追加できるようになりました。</p>
+                       <p>画像をテキストエディタにドラッグするだけで、行内に埋め込まれます。</p>
+                       <p>情報サイドバーの説明を開くと、その画像が表示されます。</p>`
             },
         },
         {
             title: {
-                "en-US": "Continuous Search",
-                "ja": "連続した検索"
+                "en-US": "Adding Mermaid Diagrams",
+                "ja": "Mermaidの図を追加"
             },
-            image: 'images/continuous-search.png',
+            image: 'images/mermaid.png',
             description: {
-                "en-US": `<p>When searching for things in the editor, a new toolbar in
-                             the workspace provides options to quickly jump between
-                             the search results.</p>`,
-                "ja": `<p>ワークスペース内の新しいツールバーにあるオプションによって、エディタ内を検索する際に、検索結果の間を素早く移動できます。</p>`
+                "en-US": `<p>You can also add <a href="https://github.com/mermaid-js/mermaid">Mermaid</a> diagrams directly into your node or flow descriptions.</p>
+                          <p>This gives you much richer options for documenting your flows.</p>`,
+                "ja": `<p>ノードやフローの説明に、<a href="https://github.com/mermaid-js/mermaid">Mermaid</a>の図を直接追加することもできます。</p>
+                       <p>これによって、フローを説明する文書作成の選択肢がより多くなります。</p>`
             },
         },
         {
             title: {
-                "en-US": "New wiring actions",
-                "ja": "新しいワイヤー操作"
+                "en-US": "Managing Global Environment Variables",
+                "ja": "グローバル環境変数の管理"
             },
-            image: "images/split-wire-with-links.gif",
+            image: 'images/global-env-vars.png',
             description: {
-                "en-US": `<p>A new action has been added that will replace a wire with a pair of connected Link nodes:</p>
-                          <ul>
-                          <li><b><code>Split Wire With Link Nodes</code></b></li>
-                          </ul>
-                          <p>Actions can be accessed from the Action List in the main menu.</p>`,
-                "ja": `<p>ワイヤーを、接続されたLinkノードのペアに置き換える動作が新たに追加されました:</p>
-                       <ul>
-                       <li><b><code>ワイヤーをlinkノードで分割</code></b></li>
-                       </ul>
-                       <p>本アクションは、メインメニュー内の動作一覧から呼び出せます。</p>`,
+                "en-US": `<p>You can set environment variables that apply to all nodes and flows in the new
+                          'Global Environment Variables' section of User Settings.</p>`,
+                "ja": `<p>ユーザ設定に新しく追加された「大域環境変数」のセクションで、全てのノードとフローに適用される環境変数を登録できます。</p>`
             },
         },
-        {
-            title: {
-                "en-US": "Default node names",
-                "ja": "標準ノードの名前"
-            },
-            // image: "images/",
-            description: {
-                "en-US": `<p>Some nodes have been updated to generate a unique name when
-                             new instances are added to the workspace. This applies to
-                             <code>Debug</code>, <code>Function</code> and <code>Link</code> nodes.</p>
-                          <p>A new action has also been added to generate default names for the selected
-                             nodes:</p>
-                             <ul>
-                             <li><b><code>Generate Node Names</code></b></li>
-                             </ul><p>Actions can be accessed from the Action List in the main menu.</p>
-                            `,
-                "ja": `<p>一部のノードは、ワークスペース上に新インスタンスとして追加した際に、一意の名前を付けるよう変更されました。この変更は、<code>Debug</code>、<code>Function</code>、<code>Link</code>ノードに適用されています。</p>
-                       <p>選択したノードに対して、標準の名前を生成する動作も新たに追加されました:</p>
-                          <ul>
-                          <li><b><code>ノード名を生成</code></b></li>
-                          </ul><p>本アクションは、メインメニュー内の動作一覧から呼び出せます。</p>
-                         `
-            }
-        },
         {
             title: {
                 "en-US": "Node Updates",
@@ -139,16 +107,9 @@ export default {
             },
             // image: "images/",
             description: {
-                "en-US": `<ul>
-                            <li>The Debug node can be configured to count messages it receives</li>
-                            <li>The Link Call node can use a message property to dynamically target the link it should call</li>
-                            <li>The HTTP Request node can be preconfigured with HTTP headers</li>
-                          </ul>`,
-                "ja": `<ul>
-                         <li>Debugノードは、受信したメッセージの数をカウントするよう設定できるようになりました。</li>
-                         <li>Link Callノードは、メッセージのプロパティによって、呼び出し対象のlinkを動的に指定できるようになりました。</li>
-                         <li>HTTP Requestノードは、HTTPヘッダを事前設定できるようになりました。</li>
-                       </ul>`
+                "en-US": `<p>The core nodes have received lots of minor fixes, documentation updates and
+                          small enhancements. Check the full changelog in the Help sidebar for a full list.</p>`,
+                "ja": `<p>コアノードにマイナーな修正、ドキュメント更新、小規模な拡張が数多く追加されています。全ての一覧は、ヘルプサイドバーの全ての更新履歴を確認してください。</p>`
             }
         }
     ]

packages/node_modules/@node-red/editor-client/src/types/node-red/func.d.ts

@@ -14,6 +14,9 @@ declare var msg: NodeMessage;
 /** @type {string} the id of the incoming `msg` (alias of msg._msgid) */
 declare const __msgid__:string;
 
+declare const util:typeof import('util')
+declare const promisify:typeof import('util').promisify
+
 /**
  * @typedef NodeStatus
  * @type {object}

packages/node_modules/@node-red/editor-client/src/vendor/jsonata/formatter.js

@@ -160,6 +160,7 @@
         '$base64encode':{ args:[  ]},
         '$boolean':{ args:[ 'arg' ]},
         '$ceil':{ args:[ 'number' ]},
+        '$clone': { args:[ 'arg' ]},
         '$contains':{ args:[ 'str', 'pattern' ]},
         '$count':{ args:[ 'array' ]},
         '$decodeUrl':{ args:[ 'str' ]},

packages/node_modules/@node-red/nodes/core/common/20-inject.js

@@ -95,45 +95,64 @@ module.exports = function(RED) {
         }
 
         this.on("input", function(msg, send, done) {
-            var errors = [];
-            var props = this.props;
+            const errors = [];
+            let props = this.props;
             if (msg.__user_inject_props__ && Array.isArray(msg.__user_inject_props__)) {
                 props = msg.__user_inject_props__;
             }
             delete msg.__user_inject_props__;
-            props.forEach(p => {
-                var property = p.p;
-                var value = p.v ? p.v : '';
-                var valueType = p.vt ? p.vt : 'str';
+            props = [...props]
+            function evaluateProperty(doneEvaluating) {
+                if (props.length === 0) { 
+                    doneEvaluating()
+                    return
+                }
+                const p = props.shift()
+                const property = p.p;
+                const value = p.v ? p.v : '';
+                const valueType = p.vt ? p.vt : 'str';
 
-                if (!property) return;
-
-                if (valueType === "jsonata") {
-                    if (p.v) {
-                        try {
-                            var exp = RED.util.prepareJSONataExpression(p.v, node);
-                            var val = RED.util.evaluateJSONataExpression(exp, msg);
-                            RED.util.setMessageProperty(msg, property, val, true);
+                if (property) {
+                    if (valueType === "jsonata") {
+                        if (p.v) {
+                            try {
+                                var exp = RED.util.prepareJSONataExpression(p.v, node);
+                                var val = RED.util.evaluateJSONataExpression(exp, msg);
+                                RED.util.setMessageProperty(msg, property, val, true);
+                            }
+                            catch  (err) {
+                                errors.push(err.message);
+                            }
                         }
-                        catch  (err) {
-                            errors.push(err.message);
+                        evaluateProperty(doneEvaluating)
+                    } else {
+                        try {
+                            RED.util.evaluateNodeProperty(value, valueType, node, msg, (err, newValue) => {
+                                if (err) {
+                                    errors.push(err.toString())
+                                } else {
+                                    RED.util.setMessageProperty(msg,property,newValue,true);
+                                }
+                                evaluateProperty(doneEvaluating)
+                            })
+                        } catch (err) {
+                            errors.push(err.toString());
+                            evaluateProperty(doneEvaluating)
                         }
                     }
-                    return;
+                } else {
+                    evaluateProperty(doneEvaluating)
                 }
-                try {
-                    RED.util.setMessageProperty(msg,property,RED.util.evaluateNodeProperty(value, valueType, this, msg),true);
-                } catch (err) {
-                    errors.push(err.toString());
-                }
-            });
-
-            if (errors.length) {
-                done(errors.join('; '));
-            } else {
-                send(msg);
-                done();
             }
+           
+            evaluateProperty(() => {
+                if (errors.length) {
+                    done(errors.join('; '));
+                } else {
+                    send(msg);
+                    done();
+                }
+            })
         });
     }
 

packages/node_modules/@node-red/nodes/core/common/24-complete.html

@@ -1,6 +1,6 @@
 <script type="text/html" data-template-name="complete">
     <div class="form-row node-input-target-row">
-        <button id="node-input-complete-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
+        <button type="button" id="node-input-complete-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
     </div>
     <div class="form-row node-input-target-row node-input-target-list-row" style="position: relative; min-height: 100px">
         <div style="position: absolute; top: -30px; right: 0;"><input type="text" id="node-input-complete-target-filter"></div>
@@ -18,7 +18,16 @@
         color:"#c0edc0",
         defaults: {
             name: {value:""},
-            scope: {value:[], type:"*[]"},
+            scope: {
+                value: [],
+                type: "*[]",
+                validate: function (v, opt) {
+                    if (v.length > 0) {
+                        return true;
+                    }
+                    return RED._("node-red:complete.errors.scopeUndefined");
+                }
+            },
             uncaught: {value:false}
         },
         inputs:0,

packages/node_modules/@node-red/nodes/core/common/25-catch.html

@@ -4,7 +4,7 @@
         <label style="width: auto" for="node-input-scope" data-i18n="catch.label.source"></label>
         <select id="node-input-scope-select">
             <option value="all" data-i18n="catch.scope.all"></option>
-            <option value="target" data-i18n="catch.scope.selected"></options>
+            <option value="target" data-i18n="catch.scope.selected"></option>
         </select>
     </div>
     <div class="form-row node-input-uncaught-row">
@@ -12,7 +12,7 @@
         <label for="node-input-uncaught" style="width: auto" data-i18n="catch.label.uncaught"></label>
     </div>
     <div class="form-row node-input-target-row">
-        <button id="node-input-catch-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
+        <button type="button" id="node-input-catch-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
     </div>
     <div class="form-row node-input-target-row node-input-target-list-row" style="position: relative; min-height: 100px">
         <div style="position: absolute; top: -30px; right: 0;"><input type="text" id="node-input-catch-target-filter"></div>

packages/node_modules/@node-red/nodes/core/common/25-status.html

@@ -4,11 +4,11 @@
         <label style="width: auto" for="node-input-scope" data-i18n="status.label.source"></label>
         <select id="node-input-scope-select">
             <option value="all" data-i18n="status.scope.all"></option>
-            <option value="target" data-i18n="status.scope.selected"></options>
+            <option value="target" data-i18n="status.scope.selected"></option>
         </select>
     </div>
     <div class="form-row node-input-target-row">
-        <button id="node-input-status-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
+        <button type="button" id="node-input-status-target-select" class="red-ui-button" data-i18n="common.label.selectNodes"></button>
     </div>
     <div class="form-row node-input-target-row node-input-target-list-row" style="position: relative; min-height: 100px">
         <div style="position: absolute; top: -30px; right: 0;"><input type="text" id="node-input-status-target-filter"></div>

packages/node_modules/@node-red/nodes/core/common/60-link.html

@@ -1,4 +1,3 @@
-
 <script type="text/html" data-template-name="link in">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="common.label.name"></span></label>
@@ -272,7 +271,17 @@
         color:"#ddd",//"#87D8CF",
         defaults: {
             name: { value: "" },
-            links: { value: [], type:"link in[]" },
+            links: {
+                value: [],
+                type: "link in[]",
+                validate: function (v, opt) {
+                    if ((this.linkType === "static" && v.length > 0)
+                      || this.linkType === "dynamic") {
+                        return true;
+                    }
+                    return RED._("node-red:link.errors.linkUndefined");
+                }
+            },
             linkType: { value:"static" },
             timeout: {
                 value: "30",

packages/node_modules/@node-red/nodes/core/common/60-link.js

@@ -164,10 +164,10 @@ module.exports = function(RED) {
                     if (returnNode && returnNode.returnLinkMessage) {
                         returnNode.returnLinkMessage(messageEvent.id, msg);
                     } else {
-                        node.warn(RED._("link.error.missingReturn"))
+                        node.warn(RED._("link.errors.missingReturn"));
                     }
                 } else {
-                    node.warn(RED._("link.error.missingReturn"))
+                    node.warn(RED._("link.errors.missingReturn"));
                 }
                 done();
             } else if (mode === "link") {

packages/node_modules/@node-red/nodes/core/common/91-global-config.html

@@ -0,0 +1,27 @@
+<script type="text/html" data-template-name="global-config">
+　　<div class="form-row">
+        <label style="width: 100%"><span data-i18n="global-config.label.open-conf"></span>:</label>
+    </div>
+    <div class="form-row">
+        <button class="red-ui-button" type="button" id="node-input-edit-env-var" data-i18n="editor:env-var.header" style="margin-left: 20px"></button>
+    </div>
+</script>
+
+<script type="text/javascript">
+    RED.nodes.registerType('global-config',{
+        category: 'config',
+        defaults: {
+            name: { value: "" },
+            env: { value: [] },
+        },
+        credentials: {
+            map: { type: "map" }
+        },
+        oneditprepare: function() {
+            $('#node-input-edit-env-var').on('click', function(evt) {
+                RED.actions.invoke('core:show-user-settings', 'envvar')
+            });
+        },
+        hasUsers: false
+    });
+</script>

packages/node_modules/@node-red/nodes/core/common/91-global-config.js

@@ -0,0 +1,7 @@
+module.exports = function(RED) {
+    "use strict";
+    function GlobalConfigNode(n) {
+        RED.nodes.createNode(this,n);
+    }
+    RED.nodes.registerType("global-config", GlobalConfigNode);
+}

packages/node_modules/@node-red/nodes/core/function/10-function.html

@@ -17,6 +17,8 @@
             display: flex;
             background: var(--red-ui-tertiary-background);
             padding-right: 75px;
+            border-top-left-radius: 3px;
+            border-top-right-radius: 3px;
         }
         #node-input-libs-container-row .red-ui-editableList-header > div {
             flex-grow: 1;
@@ -91,21 +93,21 @@
         <div id="func-tab-init" style="display:none">
             <div class="form-row node-text-editor-row" style="position:relative">
                 <div style="height: 250px; min-height:150px;" class="node-text-editor" id="node-input-init-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-init-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button type="button" id="node-init-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
             </div>
         </div>
 
         <div id="func-tab-body" style="display:none">
             <div class="form-row node-text-editor-row" style="position:relative">
                 <div style="height: 220px; min-height:150px;" class="node-text-editor" id="node-input-func-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-function-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button type="button" id="node-function-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
             </div>
         </div>
 
         <div id="func-tab-finalize" style="display:none">
             <div class="form-row node-text-editor-row" style="position:relative">
                 <div style="height: 250px; min-height:150px;" class="node-text-editor" id="node-input-finalize-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-finalize-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button type="button" id="node-finalize-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
             </div>
         </div>
 
@@ -294,7 +296,7 @@
                     if (val === "_custom_") {
                         val = $(this).val();
                     }
-                    var varName = val.trim().replace(/^@/,"").replace(/@.*$/,"").replace(/[-_/].?/g, function(v) { return v[1]?v[1].toUpperCase():"" });
+                    var varName = val.trim().replace(/^@/,"").replace(/@.*$/,"").replace(/[-_/\.].?/g, function(v) { return v[1]?v[1].toUpperCase():"" });
                     fvar.val(varName);
                     fvar.trigger("change");
 
@@ -451,11 +453,13 @@
             tabs.activateTab("func-tab-body");
 
             $( "#node-input-outputs" ).spinner({
-                min:0,
+                min: 0,
+                max: 500,
                 change: function(event, ui) {
-                    var value = this.value;
-                    if (!value.match(/^\d+$/)) { value = 1;  }
-                    else if (value < this.min) { value = this.min; }
+                    var value = parseInt(this.value);
+                    value = isNaN(value) ? 1 : value;
+                    value = Math.max(value, parseInt($(this).attr("aria-valuemin")));
+                    value = Math.min(value, parseInt($(this).attr("aria-valuemax")));
                     if (value !== this.value) { $(this).spinner("value", value); }
                 }
             });

packages/node_modules/@node-red/nodes/core/function/15-change.js

@@ -318,7 +318,7 @@ module.exports = function(RED) {
             }
             var r = node.rules[currentRule];
             if (r.t === "move") {
-                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1)) {
+                if ((r.tot !== r.pt) || (r.p.indexOf(r.to) !== -1) && (r.p !== r.to)) {
                     applyRule(msg,{t:"set", p:r.to, pt:r.tot, to:r.p, tot:r.pt},(err,msg) => {
                         applyRule(msg,{t:"delete", p:r.p, pt:r.pt}, (err,msg) => {
                             completeApplyingRules(msg,currentRule,done);

packages/node_modules/@node-red/nodes/core/function/80-template.html

@@ -21,12 +21,13 @@
                 <option value="javascript">JavaScript</option>
                 <option value="css">CSS</option>
                 <option value="markdown">Markdown</option>
+                <option value="php">PHP</option>
                 <option value="python">Python</option>
                 <option value="sql">SQL</option>
                 <option value="yaml">YAML</option>
                 <option value="text" data-i18n="template.label.none"></option>
             </select>
-            <button id="node-template-expand-editor" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button>
+            <button type="button" id="node-template-expand-editor" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button>
         </div>
     </div>
     <div class="form-row node-text-editor-row">

packages/node_modules/@node-red/nodes/core/function/89-trigger.html

@@ -25,7 +25,7 @@
         <select id="node-then-type" style="width:70%;">
             <option value="block" data-i18n="trigger.wait-reset"></option>
             <option value="wait" data-i18n="trigger.wait-for"></option>
-            <option value="loop" data-i18n="trigger.wait-loop"></option>
+            <option id="node-trigger-wait-loop" value="loop" data-i18n="trigger.wait-loop"></option>
         </select>
     </div>
     <div class="form-row node-type-duration">
@@ -181,6 +181,13 @@
                 $("#node-input-op2type").val('str');
             }
 
+            $("#node-input-op1").on("change", function() {
+                if ($("#node-input-op1type").val() === "nul") {
+                    $("#node-trigger-wait-loop").hide();
+                }
+                else { $("#node-trigger-wait-loop").show(); }
+            });
+
             var optionNothing = {value:"nul",label:this._("trigger.output.nothing"),hasValue:false};
             var optionPayload = {value:"pay",label:this._("trigger.output.existing"),hasValue:false};
             var optionOriginalPayload = {value:"pay",label:this._("trigger.output.original"),hasValue:false};

packages/node_modules/@node-red/nodes/core/network/05-tls.html

@@ -25,7 +25,7 @@
             <label class="red-ui-button" for="node-config-input-certfile"><i class="fa fa-upload"></i> <span data-i18n="tls.label.upload"></span></label>
             <input class="hide" type="file" id="node-config-input-certfile">
             <span id="tls-config-certname" style="width: calc(100% - 280px); overflow: hidden; line-height:34px; height:34px; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;"> </span>
-            <button class="red-ui-button red-ui-button-small" id="tls-config-button-cert-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
+            <button type="button" class="red-ui-button red-ui-button-small" id="tls-config-button-cert-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
         </span>
         <input type="hidden" id="node-config-input-certname">
         <input type="hidden" id="node-config-input-certdata">
@@ -37,7 +37,7 @@
             <label class="red-ui-button" for="node-config-input-keyfile"><i class="fa fa-upload"></i> <span data-i18n="tls.label.upload"></span></label>
             <input class="hide" type="file" id="node-config-input-keyfile">
             <span id="tls-config-keyname" style="width: calc(100% - 280px); overflow: hidden; line-height:34px; height:34px; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;"> </span>
-            <button class="red-ui-button red-ui-button-small" id="tls-config-button-key-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
+            <button type="button" class="red-ui-button red-ui-button-small" id="tls-config-button-key-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
         </span>
         <input type="hidden" id="node-config-input-keyname">
         <input type="hidden" id="node-config-input-keydata">
@@ -53,7 +53,7 @@
             <label class="red-ui-button" for="node-config-input-cafile"><i class="fa fa-upload"></i> <span data-i18n="tls.label.upload"></span></label>
             <input class="hide" type="file" title=" " id="node-config-input-cafile">
             <span id="tls-config-caname" style="width: calc(100% - 280px); overflow: hidden; line-height:34px; height:34px; text-overflow: ellipsis; white-space: nowrap; display: inline-block; vertical-align: middle;"> </span>
-            <button class="red-ui-button red-ui-button-small" id="tls-config-button-ca-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
+            <button type="button" class="red-ui-button red-ui-button-small" id="tls-config-button-ca-clear" style="margin-left: 10px"><i class="fa fa-times"></i></button>
         </span>
         <input type="hidden" id="node-config-input-caname">
         <input type="hidden" id="node-config-input-cadata">

packages/node_modules/@node-red/nodes/core/network/06-httpproxy.html

@@ -101,6 +101,7 @@
                             hostField.val(data.host);
                         }
                     },
+                    sortable: true,
                     removable: true
                 });
             if (this.noproxy) {

packages/node_modules/@node-red/nodes/core/network/10-mqtt.html

@@ -421,7 +421,11 @@
 <script type="text/javascript">
 (function() {
 
-    var typedInputNoneOpt = { value: 'none', label: '', hasValue: false };
+    var typedInputNoneOpt = {
+        value: 'none',
+        label: RED._("node-red:mqtt.label.none"),
+        hasValue: false
+    };
     var makeTypedInputOpt = function(value){
         return {
             value: value,
@@ -436,7 +440,11 @@
         makeTypedInputOpt("text/csv"),
         makeTypedInputOpt("text/html"),
         makeTypedInputOpt("text/plain"),
-        {value:"other", label:""}
+        {
+            value: "other",
+            label: RED._("node-red:mqtt.label.other"),
+            icon: "red/images/typedInput/az.svg"
+        }
     ];
 
     function getDefaultContentType(value) {
@@ -499,17 +507,17 @@
             cleansession: {value: true},
             birthTopic: {value:"", validate:validateMQTTPublishTopic},
             birthQos: {value:"0"},
-            birthRetain: {value:false},
+            birthRetain: {value:"false"},
             birthPayload: {value:""},
             birthMsg: { value: {}},
             closeTopic: {value:"", validate:validateMQTTPublishTopic},
             closeQos: {value:"0"},
-            closeRetain: {value:false},
+            closeRetain: {value:"false"},
             closePayload: {value:""},
             closeMsg: { value: {}},
             willTopic: {value:"", validate:validateMQTTPublishTopic},
             willQos: {value:"0"},
-            willRetain: {value:false},
+            willRetain: {value:"false"},
             willPayload: {value:""},
             willMsg: { value: {}},
             userProps: { value: ""},

packages/node_modules/@node-red/nodes/core/network/10-mqtt.js

@@ -295,7 +295,7 @@ module.exports = function(RED) {
                         /* mute error - it simply isnt JSON, just leave payload as a string */
                     }
                 }
-            } //else { 
+            } //else {
                 //leave as buffer
             //}
         }
@@ -357,7 +357,7 @@ module.exports = function(RED) {
                         return;
                     }
                     done(err);
-                }); 
+                });
             } else {
                 done();
             }
@@ -366,6 +366,16 @@ module.exports = function(RED) {
         }
     }
 
+    function updateStatus(node, allNodes) {
+        let setStatus = setStatusDisconnected
+        if(node.connecting) {
+            setStatus = setStatusConnecting
+        } else if(node.connected) {
+            setStatus = setStatusConnected
+        }
+        setStatus(node, allNodes)
+    }
+
     function setStatusDisconnected(node, allNodes) {
         if(allNodes) {
             for (var id in node.users) {
@@ -459,7 +469,6 @@ module.exports = function(RED) {
             if(!opts || typeof opts !== "object") {
                 return; //nothing to change, simply return
             }
-            const originalBrokerURL = node.brokerurl;
 
             //apply property changes (only if the property exists in the opts object)
             setIfHasProperty(opts, node, "url", init);
@@ -468,13 +477,11 @@ module.exports = function(RED) {
             setIfHasProperty(opts, node, "clientid", init);
             setIfHasProperty(opts, node, "autoConnect", init);
             setIfHasProperty(opts, node, "usetls", init);
-            setIfHasProperty(opts, node, "usews", init);
             setIfHasProperty(opts, node, "verifyservercert", init);
             setIfHasProperty(opts, node, "compatmode", init);
             setIfHasProperty(opts, node, "protocolVersion", init);
             setIfHasProperty(opts, node, "keepalive", init);
             setIfHasProperty(opts, node, "cleansession", init);
-            setIfHasProperty(opts, node, "sessionExpiry", init);
             setIfHasProperty(opts, node, "topicAliasMaximum", init);
             setIfHasProperty(opts, node, "maximumPacketSize", init);
             setIfHasProperty(opts, node, "receiveMaximum", init);
@@ -484,6 +491,11 @@ module.exports = function(RED) {
             } else if (hasProperty(opts, "userProps")) {
                 node.userProperties = opts.userProps;
             }
+            if (hasProperty(opts, "sessionExpiry")) {
+                node.sessionExpiryInterval = opts.sessionExpiry;
+            } else if (hasProperty(opts, "sessionExpiryInterval")) {
+                node.sessionExpiryInterval = opts.sessionExpiryInterval
+            }
 
             function createLWT(topic, payload, qos, retain, v5opts, v5SubPropName) {
                 let message = undefined;
@@ -567,9 +579,6 @@ module.exports = function(RED) {
             if (typeof node.usetls === 'undefined') {
                 node.usetls = false;
             }
-            if (typeof node.usews === 'undefined') {
-                node.usews = false;
-            }
             if (typeof node.verifyservercert === 'undefined') {
                 node.verifyservercert = false;
             }
@@ -698,16 +707,21 @@ module.exports = function(RED) {
             if (Object.keys(node.users).length === 1) {
                 if(node.autoConnect) {
                     node.connect();
+                    //update nodes status
+                    setTimeout(function() {
+                        updateStatus(node, true)
+                    }, 1)
                 }
             }
         };
 
-        node.deregister = function(mqttNode,done) {
+        node.deregister = function(mqttNode, done, autoDisconnect) {
             delete node.users[mqttNode.id];
-            if (!node.closing && node.connected && Object.keys(node.users).length === 0) {
-                node.disconnect();
+            if (autoDisconnect && !node.closing && node.connected && Object.keys(node.users).length === 0) {
+                node.disconnect(done);
+            } else {
+                done();
             }
-            done();
         };
         node.canConnect = function() {
             return !node.connected && !node.connecting;
@@ -782,7 +796,9 @@ module.exports = function(RED) {
 
                         // Send any birth message
                         if (node.birthMessage) {
-                            node.publish(node.birthMessage);
+                            setTimeout(() => {
+                                node.publish(node.birthMessage);
+                            }, 1);
                         }
                     });
                     node._clientOn("reconnect", function() {
@@ -839,7 +855,7 @@ module.exports = function(RED) {
             let waitEnd = (client, ms) => {
                 return new Promise( (resolve, reject) => {
                     node.closing = true;
-                    if(!client) { 
+                    if(!client) {
                         resolve();
                      } else {
                         const t = setTimeout(() => {
@@ -991,14 +1007,21 @@ module.exports = function(RED) {
                 }
 
                 if (topicOK) {
-                    node.client.publish(msg.topic, msg.payload, options, function(err) {
-                        done && done(err);
-                        return
-                    });
+                    node.client.publish(msg.topic, msg.payload, options, function (err) {
+                        if (done) {
+                            done(err)
+                        } else if(err) {
+                            node.error(err, msg)
+                        }
+                    })
                 } else {
-                    const error = new Error(RED._("mqtt.errors.invalid-topic"));
-                    error.warn = true;
-                    done(error);
+                    const error = new Error(RED._("mqtt.errors.invalid-topic"))
+                    error.warn = true
+                    if (done) {
+                        done(error)
+                    } else {
+                        node.warn(error, msg)
+                    }
                 }
             }
         };
@@ -1011,7 +1034,7 @@ module.exports = function(RED) {
 
         /**
          * Add event handlers to the MQTT.js client and track them so that
-         * we do not remove any handlers that the MQTT client uses internally.  
+         * we do not remove any handlers that the MQTT client uses internally.
          * Use {@link node._clientRemoveListeners `node._clientRemoveListeners`} to remove handlers
          * @param {string} event The name of the event
          * @param {function} handler The handler for this event
@@ -1019,11 +1042,11 @@ module.exports = function(RED) {
          node._clientOn = function(event, handler) {
             node.clientListeners.push({event, handler})
             node.client.on(event, handler)
-        } 
+        }
 
         /**
-         * Remove event handlers from the MQTT.js client & only the events 
-         * that we attached in {@link node._clientOn `node._clientOn`}.  
+         * Remove event handlers from the MQTT.js client & only the events
+         * that we attached in {@link node._clientOn `node._clientOn`}.
          * * If `event` is omitted, then all events matching `handler` are removed
          * * If `handler` is omitted, then all events named `event` are removed
          * * If both parameters are omitted, then all events are removed
@@ -1212,7 +1235,7 @@ module.exports = function(RED) {
                     } else {
                         node.brokerConn.unsubscribe(node.topic,node.id, removed);
                     }
-                    node.brokerConn.deregister(node, done);
+                    node.brokerConn.deregister(node, done, removed);
                     node.brokerConn = null;
                 } else {
                     done();
@@ -1275,9 +1298,9 @@ module.exports = function(RED) {
                 node.status({fill:"green",shape:"dot",text:"node-red:common.status.connected"});
             }
             node.brokerConn.register(node);
-            node.on('close', function(done) {
+            node.on('close', function(removed, done) {
                 if (node.brokerConn) {
-                    node.brokerConn.deregister(node,done);
+                    node.brokerConn.deregister(node, done, removed)
                     node.brokerConn = null;
                 } else {
                     done();

packages/node_modules/@node-red/nodes/core/network/21-httpin.html

@@ -227,6 +227,7 @@
                         }
                     });
                 },
+                sortable: true,
                 removable: true
             });
 

packages/node_modules/@node-red/nodes/core/network/21-httpin.js

@@ -46,7 +46,7 @@ module.exports = function(RED) {
                     isText = true;
                 } else if (parsedType.type !== "application") {
                     isText = false;
-                } else if ((parsedType.subtype !== "octet-stream") 
+                } else if ((parsedType.subtype !== "octet-stream")
                     && (parsedType.subtype !== "cbor")
                     && (parsedType.subtype !== "x-protobuf")) {
                     checkUTF = true;
@@ -200,6 +200,15 @@ module.exports = function(RED) {
             this.callback = function(req,res) {
                 var msgid = RED.util.generateId();
                 res._msgid = msgid;
+                // Since Node 15, req.headers are lazily computed and the property
+                // marked as non-enumerable.
+                // That means it doesn't show up in the Debug sidebar.
+                // This redefines the property causing it to be evaluated *and*
+                // marked as enumerable again.
+                Object.defineProperty(req, 'headers', {
+                    value: req.headers,
+                    enumerable: true
+                })
                 if (node.method.match(/^(post|delete|put|options|patch)$/)) {
                     node.send({_msgid:msgid,req:req,res:createResponseWrapper(node,res),payload:req.body});
                 } else if (node.method == "get") {
@@ -282,7 +291,7 @@ module.exports = function(RED) {
         RED.nodes.createNode(this,n);
         var node = this;
         this.headers = n.headers||{};
-        this.statusCode = n.statusCode;
+        this.statusCode = parseInt(n.statusCode);
         this.on("input",function(msg,_send,done) {
             if (msg.res) {
                 var headers = RED.util.cloneMessage(node.headers);
@@ -323,7 +332,7 @@ module.exports = function(RED) {
                         }
                     }
                 }
-                var statusCode = node.statusCode || msg.statusCode || 200;
+                var statusCode = node.statusCode || parseInt(msg.statusCode) || 200;
                 if (typeof msg.payload == "object" && !Buffer.isBuffer(msg.payload)) {
                     msg.res._res.status(statusCode).jsonp(msg.payload);
                 } else {

packages/node_modules/@node-red/nodes/core/network/21-httprequest.html

@@ -91,6 +91,11 @@
         <label for="node-input-senderr" style="width: auto" data-i18n="httpin.senderr"></label>
     </div>
 
+    <div class="form-row">
+        <input type="checkbox" id="node-input-insecureHTTPParser" style="display: inline-block; width: auto; vertical-align: top;">
+        <label for="node-input-insecureHTTPParser", style="width: auto;" data-i18n="httpin.insecureHTTPParser"></label>
+    </div>
+
 
     <div class="form-row">
         <label for="node-input-ret"><i class="fa fa-arrow-left"></i> <span data-i18n="httpin.label.return"></span></label>
@@ -227,6 +232,7 @@
             persist: {value:false},
             proxy: {type:"http proxy",required: false,
                     label:RED._("node-red:httpin.proxy-config") },
+            insecureHTTPParser: {value: false},
             authType: {value: ""},
             senderr: {value: false},
             headers: { value: [] }
@@ -338,6 +344,12 @@
             } else {
                 $("#node-input-useProxy").prop("checked", false);
             }
+
+            if (node.insecureHTTPParser) {
+                $("node-intput-insecureHTTPParser").prop("checked", true)
+            } else {
+                $("node-intput-insecureHTTPParser").prop("checked", false)
+            }
             updateProxyOptions();
             $("#node-input-useProxy").on("click", function() {
                 updateProxyOptions();
@@ -405,6 +417,7 @@
                     });
 
                 },
+                sortable: true,
                 removable: true
             });
             if (node.headers) {

packages/node_modules/@node-red/nodes/core/network/21-httprequest.js

@@ -86,6 +86,7 @@ in your Node-RED user directory (${RED.settings.userDir}).
         if (n.paytoqs === true || n.paytoqs === "query") { paytoqs = true; }
         else if (n.paytoqs === "body") { paytobody = true; }
 
+        node.insecureHTTPParser = n.insecureHTTPParser
 
         var prox, noprox;
         if (process.env.http_proxy) { prox = process.env.http_proxy; }
@@ -244,6 +245,10 @@ in your Node-RED user directory (${RED.settings.userDir}).
                                 delete options.headers[h];
                             }
                         })
+
+                        if (node.insecureHTTPParser) {
+                            options.insecureHTTPParser = true
+                        }
                     }
                 ],
                 beforeRedirect: [
@@ -430,6 +435,10 @@ in your Node-RED user directory (${RED.settings.userDir}).
                                     formData.append(opt, val);
                                 } else if (typeof val === 'object' && val.hasOwnProperty('value')) {
                                     formData.append(opt,val.value,val.options || {});
+                                } else if (Array.isArray(val)) {
+                                    for (var i=0; i<val.length; i++) {
+                                        formData.append(opt, val[i])
+                                    }
                                 } else {
                                     formData.append(opt,JSON.stringify(val));
                                 }

packages/node_modules/@node-red/nodes/core/network/31-tcpin.js

@@ -86,7 +86,7 @@ module.exports = function(RED) {
         this.topic = n.topic;
         this.stream = (!n.datamode||n.datamode=='stream'); /* stream,single*/
         this.datatype = n.datatype||'buffer'; /* buffer,utf8,base64 */
-        this.newline = (n.newline||"").replace("\\n","\n").replace("\\r","\r").replace("\\t","\t");
+        this.newline = (n.newline||"").replace(/\\n/g,"\n").replace(/\\r/g,"\r").replace(/\\t/g,"\t");
         this.base64 = n.base64;
         this.trim = n.trim || false;
         this.server = (typeof n.server == 'boolean')?n.server:(n.server == "server");

packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js

@@ -19,9 +19,9 @@ module.exports = function(RED) {
     function CSVNode(n) {
         RED.nodes.createNode(this,n);
         this.template = (n.temp || "");
-        this.sep = (n.sep || ',').replace("\\t","\t").replace("\\n","\n").replace("\\r","\r");
+        this.sep = (n.sep || ',').replace(/\\t/g,"\t").replace(/\\n/g,"\n").replace(/\\r/g,"\r");
         this.quo = '"';
-        this.ret = (n.ret || "\n").replace("\\n","\n").replace("\\r","\r");
+        this.ret = (n.ret || "\n").replace(/\\n/g,"\n").replace(/\\r/g,"\r");
         this.winflag = (this.ret === "\r\n");
         this.lineend = "\n";
         this.multi = n.multi || "one";
@@ -110,7 +110,12 @@ module.exports = function(RED) {
                                         if (msg.payload[s].hasOwnProperty(p)) {
                                             /* istanbul ignore else */
                                             if (typeof msg.payload[s][p] !== "object") {
-                                                var q = "" + msg.payload[s][p];
+                                            // Fix to honour include null values flag
+                                            //if (typeof msg.payload[s][p] !== "object" || (node.include_null_values === true && msg.payload[s][p] === null)) {
+                                                var q = "";
+                                                if (msg.payload[s][p] !== undefined) {
+                                                    q += msg.payload[s][p];
+                                                }
                                                 if (q.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                     q = q.replace(/"/g, '""');
                                                     ou += node.quo + q + node.quo + node.sep;
@@ -130,9 +135,15 @@ module.exports = function(RED) {
                                             ou += node.sep;
                                         }
                                         else {
-                                            var p = RED.util.ensureString(RED.util.getMessageProperty(msg,"payload["+s+"]['"+template[t]+"']"));
+                                            var tt = template[t];
+                                            if (template[t].indexOf('"') >=0 ) { tt = "'"+tt+"'"; }
+                                            else { tt = '"'+tt+'"'; }
+                                            var p = RED.util.getMessageProperty(msg,'payload["'+s+'"]['+tt+']');
                                             /* istanbul ignore else */
-                                            if (p === "undefined") { p = ""; }
+                                            if (p === undefined) { p = ""; }
+                                            // fix to honour include null values flag
+                                            //if (p === null && node.include_null_values !== true) { p = "";}
+                                            p = RED.util.ensureString(p);
                                             if (p.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                 p = p.replace(/"/g, '""');
                                                 ou += node.quo + p + node.quo + node.sep;

packages/node_modules/@node-red/nodes/core/sequence/17-split.html

@@ -224,7 +224,12 @@
         outputs:1,
         icon: "join.svg",
         label: function() {
-            return this.name||this._("join.join");
+            var nam = this.name||this._("join.join");
+            if (this.mode === "custom" && !isNaN(Number(this.count))) {
+                nam += " "+this.count;
+                if (this.accumulate === true) { nam+= "+"; }
+            }
+            return nam;
         },
         labelStyle: function() {
             return this.name?"node_label_italic":"";