Ensure subflow instances keep track of their groups

Merge pull request #4441 from node-red/4274-allow-theme-to-set-mermaid-theme
Allow a theme to specifiy which theme mermaid should use
2025-03-01 10:36:34 +00:00 · 2023-11-29 16:12:12 +00:00 · 2023-11-20 21:43:03 +00:00 · 2023-11-20 17:50:59 +00:00 · 2023-11-20 17:47:39 +00:00 · 2023-11-20 10:00:44 +01:00
99 changed files with 731 additions and 567 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -30,5 +30,5 @@ the [forum](https://discourse.nodered.org) or

 - [ ] I have read the [contribution guidelines](https://github.com/node-red/node-red/blob/master/CONTRIBUTING.md)
 - [ ] For non-bugfix PRs, I have discussed this change on the forum/slack team.
- [ ] I have run `grunt` to verify the unit tests pass
+- [ ] I have run `npm run test` to verify the unit tests pass
 - [ ] I have added suitable unit tests to cover the new/changed functionality
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "github-actions" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "monthly"
+    groups:
+      github-actions:
+        patterns:
+          - "*"
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -14,20 +14,20 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check out node-red repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
            path: 'node-red'
      - name: Check out node-red-docker repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
            repository: 'node-red/node-red-docker'
            path: 'node-red-docker'
      - name: Check out node-red.github.io repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
        with:
            repository: 'node-red/node-red.github.io'
            path: 'node-red.github.io'
-      - uses: actions/setup-node@v1
+      - uses: actions/setup-node@v3
        with:
            node-version: '16'
      - run: node ./node-red/.github/scripts/update-node-red-docker.js
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -19,7 +19,7 @@ jobs:
      matrix:
        node-version: [16, 18, 20]
    steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
    - name: Use Node.js ${{ matrix.node-version }}
      uses: actions/setup-node@v3
      with:
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ docs
 .vscode
 .nyc_output
 sync.ffs_db
+package-lock.json
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,38 @@
-#### 3.1.0-beta.4: Beta Release
+#### 3.1.0: Milestone Release
+
+Editor
+
+ - Default filter to All Catalogues and show nodes for small lists (#4318) @knolleary
+ - Better distinguish between ctrl and meta keys on mac (#4310) @knolleary
+ - Ensure junction appears when filtering quick-add list (#4297) @knolleary
+ - Update message catalogs for JSONata Expression editor (#4287) @kazuhitoyokoi
+ - Add tooltip to relevance sort button in user settings UI (#4288) @kazuhitoyokoi
+ - Capture workspace dirty state when quick-adding junction (#4283) @knolleary
+ - Add docs for $clone function (#4284) @knolleary
+
+Runtime
+
+ - Dependency updates (#4317) @knolleary
+ - Ensure storage/util.writeFile handles concurrent write attempts (#4316) @knolleary
+ - Migrate http -> https for nodered.org (#4313) @Rotzbua
+ - Add Node 20 to GH Action test matrix (#4305) @Rotzbua
+ - Handle group-scoped nodes inside subflow (#4301) @knolleary
+ - Handle non-url-safe chars in context api (#4298) @knolleary
+ - Fix git pull operation in project feature (#4290) @kazuhitoyokoi
+ - Change linefeed codes in Korean message catalogs (#4286) @kazuhitoyokoi
+ - Fix file permissions of message catalogs (#4285) @kazuhitoyokoi
+ - Update tour (#4278) @knolleary
+ 
+Nodes
+
+ - File: Fix handling in file nodes when number is specified as file name (#4267) @kazuhitoyokoi
+ - Function: Adding function timeout to settings file (#4265) (#4309) @knolleary
+ - Function: Fix function setup tab layout (#4299) @knolleary
+ - HTTP Request: Handle 204 in httprequest JSON (#4262) @sammachin
+ - JSON: Fix test cases of JSON node (#4275) @kazuhitoyokoi
+ - MQTT: Remove unnecessary check for clientid if autoUnsub set (#4302) @knolleary
+
+##### 3.1.0-beta.4: Beta Release

 Editor

@@ -28,7 +62,7 @@
 - Fix delay node flush issue (#4203) @dceejay
 - Update status and catch node labels in group mode (#4207) @Steve-Mcl

-#### 3.1.0-beta.3: Beta Release
+##### 3.1.0-beta.3: Beta Release

 Editor

@@ -63,7 +97,7 @@ Nodes
 - MQTT: Option to disable MQTT topic unsubscribe on disconnect (#4078) @flying7eleven


-#### 3.1.0-beta.2: Beta Release
+##### 3.1.0-beta.2: Beta Release

 Editor

@@ -113,7 +147,7 @@ Nodes
 - File Out: Fix extra newline append for multipart file write (#3915) @dceejay
 - Add validators for complete and link call nodes (#4056) @kazuhitoyokoi

-#### 3.1.0-beta.1: Beta Release
+##### 3.1.0-beta.1: Beta Release

 Editor

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -16,6 +16,9 @@ behavior to the project's core team at team@nodered.org.
 Please raise any bug reports on the relevant project's issue tracker. Be sure to
 search the list to see if your issue has already been raised.

+If your issue is more of a question on how to do something with Node-RED, please
+consider using the [community forum](https://discourse.nodered.org/).
+
 A good bug report is one that make it easy for us to understand what you were
 trying to do and what went wrong.

@@ -35,14 +38,18 @@ For feature requests, please raise them on the [forum](https://discourse.nodered
 ## Pull-Requests

 If you want to raise a pull-request with a new feature, or a refactoring
-of existing code, it may well get rejected if you haven't discussed it on
-the [forum](https://discourse.nodered.org) first.
+of existing code, please come and discuss it with us first. We prefer to
+do it that way to make sure your time and effort is well spent on something
+that fits with our goals.
+
+If you've got a bug-fix or similar for us, then you are most welcome to
+get it raised - just make sure you link back to the issue it's fixing and
+try to include some tests!

 All contributors need to sign the OpenJS Foundation's Contributor License Agreement.
 It is an online process and quick to do. If you raise a pull-request without
 having signed the CLA, you will be prompted to do so automatically.

-
 ### Code Branches

 When raising a PR for a fix or a new feature, it is important to target the right branch.
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -151,7 +151,6 @@ 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",
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
 # Node-RED

-http://nodered.org
+https://nodered.org

 [![Build Status](https://github.com/node-red/node-red/actions/workflows/tests.yml/badge.svg?branch=master)](https://github.com/node-red/node-red/actions?query=branch%3Amaster)

 Low-code programming for event-driven applications.

-![Node-RED: Low-code programming for event-driven applications](http://nodered.org/images/node-red-screenshot.png)
+![Node-RED: Low-code programming for event-driven applications](https://nodered.org/images/node-red-screenshot.png)

 ## Quick Start

-Check out http://nodered.org/docs/getting-started/ for full instructions on getting
+Check out https://nodered.org/docs/getting-started/ for full instructions on getting
 started.

 1. `sudo npm install -g --unsafe-perm node-red`
@@ -19,7 +19,7 @@ started.

 ## Getting Help

-More documentation can be found [here](http://nodered.org/docs).
+More documentation can be found [here](https://nodered.org/docs).

 For further help, or general discussion, please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack).

--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
    "name": "node-red",
-    "version": "3.1.0-beta.4",
+    "version": "3.1.0",
    "description": "Low-code programming for event-driven applications",
-    "homepage": "http://nodered.org",
+    "homepage": "https://nodered.org",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
@@ -64,8 +64,8 @@
        "mqtt": "4.3.7",
        "multer": "1.4.5-lts.1",
        "mustache": "4.2.0",
-        "node-red-admin": "^3.0.0",
-        "node-watch": "0.7.3",
+        "node-red-admin": "^3.1.1",
+        "node-watch": "0.7.4",
        "nopt": "5.0.0",
        "oauth2orize": "1.11.1",
        "on-headers": "1.0.2",
@@ -73,16 +73,16 @@
        "passport-http-bearer": "1.0.1",
        "passport-oauth2-client-password": "0.1.2",
        "raw-body": "2.5.2",
-        "semver": "7.5.0",
+        "semver": "7.5.4",
        "tar": "6.1.13",
-        "tough-cookie": "4.1.2",
+        "tough-cookie": "4.1.3",
        "uglify-js": "3.17.4",
        "uuid": "9.0.0",
        "ws": "7.5.6",
-        "xml2js": "0.6.0"
+        "xml2js": "0.6.2"
    },
    "optionalDependencies": {
-        "bcrypt": "5.1.0"
+        "bcrypt": "5.1.1"
    },
    "devDependencies": {
        "dompurify": "2.4.1",
@@ -109,7 +109,7 @@
        "jquery-i18next": "1.2.1",
        "jsdoc-nr-template": "github:node-red/jsdoc-nr-template",
        "marked": "4.3.0",
-        "mermaid": "^9.4.3",
+        "mermaid": "^10.4.0",
        "minami": "1.2.3",
        "mocha": "9.2.2",
        "node-red-node-test-helper": "^0.3.2",
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@@ -339,6 +339,8 @@ module.exports = {
                }
                theme.codeEditor = theme.codeEditor || {}
                theme.codeEditor.options = Object.assign({}, themePlugin.monacoOptions, theme.codeEditor.options);
+
+                theme.mermaid = Object.assign({}, themePlugin.mermaid, theme.mermaid)
            }
            activeThemeInitialised = true;
        }
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/editor-api",
-    "version": "3.1.0-beta.4",
+    "version": "3.1.0",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,8 +16,8 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "3.1.0-beta.4",
-        "@node-red/editor-client": "3.1.0-beta.4",
+        "@node-red/util": "3.1.0",
+        "@node-red/editor-client": "3.1.0",
        "bcryptjs": "2.4.3",
        "body-parser": "1.20.2",
        "clone": "2.1.2",
--- a/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/en-US/editor.json
@@ -1215,11 +1215,9 @@
    "validator": {
        "errors": {
            "invalid-json": "Invalid JSON data: __error__",
-            "invalid-json-prop": "__prop__: invalid JSON data: __error__",
+            "invalid-expr": "Invalid JSONata expression: __error__",
            "invalid-prop": "Invalid property expression",
-            "invalid-prop-prop": "__prop__: invalid property expression",
            "invalid-num": "Invalid number",
-            "invalid-num-prop": "__prop__: invalid number",
            "invalid-regexp": "Invalid input pattern",
            "invalid-regex-prop": "__prop__: invalid input pattern",
            "missing-required-prop": "__prop__: property value missing",
--- a/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/fr/editor.json
@@ -119,7 +119,7 @@
      "searchInput": "Rechercher vos flux",
      "subflows": "Sous-flux",
      "createSubflow": "Créer un sous-flux",
-      "selectionToSubflow": "Selection d'un sous-flux",
+      "selectionToSubflow": "Convertir en sous-flux",
      "flows": "Flux",
      "add": "Ajouter",
      "rename": "Renommer",
@@ -274,23 +274,23 @@
    "recoveredNodesInfo": "Les noeuds importés sur ce flux contiennent un mauvais identifiant de flux. Ces noeuds ont été ajoutés à ce flux afin que vous puissiez les restaurer ou les supprimer.",
    "recoveredNodesNotification": "<p>Noeuds importés sans identifiant de flux valide</p><p>Ils ont été ajoutés à un nouveau flux appelé '__flowName__'.</p>",
    "export": {
-      "selected": "noeuds sélectionnés",
-      "current": "flux actuel",
+      "selected": "les noeuds sélectionnés",
+      "current": "le flux actuel",
      "all": "tous les flux",
-      "compact": "condensé",
-      "formatted": "formaté",
+      "compact": "Condensé",
+      "formatted": "Formaté",
      "copy": "Copier dans le presse-papier",
      "export": "Exporter vers la bibliothèque",
-      "exportAs": "Exporter en tant que",
+      "exportAs": "Exporter comme",
      "overwrite": "Remplacer",
      "exists": "<p><b>\"__file__\"</b> existe déjà.</p><p>Voulez-vous le remplacer ?</p>"
    },
    "import": {
      "import": "Importer vers",
-      "importSelected": "Importation sélectionnée",
+      "importSelected": "Importer la sélection",
      "importCopy": "Importer une copie",
-      "viewNodes": "Afficher les noeuds...",
-      "newFlow": "Nouveau flux",
+      "viewNodes": "Vérifier ces noeuds",
+      "newFlow": "un nouveau flux",
      "replace": "Remplacer",
      "errors": {
        "notArray": "L'entrée n'est pas un tableau JSON",
@@ -299,7 +299,7 @@
        "missingType": "L'entrée n'est pas un flux valide - l'élément '__index__' n'a pas de propriété 'type'"
      },
      "conflictNotification1": "Certains des noeuds que vous avez importés existent déjà dans votre espace de travail.",
-      "conflictNotification2": "Sélectionner les noeuds à importer et choisir s'il faut remplacer les noeuds existants ou en importer une copie."
+      "conflictNotification2": "Sélectionnez les noeuds à importer et choisissez s'il faut remplacer les noeuds existants ou en importer une copie."
    },
    "copyMessagePath": "Chemin copié",
    "copyMessageValue": "Valeur copiée",
@@ -391,10 +391,10 @@
    "subflowInstances": "Il existe __count__ instance de ce modèle de sous-flux",
    "subflowInstances_plural": "Il existe __count__ instances de ce modèle de sous-flux",
    "editSubflowProperties": "modifier les propriétés",
-    "input": "entrées:",
-    "output": "sorties:",
-    "status": "statut du noeud",
-    "deleteSubflow": "supprimer le sous-flux",
+    "input": "Entrées:",
+    "output": "Sorties:",
+    "status": "Statut du noeud",
+    "deleteSubflow": "Supprimer le sous-flux",
    "confirmDelete": "Voulez-vous vraiment supprimer ce sous-flux ?",
    "info": "Description",
    "category": "Catégorie",
@@ -416,6 +416,7 @@
    },
    "errors": {
      "noNodesSelected": "<strong>Impossible de créer un sous-flux</strong> : aucun noeud sélectionné",
+      "acrossMultipleGroups": "Impossible de créer un sous-flux sur plusieurs groupes",
      "multipleInputsToSelection": "<strong>Impossible de créer un sous-flux</strong> : plusieurs entrées pour la sélection"
    }
  },
@@ -447,8 +448,8 @@
    "default": "Par défaut",
    "noDefaultLabel": "Aucune",
    "defaultLabel": "Utiliser l'étiquette par défaut",
-    "searchIcons": "Icônes de recherche",
-    "useDefault": "Utilisation par défaut",
+    "searchIcons": "Rechercher une icône",
+    "useDefault": "Icône par défaut",
    "description": "Description",
    "show": "Afficher",
    "hide": "Masquer",
@@ -498,13 +499,13 @@
  "keyboard": {
    "title": "Raccourcis clavier",
    "keyboard": "Clavier",
-    "filterActions": "Actions de filtrage",
-    "shortcut": "raccourci",
-    "scope": "portée",
+    "filterActions": "Rechercher l'action",
+    "shortcut": "Raccourci",
+    "scope": "Portée",
    "unassigned": "Non attribué",
-    "global": "global",
-    "workspace": "espace de travail",
-    "editor": "boîte de dialogue d'édition",
+    "global": "Global",
+    "workspace": "Espace de travail",
+    "editor": "Boîte de dialogue d'édition",
    "selectAll": "Tout sélectionner",
    "selectNone": "Ne rien sélectionner",
    "selectAllConnected": "Sélectionner tous les éléments connectés",
@@ -550,22 +551,22 @@
  },
  "palette": {
    "noInfo": "Pas d'information disponible",
-    "filter": "Filtrer les noeuds",
+    "filter": "Rechercher le noeud",
    "search": "Rechercher les modules",
    "addCategory": "Ajouter un nouveau...",
    "label": {
-      "subflows": "sous-flux",
-      "network": "réseau",
-      "common": "commun",
-      "input": "entrée",
-      "output": "sortie",
-      "function": "fonction",
-      "sequence": "séquence",
-      "parser": "analyseur",
-      "social": "social",
-      "storage": "stockage",
-      "analysis": "analyse",
-      "advanced": "avancé"
+      "subflows": "Sous-flux",
+      "network": "Réseau",
+      "common": "Commun",
+      "input": "Entrée",
+      "output": "Sortie",
+      "function": "Fonction",
+      "sequence": "Séquence",
+      "parser": "Analyseur",
+      "social": "Social",
+      "storage": "Stockage",
+      "analysis": "Analyse",
+      "advanced": "Avancé"
    },
    "actions": {
      "collapse-all": "Réduire toutes les catégories",
@@ -586,6 +587,7 @@
    "editor": {
      "title": "Gérer la palette",
      "palette": "Palette",
+      "allCatalogs": "Tous les catalogues",
      "times": {
        "seconds": "il y a quelques secondes",
        "minutes": "il y a quelques minutes",
@@ -609,24 +611,25 @@
      "nodeCount_plural": "__label__ noeuds",
      "moduleCount": "__count__ module disponible",
      "moduleCount_plural": "__count__ modules disponibles",
-      "inuse": "en cours d'utilisation",
-      "enableall": "activer tout",
-      "disableall": "désactiver tout",
-      "enable": "activer",
-      "disable": "désactiver",
-      "remove": "supprimer",
-      "update": "mettre à jour vers __version__",
-      "updated": "mis à jour",
-      "install": "installer",
-      "installed": "installé",
-      "conflict": "conflit",
+      "inuse": "En cours d'utilisation",
+      "enableall": "Activer tout",
+      "disableall": "Désactiver tout",
+      "enable": "Activer",
+      "disable": "Désactiver",
+      "remove": "Supprimer",
+      "update": "Mettre à jour vers __version__",
+      "updated": "Mis à jour",
+      "install": "Installer",
+      "installed": "Installé",
+      "conflict": "Conflit",
      "conflictTip": "<p>Ce module ne peut pas être installé car il inclut un<br/>type de noeud qui a déjà été installé</p><p>Conflits avec <code>__module__</code></p>",
      "loading": "Chargement des catalogues...",
      "tab-nodes": "Noeuds",
      "tab-install": "Installer",
-      "sort": "trier:",
-      "sortAZ": "a-z",
-      "sortRecent": "récent",
+      "sort": "Trier:",
+      "sortRelevance": "Pertinence",
+      "sortAZ": "A-Z",
+      "sortRecent": "Récent",
      "more": "+ __count__ en plus",
      "upload": "Charger le fichier tgz du module",
      "refresh": "Actualiser la liste des modules",
@@ -667,7 +670,7 @@
    "info": {
      "name": "Information",
      "tabName": "Nom",
-      "label": "info",
+      "label": "Info",
      "node": "Noeud",
      "type": "Type",
      "group": "Groupe",
@@ -681,10 +684,10 @@
      "properties": "Propriétés",
      "info": "Information",
      "desc": "Description",
-      "blank": "vide",
-      "null": "nul",
-      "showMore": "afficher en plus",
-      "showLess": "afficher en moins",
+      "blank": "Vide",
+      "null": "Nul",
+      "showMore": "Afficher en plus",
+      "showLess": "Afficher en moins",
      "flow": "Flux",
      "selection": "Sélection",
      "nodes": "__count__ noeuds",
@@ -695,7 +698,7 @@
      "arrayItems": "__count__ éléments",
      "showTips": "Vous pouvez ouvrir les astuces à partir du panneau des paramètres",
      "outline": "Plan",
-      "empty": "vide",
+      "empty": "Vide",
      "globalConfig": "Noeuds de configuration globale",
      "triggerAction": "Déclencher une action",
      "find": "Rechercher dans l'espace de travail",
@@ -706,7 +709,7 @@
    },
    "help": {
      "name": "Aide",
-      "label": "aide",
+      "label": "Aide",
      "search": "Aide à la recherche",
      "nodeHelp": "Aide sur les noeuds",
      "showHelp": "Afficher l'aide",
@@ -717,23 +720,23 @@
    },
    "config": {
      "name": "Noeuds de configuration",
-      "label": "configuration",
+      "label": "Configuration",
      "global": "Tous les flux",
-      "none": "aucun",
-      "subflows": "sous-flux",
-      "flows": "flux",
-      "filterAll": "tout",
+      "none": "Aucun",
+      "subflows": "Sous-flux",
+      "flows": "Flux",
+      "filterAll": "Tout",
      "showAllConfigNodes": "Afficher tous les noeuds de configuration",
-      "filterUnused": "inutilisé",
+      "filterUnused": "Inutilisé",
      "showAllUnusedConfigNodes": "Afficher tous les noeuds de configuration inutilisés",
      "filtered": "__count__ caché(s)"
    },
    "context": {
      "name": "Données contextuelles",
-      "label": "contexte",
-      "none": "aucune sélection",
-      "refresh": "actualiser pour charger",
-      "empty": "vide",
+      "label": "Contexte",
+      "none": "Aucune sélection",
+      "refresh": "Actualiser pour charger",
+      "empty": "Vide",
      "node": "Noeud",
      "flow": "Flux",
      "global": "Global",
@@ -744,10 +747,10 @@
    },
    "palette": {
      "name": "Gestion des palettes",
-      "label": "palette"
+      "label": "Palette"
    },
    "project": {
-      "label": "projet",
+      "label": "Projet",
      "name": "Projet",
      "description": "Description",
      "dependencies": "Dépendances",
@@ -760,11 +763,11 @@
      "showProjectSettings": "Afficher les paramètres du projet",
      "projectSettings": {
        "title": "Paramètres du projet",
-        "edit": "modifier",
+        "edit": "Modifier",
        "none": "Vide",
-        "install": "installer",
-        "removeFromProject": "supprimer du projet",
-        "addToProject": "ajouter au projet",
+        "install": "Installer",
+        "removeFromProject": "Supprimer du projet",
+        "addToProject": "Ajouter au projet",
        "files": "Fichiers",
        "flow": "Flux",
        "credentials": "Identifiants",
@@ -812,7 +815,7 @@
        "workflowAutoTip": "Les modifications sont validées automatiquement à chaque déploiement",
        "sshKeys": "Clés SSH",
        "sshKeysTip": "Vous permet de créer des connexions sécurisées aux référentiels Git distants.",
-        "add": "ajouter une clé",
+        "add": "Ajouter une clé",
        "addSshKey": "Ajouter une clé SSH",
        "addSshKeyTip": "Générer une nouvelle paire de clés publique/privée",
        "name": "Nom",
@@ -848,7 +851,7 @@
        "none": "Vide",
        "conflictResolve": "Tous les conflits ont été résolus. Valider les modifications pour terminer la fusion.",
        "localFiles": "Fichiers locaux",
-        "all": "tout",
+        "all": "Tout",
        "unmergedChanges": "Modifications non fusionnées",
        "abortMerge": "Abandonner la fusion",
        "commit": "Valider",
@@ -1097,9 +1100,9 @@
      "desc8": "Le fichier contenant les identifiants ne sera pas crypté et son contenu sera facilement lisible",
      "create-project-files": "Créer des fichiers de projet",
      "create-project": "Créer un projet",
-      "already-exists": "existe déjà",
+      "already-exists": "Existe déjà",
      "git-error": "Erreur Git",
-      "git-auth-error": "erreur d'authentification Git"
+      "git-auth-error": "Erreur d'authentification Git"
    },
    "create-success": {
      "success": "Vous avez créé avec succès votre premier projet !",
@@ -1135,8 +1138,8 @@
      "desc2": "Avant de pouvoir cloner un référentiel sur ssh, vous devez ajouter une clé SSH pour y accéder.",
      "add-ssh-key": "Ajouter une clé ssh",
      "credentials-encryption-key": "Clé de chiffrement des identifiants",
-      "already-exists-2": "existe déjà",
-      "git-error": "erreur git",
+      "already-exists-2": "Existe déjà",
+      "git-error": "Erreur git",
      "con-failed": "La connexion a échoué",
      "not-git": "Ce n'est pas un dépôt git",
      "no-resource": "Référentiel introuvable",
@@ -1148,8 +1151,8 @@
      "confirm": "Voulez-vous vraiment supprimer ce projet ?"
    },
    "create-project-list": {
-      "search": "rechercher vos projets",
-      "current": "actuel"
+      "search": "Rechercher vos projets",
+      "current": "Actuel"
    },
    "require-clean": {
      "confirm": "<p>Vous avez des modifications non déployées qui seront perdues.</p><p>Voulez-vous continuer ?</p>"
@@ -1212,11 +1215,8 @@
  "validator": {
    "errors": {
      "invalid-json": "Données JSON invalides : __error__",
-      "invalid-json-prop": "__prop__: données JSON invalides : __error__",
      "invalid-prop": "Expression de propriété non valide",
-      "invalid-prop-prop": "__prop__: expression de propriété invalide",
      "invalid-num": "Numéro invalide",
-      "invalid-num-prop": "__prop__: numéro invalide",
      "invalid-regexp": "Modèle d'entrée non valide",
      "invalid-regex-prop": "__prop__: modèle d'entrée non valide",
      "missing-required-prop": "__prop__: valeur de la propriété manquante",
--- a/packages/node_modules/@node-red/editor-client/locales/fr/jsonata.json
+++ b/packages/node_modules/@node-red/editor-client/locales/fr/jsonata.json
@@ -270,5 +270,9 @@
    "$moment": {
        "args": "[str]",
        "desc": "Obtient un objet de date à l'aide de la bibliothèque Moment."
+    },
+    "$clone": {
+        "args": "valeur",
+        "desc": "Cloner un objet en toute sécurité."
    }
 }
--- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json
@@ -1215,11 +1215,8 @@
    "validator": {
        "errors": {
            "invalid-json": "JSONデータが不正: __error__",
-            "invalid-json-prop": "__prop__: JSONデータが不正: __error__",
            "invalid-prop": "プロパティ式が不正",
-            "invalid-prop-prop": "__prop__: プロパティ式が不正",
            "invalid-num": "数値が不正",
-            "invalid-num-prop": "__prop__: 数値が不正",
            "invalid-regexp": "入力パターンが不正",
            "invalid-regex-prop": "__prop__: 入力パターンが不正",
            "missing-required-prop": "__prop__: プロパティが未設定",
--- a/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/pt-BR/editor.json
@@ -1186,11 +1186,8 @@
    "validator": {
        "errors": {
            "invalid-json": "Dados JSON inválidos: __error__",
-            "invalid-json-prop": "__prop__: dados JSON inválidos: __error__",
            "invalid-prop": "Expressão de propriedade inválida",
-            "invalid-prop-prop": "__prop__: expressão de propriedade inválida",
            "invalid-num": "Número inválido",
-            "invalid-num-prop": "__prop__: número inválido",
            "invalid-regexp": "Padrão de entrada inválido",
            "invalid-regex-prop": "__prop__: Padrão de entrada inválido",
            "missing-required-prop": "__prop__: valor de propriedade ausente",
--- a/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
+++ b/packages/node_modules/@node-red/editor-client/locales/zh-CN/editor.json
@@ -1199,11 +1199,8 @@
  "validator": {
    "errors": {
      "invalid-json": "无效的 JSON 数据： __error__",
-      "invalid-json-prop": "__prop__: 无效的 JSON 数据： __error__",
      "invalid-prop": "无效的属性表达式",
-      "invalid-prop-prop": "__prop__: 无效的属性表达式",
      "invalid-num": "无效的数字",
-      "invalid-num-prop": "__prop__: 无效的数字",
      "invalid-regexp": "输入格式无效",
      "invalid-regex-prop": "__prop__: 输入格式无效",
      "missing-required-prop": "__prop__: 缺少属性值",
--- a/packages/node_modules/@node-red/editor-client/package.json
+++ b/packages/node_modules/@node-red/editor-client/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/editor-client",
-    "version": "3.1.0-beta.4",
+    "version": "3.1.0",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js
@@ -797,8 +797,8 @@ RED.nodes = (function() {

        if (node && node._def.onremove) {
            // Deprecated: never documented but used by some early nodes
-            console.log("Deprecated API warning: node type ",node.type," has an onremove function - should be oneditremove - please report");
-            node._def.onremove.call(n);
+            console.log("Deprecated API warning: node type ",node.type," has an onremove function - should be oneditdelete - please report");
+            node._def.onremove.call(node);
        }
        return {links:removedLinks,nodes:removedNodes};
    }
@@ -2198,6 +2198,12 @@ RED.nodes = (function() {
                        }
                        node._config.x = node.x;
                        node._config.y = node.y;
+                        if (n.hasOwnProperty('w')) {
+                            node.w = n.w
+                        }
+                        if (n.hasOwnProperty('h')) {
+                            node.h = n.h
+                        }
                    } else if (n.type.substring(0,7) === "subflow") {
                        var parentId = n.type.split(":")[1];
                        var subflow = subflow_denylist[parentId]||subflow_map[parentId]||getSubflow(parentId);
--- a/packages/node_modules/@node-red/editor-client/src/js/red.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/red.js
@@ -498,6 +498,15 @@ var RED = (function() {
                            ]
                        }
                    }
+                } else if (notificationId === 'restart-required') {
+                    options.buttons = [
+                        {
+                            text: RED._("common.label.close"),
+                            click: function() {
+                                persistentNotifications[notificationId].hideNotification();
+                            }
+                        }
+                    ]
                }
                if (!persistentNotifications.hasOwnProperty(notificationId)) {
                    persistentNotifications[notificationId] = RED.notify(text,options);
@@ -731,7 +740,7 @@ var RED = (function() {
        }
        menuOptions.push({id:"menu-item-help",
            label: RED.settings.theme("menu.menu-item-help.label",RED._("menu.label.help")),
-            href: RED.settings.theme("menu.menu-item-help.url","http://nodered.org/docs")
+            href: RED.settings.theme("menu.menu-item-help.url","https://nodered.org/docs")
        });
        menuOptions.push({id:"menu-item-node-red-version", label:"v"+RED.settings.version, onselect: "core:show-about" });

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/common/typedInput.js
@@ -182,7 +182,9 @@
            valueLabel: contextLabel
        },
        str: {value:"str",label:"string",icon:"red/images/typedInput/az.svg"},
-        num: {value:"num",label:"number",icon:"red/images/typedInput/09.svg",validate:/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/},
+        num: {value:"num",label:"number",icon:"red/images/typedInput/09.svg",validate: function(v) {
+            return (true === RED.utils.validateTypedProperty(v, "num"));
+        } },
        bool: {value:"bool",label:"boolean",icon:"red/images/typedInput/bool.svg",options:["true","false"]},
        json: {
            value:"json",
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/contextMenu.js
@@ -168,8 +168,8 @@ RED.contextMenu = (function () {

            menuItems.push(
                null,
-                { onselect: 'core:undo', disabled: RED.history.list().length === 0 },
-                { onselect: 'core:redo', disabled: RED.history.listRedo().length === 0 },
+                { onselect: 'core:undo', label: RED._("keyboard.undoChange"), disabled: RED.history.list().length === 0 },
+                { onselect: 'core:redo', label: RED._("keyboard.redoChange"), disabled: RED.history.listRedo().length === 0 },
                null,
                { onselect: 'core:cut-selection-to-internal-clipboard', label: RED._("keyboard.cutNode"), disabled: !canEdit || !hasSelection },
                { onselect: 'core:copy-selection-to-internal-clipboard', label: RED._("keyboard.copyNode"), disabled: !hasSelection },
@@ -177,7 +177,7 @@ RED.contextMenu = (function () {
                { onselect: 'core:delete-selection', 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' },
+                { onselect: 'core:select-all-nodes', label: RED._("keyboard.selectAll") },
            )
        }

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/diff.js
@@ -989,9 +989,10 @@ RED.diff = (function() {
            }
            if (localNode && remoteNode && typeof localNode[d] === "string") {
                if (/\n/.test(localNode[d]) || /\n/.test(remoteNode[d])) {
-                    $('<button class="red-ui-button red-ui-button-small red-ui-diff-text-diff-button"><i class="fa fa-file-o"> <i class="fa fa-caret-left"></i> <i class="fa fa-caret-right"></i> <i class="fa fa-file-o"></i></button>').on("click", function() {
+                    var textDiff = $('<button class="red-ui-button red-ui-button-small red-ui-diff-text-diff-button"><i class="fa fa-file-o"> <i class="fa fa-caret-left"></i> <i class="fa fa-caret-right"></i> <i class="fa fa-file-o"></i></button>').on("click", function() {
                        showTextDiff(localNode[d],remoteNode[d]);
                    }).appendTo(propertyNameCell);
+                    RED.popover.tooltip(textDiff, RED._("diff.compareChanges"));
                }
            }

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editor.js
@@ -115,8 +115,9 @@ RED.editor = (function() {
                var valid = validateNodeProperty(node, definition, prop, properties[prop]);
                if ((typeof valid) === "string") {
                    result.push(valid);
-                }
-                else if(!valid) {
+                } else if (Array.isArray(valid)) {
+                    result = result.concat(valid)
+                } else if(!valid) {
                    result.push(prop);
                }
            }
@@ -165,7 +166,7 @@ RED.editor = (function() {
                // If the validator takes two arguments, it is a 3.x validator that
                // can return a String to mean 'invalid' and provide a reason
                if ((definition[property].validate.length === 2) &&
-                    ((typeof valid) === "string")) {
+                    ((typeof valid) === "string") || Array.isArray(valid)) {
                    return valid;
                } else {
                    // Otherwise, a 2.x returns a truth-like/false-like value that
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/buffer.js
@@ -121,7 +121,7 @@
                        var i=0,l=bufferBinValue.length;
                        var c = 0;
                        for(i=0;i<l;i++) {
-                            var d = parseInt(bufferBinValue[i]);
+                            var d = parseInt(Number(bufferBinValue[i]));
                            if (!isString && (isNaN(d) || d < 0 || d > 255)) {
                                valid = false;
                                break;
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js
@@ -966,12 +966,10 @@ RED.editor.codeEditor.monaco = (function() {

        //Unbind ctrl-Enter (default action is to insert a newline in editor) This permits the shortcut to close the tray.
        try {
-            ed._standaloneKeybindingService.addDynamicKeybinding(
-                '-editor.action.insertLineAfter', // command ID prefixed by '-'
-                null, // keybinding
-                () => {} // need to pass an empty handler
-            );
-        } catch (error) { }
+            monaco.editor.addKeybindingRule({keybinding: 0, command: "-editor.action.insertLineAfter"});
+        } catch (error) {
+            console.warn(error)
+        }

        ed.nodered = {
            refreshModuleLibs: refreshModuleLibs //expose this for function node externalModules refresh
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
@@ -169,7 +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();
+                            RED.editor.mermaid.render()
                        },200);
                    })
                    if (options.header) {
@@ -178,7 +178,7 @@

                    if (value) {
                        $(".red-ui-editor-type-markdown-panel-preview").html(RED.utils.renderMarkdown(expressionEditor.getValue()));
-                        mermaid.init();
+                        RED.editor.mermaid.render()
                    }
                    panels = RED.panels.create({
                        id:"red-ui-editor-type-markdown-panels",
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/mermaid.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/mermaid.js
@@ -0,0 +1,54 @@
+RED.editor.mermaid = (function () {
+    let initializing = false
+    let loaded = false
+    let pendingEvals = []
+    let diagramIds = 0
+
+    function render(selector = '.mermaid') {
+        // $(selector).hide()
+        if (!loaded) {
+            pendingEvals.push(selector)
+            
+            if (!initializing) {
+                initializing = true
+                $.getScript(
+                    'vendor/mermaid/mermaid.min.js',
+                    function (data, stat, jqxhr) {
+                        mermaid.initialize({
+                            startOnLoad: false,
+                            theme: RED.settings.get('mermaid', {}).theme
+                        })
+                        loaded = true
+                        while(pendingEvals.length > 0) {
+                            const pending = pendingEvals.shift()
+                            render(pending)
+                        }
+                    }
+                )
+            }
+        } else {
+            const nodes = document.querySelectorAll(selector)
+
+            nodes.forEach(async node => {
+                if (!node.getAttribute('mermaid-processed')) {
+                    const mermaidContent = node.innerText
+                    node.setAttribute('mermaid-processed', true)
+                    try {
+                        const { svg } = await mermaid.render('mermaid-render-'+Date.now()+'-'+(diagramIds++), mermaidContent);
+                        node.innerHTML = svg
+                    } catch (err) {
+                        $('<div>').css({
+                            fontSize: '0.8em',
+                            border: '1px solid var(--red-ui-border-color-error)',
+                            padding: '5px',
+                            marginBottom: '10px',
+                        }).text(err.toString()).prependTo(node)
+                    }
+                }
+            })
+        }
+    }  
+    return {
+        render: render,
+    };
+})();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/appearance.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/panes/appearance.js
@@ -196,7 +196,7 @@
        }

        $('<div class="form-row">'+
-            '<label for="node-input-show-label-btn" data-i18n="editor.label"></label>'+
+            '<label for="node-input-show-label" data-i18n="editor.label"></label>'+
            '<span style="margin-right: 2px;"/>'+
            '<input type="checkbox" id="node-input-show-label"/>'+
        '</div>').appendTo(dialogForm);
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/mermaid.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/mermaid.js
@@ -1,46 +0,0 @@
-// 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,
-    };
-})();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/palette-editor.js
@@ -494,6 +494,7 @@ RED.palette.editor = (function() {
        // if there is only 1 catalog, hide the select
        if (catalogEntries.length > 1) {
            catalogSelection.prepend(`<option value="all">${RED._('palette.editor.allCatalogs')}</option>`)
+            catalogSelection.val('all')
            catalogSelection.removeAttr('disabled') // permit the user to select a catalog
        }
        // refresh the searchInput counter and trigger a change
@@ -523,7 +524,7 @@ RED.palette.editor = (function() {
    function refreshFilteredItems() {
        packageList.editableList('empty');
        var currentFilter = searchInput.searchBox('value').trim();
-        if (currentFilter === ""){
+        if (currentFilter === "" && loadedList.length > 20){
            packageList.editableList('addItem',{count:loadedList.length})
            return;
        }
@@ -893,7 +894,7 @@ RED.palette.editor = (function() {
                delay: 300,
                change: function() {
                    var searchTerm = $(this).val().trim().toLowerCase();
-                    if (searchTerm.length > 0) {
+                    if (searchTerm.length > 0 || loadedList.length < 20) {
                        filteredList = loadedList.filter(function(m) {
                            return (m.index.indexOf(searchTerm) > -1);
                        }).map(function(f) { return {info:f}});
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js
@@ -166,7 +166,7 @@ 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();
+            RED.editor.mermaid.render()
        }, 200);
    }

--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-help.js
@@ -383,6 +383,7 @@ RED.sidebar.help = (function() {
                $(this).toggleClass('expanded',!isExpanded);
            })
        helpSection.parent().scrollTop(0);
+        RED.editor.mermaid.render()
    }

    function set(html,title) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js
@@ -464,7 +464,7 @@ RED.sidebar.info = (function() {
                }
                $(this).toggleClass('expanded',!isExpanded);
            });
-        mermaid.init();
+        RED.editor.mermaid.render()
    }

    var tips = (function() {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/typeSearch.js
@@ -323,7 +323,7 @@ RED.typeSearch = (function() {
        }
    }
    function applyFilter(filter,type,def) {
-        return !filter ||
+        return !def || !filter ||
            (
                (!filter.spliceMultiple) &&
                (!filter.type || type === filter.type) &&
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/utils.js
@@ -101,28 +101,8 @@ RED.utils = (function() {

    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 class='mermaid'>${code}</pre>`;
+        } else {
            return "<pre><code>" +code +"</code></pre>";
        }
    };
@@ -917,6 +897,51 @@ RED.utils = (function() {
        }
    }

+    /**
+     * Checks a typed property is valid according to the type.
+     * Returns true if valid.
+     * Return String error message if invalid
+     * @param {*} propertyType 
+     * @param {*} propertyValue 
+     * @returns true if valid, String if invalid
+     */
+    function validateTypedProperty(propertyValue, propertyType, opt) {
+
+        let error
+        if (propertyType === 'json') {
+            try {
+                JSON.parse(propertyValue);
+            } catch(err) {
+                error = RED._("validator.errors.invalid-json", {
+                    error: err.message
+                })
+            }
+        } else if (propertyType === 'msg' || propertyType === 'flow' || propertyType === 'global' ) {
+            if (!RED.utils.validatePropertyExpression(propertyValue)) {
+                error = RED._("validator.errors.invalid-prop")
+            }
+        } else if (propertyType === 'num') {
+            if (!/^NaN$|^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$|^[+-]?(0b|0B)[01]+$|^[+-]?(0o|0O)[0-7]+$|^[+-]?(0x|0X)[0-9a-fA-F]+$/.test(propertyValue)) {
+                error = RED._("validator.errors.invalid-num")
+            }
+        } else if (propertyType === 'jsonata') {
+            try { 
+                jsonata(propertyValue)
+            } catch(err) {
+                error = RED._("validator.errors.invalid-expr", {
+                    error: err.message
+                })
+            }
+        }
+        if (error) {
+            if (opt && opt.label) {
+                return opt.label+': '+error
+            }
+            return error
+        }
+        return true
+    }
+
    function getMessageProperty(msg,expr) {
        var result = null;
        var msgPropParts;
@@ -1451,6 +1476,7 @@ RED.utils = (function() {
        getDarkerColor: getDarkerColor,
        parseModuleList: parseModuleList,
        checkModuleAllowed: checkModuleAllowed,
-        getBrowserInfo: getBrowserInfo
+        getBrowserInfo: getBrowserInfo,
+        validateTypedProperty: validateTypedProperty
    }
 })();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/view.js
@@ -302,11 +302,21 @@ RED.view = (function() {
        return api
    })()

+    const isMac = RED.utils.getBrowserInfo().os === 'mac'
+    // 'Control' is the main modifier key for mouse actions. On Windows,
+    // that is the standard Ctrl key. On Mac that is the Cmd key.
+    function isControlPressed (event) {
+        return (isMac && event.metaKey) || (!isMac && event.ctrlKey)
+    }

    function init() {

        chart = $("#red-ui-workspace-chart");
        chart.on('contextmenu', function(evt) {
+            if (RED.view.DEBUG) {
+                console.warn("contextmenu", { mouse_mode, event: d3.event });
+            }
+            mouse_mode = RED.state.DEFAULT
            evt.preventDefault()
            evt.stopPropagation()
            RED.contextMenu.show({
@@ -1190,7 +1200,7 @@ RED.view = (function() {
            lasso = null;
        }
        if (d3.event.touches || d3.event.button === 0) {
-            if ((mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) && (d3.event.metaKey || d3.event.ctrlKey) && !(d3.event.altKey || d3.event.shiftKey)) {
+            if ((mouse_mode === 0 || mouse_mode === RED.state.QUICK_JOINING) && isControlPressed(d3.event) && !(d3.event.altKey || d3.event.shiftKey)) {
                // Trigger quick add dialog
                d3.event.stopPropagation();
                clearSelection();
@@ -1200,7 +1210,7 @@ RED.view = (function() {
                    clickedGroup = clickedGroup || RED.nodes.group(drag_lines[0].node.g)
                }
                showQuickAddDialog({ position: point, group: clickedGroup });
-            } else if (mouse_mode === 0 && !(d3.event.metaKey || d3.event.ctrlKey)) {
+            } else if (mouse_mode === 0 && !isControlPressed(d3.event)) {
                // CTRL not being held
                if (!d3.event.altKey) {
                    // ALT not held (shift is allowed) Trigger lasso
@@ -3540,7 +3550,7 @@ RED.view = (function() {
            d3.event.preventDefault()
            document.getSelection().removeAllRanges()
            if (d.type != "subflow") {
-                if (/^subflow:/.test(d.type) && (d3.event.ctrlKey || d3.event.metaKey)) {
+                if (/^subflow:/.test(d.type) && isControlPressed(d3.event)) {
                    RED.workspaces.show(d.type.substring(8));
                } else {
                    RED.editor.edit(d);
@@ -3704,12 +3714,12 @@ RED.view = (function() {
            d.type !== 'junction'
        lastClickNode = mousedown_node;
     
-        if (d.selected && (d3.event.ctrlKey||d3.event.metaKey)) {
+        if (d.selected && isControlPressed(d3.event)) {
            mousedown_node.selected = false;
            movingSet.remove(mousedown_node);
        } else {
            if (d3.event.shiftKey) {
-                if (!(d3.event.ctrlKey||d3.event.metaKey)) {
+                if (!isControlPressed(d3.event)) {
                    clearSelection();
                }
                var clickPosition = (d3.event.offsetX/scaleFactor - mousedown_node.x)
@@ -3878,10 +3888,10 @@ RED.view = (function() {
        }
        mousedown_link = d;

-        if (!(d3.event.metaKey || d3.event.ctrlKey)) {
+        if (!isControlPressed(d3.event)) {
            clearSelection();
        }
-        if (d3.event.metaKey || d3.event.ctrlKey) {
+        if (isControlPressed(d3.event)) {
            if (!selectedLinks.has(mousedown_link)) {
                selectedLinks.add(mousedown_link);
            } else {
@@ -3896,7 +3906,7 @@ RED.view = (function() {
        redraw();
        focusView();
        d3.event.stopPropagation();
-        if (!mousedown_link.link && movingSet.length() === 0 && (d3.event.touches || d3.event.button === 0) && selectedLinks.length() === 1 && selectedLinks.has(mousedown_link) && (d3.event.metaKey || d3.event.ctrlKey)) {
+        if (!mousedown_link.link && movingSet.length() === 0 && (d3.event.touches || d3.event.button === 0) && selectedLinks.length() === 1 && selectedLinks.has(mousedown_link) && isControlPressed(d3.event)) {
            d3.select(this).classed("red-ui-flow-link-splice",true);
            var point = d3.mouse(this);
            var clickedGroup = getGroupAt(point[0],point[1]);
@@ -3977,7 +3987,7 @@ RED.view = (function() {
        );
        lastClickNode = g;

-        if (g.selected && (d3.event.ctrlKey||d3.event.metaKey)) {
+        if (g.selected && isControlPressed(d3.event)) {
            selectedGroups.remove(g);
            d3.event.stopPropagation();
        } else {
@@ -4177,7 +4187,7 @@ RED.view = (function() {
                nodeEl.__statusGroup__.style.display = "none";
            } else {
                nodeEl.__statusGroup__.style.display = "inline";
-                let backgroundWidth = 12
+                let backgroundWidth = 15
                var fill = status_colours[d.status.fill]; // Only allow our colours for now
                if (d.status.shape == null && fill == null) {
                    backgroundWidth = 0
@@ -4197,7 +4207,11 @@ RED.view = (function() {
                    nodeEl.__statusLabel__.textContent = "";
                }
                const textSize = nodeEl.__statusLabel__.getBBox()
-                nodeEl.__statusBackground__.setAttribute('width', backgroundWidth + textSize.width + 6)
+                backgroundWidth += textSize.width
+                if (backgroundWidth > 0 && textSize.width > 0) {
+                    backgroundWidth += 6
+                }
+                nodeEl.__statusBackground__.setAttribute('width', backgroundWidth)
            }
            delete d.dirtyStatus;
        }
@@ -4609,8 +4623,8 @@ RED.view = (function() {
                statusBackground.setAttribute("y",-1);
                statusBackground.setAttribute("width",200);
                statusBackground.setAttribute("height",13);
-                statusBackground.setAttribute("rx",1);
-                statusBackground.setAttribute("ry",1);
+                statusBackground.setAttribute("rx",2);
+                statusBackground.setAttribute("ry",2);
                
                statusEl.appendChild(statusBackground);
                node[0][0].__statusBackground__ = statusBackground;
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/workspaces.js
@@ -17,6 +17,8 @@

 RED.workspaces = (function() {

+    const documentTitle = document.title;
+
    var activeWorkspace = 0;
    var workspaceIndex = 0;

@@ -339,12 +341,18 @@ RED.workspaces = (function() {
                    $("#red-ui-workspace-chart").show();
                    activeWorkspace = tab.id;
                    window.location.hash = 'flow/'+tab.id;
+                    if (tab.label) {
+                        document.title = `${documentTitle} : ${tab.label}`
+                    } else {
+                        document.title = documentTitle
+                    }
                    $("#red-ui-workspace").toggleClass("red-ui-workspace-disabled", !!tab.disabled);
                    $("#red-ui-workspace").toggleClass("red-ui-workspace-locked", !!tab.locked);
                } else {
                    $("#red-ui-workspace-chart").hide();
                    activeWorkspace = 0;
                    window.location.hash = '';
+                    document.title = documentTitle
                }
                event.workspace = activeWorkspace;
                RED.events.emit("workspace:change",event);
--- a/packages/node_modules/@node-red/editor-client/src/js/validators.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/validators.js
@@ -43,43 +43,13 @@ RED.validators = {
    typedInput: function(ptypeName,isConfig,mopt) {
        return function(v, opt) {
            var ptype = $("#node-"+(isConfig?"config-":"")+"input-"+ptypeName).val() || this[ptypeName];
-            if (ptype === 'json') {
-                try {
-                    JSON.parse(v);
-                    return true;
-                } catch(err) {
-                    if (opt && opt.label) {
-                        return RED._("validator.errors.invalid-json-prop", {
-                            error: err.message,
-                            prop: opt.label,
-                        });
-                    }
-                    return opt ? RED._("validator.errors.invalid-json", {
-                        error: err.message
-                    }) : false;
-                }
-            } else if (ptype === 'msg' || ptype === 'flow' || ptype === 'global' ) {
-                if (RED.utils.validatePropertyExpression(v)) {
-                    return true;
-                }
-                if (opt && opt.label) {
-                    return RED._("validator.errors.invalid-prop-prop", {
-                        prop: opt.label
-                    });
-                }
-                return opt ? RED._("validator.errors.invalid-prop") : false;
-            } else if (ptype === 'num') {
-                if (/^[+-]?[0-9]*\.?[0-9]*([eE][-+]?[0-9]+)?$/.test(v)) {
-                    return true;
-                }
-                if (opt && opt.label) {
-                    return RED._("validator.errors.invalid-num-prop", {
-                        prop: opt.label
-                    });
-                }
-                return opt ? RED._("validator.errors.invalid-num") : false;
+            const result = RED.utils.validateTypedProperty(v, ptype, opt)
+            if (result === true || opt) {
+                // Valid, or opt provided - return result as-is
+                return result
            }
-            return true;
-        };
+            // No opt - need to return false for backwards compatibilty
+            return false
+        }
    }
-};
+};
--- a/packages/node_modules/@node-red/editor-client/src/sass/projects.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/projects.scss
@@ -825,6 +825,7 @@ div.red-ui-projects-dialog-ssh-public-key {
        margin-top: 0 !important;
        padding: 5px 10px;
        margin-bottom: 10px;
+        border-radius: 3px 3px 0px 0px;
    }
 }

--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -320,7 +320,7 @@
            }
            // but replace with repeat one if set to repeat
            if ((this.repeat && this.repeat != 0) || this.crontab) {
-                suffix = " ↻";
+                suffix = "\t↻";
            }
            if (this.name) {
                return this.name+suffix;
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.js
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.js
@@ -109,9 +109,8 @@ module.exports = function(RED) {
                }
                const p = props.shift()
                const property = p.p;
-                const value = p.v ? p.v : '';
-                const valueType = p.vt ? p.vt : 'str';
-
+                const value = p.v !== undefined ? p.v : '';
+                const valueType = p.vt !== undefined ? p.vt : 'str';
                if (property) {
                    if (valueType === "jsonata") {
                        if (p.v) {
--- a/packages/node_modules/@node-red/nodes/core/common/21-debug.html
+++ b/packages/node_modules/@node-red/nodes/core/common/21-debug.html
@@ -86,7 +86,7 @@
        },
        label: function() {
            var suffix = "";
-            if (this.console === true || this.console === "true") { suffix = " ⇲"; }
+            if (this.console === true || this.console === "true") { suffix = "\t⇲"; }
            if (this.targetType === "jsonata") {
                return (this.name || "JSONata") + suffix;
            }
--- a/packages/node_modules/@node-red/nodes/core/common/60-link.html
+++ b/packages/node_modules/@node-red/nodes/core/common/60-link.html
@@ -275,7 +275,7 @@
                value: [],
                type: "link in[]",
                validate: function (v, opt) {
-                    if ((this.linkType === "static" && v.length > 0)
+                    if (((this.linkType || "static") === "static" && v.length > 0)
                      || this.linkType === "dynamic") {
                        return true;
                    }
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -366,7 +366,7 @@
            name: {value:"_DEFAULT_"},
            func: {value:"\nreturn msg;"},
            outputs: {value:1},
-            timeout:{value:0},
+            timeout:{value:RED.settings.functionTimeout || 0},
            noerr: {value:0,required:true,
                    validate: function(v, opt) {
                        if (!v) {
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.js
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.js
@@ -521,7 +521,8 @@ module.exports = function(RED) {
    RED.nodes.registerType("function",FunctionNode, {
        dynamicModuleList: "libs",
        settings: {
-            functionExternalModules: { value: true, exportable: true }
+            functionExternalModules: { value: true, exportable: true },
+            functionTimeout: { value:0, exportable: true }
        }
    });
    RED.library.register("functions");
--- a/packages/node_modules/@node-red/nodes/core/function/10-switch.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-switch.html
@@ -103,7 +103,6 @@
            } else if (type === "istype") {
                r.v = rule.find(".node-input-rule-type-value").typedInput('type');
                r.vt = rule.find(".node-input-rule-type-value").typedInput('type');
-                r.vt = (r.vt === "number") ? "num" : "str";
            } else if (type === "jsonata_exp") {
                r.v = rule.find(".node-input-rule-exp-value").typedInput('value');
                r.vt = rule.find(".node-input-rule-exp-value").typedInput('type');
@@ -168,7 +167,33 @@
                       label:RED._("node-red:common.label.payload"),
                       validate: RED.validators.typedInput("propertyType", false)},
            propertyType: { value:"msg" },
-            rules: {value:[{t:"eq", v:"", vt:"str"}]},
+            rules: {
+                value:[{t:"eq", v:"", vt:"str"}],
+                validate: function (rules, opt) {
+                    let msg;
+                    const errors = []
+                    if (!rules || rules.length === 0) { return true }
+                    for (var i=0;i<rules.length;i++) {
+                        const opt = { label: RED._('node-red:switch.label.rule')+' '+(i+1) }
+                        const r = rules[i];
+                        if (r.hasOwnProperty('v')) {
+                            if ((msg = RED.utils.validateTypedProperty(r.v,r.vt,opt)) !== true) {
+                                errors.push(msg)
+                            }
+                        }
+                        if (r.hasOwnProperty('v2')) {
+                            if ((msg = RED.utils.validateTypedProperty(r.v2,r.v2t,opt)) !== true) {
+                                errors.push(msg)
+                            }
+                        }
+                    }
+                    if (errors.length) {
+                        console.log(errors)
+                        return errors
+                    }
+                    return true;
+                }
+            },
            checkall: {value:"true", required:true},
            repair: {value:false},
            outputs: {value:1}
@@ -218,7 +243,11 @@
                        if (i > 0) {
                            var lastRule = $("#node-input-rule-container").editableList('getItemAt',i-1);
                            var exportedRule = exportRule(lastRule.element);
-                            opt.r.vt = exportedRule.vt;
+                            if (exportedRule.t === "istype") {
+                                opt.r.vt = (exportedRule.vt === "number") ? "num" : "str";
+                            } else {
+                                opt.r.vt = exportedRule.vt;
+                            }
                            opt.r.v = "";
                            // We could copy the value over as well and preselect it (see the 'activeElement' code below)
                            // But not sure that feels right. Is copying over the last value 'expected' behaviour?
--- a/packages/node_modules/@node-red/nodes/core/function/15-change.html
+++ b/packages/node_modules/@node-red/nodes/core/function/15-change.html
@@ -19,71 +19,42 @@

 <script type="text/javascript">
 (function() {
-    function isInvalidProperty(v,vt) {
-        if (/msg|flow|global/.test(vt)) {
-            if (!RED.utils.validatePropertyExpression(v)) {
-                return RED._("node-red:change.errors.invalid-prop", {
-                    property: v
-                });
-            }
-        } else if (vt === "jsonata") {
-            try{ jsonata(v); } catch(e) {
-                return RED._("node-red:change.errors.invalid-expr", {
-                    error: e.message
-                });
-            }
-        } else if (vt === "json") {
-            try{ JSON.parse(v); } catch(e) {
-                return RED._("node-red:change.errors.invalid-json-data", {
-                    error: e.message
-                });
-            }
-        }
-        return false;
-    }
-
    RED.nodes.registerType('change', {
        color: "#E2D96E",
        category: 'function',
        defaults: {
            name: {value:""},
-            rules:{value:[{t:"set",p:"payload",pt:"msg",to:"",tot:"str"}],validate: function(rules, opt) {
-                var msg;
-                if (!rules || rules.length === 0) { return true }
-                for (var i=0;i<rules.length;i++) {
-                    var r = rules[i];
-                    if (r.t === 'set') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
+            rules:{
+                value:[{t:"set",p:"payload",pt:"msg",to:"",tot:"str"}],
+                validate: function(rules, opt) {
+                    let msg;
+                    const errors = []
+                    if (!rules || rules.length === 0) { return true }
+                    for (var i=0;i<rules.length;i++) {
+                        const opt = { label: RED._('node-red:change.label.rule')+' '+(i+1) }
+                        const r = rules[i];
+                        if (r.t === 'set' || r.t === 'change' || r.t === 'delete' || r.t === 'move') {
+                            if ((msg = RED.utils.validateTypedProperty(r.p,r.pt,opt)) !== true) {
+                                errors.push(msg)
+                            }
                        }
-                        if (msg = isInvalidProperty(r.to,r.tot)) {
-                            return msg;
+                        if (r.t === 'set' || r.t === 'change' || r.t === 'move') {
+                            if ((msg = RED.utils.validateTypedProperty(r.to,r.tot,opt)) !== true) {
+                                errors.push(msg)
+                            }
                        }
-                    } else if (r.t === 'change') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
-                        }
-                        if(msg = isInvalidProperty(r.from,r.fromt)) {
-                            return msg;
-                        }
-                        if(msg = isInvalidProperty(r.to,r.tot)) {
-                            return msg;
-                        }
-                    } else if (r.t === 'delete') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
-                        }
-                    } else if (r.t === 'move') {
-                        if (msg = isInvalidProperty(r.p,r.pt)) {
-                            return msg;
-                        }
-                        if (msg = isInvalidProperty(r.to,r.tot)) {
-                            return msg;
+                        if (r.t === 'change') {
+                            if ((msg = RED.utils.validateTypedProperty(r.from,r.fromt,opt)) !== true) {
+                                errors.push(msg)
+                            }
                        }
                    }
+                    if (errors.length) {
+                        return errors
+                    }
+                    return true;
                }
-                return true;
-            }},
+            },
            // legacy
            action: {value:""},
            property: {value:""},
--- a/packages/node_modules/@node-red/nodes/core/function/80-template.html
+++ b/packages/node_modules/@node-red/nodes/core/function/80-template.html
@@ -153,7 +153,7 @@
            }
            var editorRow = $("#dialog-form>div.node-text-editor-row");
            height -= (parseInt(editorRow.css("marginTop"))+parseInt(editorRow.css("marginBottom")));
-            $(".node-text-editor").css("height",height+"px");
+            $("#dialog-form .node-text-editor").css("height",height+"px");
            this.editor.resize();
        }
    });
--- a/packages/node_modules/@node-red/nodes/core/function/89-delay.js
+++ b/packages/node_modules/@node-red/nodes/core/function/89-delay.js
@@ -284,7 +284,7 @@ module.exports = function(RED) {
                        done();
                    }
                }
-                else {
+                else if (!msg.hasOwnProperty("reset")) {
                    if (maxKeptMsgsCount(node) > 0) {
                        if (node.intervalID === -1) {
                            node.send(msg);
--- a/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
+++ b/packages/node_modules/@node-red/nodes/core/network/10-mqtt.js
@@ -24,7 +24,6 @@ module.exports = function(RED) {
        "text/css":"string",
        "text/html":"string",
        "text/plain":"string",
-        "text/html":"string",
        "application/json":"json",
        "application/octet-stream":"buffer",
        "application/pdf":"buffer",
@@ -105,6 +104,7 @@ module.exports = function(RED) {
     * @returns `true` if it is a valid topic
     */
    function isValidPublishTopic(topic) {
+        if (topic.length === 0) return false;
        return !/[\+#\b\f\n\r\t\v\0]/.test(topic);
    }

@@ -220,8 +220,8 @@ module.exports = function(RED) {
     */
    function subscriptionHandler(node, datatype ,topic, payload, packet) {
        const msg = {topic:topic, payload:null, qos:packet.qos, retain:packet.retain};
-        const v5 = (node && node.brokerConn) 
-            ? node.brokerConn.v5() 
+        const v5 = (node && node.brokerConn)
+            ? node.brokerConn.v5()
            : Object.prototype.hasOwnProperty.call(packet, "properties");
        if(v5 && packet.properties) {
            setStrProp(packet.properties, msg, "responseTopic");
@@ -452,7 +452,7 @@ module.exports = function(RED) {

    /**
     * Perform the disconnect action
-     * @param {MQTTInNode|MQTTOutNode} node 
+     * @param {MQTTInNode|MQTTOutNode} node
     * @param {Function} done
     */
    function handleDisconnectAction(node, done) {
@@ -866,7 +866,7 @@ module.exports = function(RED) {
             * Call end and wait for the client to end (or timeout)
             * @param {mqtt.MqttClient} client The broker client
             * @param {number} ms The time to wait for the client to end
-             * @returns 
+             * @returns
             */
            let waitEnd = (client, ms) => {
                return new Promise( (resolve, reject) => {
@@ -906,7 +906,7 @@ module.exports = function(RED) {
        node.subid = 1;

        //typedef for subscription object:
-        /** 
+        /**
         * @typedef {Object} Subscription
         * @property {String} topic - topic to subscribe to
         * @property {Object} [options] - options object
@@ -934,7 +934,7 @@ module.exports = function(RED) {
            const ref = _ref || 0;
            let options
            let qos = 1 // default to QoS 1 (AWS and several other brokers don't support QoS 2)
-            
+
            // if options is an object, then clone it
            if (typeof _options == "object") {
                options = RED.util.cloneMessage(_options || {})
@@ -948,7 +948,7 @@ module.exports = function(RED) {
            if (typeof qos === "number" && qos >= 0 && qos <= 2) {
                options.qos = qos;
            }
-            
+
            subscription.topic = _topic;
            subscription.qos = qos;
            subscription.options = RED.util.cloneMessage(options);
@@ -958,16 +958,16 @@ module.exports = function(RED) {
        }

        /**
-         * If topic is a subscription object, then use that, otherwise look up the topic in 
+         * If topic is a subscription object, then use that, otherwise look up the topic in
         * the  subscriptions object.  If the topic is not found, then create a new subscription
         * object and add it to the subscriptions object.
-         * @param {Subscription|String} topic 
-         * @param {*} options 
-         * @param {*} callback 
-         * @param {*} ref 
+         * @param {Subscription|String} topic
+         * @param {*} options
+         * @param {*} callback
+         * @param {*} ref
         */
        node.subscribe = function (topic, options, callback, ref) {
-            /** @type {Subscription} */ 
+            /** @type {Subscription} */
            let subscription
            let doCompare = false
            let changesFound = false
@@ -1005,7 +1005,7 @@ module.exports = function(RED) {
                    _brokerConn.unsubscribe(sub.topic, sub.ref, true)
                }
            })
-            
+
            // if subscription is found (or sent in as a parameter), then check for changes.
            // if there are any changes requested, tidy up the old subscription
            if (subscription) {
@@ -1092,7 +1092,7 @@ module.exports = function(RED) {
                        delete sub[ref]
                    }
                }
-                // if instructed to remove the actual MQTT client subscription 
+                // if instructed to remove the actual MQTT client subscription
                if (unsub) {
                    // if there are no more subscriptions for the topic, then remove the topic
                    if (Object.keys(sub).length === 0) {
--- a/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
+++ b/packages/node_modules/@node-red/nodes/core/network/21-httprequest.js
@@ -452,10 +452,6 @@ 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));
                                }
--- a/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
+++ b/packages/node_modules/@node-red/nodes/core/parsers/70-CSV.js
@@ -63,7 +63,7 @@ module.exports = function(RED) {
                        if (!(notemplate && (msg.hasOwnProperty("parts") && msg.parts.hasOwnProperty("index") && msg.parts.index > 0))) {
                            template = clean(node.template);
                        }
-                        var ou = "";
+                        const ou = [];
                        if (!Array.isArray(msg.payload)) { msg.payload = [ msg.payload ]; }
                        if (node.hdrout !== "none" && node.hdrSent === false) {
                            if ((template.length === 1) && (template[0] === '')) {
@@ -74,7 +74,7 @@ module.exports = function(RED) {
                                    template = Object.keys(msg.payload[0]);
                                }
                            }
-                            ou += template.map(v => v.indexOf(node.sep)!==-1 ? '"'+v+'"' : v).join(node.sep) + node.ret;
+                            ou.push(template.map(v => v.indexOf(node.sep)!==-1 ? '"'+v+'"' : v).join(node.sep));
                            if (node.hdrout === "once") { node.hdrSent = true; }
                        }
                        for (var s = 0; s < msg.payload.length; s++) {
@@ -93,7 +93,7 @@ module.exports = function(RED) {
                                        msg.payload[s][t] = node.quo + msg.payload[s][t].toString() + node.quo;
                                    }
                                }
-                                ou += msg.payload[s].join(node.sep) + node.ret;
+                                ou.push(msg.payload[s].join(node.sep));
                            }
                            else {
                                if ((template.length === 1) && (template[0] === '') && (msg.hasOwnProperty("columns"))) {
@@ -105,6 +105,7 @@ module.exports = function(RED) {
                                        node.warn(RED._("csv.errors.obj_csv"));
                                        tmpwarn = false;
                                    }
+                                    const row = [];
                                    for (var p in msg.payload[0]) {
                                        /* istanbul ignore else */
                                        if (msg.payload[s].hasOwnProperty(p)) {
@@ -118,21 +119,22 @@ module.exports = function(RED) {
                                                }
                                                if (q.indexOf(node.quo) !== -1) { // add double quotes if any quotes
                                                    q = q.replace(/"/g, '""');
-                                                    ou += node.quo + q + node.quo + node.sep;
+                                                    row.push(node.quo + q + node.quo);
                                                }
                                                else if (q.indexOf(node.sep) !== -1 || p.indexOf("\n") !== -1) { // add quotes if any "commas" or "\n"
-                                                    ou += node.quo + q + node.quo + node.sep;
+                                                    row.push(node.quo + q + node.quo);
                                                }
-                                                else { ou += q + node.sep; } // otherwise just add
+                                                else { row.push(q); } // otherwise just add
                                            }
                                        }
                                    }
-                                    ou = ou.slice(0,-1) + node.ret;
+                                    ou.push(row.join(node.sep)); // add separator
                                }
                                else {
+                                    const row = [];
                                    for (var t=0; t < template.length; t++) {
                                        if (template[t] === '') {
-                                            ou += node.sep;
+                                            row.push('');
                                        }
                                        else {
                                            var tt = template[t];
@@ -146,19 +148,20 @@ module.exports = function(RED) {
                                            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;
+                                                row.push(node.quo + p + node.quo);
                                            }
                                            else if (p.indexOf(node.sep) !== -1 || p.indexOf("\n") !== -1) { // add quotes if any "commas" or "\n"
-                                                ou += node.quo + p + node.quo + node.sep;
+                                                row.push(node.quo + p + node.quo);
                                            }
-                                            else { ou += p + node.sep; } // otherwise just add
+                                            else { row.push(p); } // otherwise just add
                                        }
                                    }
-                                    ou = ou.slice(0,-1) + node.ret; // remove final "comma" and add "newline"
+                                    ou.push(row.join(node.sep)); // add separator
                                }
                            }
                        }
-                        msg.payload = ou;
+                        // join lines, don't forget to add the last new line
+                        msg.payload = ou.join(node.ret) + node.ret;
                        msg.columns = template.map(v => v.indexOf(',')!==-1 ? '"'+v+'"' : v).join(',');
                        if (msg.payload !== '') { send(msg); }
                        done();
--- a/packages/node_modules/@node-red/nodes/icons/arduino.png
+++ b/packages/node_modules/@node-red/nodes/icons/arduino.png
--- a/packages/node_modules/@node-red/nodes/icons/arduino.svg
+++ b/packages/node_modules/@node-red/nodes/icons/arduino.svg
@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff"><path d="m9.7884 22.379c-5.2427-0.41732-9.6475 5.7885-7.4975 10.585 2.0949 5.2041 9.9782 6.6154 13.727 2.4477 3.633-3.5613 5.0332-9.0411 9.4821-11.853 4.5205-3.0872 11.797-0.172 12.68 5.3144 0.86 5.2537-4.8017 10.364-9.9231 8.8205-3.7873-0.85449-6.5051-4.0905-8.0487-7.4975-1.9019-3.2526-4.3882-6.7257-8.2693-7.6077-0.6891-0.15656-1.4003-0.21831-2.1059-0.21721z" stroke-width="3.3"/><path d="m6.7012 29.821h6.6154" stroke-width="1.4"/><path d="m26.988 29.821h5.5128m-2.8115-2.7564v5.5128" stroke-width="1.8"/></g></svg>
--- a/packages/node_modules/@node-red/nodes/icons/bluetooth.png
+++ b/packages/node_modules/@node-red/nodes/icons/bluetooth.png
--- a/packages/node_modules/@node-red/nodes/icons/bluetooth.svg
+++ b/packages/node_modules/@node-red/nodes/icons/bluetooth.svg
@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m8.3474 17.75 22.298 22.444-10.747 13.013v-46.497l10.747 12.428-22.298 21.859" fill="none" stroke="#fff" stroke-width="4"/></svg>
--- a/packages/node_modules/@node-red/nodes/icons/leveldb.png
+++ b/packages/node_modules/@node-red/nodes/icons/leveldb.png
--- a/packages/node_modules/@node-red/nodes/icons/leveldb.svg
+++ b/packages/node_modules/@node-red/nodes/icons/leveldb.svg
@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m2.7078 12.986c0 7.7994-0.36386 21.569 0 32.545s35.118 9.8751 34.848 0c-0.26959-9.8751 0-24.82 0-32.545 0-7.7243-34.848-7.7995-34.848 0z" fill="none" stroke="#fff"/><g fill="#fff"><path d="m3.8741 13.406v8.955c0.021834 3.5781 19.543 5.0789 25.575 3.2543 0 0 0.02229-2.6683 0.02998-2.6673l5.5325 0.7238c0.64508 0.0844 1.1345-0.74597 1.134-1.3284v-8.573l-0.99896 0.93349-15.217-2.2765c4.5883 2.1798 9.808 4.1312 9.808 4.1312-9.3667 3.1562-25.846-0.31965-25.864-3.1525z"/><path d="m3.886 26.607v8.1052c3.2188 6.1087 29.901 5.8574 32.272 0v-8.1052c-3.3598 4.6685-29.204 5.1534-32.272 0z"/><path d="m4.0032 39.082v7.1522c2.556 7.4622 28.918 7.6072 32.272 0v-7.1522c-3.2345 4.9471-29.087 5.359-32.272 0z"/></g></svg>
--- a/packages/node_modules/@node-red/nodes/icons/mongodb.png
+++ b/packages/node_modules/@node-red/nodes/icons/mongodb.png
--- a/packages/node_modules/@node-red/nodes/icons/mongodb.svg
+++ b/packages/node_modules/@node-red/nodes/icons/mongodb.svg
@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m23.515 13.831c-4.7594-5.8789-2.6084-5.7751-7.3474 0-8.0368 10.477-8.3322 24.431 2.5476 32.935 0.13181 2.0418 0.46056 4.9803 0.46056 4.9803h1.315s0.32875-2.9219 0.46017-4.9803c2.8458-2.2339 16.799-14.619 2.5641-32.935z" fill="#fff"/></svg>
--- a/packages/node_modules/@node-red/nodes/icons/mouse.png
+++ b/packages/node_modules/@node-red/nodes/icons/mouse.png
--- a/packages/node_modules/@node-red/nodes/icons/mouse.svg
+++ b/packages/node_modules/@node-red/nodes/icons/mouse.svg
@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff" stroke-width="3"><path d="m6 30c6 5 24 4 29-0.07"/><path d="m21 33 0.1-19c0.02-4 4-3 4-6s-4-2-4-5"/><path d="m6 22c0-11 29-10 29 0v21c0 18-29 19-29 0s4e-7 -11 0-21z"/></g></svg>
--- a/packages/node_modules/@node-red/nodes/icons/rbe.png
+++ b/packages/node_modules/@node-red/nodes/icons/rbe.png
--- a/packages/node_modules/@node-red/nodes/icons/rbe.svg
+++ b/packages/node_modules/@node-red/nodes/icons/rbe.svg
@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m29 12s0.1 30 0.05 31-3 5-7 5-19 0.04-19 0.04c6-4 9-5 17-5 0 0 4-0.1 4-2 0-2 8e-3 -29 8e-3 -29z" fill="#fff"/><path d="m12 47s-0.1-30-0.05-31 3-5 7-5 19-0.04 19-0.04c-6 4-9 5-17 5 0 0-4 0.1-4 2 0 2-8e-3 29-8e-3 29z" fill="#fff"/></svg>
--- a/packages/node_modules/@node-red/nodes/icons/redis.png
+++ b/packages/node_modules/@node-red/nodes/icons/redis.png
--- a/packages/node_modules/@node-red/nodes/icons/redis.svg
+++ b/packages/node_modules/@node-red/nodes/icons/redis.svg
@@ -0,0 +1 @@
+<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff" stroke-width="3"><path class="cls-4" d="m17.639 30.221c-1.7087-0.88225-12.465-5.6284-14.414-6.636-1.9492-1.0075-1.9868-1.7073-0.075164-2.5188 1.9117-0.81145 12.643-5.3861 14.91-6.2738 2.2675-0.8877 3.0517-0.91493 4.9785-0.14704 1.9267 0.76789 12.026 5.1329 13.923 5.8898 1.8966 0.75699 1.9843 1.386 0.02631 2.4861-1.958 1.1001-12.1 5.6611-14.285 6.8729s-3.355 1.2091-5.0636 0.32685z"/><path class="cls-4" d="m32.23 25.251c2.8239 1.2039 4.155 1.764 4.7307 1.9938 1.8966 0.75699 1.9843 1.386 0.0263 2.4861s-12.1 5.6611-14.285 6.8729c-2.1848 1.2117-3.3548 1.209-5.0634 0.32676-1.7087-0.88225-12.465-5.6284-14.414-6.636-1.9492-1.0075-1.9868-1.7073-0.075164-2.5188 10.883-4.6196-9.1087 3.8612 4.9598-2.1076"/><path class="cls-4" d="m32.23 31.961c2.8239 1.2039 4.155 1.764 4.7307 1.9938 1.8966 0.75699 1.9843 1.386 0.0263 2.4861s-12.1 5.6611-14.285 6.8729c-2.1848 1.2117-3.3548 1.209-5.0634 0.32676-1.7087-0.88225-12.465-5.6284-14.414-6.636-1.9492-1.0075-1.9868-1.7073-0.075164-2.5188 10.883-4.6196-9.1087 3.8612 4.9598-2.1076"/></g></svg>
--- a/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/de/function/10-function.html
@@ -25,7 +25,7 @@
    <p>Wenn ein promise-Objekt aus dem Start-Code zurückgegeben wird,
       beginnt danach die reguläre Verarbeitung der Eingangsnachrichten.</p>
    <h3>Details</h3>
-    <p>Siehe  <a target="_blank" href="http://nodered.org/docs/writing-functions.html">Onlinedokumentation</a>
+    <p>Siehe  <a target="_blank" href="https://nodered.org/docs/writing-functions.html">Onlinedokumentation</a>
       für weitere Informationen zum Schreiben von Funktionen.</p>
    <h4><b>Nachrichten senden</b></h4>
    <p>Die Funktion kann die Nachrichten zurückgeben, die sie an die nächsten Nodes im Flow weitergeben möchte,
--- a/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/function/10-function.html
@@ -26,7 +26,7 @@
    <p>If the On Start code returns a Promise object, the node will not start handling messages
        until the promise is resolved.</p>
    <h3>Details</h3>
-    <p>See the <a target="_blank" href="http://nodered.org/docs/writing-functions.html">online documentation</a>
+    <p>See the <a target="_blank" href="https://nodered.org/docs/writing-functions.html">online documentation</a>
    for more information on writing functions.</p>
    <h4>Sending messages</h4>
    <p>The function can either return the messages it wants to pass on to the next nodes
--- a/packages/node_modules/@node-red/nodes/locales/fr/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/locales/fr/common/20-inject.html
@@ -36,5 +36,5 @@
 <p><b>Remarque</b> : Les options <i>"Intervalle entre les heures"</i> et <i>"à une heure précise"</i> utilisent le système cron standard.
  Cela signifie que pour la première option, vous pouvez envoyer un message à intervalle régulier entre les heures voulues.
  Si vous voulez envoyer un message toutes les minutes à partir de maintenant, utiliser l'option <i>"intervalle"</i>.</p>
-<p><b>Remarque</b> : Pour inclure une nouvelle ligne dans une chaîne, vous devez utiliser un noeud de fonction pour créer la charge utile.</p>
+<p><b>Remarque</b> : Pour inclure une nouvelle ligne dans une chaîne, vous devez utiliser soit un noeud de fonction soit le noeud template pour créer la charge utile.</p>
 </script>
--- a/packages/node_modules/@node-red/nodes/locales/fr/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/fr/function/10-function.html
@@ -26,7 +26,7 @@
    <p>Si le code 'Au démarrage' renvoie un objet Promise (promesse), le noeud ne commencera pas à gérer les messages
      jusqu'à ce que la promesse soit résolue.</p>
    <h3>Détails</h3>
-    <p>Voir la <a target="_blank" href="http://nodered.org/docs/writing-functions.html">documentation en ligne</a>
+    <p>Voir la <a target="_blank" href="https://nodered.org/docs/writing-functions.html">documentation en ligne</a>
      pour plus d'informations sur les fonctions d'écriture.</p>
    <h4>Envoi de messages</h4>
    <p>La fonction peut envoyer les messages qu'elle souhaite transmettre aux noeuds suivants
--- a/packages/node_modules/@node-red/nodes/locales/fr/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/fr/messages.json
@@ -11,11 +11,11 @@
            "expand": "Développer"
        },
        "status": {
-            "connected": "connecté",
-            "not-connected": "pas connecté",
-            "disconnected": "déconnecté",
-            "connecting": "connexion",
-            "error": "erreur",
+            "connected": "Connecté",
+            "not-connected": "Pas connecté",
+            "disconnected": "Déconnecté",
+            "connecting": "Connexion",
+            "error": "Erreur",
            "ok": "OK"
        },
        "notification": {
@@ -32,7 +32,7 @@
    },
    "inject": {
        "inject": "Injecter",
-        "injectNow": "injecter maintenant",
+        "injectNow": "Injecter maintenant",
        "repeat": "répéter = __repeat__",
        "crontab": "crontab = __crontab__",
        "stopped": "arrêté",
@@ -98,7 +98,7 @@
        "catchUncaught": "catch : non capturé",
        "label": {
            "source": "Détecter les erreurs de",
-            "selectAll": "tout sélectionner",
+            "selectAll": "Tout sélectionner",
            "uncaught": "Ignorer les erreurs gérées par les autres noeuds Catch"
        },
        "scope": {
@@ -112,7 +112,7 @@
        "statusNodes": "statut : __number__",
        "label": {
            "source": "Signaler l'état de",
-            "sortByType": "trier par type"
+            "sortByType": "Trier par type"
        },
        "scope": {
            "all": "tous les noeuds",
@@ -148,23 +148,23 @@
            "deactivated": "Désactivé avec succès : __label__"
        },
        "sidebar": {
-            "label": "débogage",
+            "label": "Débogage",
            "name": "Messages de débogage",
-            "filterAll": "tous les noeuds",
-            "filterSelected": "noeuds sélectionnés",
-            "filterCurrent": "flux actuel",
+            "filterAll": "Tous les noeuds",
+            "filterSelected": "Noeuds sélectionnés",
+            "filterCurrent": "Flux actuel",
            "debugNodes": "noeuds de débogage",
-            "clearLog": "Effacer les messages",
-            "clearFilteredLog": "Effacer les messages filtrés",
+            "clearLog": "Tous les messages",
+            "clearFilteredLog": "Les messages filtrés",
            "filterLog": "Filtrer les messages",
            "openWindow": "Ouvrir dans une nouvelle fenêtre",
            "copyPath": "Copier le chemin",
            "copyPayload": "Copier la valeur",
            "pinPath": "Épingler le chemin",
-            "selectAll": "tout sélectionner",
-            "selectNone": "ne rien sélectionner",
-            "all": "tout",
-            "filtered": "filtré"
+            "selectAll": "Tout sélectionner",
+            "selectNone": "Ne rien sélectionner",
+            "all": "Tout",
+            "filtered": "Filtrés"
        },
        "messageMenu": {
            "collapseAll": "Réduire tous les chemins",
@@ -177,11 +177,11 @@
        "linkIn": "Lien entrant",
        "linkOut": "Lien sortant",
        "linkCall": "Appel de lien",
-        "linkOutReturn": "retour de lien",
+        "linkOutReturn": "Retour de lien",
        "outMode": "Mode",
        "sendToAll": "Envoyer à tous les noeuds de liaison connectés",
        "returnToCaller": "Retour au noeud de liaison appelant",
-        "timeout": "temps mort",
+        "timeout": "Temps mort",
        "linkCallType": "Type de liaison",
        "staticLinkCall": "Lien fixe",
        "dynamicLinkCall": "Lien dynamique (msg.target)",
@@ -225,7 +225,7 @@
            "command": "Commande",
            "append": "Joindre",
            "timeout": "Temps mort",
-            "timeoutplace": "facultatif",
+            "timeoutplace": "Facultatif",
            "return": "Sortie",
            "seconds": "secondes",
            "stdout": "stdout",
@@ -234,7 +234,7 @@
            "winHide": "Masquer la console"
        },
        "placeholder": {
-            "extraparams": "paramètres d'entrée supplémentaires"
+            "extraparams": "Paramètres d'entrée supplémentaires"
        },
        "opt": {
            "exec": "lorsque la commande est terminée - mode exec",
@@ -319,7 +319,7 @@
        "queuemsg": "Mettre en file d'attente les messages intermédiaires",
        "dropmsg": "Supprimer les messages intermédiaires",
        "sendmsg": "Envoyer les messages intermédiaires sur la 2ème sortie",
-        "allowrate": "autoriser msg.rate (en ms) à remplacer le débit",
+        "allowrate": "Autoriser msg.rate (en ms) à remplacer le débit",
        "label": {
            "delay": "retard",
            "variable": "variable",
@@ -349,7 +349,7 @@
            }
        },
        "errors": {
-            "too-many": "trop de messages en attente dans le noeud 'Delay'",
+            "too-many": "Trop de messages en attente dans le noeud 'Delay'",
            "invalid-timeout": "Valeur de délai invalide",
            "invalid-rate": "Valeur de taux invalide",
            "invalid-rate-unit": "Valeur de débit invalide",
@@ -359,8 +359,8 @@
    },
    "trigger": {
        "send": "Envoyer",
-        "then": "puis",
-        "then-send": "puis envoyer",
+        "then": "Puis",
+        "then-send": "Puis envoyer",
        "output": {
            "string": "la chaîne",
            "number": "le nombre",
@@ -381,9 +381,9 @@
            "m": "Minutes",
            "h": "Heures"
        },
-        "extend": " prolonger le délai si un nouveau message arrive",
-        "override": "remplacer le délai avec msg.delay",
-        "second": " envoyer un deuxième message à une sortie séparée",
+        "extend": " Prolonger le délai si un nouveau message arrive",
+        "override": "Remplacer le délai avec msg.delay",
+        "second": " Envoyer un deuxième message à une sortie séparée",
        "label": {
            "trigger": "déclencher",
            "trigger-block": "déclencher et bloquer",
@@ -408,7 +408,7 @@
    "mqtt": {
        "label": {
            "broker": "Serveur",
-            "example": "par exemple. localhost",
+            "example": "expl. localhost",
            "output": "Sortie",
            "qos": "QoS",
            "retain": "Conserver",
@@ -438,7 +438,7 @@
            "sessionExpiry": "Expiration de la session (secondes)",
            "topicAlias": "Alias",
            "payloadFormatIndicator": "Formater",
-            "payloadFormatIndicatorFalse": "octets non spécifiés (par défaut)",
+            "payloadFormatIndicatorFalse": "Octets non spécifiés (par défaut)",
            "payloadFormatIndicatorTrue": "Charge utile encodée en UTF-8",
            "protocolVersion": "Protocole",
            "protocolVersion3": "MQTT V3.1 (hérité)",
@@ -493,8 +493,8 @@
        "false": "faux",
        "tip": "Conseil : laisser le sujet, le qos ou le contenu vide si vous souhaitez les définir via les propriétés du msg.",
        "errors": {
-            "not-defined": "sujet non défini",
-            "missing-config": "configuration du courtier manquante",
+            "not-defined": "Sujet non défini",
+            "missing-config": "Configuration du courtier manquante",
            "invalid-topic": "Sujet invalide spécifié",
            "nonclean-missingclientid": "Aucun ID client défini, utilisation d'une session propre",
            "invalid-json-string": "Chaîne JSON invalide",
@@ -514,7 +514,7 @@
            "upload": "Accepter les téléchargements de fichiers ?",
            "status": "Code d'état",
            "headers": "En-têtes",
-            "other": "autre",
+            "other": "Autre",
            "paytoqs": {
                "ignore": "Ignorer",
                "query": "Joindre aux paramètres de chaîne de requête",
@@ -625,7 +625,7 @@
            "chars": "caractères",
            "close": "Fermer",
            "optional": "(facultatif)",
-            "reattach": "rattacher le délimiteur"
+            "reattach": "Rattacher le délimiteur"
        },
        "type": {
            "listen": "Écoute sur",
@@ -633,8 +633,8 @@
            "reply": "Répondre sur TCP"
        },
        "output": {
-            "stream": "flux de",
-            "single": "unique",
+            "stream": "Flux de",
+            "single": "Unique",
            "buffer": "Tampon",
            "string": "Chaîne",
            "base64": "Chaîne en Base64"
@@ -657,15 +657,15 @@
            "connections_plural": "__count__ connexions"
        },
        "errors": {
-            "connection-lost": "connexion perdue avec __host__:__port__",
-            "timeout": "délai d'expiration du port __port__ du socket fermé",
-            "cannot-listen": "impossible d'écouter sur le port __port__, erreur : __error__",
-            "error": "erreur : __error__",
-            "socket-error": "erreur de courtier depuis __host__:__port__",
+            "connection-lost": "Connexion perdue avec __host__:__port__",
+            "timeout": "Délai d'expiration du port __port__ du socket fermé",
+            "cannot-listen": "Impossible d'écouter sur le port __port__, erreur : __error__",
+            "error": "Erreur : __error__",
+            "socket-error": "Erreur de courtier depuis __host__:__port__",
            "no-host": "Hôte et/ou port non défini",
-            "connect-timeout": "délai de connexion",
-            "connect-fail": "la connexion a échoué",
-            "bad-string": "échec de la conversion en chaîne",
+            "connect-timeout": "Délai de connexion",
+            "connect-fail": "La connexion a échoué",
+            "bad-string": "Échec de la conversion en chaîne",
            "invalid-host": "Hôte invalide",
            "invalid-port": "Port invalide"
        }
@@ -722,7 +722,7 @@
        },
        "errors": {
            "access-error": "Erreur d'accès UDP, vous aurez peut-être besoin d'un accès root pour les ports inférieurs à 1024",
-            "error": "erreur : __erreur__",
+            "error": "Erreur : __erreur__",
            "bad-mcaddress": "Mauvaise adresse de multidiffusion",
            "interface": "Doit être l'adresse IP de l'interface requise",
            "ip-notset": "udp : adresse IP non définie",
@@ -730,7 +730,7 @@
            "port-invalid": "udp : numéro de port non valide",
            "alreadyused": "udp : port __port__ déjà utilisé",
            "ifnotfound": "udp : interface __iface__ introuvable",
-            "invalid-group": "groupe de multidiffusion invalide"
+            "invalid-group": "Groupe de multidiffusion invalide"
        }
    },
    "switch": {
@@ -738,15 +738,15 @@
        "label": {
            "property": "Propriété",
            "rule": "règle",
-            "repair": "recréer des séquences du messages",
-            "value-rules": "règles de valeur",
-            "sequence-rules": "règles de séquence"
+            "repair": "Recréer des séquences du messages",
+            "value-rules": "Règles de valeur",
+            "sequence-rules": "Règles de séquence"
        },
        "previous": "valeur précédente",
        "and": "et",
-        "checkall": "vérifier toutes les règles",
-        "stopfirst": "arrêter après la première concordance",
-        "ignorecase": "ignorer la casse",
+        "checkall": "Vérifier toutes les règles",
+        "stopfirst": "Arrêter après la première concordance",
+        "ignorecase": "Ignorer la casse",
        "rules": {
            "btwn": "est entre",
            "cont": "contient",
@@ -767,7 +767,7 @@
        },
        "errors": {
            "invalid-expr": "Expression JSONata non valide : __error__",
-            "too-many": "trop de messages en attente dans le noeud de commutation"
+            "too-many": "Trop de messages en attente dans le noeud de commutation"
        }
    },
    "change": {
@@ -840,13 +840,13 @@
            "entrée": "Entrée",
            "skip-s": "Passer en premier",
            "skip-e": "lignes",
-            "firstrow": "la première ligne contient les noms des colonnes",
+            "firstrow": "La première ligne contient les noms des colonnes",
            "output": "Sortie",
-            "includerow": "inclure la ligne du nom de la colonne",
+            "includerow": "Inclure la ligne du nom de la colonne",
            "newline": "Nouvelle ligne",
-            "usestrings": "analyser les valeurs numériques",
-            "include_empty_strings": "inclure les chaînes vides",
-            "include_null_values": "inclure les valeurs nulles"
+            "usestrings": "Analyser les valeurs numériques",
+            "include_empty_strings": "Inclure les chaînes vides",
+            "include_null_values": "Inclure les valeurs nulles"
        },
        "placeholder": {
            "columns": "noms de colonnes séparés par des virgules"
@@ -936,8 +936,8 @@
    },
    "file": {
        "label": {
-            "write": "écrire le fichier",
-            "read": "lire le fichier",
+            "write": "Écrire le fichier",
+            "read": "Lire le fichier",
            "filename": "Nom du fichier",
            "path": "chemin",
            "action": "Action",
@@ -972,8 +972,8 @@
            "appendedfile": "ajouté au fichier : __file__"
        },
        "encoding": {
-            "none": "par défaut",
-            "setbymsg": "défini par msg.encoding",
+            "none": "Par défaut",
+            "setbymsg": "Défini par msg.encoding",
            "native": "Natif",
            "unicode": "Unicode",
            "japanese": "Japonais",
@@ -990,10 +990,10 @@
        "errors": {
            "nofilename": "Aucun nom de fichier spécifié",
            "invaliddelete": "Attention : suppression non valide. Veuiller utiliser une option de suppression spécifique dans la boîte de dialogue de configuration.",
-            "deletefail": "échec de la suppression du fichier : __error__",
-            "writefail": "échec de l'écriture dans le fichier : __error__",
-            "appendfail": "échec de l'ajout au fichier : __error__",
-            "createfail": "échec de la création du fichier : __error__"
+            "deletefail": "Échec de la suppression du fichier : __error__",
+            "writefail": "Échec de l'écriture dans le fichier : __error__",
+            "appendfail": "Échec de l'ajout au fichier : __error__",
+            "createfail": "Échec de la création du fichier : __error__"
        },
        "tip": "Astuce : Le nom du fichier doit être un chemin absolu, sinon il sera relatif au répertoire de travail du processus Node-RED."
    },
@@ -1018,9 +1018,9 @@
            "reduce": "réduire la séquence",
            "custom": "manuel"
        },
-        "combine": "Combine each",
+        "combine": "Combiner chaque",
        "completeMessage": "message complet",
-        "create": "créer",
+        "create": "Créer",
        "type": {
            "string": "une Chaîne",
            "array": "un Tableau",
@@ -1028,13 +1028,13 @@
            "object": "un Objet clé/valeur",
            "merged": "un Objet fusionné"
        },
-        "using": "en utilisant la valeur de",
-        "key": "comme la clé",
+        "using": "En utilisant la valeur du",
+        "key": "comme clé",
        "joinedUsing": "joint en utilisant",
        "send": "Envoyer le message :",
-        "afterCount": "Après un certain nombre de parties du message",
-        "count": "compter",
-        "subsequent": "et tous les messages suivants.",
+        "afterCount": "Après un nombre de parties du message",
+        "count": "nombre",
+        "subsequent": "Et tous les messages suivants.",
        "afterTimeout": "Après un délai d'attente après le premier message",
        "seconds": "secondes",
        "complete": "Après un message avec la propriété <code>msg.complete</code> définie",
@@ -1068,10 +1068,10 @@
        "order": "Sens",
        "ascending": "croissant",
        "descending": "descendant",
-        "as-number": "comme nombre",
+        "as-number": "Comme nombre",
        "invalid-exp": "Expression JSONata invalide dans le noeud sort: __message__",
        "too-many": "Trop de messages en attente dans le noeud sort",
-        "clear": "effacer le message en attente dans le noeud sort"
+        "clear": "Effacer le message en attente dans le noeud sort"
    },
    "batch": {
        "batch": "Regrouper",
@@ -1084,21 +1084,21 @@
        "count": {
            "label": "Nombre de messages",
            "overlap": "Chevauchement",
-            "count": "compter",
+            "count": "nombre",
            "invalid": "Comptage et chevauchement invalides"
        },
        "interval": {
            "label": "Intervalle",
            "seconds": "secondes",
-            "empty": "envoyer un message vide lorsqu'aucun message n'arrive"
+            "empty": "Envoyer un message vide lorsqu'aucun message n'arrive"
        },
        "concat": {
            "topics-label": "Sujets",
            "topic": "sujet"
        },
-        "too-many": "trop de messages en attente dans le noeud batch",
-        "unexpected": "mode inattendu",
-        "no-parts": "aucune propriété de pièces dans le message",
+        "too-many": "Trop de messages en attente dans le noeud batch",
+        "unexpected": "Mode inattendu",
+        "no-parts": "Aucune propriété de pièces dans le message",
        "error": {
            "invalid-count": "Compte invalide",
            "invalid-overlap": "Recouvrement invalide",
@@ -1132,7 +1132,7 @@
            "out": "par rapport à la dernière valeur de sortie valide"
        },
        "warn": {
-            "nonumber": "aucun numéro trouvé dans la charge utile"
+            "nonumber": "Aucun numéro trouvé dans la charge utile"
        }
    },
    "global-config": {
--- a/packages/node_modules/@node-red/nodes/locales/ja/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/ja/function/10-function.html
@@ -22,7 +22,7 @@
    <p><b>初期化処理</b>タブにはノードの開始時に実行されるコードを、<b>終了処理</b>タブにはノードの終了時に実行されるコードを指定します。</p>
    <p>初期化処理タブの返却値としてPromiseオブジェクトを返却すると、入力メッセージの処理を開始する前にその完了を待ちます。</p>
    <h3>詳細</h3>
-    <p>コードの書き方の詳細については、<a target="_blank" href="http://nodered.org/docs/writing-functions.html">オンラインドキュメント</a>を参照してください。</p>
+    <p>コードの書き方の詳細については、<a target="_blank" href="https://nodered.org/docs/writing-functions.html">オンラインドキュメント</a>を参照してください。</p>
    <h4>メッセージの送信</h4>
    <p>フロー内の次ノードにメッセージを渡すためには、メッセージを返却するか<code>node.send(messages)</code>を呼び出します。</p>
    <p>返却/sendの対象は次のとおりです:</p>
--- a/packages/node_modules/@node-red/nodes/locales/ko/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/ko/function/10-function.html
@@ -20,7 +20,7 @@
    <p><code>msg</code>오브젝트는<code>msg.payload</code>프로퍼티에 메시지 본체를 유지하는 것이 관례입니다.</p>
    <p>보통 코드는 메시지 오브젝트(혹은 여러 메시지 객체)를 반환합니다.후속 플로우의 실행을 정지하고 싶은 경우에는, 오브젝트를 반환하지 않아도 상관없습니다.</p>
    <h3>상세</h3>
-    <p>코드 쓰는 방식에 대한 자세한 내용은, <a target="_blank" href="http://nodered.org/docs/writing-functions.html">공식 홈페이지</a>를 참조해 주세요.</p>
+    <p>코드 쓰는 방식에 대한 자세한 내용은, <a target="_blank" href="https://nodered.org/docs/writing-functions.html">공식 홈페이지</a>를 참조해 주세요.</p>
    <h4>메세지 송신</h4>
    <p>플로우 내의 다음 노드에 메세지를 전달하기 위해서는, 메세지를 반환하거나, <code>node.send(messages)</code>를 호출합니다.</p>
    <p>반환/send 대상은 다음과 같습니다:</p>
--- a/packages/node_modules/@node-red/nodes/locales/pt-BR/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/pt-BR/function/10-function.html
@@ -26,7 +26,7 @@
      <p>Se o código <b>On Start</b> retornar um objeto do tipo promessa, o nó não começará a tratar as mensagens
          até que a promessa seja resolvida.</p>
      <h3>Detalhes</h3>
-      <p>Consulte a <a target="_blank" href="http://nodered.org/docs/writing-functions.html">documentação online</a>
+      <p>Consulte a <a target="_blank" href="https://nodered.org/docs/writing-functions.html">documentação online</a>
      para obter maiores informações sobre funções de escrita.</p>
      <h4>Enviando mensagens</h4>
      <p>A função pode retornar as mensagens que deseja passar para os próximos nós
--- a/packages/node_modules/@node-red/nodes/locales/ru/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/ru/function/10-function.html
@@ -36,7 +36,7 @@

  <h3>Подробности</h3>
  <p>
-    Смотрите <a target="_blank" href="http://nodered.org/docs/writing-functions.html">онлайн-документацию</a> для получения дополнительной информации по написанию функций.
+    Смотрите <a target="_blank" href="https://nodered.org/docs/writing-functions.html">онлайн-документацию</a> для получения дополнительной информации по написанию функций.
  </p>

  <h4>Отправка сообщений</h4>
--- a/packages/node_modules/@node-red/nodes/locales/zh-CN/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/zh-CN/function/10-function.html
@@ -20,7 +20,7 @@
    <p>通常，<code>msg</code>对象将消息正文保留在<code>msg.payload</code>属性中。</p>
    <p>该函数一般会返回一个消息对象（或多个消息对象），但也可以为了停止流而什么都不返回。</p>
    <h3>详细</h3>
-    <p>请参见<a target="_blank" href="http://nodered.org/docs/writing-functions.html">在线文档</a>来获得更多有关编写函数的信息。</p>
+    <p>请参见<a target="_blank" href="https://nodered.org/docs/writing-functions.html">在线文档</a>来获得更多有关编写函数的信息。</p>
    <h4>传送消息</h4>
    <p>要将消息传递到流中的下一个节点，请返回消息或调用<code>node.send(messages)</code>。</p>
    <p>它将返回/send:</p>
--- a/packages/node_modules/@node-red/nodes/locales/zh-TW/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/locales/zh-TW/function/10-function.html
@@ -20,7 +20,7 @@
  <p>通常，<code>msg</code>對象將消息正文保留在<code>msg.payload</code>屬性中。</p>
  <p>該函數一般會返回一個消息對象（或多個消息對象），但也可以爲了停止流程而什麽都不返回。</p>
  <h3>詳細</h3>
-  <p>請參見<a target="_blank" href="http://nodered.org/docs/writing-functions.html">在線文檔</a>來獲得更多有關編寫函數的信息。</p>
+  <p>請參見<a target="_blank" href="https://nodered.org/docs/writing-functions.html">在線文檔</a>來獲得更多有關編寫函數的信息。</p>
  <h4>傳送消息</h4>
  <p>要將消息傳遞到流程中的下一個節點，請返回消息或調用<code>node.send(messages)</code>。</p>
  <p>它將返回/send:</p>
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/nodes",
-    "version": "3.1.0-beta.4",
+    "version": "3.1.0",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
@@ -38,13 +38,13 @@
        "mqtt": "4.3.7",
        "multer": "1.4.5-lts.1",
        "mustache": "4.2.0",
-        "node-watch": "0.7.3",
+        "node-watch": "0.7.4",
        "on-headers": "1.0.2",
        "raw-body": "2.5.2",
-        "tough-cookie": "4.1.2",
+        "tough-cookie": "4.1.3",
        "uuid": "9.0.0",
        "ws": "7.5.6",
-        "xml2js": "0.6.0",
+        "xml2js": "0.6.2",
        "iconv-lite": "0.6.3"
    }
 }
--- a/packages/node_modules/@node-red/registry/lib/loader.js
+++ b/packages/node_modules/@node-red/registry/lib/loader.js
@@ -143,6 +143,12 @@ function loadModuleFiles(modules) {
        return loadNodeSetList(pluginList);
    }).then(function() {
        return loadNodeSetList(nodeList);
+    }).then(function () {
+        if (settings.available()) {
+            return registry.saveNodeList();
+        } else {
+            return
+        }
    })
 }

@@ -436,7 +442,7 @@ async function loadPlugin(plugin) {
        return plugin;
    }
 }
-
+let invocation = 0
 function loadNodeSetList(nodes) {
    var promises = [];
    nodes.forEach(function(node) {
@@ -451,13 +457,7 @@ function loadNodeSetList(nodes) {
        }
    });

-    return Promise.all(promises).then(function() {
-        if (settings.available()) {
-            return registry.saveNodeList();
-        } else {
-            return;
-        }
-    });
+    return Promise.all(promises)
 }

 function addModule(module) {
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/registry",
-    "version": "3.1.0-beta.4",
+    "version": "3.1.0",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,10 +16,10 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "3.1.0-beta.4",
+        "@node-red/util": "3.1.0",
        "clone": "2.1.2",
        "fs-extra": "11.1.1",
-        "semver": "7.5.0",
+        "semver": "7.5.4",
        "tar": "6.1.13",
        "uglify-js": "3.17.4"
    }
--- a/packages/node_modules/@node-red/runtime/lib/api/settings.js
+++ b/packages/node_modules/@node-red/runtime/lib/api/settings.js
@@ -99,6 +99,9 @@ var api = module.exports = {
                    safeSettings.markdownEditor = runtime.settings.editorTheme.markdownEditor || {};
                    safeSettings.markdownEditor.mermaid = safeSettings.markdownEditor.mermaid || { enabled: true };
                }
+                if (runtime.settings.editorTheme.mermaid) {
+                    safeSettings.mermaid = runtime.settings.editorTheme.mermaid
+                }
            }
            safeSettings.libraries = runtime.library.getLibraries();
            if (util.isArray(runtime.settings.paletteCategories)) {
--- a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js
@@ -161,7 +161,8 @@ class Flow {
            for (let i = 0; i < configNodes.length; i++) {
                const node = this.flow.configs[configNodes[i]]
                if (node.type === 'global-config' && node.env) {
-                    const nodeEnv = await flowUtil.evaluateEnvProperties(this, node.env, credentials.get(node.id))
+                    const globalCreds = credentials.get(node.id)?.map || {}
+                    const nodeEnv = await flowUtil.evaluateEnvProperties(this, node.env, globalCreds)
                    this._env = { ...this._env, ...nodeEnv }
                }
            }
--- a/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js
@@ -73,9 +73,20 @@ class Subflow extends Flow {
            id: subflowInstance.id,
            configs: {},
            nodes: {},
+            groups: {},
            subflows: {}
        }

+        if (subflowDef.groups) {
+            // Clone all of the subflow group definitions and give them new IDs
+            for (i in subflowDef.groups) {
+                if (subflowDef.groups.hasOwnProperty(i)) {
+                    node = createNodeInSubflow(subflowInstance.id,subflowDef.groups[i]);
+                    node_map[node._alias] = node;
+                    subflowInternalFlowConfig.groups[node.id] = node;
+                }
+            }
+        }
        if (subflowDef.configs) {
            // Clone all of the subflow config node definitions and give them new IDs
            for (i in subflowDef.configs) {
--- a/packages/node_modules/@node-red/runtime/lib/flows/util.js
+++ b/packages/node_modules/@node-red/runtime/lib/flows/util.js
@@ -57,18 +57,20 @@ var EnvVarPropertyRE = /^\${(\S+)}$/;


 function mapEnvVarProperties(obj,prop,flow,config) {
-    var v = obj[prop];
+    const v = obj[prop];
    if (Buffer.isBuffer(v)) {
        return;
    } else if (Array.isArray(v)) {
-        for (var i=0;i<v.length;i++) {
+        for (let i=0;i<v.length;i++) {
            mapEnvVarProperties(v,i,flow,config);
        }
    } else if (typeof obj[prop] === 'string') {
        if (obj[prop][0] === "$" && (EnvVarPropertyRE_old.test(v) || EnvVarPropertyRE.test(v)) ) {
-            var envVar = v.substring(2,v.length-1);
-            var r = redUtil.getSetting(config, envVar, flow);
-            obj[prop] = r ? r : obj[prop];
+            const envVar = v.substring(2,v.length-1);
+            const r = redUtil.getSetting(config, envVar, flow);
+            if (r !== undefined && r !== '') {
+                obj[prop] = r
+            }
        }
    } else {
        for (var p in v) {
@@ -80,6 +82,7 @@ function mapEnvVarProperties(obj,prop,flow,config) {
 }

 async function evaluateEnvProperties(flow, env, credentials) {
+    credentials = credentials || {}
    const pendingEvaluations = []
    const evaluatedEnv = {}
    const envTypes = []
@@ -112,6 +115,7 @@ async function evaluateEnvProperties(flow, env, credentials) {
    if (pendingEvaluations.length > 0) {
        await Promise.all(pendingEvaluations)
    }
+    // Now loop over the env types and evaluate them properly
    for (let i = 0; i < envTypes.length; i++) {
        let { name, value, type } = envTypes[i]
        // If an env-var wants to lookup itself, delegate straight to the parent
@@ -122,7 +126,17 @@ async function evaluateEnvProperties(flow, env, credentials) {
        if (evaluatedEnv.hasOwnProperty(value)) {
            value = evaluatedEnv[value]
        } else {
-            value = redUtil.evaluateNodeProperty(value, type, {_flow: flow}, null, null);
+            value = redUtil.evaluateNodeProperty(value, type, {_flow: {
+                // Provide a hook so when it tries to look up a flow setting,
+                // we can insert the just-evaluated value which hasn't yet
+                // been set on the flow object - otherwise delegate up to the flow
+                getSetting: function(name) {
+                    if (evaluatedEnv.hasOwnProperty(name)){
+                        return evaluatedEnv[name]
+                    }
+                    return flow.getSetting(name)
+                }
+            }}, null, null);
        }
        evaluatedEnv[name] = value
    }
--- a/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/Node.js
@@ -42,6 +42,7 @@ function Node(n) {
    this._closeCallbacks = [];
    this._inputCallback = null;
    this._inputCallbacks = null;
+    this._expectedDoneCount = 0;

    if (n.name) {
        this.name = n.name;
@@ -159,6 +160,9 @@ Node.prototype.on = function(event, callback) {
    if (event == "close") {
        this._closeCallbacks.push(callback);
    } else if (event === "input") {
+        if (callback.length === 3) {
+            this._expectedDoneCount++
+        }
        if (this._inputCallback) {
            this._inputCallbacks = [this._inputCallback, callback];
            this._inputCallback = null;
@@ -218,19 +222,17 @@ Node.prototype._emitInput = function(arg) {
            } else if (node._inputCallbacks) {
                // Multiple callbacks registered. Call each one, tracking eventual completion
                var c = node._inputCallbacks.length;
+                let doneCount = 0
                for (var i=0;i<c;i++) {
                    var cb = node._inputCallbacks[i];
-                    if (cb.length === 2) {
-                        c++;
-                    }
                    try {
                        cb.call(
                            node,
                            arg,
                            function() { node.send.apply(node,arguments) },
                            function(err) {
-                                c--;
-                                if (c === 0) {
+                                doneCount++;
+                                if (doneCount === node._expectedDoneCount) {
                                    node._complete(arg,err);
                                }
                            }
@@ -257,6 +259,9 @@ Node.prototype._removeListener = Node.prototype.removeListener;
 Node.prototype.removeListener = function(name, listener) {
    var index;
    if (name === "input") {
+        if (listener.length === 3) {
+            this._expectedDoneCount--
+        }
        if (this._inputCallback && this._inputCallback === listener) {
            // Removing the only callback
            this._inputCallback = null;
--- a/packages/node_modules/@node-red/runtime/locales/fr/runtime.json
+++ b/packages/node_modules/@node-red/runtime/locales/fr/runtime.json
@@ -48,7 +48,7 @@
        "port-in-use": "Erreur : port utilisé",
        "uncaught-exception": "Exception non reconnue :",
        "admin-ui-disabled": "Interface d'administration désactivée",
-        "now-running": "Le serveur tourne maintenant sur __listenpath__",
+        "now-running": "Le serveur est disponible à l'adresse __listenpath__",
        "failed-to-start": "Échec lors du démarrage du serveur :",
        "headless-mode": "Fonctionne en mode sans interface graphique (headless)",
        "httpadminauth-deprecated": "L'utilisation de httpAdminAuth est DÉCONSEILLÉE. Utiliser adminAuth à la place",
@@ -100,7 +100,7 @@
            "error": "Erreur lors du chargement des identifiants : __message__",
            "error-saving": "Erreur lors de l'enregistrement des identifiants : __message__",
            "not-registered": "Le type d'identifiant '__type__' n'a pas été enregistré",
-            "system-key-warning": "\n\n---------------------------------------------------------------------\nVotre fichier contenant les identifiants de flux est chiffré à l'aide d'une clé générée par le système.\n\nSi la clé générée par le système est perdue pour une raison quelconque, votre fichier contenant\nles identifiants ne sera pas récupérable, vous devrez le supprimer et ressaisir vos identifiants.\n\nVous pouvez définir votre propre clé en utilisant l'option 'credentialSecret' dans\nvotre fichier de paramètres. Node-RED rechiffrera alors votre fichier contenant les identifiants\nà l'aide de la clé que vous avez choisie la prochaine fois que vous déploierez une modification.\n---------------------------------------------------------------------\n",
+            "system-key-warning": "\n\n--------------------------------------------------------------------------------------------------------\nVotre fichier contenant les identifiants de flux est chiffré à l'aide d'une clé générée par le système.\n\nSi la clé générée par le système est perdue pour une raison quelconque, votre fichier contenant\nles identifiants ne sera pas récupérable, vous devrez le supprimer et ressaisir vos identifiants.\n\nVous pouvez définir votre propre clé en utilisant l'option 'credentialSecret' dans\nvotre fichier de paramètres. Node-RED rechiffrera alors votre fichier contenant les identifiants\nà l'aide de la clé que vous avez choisie la prochaine fois que vous déploierez une modification.\n--------------------------------------------------------------------------------------------------------\n",
            "unencrypted": "Utilisation d'identifiants non chiffrés",
            "encryptedNotFound": "Identifiants chiffrés introuvables"
        },
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/runtime",
-    "version": "3.1.0-beta.4",
+    "version": "3.1.0",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,8 +16,8 @@
        }
    ],
    "dependencies": {
-        "@node-red/registry": "3.1.0-beta.4",
-        "@node-red/util": "3.1.0-beta.4",
+        "@node-red/registry": "3.1.0",
+        "@node-red/util": "3.1.0",
        "async-mutex": "0.4.0",
        "clone": "2.1.2",
        "express": "4.18.2",
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -1,6 +1,6 @@
 {
    "name": "@node-red/util",
-    "version": "3.1.0-beta.4",
+    "version": "3.1.0",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- a/packages/node_modules/node-red/README.md
+++ b/packages/node_modules/node-red/README.md
@@ -1,14 +1,14 @@
 # Node-RED

-http://nodered.org
+https://nodered.org

 Low-code programming for event-driven applications.

-![Node-RED: Low-code programming for event-driven applications.](http://nodered.org/images/node-red-screenshot.png)
+![Node-RED: Low-code programming for event-driven applications.](https://nodered.org/images/node-red-screenshot.png)

 ## Quick Start

-Check out http://nodered.org/docs/getting-started/ for full instructions on getting
+Check out https://nodered.org/docs/getting-started/ for full instructions on getting
 started.

 1. `sudo npm install -g --unsafe-perm node-red`
@@ -17,7 +17,7 @@ started.

 ## Getting Help

-More documentation can be found [here](http://nodered.org/docs).
+More documentation can be found [here](https://nodered.org/docs).

 For further help, or general discussion, please use the [Node-RED Forum](https://discourse.nodered.org) or [slack team](https://nodered.org/slack).

--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,8 +1,8 @@
 {
    "name": "node-red",
-    "version": "3.1.0-beta.4",
+    "version": "3.1.0",
    "description": "Low-code programming for event-driven applications",
-    "homepage": "http://nodered.org",
+    "homepage": "https://nodered.org",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
@@ -31,17 +31,17 @@
        "flow"
    ],
    "dependencies": {
-        "@node-red/editor-api": "3.1.0-beta.4",
-        "@node-red/runtime": "3.1.0-beta.4",
-        "@node-red/util": "3.1.0-beta.4",
-        "@node-red/nodes": "3.1.0-beta.4",
+        "@node-red/editor-api": "3.1.0",
+        "@node-red/runtime": "3.1.0",
+        "@node-red/util": "3.1.0",
+        "@node-red/nodes": "3.1.0",
        "basic-auth": "2.0.1",
        "bcryptjs": "2.4.3",
        "express": "4.18.2",
        "fs-extra": "11.1.1",
-        "node-red-admin": "^3.0.0",
+        "node-red-admin": "^3.1.1",
        "nopt": "5.0.0",
-        "semver": "7.5.0"
+        "semver": "7.5.4"
    },
    "optionalDependencies": {
        "bcrypt": "5.1.0"
--- a/packages/node_modules/node-red/red.js
+++ b/packages/node_modules/node-red/red.js
@@ -88,7 +88,7 @@ if (parsedArgs.help) {
    console.log("  -?, --help           show this help");
    console.log("  admin <command>      run an admin command");
    console.log("");
-    console.log("Documentation can be found at http://nodered.org");
+    console.log("Documentation can be found at https://nodered.org");
    process.exit();
 }

--- a/packages/node_modules/node-red/settings.js
+++ b/packages/node_modules/node-red/settings.js
@@ -71,7 +71,7 @@ module.exports = {
 ******************************************************************************/

    /** To password protect the Node-RED editor and admin API, the following
-     * property can be used. See http://nodered.org/docs/security.html for details.
+     * property can be used. See https://nodered.org/docs/security.html for details.
     */
    //adminAuth: {
    //    type: "credentials",
@@ -120,7 +120,7 @@ module.exports = {
     * including node-red-dashboard, or the static content (httpStatic), the
     * following properties can be used.
     * The `pass` field is a bcrypt hash of the password.
-     * See http://nodered.org/docs/security.html#generating-the-password-hash
+     * See https://nodered.org/docs/security.html#generating-the-password-hash
     */
    //httpNodeAuth: {user:"user",pass:"$2a$08$zZWtXTja0fB1pzD4sHCMyOCMYz2Z6dNbM6tl8sJogENOMcxWV9DN."},
    //httpStaticAuth: {user:"user",pass:"$2a$08$zZWtXTja0fB1pzD4sHCMyOCMYz2Z6dNbM6tl8sJogENOMcxWV9DN."},
@@ -444,6 +444,7 @@ module.exports = {
 *  - fileWorkingDirectory
 *  - functionGlobalContext
 *  - functionExternalModules
+ *  - functionTimeout
 *  - nodeMessageBufferMaxLength
 *  - ui (for use with Node-RED Dashboard)
 *  - debugUseColors
@@ -468,6 +469,9 @@ module.exports = {
    /** Allow the Function node to load additional npm modules directly */
    functionExternalModules: true,

+    /** Default timeout, in seconds, for the Function node. 0 means no timeout is applied */
+    functionTimeout: 0,
+
    /** The following property can be used to set predefined values in Global Context.
     * This allows extra node modules to be made available with in Function node.
     * For example, the following:
--- a/test/nodes/core/function/10-function_spec.js
+++ b/test/nodes/core/function/10-function_spec.js
@@ -1449,6 +1449,34 @@ describe('function node', function() {
        });
    });

+    it('check if default function timeout settings are recognized', function (done) {
+        RED.settings.functionTimeout = 0.01;
+        var flow = [{id: "n1",type: "function",timeout: RED.settings.functionTimeout,wires: [["n2"]],func: "while(1==1){};\nreturn msg;"}];
+        helper.load(functionNode, flow, function () {
+            var n1 = helper.getNode("n1");
+            n1.receive({ payload: "foo", topic: "bar" });
+            setTimeout(function () {
+                try {
+                    helper.log().called.should.be.true();
+                    var logEvents = helper.log().args.filter(function (evt) {
+                        return evt[0].type == "function";
+                    });
+                    logEvents.should.have.length(1);
+                    var msg = logEvents[0][0];
+                    msg.should.have.property('level', helper.log().ERROR);
+                    msg.should.have.property('id', 'n1');
+                    msg.should.have.property('type', 'function');
+                    should.equal(RED.settings.functionTimeout, 0.01);
+                    should.equal(msg.msg.message, 'Script execution timed out after 10ms');
+                    delete RED.settings.functionTimeout;
+                    done();
+                } catch (err) {
+                    done(err);
+                }
+            }, 500);
+        });
+    });
+
    describe("finalize function", function() {

        it('should execute', function(done) {
--- a/test/nodes/core/network/21-httprequest_spec.js
+++ b/test/nodes/core/network/21-httprequest_spec.js
@@ -2538,38 +2538,4 @@ describe('HTTP Request Node', function() {
            });
        }
    });
-
-    describe('multipart form posts', function() {
-        it('should send arrays as multiple entries', function (done) {
-            const flow = [
-                {
-                    id: 'n1', type: 'http request', wires: [['n2']], method: 'POST', ret: 'obj', url: getTestURL('/file-upload'), headers: [
-                    ]
-                },
-                { id: "n2", type: "helper" }
-            ];
-            helper.load(httpRequestNode, flow, function() {
-                var n1 = helper.getNode("n1");
-                var n2 = helper.getNode("n2");
-                n2.on('input', function(msg){
-                    try {
-                        msg.payload.body.should.have.property('foo')
-                        msg.payload.body.list.should.deepEqual(['a','b','c'])
-                        done()
-                    } catch (e) {
-                        done(e)
-                    }
-                });
-                n1.receive({
-                    headers: {
-                        'content-type': 'multipart/form-data'
-                    },
-                    payload: {
-                        foo: 'bar',
-                        list: [ 'a', 'b', 'c' ]
-                    }
-                });
-            })
-        });
-    })
 });
--- a/test/unit/@node-red/editor-api/lib/editor/theme_spec.js
+++ b/test/unit/@node-red/editor-api/lib/editor/theme_spec.js
@@ -98,7 +98,7 @@ describe("api/editor/theme", function () {
                },
                header: {
                    title: "Test Header Title",
-                    url: "http://nodered.org",
+                    url: "https://nodered.org",
                    image: "/absolute/path/to/header/image" // or null to remove image
                },

@@ -147,7 +147,7 @@ describe("api/editor/theme", function () {
        context.page.tabicon.should.have.a.property("colour", "#8f008f")
        context.should.have.a.property("header");
        context.header.should.have.a.property("title", "Test Header Title");
-        context.header.should.have.a.property("url", "http://nodered.org");
+        context.header.should.have.a.property("url", "https://nodered.org");
        context.header.should.have.a.property("image", "theme/header/image");
        context.page.should.have.a.property("css");
        context.page.css.should.have.lengthOf(1);
--- a/test/unit/@node-red/runtime/lib/flows/Flow_spec.js
+++ b/test/unit/@node-red/runtime/lib/flows/Flow_spec.js
@@ -26,6 +26,7 @@ var flowUtils = NR_TEST_UTILS.require("@node-red/runtime/lib/flows/util");
 var Flow = NR_TEST_UTILS.require("@node-red/runtime/lib/flows/Flow");
 var flows = NR_TEST_UTILS.require("@node-red/runtime/lib/flows");
 var Node = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/Node");
+var credentials = NR_TEST_UTILS.require("@node-red/runtime/lib/nodes/credentials");
 var hooks = NR_TEST_UTILS.require("@node-red/util/lib/hooks");
 var typeRegistry = NR_TEST_UTILS.require("@node-red/registry");

@@ -61,6 +62,7 @@ describe('Flow', function() {
        this.scope = n.scope;
        var node = this;
        this.foo = n.foo;
+        this.bar = n.bar;
        this.handled = 0;
        this.stopped = false;
        currentNodes[node.id] = node;
@@ -1235,11 +1237,12 @@ describe('Flow', function() {
    })

    describe("#env", function () {
+        afterEach(() => {
+            delete process.env.V0;
+            delete process.env.V1;
+            credentials.get.restore?.()
+        })
        it("can instantiate a node with environment variable property values of group and tab", async function () {
-            after(function() {
-                delete process.env.V0;
-                delete process.env.V1;
-            })
            process.env.V0 = "gv0";
            process.env.V1 = "gv1";
            process.env.V3 = "gv3";
@@ -1283,10 +1286,6 @@ describe('Flow', function() {
        });

        it("can access environment variable property using $parent", async function () {
-            after(function() {
-                delete process.env.V0;
-                delete process.env.V1;
-            })
            process.env.V0 = "gv0";
            process.env.V1 = "gv1";
            var config = flowUtils.parseConfig([
@@ -1321,9 +1320,6 @@ describe('Flow', function() {
        });

        it("can define environment variable using JSONata", async function () {
-            after(function() {
-                delete process.env.V0;
-            })
            var config = flowUtils.parseConfig([
                {id:"t1",type:"tab",env:[
                    {"name": "V0", value: "1+2", type: "jsonata"}
@@ -1346,9 +1342,6 @@ describe('Flow', function() {
        });

        it("can access global environment variables defined as JSONata values", async function () {
-            after(function() {
-                delete process.env.V0;
-            })
            var config = flowUtils.parseConfig([
                {id:"t1",type:"tab",env:[
                    {"name": "V0", value: "1+2", type: "jsonata"}
@@ -1370,15 +1363,21 @@ describe('Flow', function() {
            await flow.stop()
        });
        it("global flow can access global-config defined environment variables", async function () {
-            after(function() {
-                delete process.env.V0;
+            sinon.stub(credentials,"get").callsFake(function(id) {
+                if (id === 'gc') {
+                    return { map: { GC_CRED: 'gc_cred' }}
+                }
+                return null
            })
+
            const config = flowUtils.parseConfig([
                {id:"gc", type:"global-config", env:[
-                    {"name": "GC0", value: "3+4", type: "jsonata"}
+                    {"name": "GC0", value: "3+4", type: "jsonata"},
+                    {"name": "GC_CRED", type: "cred"},
+                    
                ]},
                {id:"t1",type:"tab" },
-                {id:"1",x:10,y:10,z:"t1",type:"test",foo:"${GC0}",wires:[]},
+                {id:"1",x:10,y:10,z:"t1",type:"test",foo:"${GC0}", bar:"${GC_CRED}", wires:[]},
            ]);
            // Two-arg call - makes this the global flow that handles global-config nodes
            const globalFlow = Flow.create({getSetting:v=>process.env[v]},config);
@@ -1390,6 +1389,7 @@ describe('Flow', function() {

            var activeNodes = flow.getActiveNodes();
            activeNodes["1"].foo.should.equal(7);
+            activeNodes["1"].bar.should.equal('gc_cred');

            await flow.stop()
            await globalFlow.stop()
--- a/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
+++ b/test/unit/@node-red/runtime/lib/nodes/Node_spec.js
@@ -183,6 +183,35 @@ describe('Node', function() {
            n.receive(message);
        });

+
+        it('calls parent flow handleComplete when multiple callbacks provided', function(done) {
+            var n = new RedNode({id:'123',type:'abc', _flow: {
+                handleComplete: function(node,msg) {
+                    try {
+                        doneCount.should.equal(2)
+                        msg.should.deepEqual(message);
+                        done();
+                    } catch(err) {
+                        done(err);
+                    }
+                }
+            }});
+
+            var message = {payload:"hello world"};
+            let doneCount = 0
+            n.on('input',function(msg, nodeSend, nodeDone) {
+                doneCount++
+                nodeDone();
+            });
+            // Include a callback without explicit done signature
+            n.on('input',function(msg) { });
+            n.on('input',function(msg, nodeSend, nodeDone) {
+                doneCount++
+                nodeDone();
+            });
+            n.receive(message);
+        });
+
        it('triggers onComplete hook when done callback provided', function(done) {
            var handleCompleteCalled = false;
            var hookCalled = false;
Author	SHA1	Message	Date
Nick O'Leary	fb54c05d9f	Ensure subflow instances keep track of their groups	2023-11-29 16:12:12 +00:00
Stephen McLaughlin	a55554193b	Merge pull request #4441 from node-red/4274-allow-theme-to-set-mermaid-theme Allow a theme to specifiy which theme mermaid should use	2023-11-20 21:43:03 +00:00
Nick O'Leary	d2a8338d4a	Rename mermaidOptions to mermaid for contrib themes	2023-11-20 17:50:59 +00:00
Nick O'Leary	e945deeab6	Allow mermaid theme to be set via editorTheme and custom themes Fixes #4274	2023-11-20 17:47:39 +00:00
Nick O'Leary	3dec609459	Merge pull request #4438 from node-red/update-deps-2 Update node-red-admin version	2023-11-20 10:00:44 +01:00
Nick O'Leary	e73b9f646d	Update nr package to match	2023-11-17 10:44:34 +00:00
Nick O'Leary	3cea6400d1	Update node-red-admin version	2023-11-17 10:42:06 +00:00
Nick O'Leary	c6a8eee73d	Merge pull request #4416 from node-red/mqtt-check-topic-length check topic length > 0 before publish	2023-11-07 17:46:33 +00:00
Nick O'Leary	74d431ea36	Merge pull request #4427 from node-red/4394-update-page-title-on-flow-nav Update browser title with flow name if set	2023-11-07 17:40:36 +00:00
Nick O'Leary	409a559a13	Merge pull request #4411 from node-red/4376-handle-falsy-env-vars Handle false-like env vars properly	2023-11-07 17:40:18 +00:00
Nick O'Leary	6829535350	Merge pull request #4409 from node-red/4381-avoid-multiple-settings-saves Only save settings once during node load process	2023-11-07 17:40:03 +00:00
Nick O'Leary	6488111f79	Merge pull request #4423 from node-red/4415-handle-excluded-core-nodes Ensure typeSearch handles undefined node definitions	2023-11-07 17:39:46 +00:00
Nick O'Leary	923339c1d8	Merge pull request #4426 from node-red/4044-group-bb-import Ensure group w/h are imported if present	2023-11-07 17:39:30 +00:00
Nick O'Leary	3f4d96f4cd	Merge pull request #4425 from node-red/4418-fix-empty-status-background Hide node status background when there is no status to show	2023-11-07 17:26:00 +00:00
Nick O'Leary	c52985d245	Update browser title with flow name if set Fixes #4394	2023-11-07 17:24:04 +00:00
Nick O'Leary	88e6c71aa0	Ensure group w/h are imported if present Fixes #4044	2023-11-07 17:09:22 +00:00
Nick O'Leary	4d08e297c4	Hide node status background when there is no status to show Fixes #4418	2023-11-07 16:34:36 +00:00
Nick O'Leary	ad2b30691f	Ensure typeSearch handles undefined node definitions Fixes #4415	2023-11-03 11:28:04 +01:00
Dave Conway-Jones	369bad01b8	check topic length > 0 before publish to close #4414	2023-11-03 08:55:38 +00:00
Nick O'Leary	b6ecc6d9ea	Handle false-like env vars properly	2023-11-02 00:40:55 +01:00
Nick O'Leary	0117df0960	Only save settings once during node load process	2023-11-01 16:18:03 +01:00
Nick O'Leary	6ac905f264	Merge pull request #4407 from node-red/4392-add-close-button-to-restart-notification Add a close button to the restart-required notification	2023-11-01 15:20:48 +01:00
Nick O'Leary	e5307f6604	Add a close button to the restart-required notification Fixes #4392	2023-11-01 14:39:51 +01:00
Nick O'Leary	8d9b6dd859	Merge pull request #4405 from node-red/4396-fix-global-config-cred-lookup Ensure global-config nodes lookup cred values properly	2023-11-01 14:20:56 +01:00
Nick O'Leary	01821ead0f	Merge pull request #4371 from ralphwetzel/master Extend typedInput "num" type validity check to NaN, binary, octal & hex	2023-11-01 14:20:31 +01:00
Nick O'Leary	1451fb9e2f	Merge pull request #4399 from kazuhitoyokoi/master-fixrepeat4inject Fix unintended new line in node name	2023-11-01 14:17:21 +01:00
Nick O'Leary	245751bb23	Merge pull request #4382 from hazymat/master Ctrl-Enter does not close tray (Monaco) #4377	2023-11-01 14:15:08 +01:00
Nick O'Leary	f07519c705	Merge pull request #4393 from node-red/Fix-buffer-viewer-to-handle-0b-style- fix buffer viewer to handle 0b style binary	2023-11-01 14:14:20 +01:00
Nick O'Leary	33a978a246	Ensure credentials.get stub is restored after tests	2023-11-01 14:12:20 +01:00
Nick O'Leary	861dc0c383	Ensure global-config nodes lookup cred values properly Fixes #4396	2023-11-01 11:07:48 +01:00
Kazuhito Yokoi	fae3a5c26a	Fix unintended new line in node name	2023-10-29 14:58:03 +09:00
Dave Conway-Jones	1a52c0adfc	fix buffer viewer to handle 0b style binary	2023-10-24 23:15:34 +01:00
Mat Smith	44c0bbc61e	Ctrl-Enter does not close tray (Monaco) #4377	2023-10-12 18:53:34 +01:00
ralphwetzel	5ac50fae3a	Extend typedInput "num" type validity check to NaN, binary, octal & hex	2023-09-26 20:00:48 +02:00
Nick O'Leary	ee48a2f2bf	Merge pull request #4362 from node-red/4342-subflow-err Handle credential env var evaluation when no value set	2023-09-25 18:20:28 +01:00
Nick O'Leary	680d5b8216	Merge pull request #4364 from node-red/4323-redo-mermaid-integration Rework mermaid integration to support off-DOM rendering	2023-09-25 18:08:48 +01:00
Nick O'Leary	c9320c190d	Ensure creds object is not undefined when evaling env vars	2023-09-25 18:08:02 +01:00
Nick O'Leary	566c667c5d	Merge pull request #4354 from bonanitech/ignore-package-lock Don't commit package-lock.json	2023-09-25 18:05:46 +01:00
Nick O'Leary	ec6e42e655	Merge pull request #4361 from node-red/4342-fix-subflow-env-self-reference Fix env evaluation when one env references another in the same object	2023-09-25 18:04:58 +01:00
Nick O'Leary	bba6b6f71d	Merge pull request #4365 from node-red/4334-context-labels Add missing nls labels to context menu	2023-09-25 18:04:35 +01:00
Nick O'Leary	c261f6625a	Merge pull request #4368 from node-red/4340-switch-validation Improve validation of switch/change node rules	2023-09-25 18:04:19 +01:00
Nick O'Leary	a489b270d1	Remove extra debug	2023-09-25 17:38:16 +01:00
Nick O'Leary	51cb61940d	Improve validation of switch/change node rules Fixes #4340	2023-09-25 17:33:59 +01:00
Nick O'Leary	ce2f896b45	Add missing nls labels to context menu Fixes #4334	2023-09-22 16:29:33 +01:00
Nick O'Leary	6635ff9a69	Rework mermaid integration to support off-DOM rendering	2023-09-22 15:23:01 +01:00
Nick O'Leary	41797f8cef	Handle credential env var evaluation when no value set	2023-09-22 13:56:54 +01:00
Nick O'Leary	797cea5394	Fix env evaluation when one env references another in the same object Fixes #4342	2023-09-22 13:49:54 +01:00
Mauricio Bonani	2880d4120e	Don't commit package-lock.json	2023-09-19 14:58:44 -04:00
Nick O'Leary	58dec7b9b0	Merge pull request #4312 from Rotzbua/add_dependabot Add dependabot for Github Actions	2023-09-19 09:28:50 +01:00
Nick O'Leary	b0f900e25d	Merge pull request #4311 from Rotzbua/update_gh_actions Update outdated Github Actions	2023-09-19 09:28:19 +01:00
Nick O'Leary	fc54848318	Merge pull request #4349 from braincube-io/feat/fmo/makeCsvExportFast Performance : make CSV export way faster by not re-allocating and handling huge string	2023-09-19 09:22:54 +01:00
Nick O'Leary	2f9f8cda81	Merge pull request #4350 from node-red/Fix-delay-node-passing-on-reset-regression Fix regression in delay node to not pass on msg.reset	2023-09-19 09:21:33 +01:00
Nick O'Leary	667e7ab8dc	Merge pull request #4348 from ZJvandeWeg/patch-2 github: Request `npm run test` in PR template	2023-09-19 09:21:06 +01:00
Nick O'Leary	4e55408fed	Merge pull request #4346 from kazuhitoyokoi/master-fixheight4templete Fix height of description editor in template node	2023-09-19 09:20:09 +01:00
Nick O'Leary	88aa61ea77	Merge pull request #4329 from GogoVega/french-translation-v3.1-beta.4-changes Add French translation of v3.1.0-beta.4 changes + slight improvements	2023-09-19 09:19:49 +01:00
Nick O'Leary	2ccdeb968c	Merge pull request #4332 from node-red/4330-fix-multiple-input-handlers Handle nodes with multiple input handlers properly	2023-09-19 09:19:22 +01:00
Nick O'Leary	90045683c9	Merge pull request #4331 from node-red/fix-unexpected-link-validation-err Handle undefined linkType value for existing link-call nodes	2023-09-19 09:18:50 +01:00
Nick O'Leary	eb49b01cbc	Merge pull request #4351 from node-red/knolleary-patch-1 Soften the language around unrequited PRs	2023-09-19 09:18:26 +01:00
Nick O'Leary	3a6062775e	Update CONTRIBUTING.md Soften the language around unrequited PRs	2023-09-18 21:03:46 +01:00
Dave Conway-Jones	718a7bfc26	Update 89-delay.js	2023-09-18 19:32:01 +01:00
Franck	27ca30aa82	PERF : make csv way faster by not allocating and handling huge string	2023-09-18 15:16:15 +02:00
Zeger-Jan van de Weg	01b0bf1a36	github: Request `npm run test` in PR template Due to the way grunt is installed, `grunt` might not work for the user locally. However, `npm run test` will succeed for them, as NPM knows where `grunt` is located to execute.	2023-09-17 08:38:10 +02:00
Kazuhito Yokoi	e1cecc9601	Fix height of description editor in template node	2023-09-16 15:46:07 +09:00
GogoVega	4c13f5a0af	Adapting the translation depending on the context	2023-09-09 14:34:33 +02:00
GogoVega	f5a9942d5e	Fix translation mistakenly erased	2023-09-09 10:59:59 +02:00
Nick O'Leary	ee2d91fb4a	Handle nodes with multiple input handlers properly Fixes #4330	2023-09-08 16:26:10 +01:00
Nick O'Leary	6ca41ba69d	Handle undefined linkType value for existing link-call nodes	2023-09-08 16:03:08 +01:00
GogoVega	7f9d142038	Add translation of v3.1-beta.4 changes	2023-09-08 15:45:00 +02:00
GogoVega	44a1f83b26	Add some capital letters	2023-09-08 15:39:46 +02:00
Nick O'Leary	d9bbac20f3	Merge pull request #4320 from node-red/dev Sync `dev` to `master` for 3.1.0 release	2023-09-06 14:04:36 +01:00
Nick O'Leary	a48c57dd17	Merge pull request #4321 from node-red/rel-310 Bump version and changelog for 3.1.0 release	2023-09-06 13:57:44 +01:00
Nick O'Leary	77b235655c	Bump version and changelog	2023-09-05 21:29:20 +01:00
Nick O'Leary	8dc0261993	Merge pull request #4319 from Rotzbua/fix_duplicate Fix duplicate declaration	2023-09-05 20:41:38 +01:00
Rotzbua	65d2ad68d3	Fix duplicate declaration	2023-09-05 19:02:39 +02:00
Nick O'Leary	52fde088e9	Merge pull request #4318 from node-red/4315-small-catalogs-fix Default filter to All Catalogues and show nodes for small lists	2023-09-05 17:59:57 +01:00
Nick O'Leary	ab6d537c3e	Default filter to All Catalogues and show nodes for small lists	2023-09-05 17:49:50 +01:00
Nick O'Leary	3a6078a56a	Merge pull request #4317 from node-red/update-deps-31 Dependency updates	2023-09-05 17:21:06 +01:00
Nick O'Leary	b0c3fefcab	Dependency updates	2023-09-05 17:16:05 +01:00
Nick O'Leary	2bc739194e	Merge pull request #4316 from node-red/4221-handle-concurrent-write-file Ensure storage/util.writeFile handles concurrent write attempts	2023-09-05 15:57:27 +01:00
Nick O'Leary	e18721a03e	Merge pull request #4313 from Rotzbua/fix_https Migrate http -> https for nodered.org	2023-09-05 14:20:32 +01:00
Rotzbua	25120e44ce	Update outdated GH Actions	2023-09-05 14:56:14 +02:00
Rotzbua	aea32cc279	Migrate http -> https for nodered.org	2023-09-05 14:55:56 +02:00
Nick O'Leary	ce0feb2f42	Merge pull request #4310 from node-red/4206-ctrl-click-behaviour Better distinguish between ctrl and meta keys on mac	2023-09-05 13:48:17 +01:00
Rotzbua	12a1c5c2f4	Add dependabot for GH Action workflows	2023-09-05 14:11:08 +02:00
Nick O'Leary	d307968880	Better distinguish between ctrl and meta keys on mac Fixes #4206, #4205	2023-09-05 12:36:44 +01:00
Nick O'Leary	1f98d19f77	Merge pull request #4309 from node-red/pr_4265 Adding function timeout to settings file (#4265)	2023-09-05 11:44:41 +01:00
Nick O'Leary	9a934c941f	Tidy up functionTimeout setting	2023-09-05 10:34:18 +01:00
Nick O'Leary	dbc7284b97	Merge pull request #4308 from node-red/revert-3991-http-request-form-array Revert "Support form-data arrays"	2023-09-05 10:03:13 +01:00
Nick O'Leary	46b15a51d4	Revert "Support form-data arrays"	2023-09-05 09:41:48 +01:00
Nick O'Leary	cc5533c183	Merge pull request #4281 from kazuhitoyokoi/master-roundedcorners Fix not rounded corners in project settings UI	2023-08-16 15:53:07 +01:00
Nick O'Leary	19787e5d28	Merge pull request #4280 from kazuhitoyokoi/master-svgicon2 Add svg icons for nodes	2023-08-16 15:52:47 +01:00
Kazuhito Yokoi	6e46666895	Fix not rounded corners in project settings UI	2023-08-16 20:14:22 +09:00
Kazuhito Yokoi	a87d7276c5	Add svg icons for nodes	2023-08-16 19:21:31 +09:00
Nick O'Leary	c630b4f770	Merge pull request #4276 from kazuhitoyokoi/master-svgicon Add svg icons for nodes	2023-08-16 10:23:35 +01:00
Kazuhito Yokoi	66144c1eb5	Add svg icons for nodes	2023-08-15 16:16:04 +09:00
Nick O'Leary	9542c22191	Merge pull request #4259 from kazuhitoyokoi/master-fixtooltip4textdiff Add tooltip to text diff button	2023-08-14 11:11:32 +01:00
Nick O'Leary	15b8d79489	Merge pull request #4261 from DarshanDixit05/fix-Invalid-label fix : Invalid label for attribute on the tray	2023-08-14 11:11:10 +01:00
Nick O'Leary	37a518b655	Merge pull request #4273 from kazuhitoyokoi/master-fixswitchnode Fix broken text input in the switch node (again)	2023-08-14 11:09:05 +01:00
Nick O'Leary	312b2f8ddb	Merge pull request #4270 from AuspeXeu/master fix: undefined node and wrong method name	2023-08-14 11:08:04 +01:00
Kazuhito Yokoi	9caa6a3553	Fix broken text input in the switch node (again)	2023-08-13 15:33:37 +09:00
Christian Vaas	6c597bba5b	fix: undefined node and wrong method name	2023-08-08 19:21:31 +02:00
Kilian Hertel	f7b64b101e	adding function timeout to settings file adding function timeout to settings file	2023-08-04 14:20:49 +02:00
DarshanDixit05	9540502d06	removed package lock	2023-07-31 20:22:46 +05:30
DarshanDixit05	792dedb1f1	fix : Invalid label for attribute on the tray	2023-07-31 19:34:12 +05:30
Kazuhito Yokoi	0bf1343442	Add tooltip to text diff button	2023-07-29 16:36:55 +09:00
				`@@ -0,0 +1 @@`
				<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><g fill="none" stroke="#fff"><path d="m9.7884 22.379c-5.2427-0.41732-9.6475 5.7885-7.4975 10.585 2.0949 5.2041 9.9782 6.6154 13.727 2.4477 3.633-3.5613 5.0332-9.0411 9.4821-11.853 4.5205-3.0872 11.797-0.172 12.68 5.3144 0.86 5.2537-4.8017 10.364-9.9231 8.8205-3.7873-0.85449-6.5051-4.0905-8.0487-7.4975-1.9019-3.2526-4.3882-6.7257-8.2693-7.6077-0.6891-0.15656-1.4003-0.21831-2.1059-0.21721z" stroke-width="3.3"/><path d="m6.7012 29.821h6.6154" stroke-width="1.4"/><path d="m26.988 29.821h5.5128m-2.8115-2.7564v5.5128" stroke-width="1.8"/></g></svg>
				`@@ -0,0 +1 @@`
				`<svg width="40" height="60" viewBox="0, 0, 40, 60" xmlns="http://www.w3.org/2000/svg"><path d="m8.3474 17.75 22.298 22.444-10.747 13.013v-46.497l10.747 12.428-22.298 21.859" fill="none" stroke="#fff" stroke-width="4"/></svg>`