From e149174696ce0f00aaebeb92c3ffff1b299b565e Mon Sep 17 00:00:00 2001 From: bartbutenaers Date: Fri, 6 Nov 2020 08:45:50 +0100 Subject: [PATCH 01/15] Disable TypedInput --- .../editor-client/src/js/ui/common/typedInput.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git 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 index 037e8e454..ba314c830 100644 --- 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 @@ -954,6 +954,18 @@ }, hide: function() { this.uiSelect.hide(); + }, + disable: function(val) { + if(val === true) { + this.uiSelect.attr("disabled", "disabled"); + } else if (val === false) { + this.uiSelect.attr("disabled", null); //remove attr + } else { + this.uiSelect.attr("disabled", val); //user value + } + }, + disabled: function() { + return this.uiSelect.attr("disabled"); } }); })(jQuery); From 32b04cd32fc5bec6ef516efff04bd215b4742cdf Mon Sep 17 00:00:00 2001 From: bartbutenaers Date: Fri, 6 Nov 2020 08:48:14 +0100 Subject: [PATCH 02/15] Disable TypedInput --- .../editor-client/src/sass/ui/common/typedInput.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss index ec865b116..9b106e9f9 100644 --- a/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss +++ b/packages/node_modules/@node-red/editor-client/src/sass/ui/common/typedInput.scss @@ -25,6 +25,14 @@ box-sizing: border-box; overflow:visible; position: relative; + &[disabled] { + input, button { + background: $secondary-background-inactive; + pointer-events: none; + cursor: not-allowed; + } + } + .red-ui-typedInput-input-wrap { flex-grow: 1; } From 50dd0354d16d9f82b27f86715ed6d7df60b31edb Mon Sep 17 00:00:00 2001 From: aaronmyatt Date: Fri, 4 Dec 2020 23:00:31 +0800 Subject: [PATCH 03/15] adds admin middleware tests --- .../unit/@node-red/editor-api/lib/index_spec.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/test/unit/@node-red/editor-api/lib/index_spec.js b/test/unit/@node-red/editor-api/lib/index_spec.js index 1d5e9380b..805169307 100644 --- a/test/unit/@node-red/editor-api/lib/index_spec.js +++ b/test/unit/@node-red/editor-api/lib/index_spec.js @@ -96,4 +96,21 @@ describe("api/index", function() { request(api.httpAdmin).get("/auth/login").expect(200).end(done) }) }); + + describe('initialises api with admin middleware', function(done) { + it('ignores non-function values',function(done) { + api.init({ httpAdminRoot: true, httpAdminMiddleware: undefined },{},{},{}); + const middlewareFound = api.httpAdmin._router.stack.filter((layer) => layer.name === 'testMiddleware') + should(middlewareFound).be.empty(); + done(); + }); + + it('only accepts functions as middleware',function(done) { + const testMiddleware = function(req, res, next){ next(); }; + api.init({ httpAdminRoot: true, httpAdminMiddleware: testMiddleware },{},{},{}); + const middlewareFound = api.httpAdmin._router.stack.filter((layer) => layer.name === 'testMiddleware') + should(middlewareFound).be.length(1); + done(); + }); + }); }); From 950fd7d2cf933ec60aa298c05b48750775d36e3a Mon Sep 17 00:00:00 2001 From: aaronmyatt Date: Sat, 5 Dec 2020 15:15:36 +0800 Subject: [PATCH 04/15] removes unused dependencies --- test/unit/@node-red/editor-api/lib/index_spec.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/test/unit/@node-red/editor-api/lib/index_spec.js b/test/unit/@node-red/editor-api/lib/index_spec.js index 805169307..c667ae1f2 100644 --- a/test/unit/@node-red/editor-api/lib/index_spec.js +++ b/test/unit/@node-red/editor-api/lib/index_spec.js @@ -18,9 +18,6 @@ var should = require("should"); var sinon = require("sinon"); var request = require("supertest"); var express = require("express"); -var when = require("when"); -var fs = require("fs"); -var path = require("path"); var NR_TEST_UTILS = require("nr-test-utils"); From 0b569a4120b30480f3f3a281204ff1cdd019c873 Mon Sep 17 00:00:00 2001 From: aaronmyatt Date: Sat, 5 Dec 2020 23:06:18 +0800 Subject: [PATCH 05/15] exercise admin auth pathways --- .../@node-red/editor-api/lib/index_spec.js | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/test/unit/@node-red/editor-api/lib/index_spec.js b/test/unit/@node-red/editor-api/lib/index_spec.js index c667ae1f2..44048e6df 100644 --- a/test/unit/@node-red/editor-api/lib/index_spec.js +++ b/test/unit/@node-red/editor-api/lib/index_spec.js @@ -20,6 +20,7 @@ var request = require("supertest"); var express = require("express"); var NR_TEST_UTILS = require("nr-test-utils"); +const auth = require("basic-auth"); var api = NR_TEST_UTILS.require("@node-red/editor-api"); @@ -110,4 +111,37 @@ describe("api/index", function() { done(); }); }); + + //adminAuth: { + // type: "credentials", + // users: [{ + // username: "admin", + // password: "$2a$08$zZWtXTja0fB1pzD4sHCMyOCMYz2Z6dNbM6tl8sJogENOMcxWV9DN.", + // permissions: "*" + // }] + //}, + + describe('initialises api with authentication enabled', function(done) { + + it('enables an oauth/openID based authentication mechanism',function(done) { + const stub = sinon.stub(apiAuth, 'genericStrategy', function(){}); + const adminAuth = { type: 'strategy', strategy: {} } + api.init({ httpAdminRoot: true, adminAuth },{},{},{}); + should(stub.called).be.ok(); + stub.restore(); + done(); + }); + + it('enables password protection',function(done) { + const adminAuth = { type: 'credentials' } + api.init({ httpAdminRoot: true, adminAuth },{},{},{}); + + // is the name ("initialize") of the passport middleware present + const middlewareFound = api.httpAdmin._router.stack.filter((layer) => layer.name === 'initialize') + should(middlewareFound).be.length(1); + done(); + }); + + }); + }); From c9bc530df0dc5989e32ba23b137c656e51715637 Mon Sep 17 00:00:00 2001 From: aaronmyatt Date: Sun, 6 Dec 2020 15:29:54 +0800 Subject: [PATCH 06/15] tests custom cors settings --- .../@node-red/editor-api/lib/index_spec.js | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/test/unit/@node-red/editor-api/lib/index_spec.js b/test/unit/@node-red/editor-api/lib/index_spec.js index 44048e6df..2f84030aa 100644 --- a/test/unit/@node-red/editor-api/lib/index_spec.js +++ b/test/unit/@node-red/editor-api/lib/index_spec.js @@ -112,15 +112,6 @@ describe("api/index", function() { }); }); - //adminAuth: { - // type: "credentials", - // users: [{ - // username: "admin", - // password: "$2a$08$zZWtXTja0fB1pzD4sHCMyOCMYz2Z6dNbM6tl8sJogENOMcxWV9DN.", - // permissions: "*" - // }] - //}, - describe('initialises api with authentication enabled', function(done) { it('enables an oauth/openID based authentication mechanism',function(done) { @@ -144,4 +135,25 @@ describe("api/index", function() { }); + describe('initialises api with custom cors config', function (done) { + const httpAdminCors = { + origin: "*", + methods: "GET,PUT,POST,DELETE" + }; + + it('uses default cors middleware when user settings absent', function(done){ + api.init({ httpAdminRoot: true }, {}, {}, {}); + const middlewareFound = api.httpAdmin._router.stack.filter((layer) => layer.name === 'corsMiddleware') + should(middlewareFound).be.length(1); + done(); + }) + + it('enables custom cors middleware when settings present', function(done){ + api.init({ httpAdminRoot: true, httpAdminCors }, {}, {}, {}); + const middlewareFound = api.httpAdmin._router.stack.filter((layer) => layer.name === 'corsMiddleware') + should(middlewareFound).be.length(2); + done(); + }) + }); + }); From be828af3e2524fb40d9087431d3dc41a4ef291ce Mon Sep 17 00:00:00 2001 From: johnwang71 Date: Mon, 14 Dec 2020 18:18:50 +0800 Subject: [PATCH 07/15] Fix bug: Crash & quit while handling exception with undefine msg.error. i.e. flow with 3 nodes, http-in, delay 5-10s, http-out; client with 3s timeout request the flow; TypeError: Cannot read property 'hasOwnProperty' of undefined\r at Flow.handleError (/usr/src/node-red/node_modules/@node-red/runtime/lib/flows/Flow.js:474:27) --- packages/node_modules/@node-red/runtime/lib/flows/Flow.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js index a7e00bfbc..325639f64 100644 --- a/packages/node_modules/@node-red/runtime/lib/flows/Flow.js +++ b/packages/node_modules/@node-red/runtime/lib/flows/Flow.js @@ -470,8 +470,8 @@ class Flow { } // console.log("HE",logMessage); var count = 1; - if (msg && msg.hasOwnProperty("error") && msg.error !== null) { - if (msg.error.hasOwnProperty("source") && msg.error.source !== null) { + if (msg && msg.hasOwnProperty("error") && msg.error) { + if (msg.error.hasOwnProperty("source") && msg.error.source) { if (msg.error.source.id === node.id) { count = msg.error.source.count+1; if (count === 10) { From 496b5a092fc6fcdda51d783fa3c439f4dda41275 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Tue, 15 Dec 2020 17:20:22 +0000 Subject: [PATCH 08/15] Ensure subflow credential objects exist Fixes #2783 --- packages/node_modules/@node-red/runtime/lib/flows/Subflow.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js b/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js index 78ec9ee75..d8514dac4 100644 --- a/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js +++ b/packages/node_modules/@node-red/runtime/lib/flows/Subflow.js @@ -117,8 +117,8 @@ class Subflow extends Flow { this.node_map = node_map; this.path = parent.path+"/"+(subflowInstance._alias||subflowInstance.id); - this.templateCredentials = credentials.get(subflowDef.id); - this.instanceCredentials = credentials.get(this.id); + this.templateCredentials = credentials.get(subflowDef.id) || {}; + this.instanceCredentials = credentials.get(this.id) || {}; var env = []; if (this.subflowDef.env) { From 55e6c6e01adf0afc71ec1601be727f21a9685c51 Mon Sep 17 00:00:00 2001 From: aaronmyatt Date: Wed, 16 Dec 2020 21:53:52 +0800 Subject: [PATCH 09/15] adds tests for editor-api.start() --- .../@node-red/editor-api/lib/index_spec.js | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/test/unit/@node-red/editor-api/lib/index_spec.js b/test/unit/@node-red/editor-api/lib/index_spec.js index 2f84030aa..28928181b 100644 --- a/test/unit/@node-red/editor-api/lib/index_spec.js +++ b/test/unit/@node-red/editor-api/lib/index_spec.js @@ -156,4 +156,27 @@ describe("api/index", function() { }) }); + describe('editor start', function (done) { + + it('cannot be started when editor is disabled', function (done) { + const stub = sinon.stub(apiEditor, 'start', function () { + return Promise.resolve(true); + }); + api.init({ httpAdminRoot: true, disableEditor: true }, {}, {}, {}); + should(api.start()).resolvedWith(true); + stub.restore(); + done(); + }); + + it('can be started when editor enabled', function (done) { + const stub = sinon.stub(apiEditor, 'start'); + api.init({ httpAdminRoot: true, disableEditor: false }, {}, {}, {}); + api.start(); + should(stub.called).be.true(); + stub.restore(); + done(); + }); + + }); + }); From c433f736a5b7d3182f3a538a129fea2f6b4350d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20M=C3=B6dinger?= Date: Thu, 17 Dec 2020 09:25:35 +0100 Subject: [PATCH 10/15] Improvements to DE translation (#2192) * Gitter->Raster inconsistency * Set to -> Festlegen bei // Setzen als --- .../@node-red/editor-client/locales/de/editor.json | 2 +- .../node_modules/@node-red/nodes/locales/de/messages.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/locales/de/editor.json b/packages/node_modules/@node-red/editor-client/locales/de/editor.json index 0c8dd42eb..7c408d742 100755 --- a/packages/node_modules/@node-red/editor-client/locales/de/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/de/editor.json @@ -32,7 +32,7 @@ "label" : { "view" : { "view" : "Ansicht", - "grid" : "Gitter", + "grid" : "Raster", "showGrid" : "Raster anzeigen", "snapGrid" : "Am Raster ausrichten", "gridSize" : "Rastergröße", diff --git a/packages/node_modules/@node-red/nodes/locales/de/messages.json b/packages/node_modules/@node-red/nodes/locales/de/messages.json index 7d9bd3523..fe1e1dfc1 100755 --- a/packages/node_modules/@node-red/nodes/locales/de/messages.json +++ b/packages/node_modules/@node-red/nodes/locales/de/messages.json @@ -583,11 +583,11 @@ "regex" : "Reguläre Ausdrücke verwenden" }, "action" : { - "set" : "Festlegen", + "set" : "Setze", "change" : "Ändern", "delete" : "Löschen", "move" : "Bewegen", - "to" : "bis", + "to" : "auf", "search" : "Suchen nach", "replace" : "Ersetzen durch" }, From fa84c4e4613a67c5dc066cbde1a4793a6376c22e Mon Sep 17 00:00:00 2001 From: Tiago Ferreira Date: Tue, 29 Dec 2020 21:54:57 +0000 Subject: [PATCH 11/15] Allow to explicit use userMenu in the theme configuration Unit test to ensure that works after the theme is initialize Allow to explicti use userMenu in the theme configuration --- .../@node-red/editor-client/src/js/user.js | 2 +- .../@node-red/editor-api/lib/editor/theme_spec.js | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/user.js b/packages/node_modules/@node-red/editor-client/src/js/user.js index dd0ff8f90..bd7339285 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/user.js +++ b/packages/node_modules/@node-red/editor-client/src/js/user.js @@ -219,7 +219,7 @@ RED.user = (function() { function init() { if (RED.settings.user) { - if (!RED.settings.editorTheme || !RED.settings.editorTheme.hasOwnProperty("userMenu")) { + if (!RED.settings.editorTheme || !RED.settings.editorTheme.hasOwnProperty("userMenu") || RED.settings.editorTheme.userMenu) { var userMenu = $('
    • ') .prependTo(".red-ui-header-toolbar"); diff --git a/test/unit/@node-red/editor-api/lib/editor/theme_spec.js b/test/unit/@node-red/editor-api/lib/editor/theme_spec.js index 67e305f71..e7db72dd6 100644 --- a/test/unit/@node-red/editor-api/lib/editor/theme_spec.js +++ b/test/unit/@node-red/editor-api/lib/editor/theme_spec.js @@ -143,4 +143,19 @@ describe("api/editor/theme", function () { settings.projects.should.have.a.property("enabled", false); }); + it("test explicit userMenu set to true in theme setting", function () { + theme.init({ + editorTheme: { + userMenu: true, + } + }); + + theme.app(); + + var settings = theme.settings(); + settings.should.have.a.property("userMenu"); + settings.userMenu.should.be.eql(true); + + }); + }); From 30a68fefec167af1a5499b510d25b5eae66faae4 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 6 Jan 2021 11:22:52 +0000 Subject: [PATCH 12/15] Ensure subflow-scoped config nodes do not get moved on import Fixes #2789 --- packages/node_modules/@node-red/editor-client/src/js/nodes.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/nodes.js b/packages/node_modules/@node-red/editor-client/src/js/nodes.js index ddeea65e6..0d664ce3c 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/nodes.js +++ b/packages/node_modules/@node-red/editor-client/src/js/nodes.js @@ -1360,7 +1360,7 @@ RED.nodes = (function() { } } } else { - if (n.z && !workspaces[n.z]) { + if (n.z && !workspaces[n.z] && !subflow_map[n.z]) { n.z = activeWorkspace; } } From ea720bb4a58cc276492f9e81615da5a914c34ce3 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 6 Jan 2021 11:41:17 +0000 Subject: [PATCH 13/15] Bump dependencies --- package.json | 14 +++++++------- .../node_modules/@node-red/editor-api/package.json | 4 ++-- packages/node_modules/@node-red/nodes/package.json | 4 ++-- .../node_modules/@node-red/registry/package.json | 2 +- .../node_modules/@node-red/runtime/package.json | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 5fa8dca88..3bbb2f323 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ ], "dependencies": { "ajv": "6.12.6", - "async-mutex": "0.2.4", + "async-mutex": "0.2.6", "basic-auth": "2.0.1", "bcryptjs": "2.4.3", "body-parser": "1.19.0", @@ -38,7 +38,7 @@ "cookie-parser": "1.4.5", "cors": "2.8.5", "cron": "1.7.2", - "denque": "1.4.1", + "denque": "1.5.0", "express": "4.17.1", "express-session": "1.17.1", "fs-extra": "8.1.0", @@ -54,11 +54,11 @@ "lodash.clonedeep": "^4.5.0", "media-typer": "1.1.0", "memorystore": "1.6.4", - "mime": "2.4.6", + "mime": "2.4.7", "moment-timezone": "0.5.32", "mqtt": "4.2.6", "multer": "1.4.2", - "mustache": "4.0.1", + "mustache": "4.1.0", "node-red-admin": "^0.2.6", "node-red-node-rbe": "^0.2.9", "node-red-node-sentiment": "^0.1.6", @@ -73,7 +73,7 @@ "request": "2.88.0", "semver": "6.3.0", "tar": "6.0.5", - "uglify-js": "3.11.6", + "uglify-js": "3.12.4", "when": "3.7.8", "ws": "6.2.1", "xml2js": "0.4.23" @@ -82,7 +82,7 @@ "bcrypt": "3.0.8" }, "devDependencies": { - "dompurify": "2.2.2", + "dompurify": "2.2.6", "grunt": "1.3.0", "grunt-chmod": "~1.1.1", "grunt-cli": "~1.3.2", @@ -104,7 +104,7 @@ "grunt-simple-nyc": "^3.0.1", "http-proxy": "1.18.1", "jsdoc-nr-template": "github:node-red/jsdoc-nr-template", - "marked": "1.2.5", + "marked": "1.2.7", "minami": "1.2.3", "mocha": "^5.2.0", "node-red-node-test-helper": "^0.2.5", diff --git a/packages/node_modules/@node-red/editor-api/package.json b/packages/node_modules/@node-red/editor-api/package.json index 2b89c8023..ac4021030 100644 --- a/packages/node_modules/@node-red/editor-api/package.json +++ b/packages/node_modules/@node-red/editor-api/package.json @@ -25,9 +25,9 @@ "express-session": "1.17.1", "express": "4.17.1", "memorystore": "1.6.4", - "mime": "2.4.6", + "mime": "2.4.7", "multer": "1.4.2", - "mustache": "4.0.1", + "mustache": "4.1.0", "oauth2orize": "1.11.0", "passport-http-bearer": "1.0.1", "passport-oauth2-client-password": "0.1.2", diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json index d5f0c3e1a..1c8574e90 100644 --- a/packages/node_modules/@node-red/nodes/package.json +++ b/packages/node_modules/@node-red/nodes/package.json @@ -23,7 +23,7 @@ "cookie": "0.4.1", "cors": "2.8.5", "cron": "1.7.2", - "denque": "1.4.1", + "denque": "1.5.0", "fs-extra": "8.1.0", "fs.notify": "0.0.4", "hash-sum": "2.0.0", @@ -33,7 +33,7 @@ "media-typer": "1.1.0", "mqtt": "4.2.6", "multer": "1.4.2", - "mustache": "4.0.1", + "mustache": "4.1.0", "on-headers": "1.0.2", "raw-body": "2.4.1", "request": "2.88.0", diff --git a/packages/node_modules/@node-red/registry/package.json b/packages/node_modules/@node-red/registry/package.json index c8a570001..174ce5b12 100644 --- a/packages/node_modules/@node-red/registry/package.json +++ b/packages/node_modules/@node-red/registry/package.json @@ -19,7 +19,7 @@ "@node-red/util": "1.2.6", "semver": "6.3.0", "tar": "6.0.5", - "uglify-js": "3.11.6", + "uglify-js": "3.12.4", "when": "3.7.8" } } diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json index 620f2f7ed..7375bf9af 100644 --- a/packages/node_modules/@node-red/runtime/package.json +++ b/packages/node_modules/@node-red/runtime/package.json @@ -18,7 +18,7 @@ "dependencies": { "@node-red/registry": "1.2.6", "@node-red/util": "1.2.6", - "async-mutex": "0.2.4", + "async-mutex": "0.2.6", "clone": "2.1.2", "express": "4.17.1", "fs-extra": "8.1.0", From abe77ab96f8541fac21c2863256761e1a4041912 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Wed, 6 Jan 2021 11:49:31 +0000 Subject: [PATCH 14/15] Bump for 1.2.7 --- CHANGELOG.md | 22 +++++++++++++++++++ package.json | 2 +- .../@node-red/editor-api/package.json | 6 ++--- .../@node-red/editor-client/package.json | 2 +- .../node_modules/@node-red/nodes/package.json | 2 +- .../@node-red/registry/package.json | 4 ++-- .../@node-red/runtime/package.json | 6 ++--- .../node_modules/@node-red/util/package.json | 2 +- packages/node_modules/node-red/package.json | 10 ++++----- 9 files changed, 39 insertions(+), 17 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c12019755..fdbb4ada9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,25 @@ +### 1.2.7: Maintenance Release + +Editor + + - Ensure subflow-scoped config nodes do not get moved on import Fixes #2789 + - Allow TypedInput to be disabled (#2752) @bartbutenaers + - Allow userMenu to be explicitly enabled (#2805) @tfmf + - Improvements to DE translation (#2192) @ketzu + + +Runtime + + - Handle `undefined` error passed to node.error (#2781) @johnwang71 + - Disable nyc coverage reporting on older node versions + - Improve Editor API unit test coverage (#2777) @aaronmyatt + + +Nodes + + - Trigger: ensure timestamp option sends .now() at point of sending + + ### 1.2.6: Maintenance Release diff --git a/package.json b/package.json index 3bbb2f323..1050b4bff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-red", - "version": "1.2.6", + "version": "1.2.7", "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 ac4021030..89838e602 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": "1.2.6", + "version": "1.2.7", "license": "Apache-2.0", "main": "./lib/index.js", "repository": { @@ -16,8 +16,8 @@ } ], "dependencies": { - "@node-red/util": "1.2.6", - "@node-red/editor-client": "1.2.6", + "@node-red/util": "1.2.7", + "@node-red/editor-client": "1.2.7", "bcryptjs": "2.4.3", "body-parser": "1.19.0", "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 06034b997..5adb7deed 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": "1.2.6", + "version": "1.2.7", "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 1c8574e90..25b277921 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": "1.2.6", + "version": "1.2.7", "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 174ce5b12..74816922e 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": "1.2.6", + "version": "1.2.7", "license": "Apache-2.0", "main": "./lib/index.js", "repository": { @@ -16,7 +16,7 @@ } ], "dependencies": { - "@node-red/util": "1.2.6", + "@node-red/util": "1.2.7", "semver": "6.3.0", "tar": "6.0.5", "uglify-js": "3.12.4", diff --git a/packages/node_modules/@node-red/runtime/package.json b/packages/node_modules/@node-red/runtime/package.json index 7375bf9af..10adaa423 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": "1.2.6", + "version": "1.2.7", "license": "Apache-2.0", "main": "./lib/index.js", "repository": { @@ -16,8 +16,8 @@ } ], "dependencies": { - "@node-red/registry": "1.2.6", - "@node-red/util": "1.2.6", + "@node-red/registry": "1.2.7", + "@node-red/util": "1.2.7", "async-mutex": "0.2.6", "clone": "2.1.2", "express": "4.17.1", diff --git a/packages/node_modules/@node-red/util/package.json b/packages/node_modules/@node-red/util/package.json index 8878e4245..fafa7f6ec 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": "1.2.6", + "version": "1.2.7", "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 533b033d1..3f18a811e 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": "1.2.6", + "version": "1.2.7", "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": "1.2.6", - "@node-red/runtime": "1.2.6", - "@node-red/util": "1.2.6", - "@node-red/nodes": "1.2.6", + "@node-red/editor-api": "1.2.7", + "@node-red/runtime": "1.2.7", + "@node-red/util": "1.2.7", + "@node-red/nodes": "1.2.7", "basic-auth": "2.0.1", "bcryptjs": "2.4.3", "express": "4.17.1", From 06ceb056f36ada560e66c16e71453c1c15dd0795 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 7 Jan 2021 10:09:49 +0000 Subject: [PATCH 15/15] Update build.yml --- .github/workflows/build.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ed34b9fad..b7239546c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,5 +1,6 @@ name: PublishDockerImage - +env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true on: release: types: [published] @@ -27,8 +28,6 @@ jobs: with: node-version: '12' - run: node ./node-red/.github/scripts/update-node-red-docker.js - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true - name: Create Docker Pull Request uses: peter-evans/create-pull-request@v2 with: