From b00282590d728ad20c5a0fba1ff5fcf9abb9b038 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Fri, 7 Jan 2022 09:27:01 +0900
Subject: [PATCH 01/11] Fix copy buttons on the debug window

---
 .../@node-red/editor-client/src/js/ui/clipboard.js           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
index b38017c60..626ada7e5 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@@ -940,6 +940,7 @@ RED.clipboard = (function() {
         if (truncated) {
             msg += "_truncated";
         }
+        var clipboardHidden = $('<textarea type="text" id="red-ui-clipboard-hidden" tabIndex="-1">').appendTo(document.body);
         $("#red-ui-clipboard-hidden").val(value).focus().select();
         var result =  document.execCommand("copy");
         if (result && element) {
@@ -954,7 +955,7 @@ RED.clipboard = (function() {
             },1000);
             popover.open();
         }
-        $("#red-ui-clipboard-hidden").val("");
+        clipboardHidden.remove();
         if (currentFocus) {
             $(currentFocus).focus();
         }
@@ -1236,8 +1237,6 @@ RED.clipboard = (function() {
         init: function() {
             setupDialogs();
 
-            $('<textarea type="text" id="red-ui-clipboard-hidden" tabIndex="-1">').appendTo("#red-ui-editor");
-
             RED.actions.add("core:show-export-dialog",showExportNodes);
             RED.actions.add("core:show-import-dialog",showImportNodes);
 

From ba794ba58c406e086bb53be7273461db6e0671db Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Fri, 7 Jan 2022 11:49:26 +0900
Subject: [PATCH 02/11] Use clipboard.writeText() instead of
 execCommand("copy")

---
 .../editor-client/src/js/ui/clipboard.js      | 38 +++++++++----------
 .../editor-client/src/sass/editor.scss        |  4 --
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
index 626ada7e5..7fb0fb2a8 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@@ -940,29 +940,25 @@ RED.clipboard = (function() {
         if (truncated) {
             msg += "_truncated";
         }
-        var clipboardHidden = $('<textarea type="text" id="red-ui-clipboard-hidden" tabIndex="-1">').appendTo(document.body);
-        $("#red-ui-clipboard-hidden").val(value).focus().select();
-        var result =  document.execCommand("copy");
-        if (result && element) {
-            var popover = RED.popover.create({
-                target: element,
-                direction: 'left',
-                size: 'small',
-                content: RED._(msg)
-            });
-            setTimeout(function() {
-                popover.close();
-            },1000);
-            popover.open();
-        }
-        clipboardHidden.remove();
-        if (currentFocus) {
-            $(currentFocus).focus();
-        }
-        return result;
+        navigator.clipboard.writeText(value).then(function () {
+            if (element) {
+                var popover = RED.popover.create({
+                    target: element,
+                    direction: 'left',
+                    size: 'small',
+                    content: RED._(msg)
+                });
+                setTimeout(function() {
+                    popover.close();
+                },1000);
+                popover.open();
+            }
+            if (currentFocus) {
+                $(currentFocus).focus();
+            }
+        });
     }
 
-
     function importNodes(nodesStr,addFlow) {
         var newNodes = nodesStr;
         if (typeof nodesStr === 'string') {
diff --git a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
index 48e32cf39..96a0f998f 100644
--- a/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/editor.scss
@@ -356,10 +356,6 @@ button.red-ui-button-small
     background: $secondary-background;
 }
 
-#red-ui-clipboard-hidden {
-    position: absolute;
-    top: -3000px;
-}
 .form-row .red-ui-editor-node-label-form-row {
     margin: 5px 0 0 50px;
     label {

From 036a825892814505902fe5f124a473afc51fefec Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 12 Jan 2022 21:46:56 +0000
Subject: [PATCH 03/11] Only setup ws client heartbeat once it is connected
 Fixes #3264

---
 .../nodes/core/network/22-websocket.js        | 28 ++++++++++---------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/network/22-websocket.js b/packages/node_modules/@node-red/nodes/core/network/22-websocket.js
index 3373c6e72..13949b251 100644
--- a/packages/node_modules/@node-red/nodes/core/network/22-websocket.js
+++ b/packages/node_modules/@node-red/nodes/core/network/22-websocket.js
@@ -105,22 +105,24 @@ module.exports = function(RED) {
             if (node.isServer) {
                 node._clients[id] = socket;
                 node.emit('opened',{count:Object.keys(node._clients).length,id:id});
-            } else {
-                if (node.heartbeat) {
-                    node.heartbeatInterval = setInterval(function() {
-                        if (socket.nrPendingHeartbeat) {
-                            // No pong received
-                            socket.terminate();
-                            socket.nrErrorHandler(new Error("timeout"));
-                            return;
-                        }
-                        socket.nrPendingHeartbeat = true;
-                        socket.ping();
-                    },node.heartbeat);
-                }
             }
             socket.on('open',function() {
                 if (!node.isServer) {
+                    if (node.heartbeat) {
+                        clearInterval(node.heartbeatInterval);
+                        node.heartbeatInterval = setInterval(function() {
+                            if (socket.nrPendingHeartbeat) {
+                                // No pong received
+                                socket.terminate();
+                                socket.nrErrorHandler(new Error("timeout"));
+                                return;
+                            }
+                            socket.nrPendingHeartbeat = true;
+                            try {
+                                socket.ping();
+                            } catch(err) {}
+                        },node.heartbeat);
+                    }
                     node.emit('opened',{count:'',id:id});
                 }
             });

From 0cf9b5f3df4991c8d614966da28ac83e48550d86 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 12 Jan 2022 21:56:38 +0000
Subject: [PATCH 04/11] Improve jsonata legacy mode detection regex Fixes #3290

---
 .../@node-red/editor-client/src/js/ui/editors/expression.js     | 2 +-
 packages/node_modules/@node-red/util/lib/util.js                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
index 51bba8159..7f8eb4265 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/expression.js
@@ -247,7 +247,7 @@
                         var currentExpression = expressionEditor.getValue();
                         var expr;
                         var usesContext = false;
-                        var legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
+                        var legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(currentExpression);
                         $(".red-ui-editor-type-expression-legacy").toggle(legacyMode);
                         try {
                             expr = jsonata(currentExpression);
diff --git a/packages/node_modules/@node-red/util/lib/util.js b/packages/node_modules/@node-red/util/lib/util.js
index bfea58f0f..93dcd83cd 100644
--- a/packages/node_modules/@node-red/util/lib/util.js
+++ b/packages/node_modules/@node-red/util/lib/util.js
@@ -686,7 +686,7 @@ function prepareJSONataExpression(value,node) {
         return moment(arg1, arg2, arg3, arg4);
     });
     expr.registerFunction('clone', cloneMessage, '<(oa)-:o>');
-    expr._legacyMode = /(^|[^a-zA-Z0-9_'"])msg([^a-zA-Z0-9_'"]|$)/.test(value);
+    expr._legacyMode = /(^|[^a-zA-Z0-9_'".])msg([^a-zA-Z0-9_'"]|$)/.test(value);
     expr._node = node;
     return expr;
 }

From 82ae2e71183319a24e795cb4bd2eaf7a1c670719 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 12 Jan 2022 22:07:44 +0000
Subject: [PATCH 05/11] Handle reporting error location when stack is truncated
 Fixes #3292

---
 packages/node_modules/@node-red/util/lib/events.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/node_modules/@node-red/util/lib/events.js b/packages/node_modules/@node-red/util/lib/events.js
index df45b4d16..b1e1e4f9f 100644
--- a/packages/node_modules/@node-red/util/lib/events.js
+++ b/packages/node_modules/@node-red/util/lib/events.js
@@ -32,8 +32,14 @@ function wrapEventFunction(obj,func) {
     return function(eventName, listener) {
         if (deprecatedEvents.hasOwnProperty(eventName)) {
             const log = require("@node-red/util").log;
-            const stack = (new Error().stack).split("\n")[2].split("(")[1].slice(0,-1);
-            log.warn(`[RED.events] Deprecated use of "${eventName}" event from "${stack}". Use "${deprecatedEvents[eventName]}" instead.`)
+
+            const stack = (new Error().stack).split("\n");
+            let location = "(unknown)"
+            // See https://github.com/node-red/node-red/issues/3292
+            if (stack.length > 2) {
+                location = stack[2].split("(")[1].slice(0,-1);
+            }
+            log.warn(`[RED.events] Deprecated use of "${eventName}" event from "${location}". Use "${deprecatedEvents[eventName]}" instead.`)
         }
         return events["_"+func].call(events,eventName,listener)
     }

From df70c8a800afdf7b977e22699ecdc641ce1d8caf Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Wed, 12 Jan 2022 22:45:18 +0000
Subject: [PATCH 06/11] Fix generating flow name with incrementing number Fixes
 #3295

---
 .../@node-red/editor-client/src/js/ui/workspaces.js        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git 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
index 46835a032..d3fc939a6 100644
--- 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
@@ -66,7 +66,7 @@ RED.workspaces = (function() {
             var tabId = RED.nodes.id();
             do {
                 workspaceIndex += 1;
-            } while ($("#red-ui-workspace-tabs a[title='"+RED._('workspace.defaultName',{number:workspaceIndex})+"']").size() !== 0);
+            } while ($("#red-ui-workspace-tabs li[flowname='"+RED._('workspace.defaultName',{number:workspaceIndex})+"']").size() !== 0);
 
             ws = {
                 type: "tab",
@@ -79,12 +79,15 @@ RED.workspaces = (function() {
             };
             RED.nodes.addWorkspace(ws,targetIndex);
             workspace_tabs.addTab(ws,targetIndex);
+
             workspace_tabs.activateTab(tabId);
             if (!skipHistoryEntry) {
                 RED.history.push({t:'add',workspaces:[ws],dirty:RED.nodes.dirty()});
                 RED.nodes.dirty(true);
             }
         }
+        $("#red-ui-tab-"+(ws.id.replace(".","-"))).attr("flowname",ws.label)
+
         RED.view.focus();
         return ws;
     }
@@ -583,7 +586,7 @@ RED.workspaces = (function() {
         refresh: function() {
             RED.nodes.eachWorkspace(function(ws) {
                 workspace_tabs.renameTab(ws.id,ws.label);
-
+                $("#red-ui-tab-"+(ws.id.replace(".","-"))).attr("flowname",ws.label)
             })
             RED.nodes.eachSubflow(function(sf) {
                 if (workspace_tabs.contains(sf.id)) {

From cf613aafb21ac4390dd5c7004473ac2b4c121334 Mon Sep 17 00:00:00 2001
From: Kazuhito Yokoi <kazuhito.yokoi.nx@hitachi.com>
Date: Thu, 13 Jan 2022 10:35:12 +0900
Subject: [PATCH 07/11] Update
 packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js

Co-authored-by: Nick O'Leary <nick.oleary@gmail.com>
---
 .../node_modules/@node-red/editor-client/src/js/ui/clipboard.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
index 7fb0fb2a8..648f17e4e 100644
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/clipboard.js
@@ -956,7 +956,7 @@ RED.clipboard = (function() {
             if (currentFocus) {
                 $(currentFocus).focus();
             }
-        });
+        }).catch(err => { console.error("Failed to copy:",err) });
     }
 
     function importNodes(nodesStr,addFlow) {

From c480f96d308a82fa52bbc24acccbf340bb321da6 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 13 Jan 2022 09:46:37 +0000
Subject: [PATCH 08/11] Prevent function scrollbar from obscuring expand button
 Fixes #2955

---
 .../@node-red/nodes/core/function/10-function.html          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/nodes/core/function/10-function.html b/packages/node_modules/@node-red/nodes/core/function/10-function.html
index bf7d0dbd1..a1ed14f6d 100644
--- a/packages/node_modules/@node-red/nodes/core/function/10-function.html
+++ b/packages/node_modules/@node-red/nodes/core/function/10-function.html
@@ -91,21 +91,21 @@
         <div id="func-tab-init" style="display:none">
             <div class="form-row node-text-editor-row" style="position:relative">
                 <div style="height: 250px; min-height:150px;" class="node-text-editor" id="node-input-init-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 5;"><button id="node-init-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-init-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
             </div>
         </div>
 
         <div id="func-tab-body" style="display:none">
             <div class="form-row node-text-editor-row" style="position:relative">
                 <div style="height: 220px; min-height:150px;" class="node-text-editor" id="node-input-func-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 5;"><button id="node-function-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-function-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
             </div>
         </div>
 
         <div id="func-tab-finalize" style="display:none">
             <div class="form-row node-text-editor-row" style="position:relative">
                 <div style="height: 250px; min-height:150px;" class="node-text-editor" id="node-input-finalize-editor" ></div>
-                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 5;"><button id="node-finalize-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
+                <div style="position: absolute; right:0; bottom: calc(100% - 20px); z-Index: 10;"><button id="node-finalize-expand-js" class="red-ui-button red-ui-button-small"><i class="fa fa-expand"></i></button></div>
             </div>
         </div>
 

From fb7a2a8d5d3154574f22da7d1146b0600f5fb487 Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 13 Jan 2022 10:19:56 +0000
Subject: [PATCH 09/11] Update dependencies

---
 package.json                                  | 20 +++++++++----------
 .../@node-red/editor-api/package.json         |  6 +++---
 .../node_modules/@node-red/nodes/package.json |  6 +++---
 .../@node-red/registry/package.json           |  2 +-
 .../@node-red/runtime/package.json            |  2 +-
 .../node_modules/@node-red/util/package.json  |  2 +-
 packages/node_modules/node-red/package.json   |  2 +-
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 5b7fdb0f3..5abd9facd 100644
--- a/package.json
+++ b/package.json
@@ -26,13 +26,13 @@
         }
     ],
     "dependencies": {
-        "acorn": "8.6.0",
+        "acorn": "8.7.0",
         "acorn-walk": "8.2.0",
         "ajv": "8.8.2",
         "async-mutex": "0.3.2",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.19.0",
+        "body-parser": "1.19.1",
         "cheerio": "1.0.0-rc.10",
         "clone": "2.1.2",
         "content-type": "1.0.4",
@@ -41,7 +41,7 @@
         "cors": "2.8.5",
         "cronosjs": "1.7.1",
         "denque": "2.0.1",
-        "express": "4.17.1",
+        "express": "4.17.2",
         "express-session": "1.17.2",
         "form-data": "4.0.0",
         "fs-extra": "10.0.0",
@@ -50,7 +50,7 @@
         "hash-sum": "2.0.0",
         "hpagent": "0.1.2",
         "https-proxy-agent": "5.0.0",
-        "i18next": "21.5.4",
+        "i18next": "21.6.6",
         "iconv-lite": "0.6.3",
         "is-utf8": "0.2.1",
         "js-yaml": "3.14.1",
@@ -61,21 +61,21 @@
         "memorystore": "1.6.6",
         "mime": "2.5.2",
         "moment-timezone": "0.5.34",
-        "mqtt": "4.2.8",
+        "mqtt": "4.3.4",
         "multer": "1.4.3",
         "mustache": "4.2.0",
         "node-red-admin": "^2.2.1",
         "nopt": "5.0.0",
         "oauth2orize": "1.11.1",
         "on-headers": "1.0.2",
-        "passport": "0.5.0",
+        "passport": "0.5.2",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
         "raw-body": "2.4.2",
         "semver": "7.3.5",
         "tar": "6.1.11",
         "tough-cookie": "4.0.0",
-        "uglify-js": "3.14.4",
+        "uglify-js": "3.14.5",
         "uuid": "8.3.2",
         "ws": "7.5.1",
         "xml2js": "0.4.23"
@@ -84,7 +84,7 @@
         "bcrypt": "5.0.1"
     },
     "devDependencies": {
-        "dompurify": "2.3.3",
+        "dompurify": "2.3.4",
         "grunt": "1.4.1",
         "grunt-chmod": "~1.1.1",
         "grunt-cli": "~1.4.3",
@@ -113,11 +113,11 @@
         "node-red-node-test-helper": "^0.2.7",
         "nodemon": "2.0.15",
         "proxy": "^1.0.2",
-        "sass": "1.44.0",
+        "sass": "1.48.0",
         "should": "13.2.3",
         "sinon": "11.1.2",
         "stoppable": "^1.1.0",
-        "supertest": "6.1.6"
+        "supertest": "6.2.1"
     },
     "engines": {
         "node": ">=12"
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index 028b03be4..e15f4976c 100644
--- a/packages/node_modules/@node-red/editor-api/package.json
+++ b/packages/node_modules/@node-red/editor-api/package.json
@@ -19,11 +19,11 @@
         "@node-red/util": "2.1.4",
         "@node-red/editor-client": "2.1.4",
         "bcryptjs": "2.4.3",
-        "body-parser": "1.19.0",
+        "body-parser": "1.19.1",
         "clone": "2.1.2",
         "cors": "2.8.5",
         "express-session": "1.17.2",
-        "express": "4.17.1",
+        "express": "4.17.2",
         "memorystore": "1.6.6",
         "mime": "2.5.2",
         "multer": "1.4.3",
@@ -31,7 +31,7 @@
         "oauth2orize": "1.11.1",
         "passport-http-bearer": "1.0.1",
         "passport-oauth2-client-password": "0.1.2",
-        "passport": "0.5.0",
+        "passport": "0.5.2",
         "ws": "7.5.1"
     },
     "optionalDependencies": {
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index d90f4e052..ff45dc2ad 100644
--- a/packages/node_modules/@node-red/nodes/package.json
+++ b/packages/node_modules/@node-red/nodes/package.json
@@ -15,10 +15,10 @@
         }
     ],
     "dependencies": {
-        "acorn": "8.6.0",
+        "acorn": "8.7.0",
         "acorn-walk": "8.2.0",
         "ajv": "8.8.2",
-        "body-parser": "1.19.0",
+        "body-parser": "1.19.1",
         "cheerio": "1.0.0-rc.10",
         "content-type": "1.0.4",
         "cookie-parser": "1.4.6",
@@ -36,7 +36,7 @@
         "is-utf8": "0.2.1",
         "js-yaml": "3.14.1",
         "media-typer": "1.1.0",
-        "mqtt": "4.2.8",
+        "mqtt": "4.3.4",
         "multer": "1.4.3",
         "mustache": "4.2.0",
         "on-headers": "1.0.2",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index 30d132fa7..69cda2f80 100644
--- a/packages/node_modules/@node-red/registry/package.json
+++ b/packages/node_modules/@node-red/registry/package.json
@@ -21,6 +21,6 @@
         "fs-extra": "10.0.0",
         "semver": "7.3.5",
         "tar": "6.1.11",
-        "uglify-js": "3.14.4"
+        "uglify-js": "3.14.5"
     }
 }
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index 9a36aa6b0..b1ee32ef9 100644
--- a/packages/node_modules/@node-red/runtime/package.json
+++ b/packages/node_modules/@node-red/runtime/package.json
@@ -20,7 +20,7 @@
         "@node-red/util": "2.1.4",
         "async-mutex": "0.3.2",
         "clone": "2.1.2",
-        "express": "4.17.1",
+        "express": "4.17.2",
         "fs-extra": "10.0.0",
         "json-stringify-safe": "5.0.1"
     }
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index d0424d9a7..3e244c837 100644
--- a/packages/node_modules/@node-red/util/package.json
+++ b/packages/node_modules/@node-red/util/package.json
@@ -16,7 +16,7 @@
     ],
     "dependencies": {
         "fs-extra": "10.0.0",
-        "i18next": "21.5.4",
+        "i18next": "21.6.6",
         "json-stringify-safe": "5.0.1",
         "jsonata": "1.8.5",
         "lodash.clonedeep": "^4.5.0",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index 6c8cf38f6..d0f78d65b 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -37,7 +37,7 @@
         "@node-red/nodes": "2.1.4",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
-        "express": "4.17.1",
+        "express": "4.17.2",
         "fs-extra": "10.0.0",
         "node-red-admin": "^2.2.1",
         "nopt": "5.0.0",

From f055d422774d86990734726902d1fba6a420fc1a Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 13 Jan 2022 10:22:41 +0000
Subject: [PATCH 10/11] Update package version for 2.1.5

---
 package.json                                           |  2 +-
 .../node_modules/@node-red/editor-api/package.json     |  6 +++---
 .../node_modules/@node-red/editor-client/package.json  |  2 +-
 packages/node_modules/@node-red/nodes/package.json     |  2 +-
 packages/node_modules/@node-red/registry/package.json  |  4 ++--
 packages/node_modules/@node-red/runtime/package.json   |  6 +++---
 packages/node_modules/@node-red/util/package.json      |  2 +-
 packages/node_modules/node-red/package.json            | 10 +++++-----
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/package.json b/package.json
index 5abd9facd..fd6532c6e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json
index e15f4976c..da76b539f 100644
--- 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": "2.1.4",
+    "version": "2.1.5",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "2.1.4",
-        "@node-red/editor-client": "2.1.4",
+        "@node-red/util": "2.1.5",
+        "@node-red/editor-client": "2.1.5",
         "bcryptjs": "2.4.3",
         "body-parser": "1.19.1",
         "clone": "2.1.2",
diff --git a/packages/node_modules/@node-red/editor-client/package.json b/packages/node_modules/@node-red/editor-client/package.json
index 4f2b6f362..1b73f54df 100644
--- 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": "2.1.4",
+    "version": "2.1.5",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json
index ff45dc2ad..13c9040cb 100644
--- 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": "2.1.4",
+    "version": "2.1.5",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json
index 69cda2f80..3cf41845e 100644
--- 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": "2.1.4",
+    "version": "2.1.5",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "2.1.4",
+        "@node-red/util": "2.1.5",
         "clone": "2.1.2",
         "fs-extra": "10.0.0",
         "semver": "7.3.5",
diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json
index b1ee32ef9..63a4899bc 100644
--- 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": "2.1.4",
+    "version": "2.1.5",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "2.1.4",
-        "@node-red/util": "2.1.4",
+        "@node-red/registry": "2.1.5",
+        "@node-red/util": "2.1.5",
         "async-mutex": "0.3.2",
         "clone": "2.1.2",
         "express": "4.17.2",
diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json
index 3e244c837..52f66cba4 100644
--- 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": "2.1.4",
+    "version": "2.1.5",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
diff --git a/packages/node_modules/node-red/package.json b/packages/node_modules/node-red/package.json
index d0f78d65b..46ddebb68 100644
--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -31,10 +31,10 @@
         "flow"
     ],
     "dependencies": {
-        "@node-red/editor-api": "2.1.4",
-        "@node-red/runtime": "2.1.4",
-        "@node-red/util": "2.1.4",
-        "@node-red/nodes": "2.1.4",
+        "@node-red/editor-api": "2.1.5",
+        "@node-red/runtime": "2.1.5",
+        "@node-red/util": "2.1.5",
+        "@node-red/nodes": "2.1.5",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.2",

From 943b103001e64f20384669b7284692afcc1c474b Mon Sep 17 00:00:00 2001
From: Nick O'Leary <nick.oleary@gmail.com>
Date: Thu, 13 Jan 2022 10:29:20 +0000
Subject: [PATCH 11/11] Update changelog

---
 CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2650dceab..2b9daf8c0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,37 @@
+#### 2.1.5: Maintenance Release
+
+Runtime
+
+ - Handle reporting error location when stack is truncated (#3346) @knolleary
+ - Initialize passport when only adminAuth.tokens is set (#3343) @knolleary
+ - Add log logging (#3342) @knolleary
+
+Editor
+
+ - Fix copy buttons on the debug window (another method) (#3331) @kazuhitoyokoi
+ - Add Japanese translations for hidden flow (#3302) @kazuhitoyokoi
+ - Improve jsonata legacy mode detection regex (#3345) @knolleary
+ - Fix generating flow name with incrementing number (#3347) @knolleary
+ - resume focus after import/export dialog close (#3337) @HiroyasuNishiyama
+ - Fix findPreviousVisibleTab action (#3321) @knolleary
+ - Fix storing hidden tab state when not hidden via action (#3312) @knolleary
+ - Avoid adding empty env properties to tabs/groups (#3311) @knolleary
+ - Fix hide icon in tour guide (#3301) @kazuhitoyokoi
+
+Nodes
+
+ - File: Update file node examples according to node name change (#3335) @HiroyasuNishiyama
+ - Filter (RBE): Fix for filter node narrrowbandEq mode start condition failure (#3339) @dceejay
+ - Function: Prevent function scrollbar from obscuring expand button (#3348) @knolleary
+ - Function: load extralibs when expanding monaco. fixes #3319 (#3334) @Steve-Mcl
+ - Function: Update Function to use correct api to access env vars (#3310) @knolleary
+ - HTTP Request: Fix basic auth with empty username or password (#3325) @hardillb
+ - Inject: Fix incorrect clearing of blank payload property in Inject node (#3322) @knolleary
+ - Link Call: add link call example (#3336) @HiroyasuNishiyama
+ - WebSocket: Only setup ws client heartbeat once it is connected (#3344) @knolleary
+ - Update Japanese translations in node help (#3332) @kazuhitoyokoi
+
+
 #### 2.1.4: Maintenance Release
 
 Runtime