Fix missing node icons in workspace

Merge pull request #4564 from node-red/rel315
Bump for 3.1.5 release
2025-03-01 10:36:34 +00:00 · 2024-02-19 16:07:22 +00:00 · 2024-02-08 15:37:48 +00:00 · 2024-02-08 15:32:53 +00:00 · 2024-02-07 15:24:10 +00:00 · 2024-02-07 14:52:17 +00:00
12 changed files with 30 additions and 22 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+#### 3.1.5: Maintenance Release
+
+Runtime
+
+ - Fix require of dns module (#4562) @knolleary
+ - Ensure global creds object is initialised when adding first cred (#4561) @knolleary
+
 #### 3.1.4: Maintenance Release

 Editor
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
    "name": "node-red",
-    "version": "3.1.4",
+    "version": "3.1.5",
    "description": "Low-code programming for event-driven applications",
    "homepage": "https://nodered.org",
    "license": "Apache-2.0",
--- 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.4",
+    "version": "3.1.5",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,8 +16,8 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "3.1.4",
-        "@node-red/editor-client": "3.1.4",
+        "@node-red/util": "3.1.5",
+        "@node-red/editor-client": "3.1.5",
        "bcryptjs": "2.4.3",
        "body-parser": "1.20.2",
        "clone": "2.1.2",
--- 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.4",
+    "version": "3.1.5",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- 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
@@ -4156,7 +4156,7 @@ RED.view = (function() {
                    }
                    var width = img.width * scaleFactor;
                    if (width > 20) {
-                        scalefactor *= 20/width;
+                        scaleFactor *= 20/width;
                        width = 20;
                    }
                    var height = img.height * scaleFactor;
--- 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.4",
+    "version": "3.1.5",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- 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.4",
+    "version": "3.1.5",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,7 +16,7 @@
        }
    ],
    "dependencies": {
-        "@node-red/util": "3.1.4",
+        "@node-red/util": "3.1.5",
        "clone": "2.1.2",
        "fs-extra": "11.1.1",
        "semver": "7.5.4",
--- a/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
+++ b/packages/node_modules/@node-red/runtime/lib/nodes/credentials.js
@@ -384,7 +384,8 @@ var api = module.exports = {
                    }
                }
            } else if (nodeType === "global-config") {
-                const existingCredentialKeys = Object.keys(savedCredentials?.map || [])
+                savedCredentials.map = savedCredentials.map || {}
+                const existingCredentialKeys = Object.keys(savedCredentials.map)
                const newCredentialKeys = Object.keys(newCreds?.map || [])
                existingCredentialKeys.forEach(key => {
                    if (!newCreds.map?.[key]) {
@@ -396,7 +397,7 @@ var api = module.exports = {
                })
                newCredentialKeys.forEach(key => {
                    if (!/^has_/.test(key)) {
-                        if (!savedCredentials.map?.[key] || newCreds.map[key] !== '__PWRD__') {
+                        if (!savedCredentials.map[key] || newCreds.map[key] !== '__PWRD__') {
                            // This key either doesn't exist in current saved, or the
                            // value has been changed
                            savedCredentials.map[key] = newCreds.map[key]
--- 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.4",
+    "version": "3.1.5",
    "license": "Apache-2.0",
    "main": "./lib/index.js",
    "repository": {
@@ -16,8 +16,8 @@
        }
    ],
    "dependencies": {
-        "@node-red/registry": "3.1.4",
-        "@node-red/util": "3.1.4",
+        "@node-red/registry": "3.1.5",
+        "@node-red/util": "3.1.5",
        "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.4",
+    "version": "3.1.5",
    "license": "Apache-2.0",
    "repository": {
        "type": "git",
--- a/packages/node_modules/node-red/lib/red.js
+++ b/packages/node_modules/node-red/lib/red.js
@@ -26,8 +26,8 @@ var server = null;
 var apiEnabled = false;

 const NODE_MAJOR_VERSION = process.versions.node.split('.')[0];
-if (NODE_MAJOR_VERSION > 14) {
-    const dns = require('node:dns');
+if (NODE_MAJOR_VERSION >= 16) {
+    const dns = require('dns');
    dns.setDefaultResultOrder('ipv4first');
 }

--- a/packages/node_modules/node-red/package.json
+++ b/packages/node_modules/node-red/package.json
@@ -1,6 +1,6 @@
 {
    "name": "node-red",
-    "version": "3.1.4",
+    "version": "3.1.5",
    "description": "Low-code programming for event-driven applications",
    "homepage": "https://nodered.org",
    "license": "Apache-2.0",
@@ -31,10 +31,10 @@
        "flow"
    ],
    "dependencies": {
-        "@node-red/editor-api": "3.1.4",
-        "@node-red/runtime": "3.1.4",
-        "@node-red/util": "3.1.4",
-        "@node-red/nodes": "3.1.4",
+        "@node-red/editor-api": "3.1.5",
+        "@node-red/runtime": "3.1.5",
+        "@node-red/util": "3.1.5",
+        "@node-red/nodes": "3.1.5",
        "basic-auth": "2.0.1",
        "bcryptjs": "2.4.3",
        "express": "4.18.2",
Author	SHA1	Message	Date
Nick O'Leary	aeb79bce2a	Fix missing node icons in workspace	2024-02-19 16:07:22 +00:00
Nick O'Leary	b10ef4c98c	Merge pull request #4564 from node-red/rel315 Bump for 3.1.5 release	2024-02-08 15:37:48 +00:00
Nick O'Leary	3ff038fb98	Bump for 3.1.5 release	2024-02-08 15:32:53 +00:00
Nick O'Leary	adb498af24	Merge pull request #4562 from node-red/fix-require Fix require of dns module	2024-02-07 15:24:10 +00:00
Nick O'Leary	fc67a2efc2	Merge pull request #4561 from node-red/4560-fix-global-env-cred Ensure global creds object is initialised when adding first cred	2024-02-07 14:52:17 +00:00
Nick O'Leary	55771c7241	Fix require of dns module	2024-02-07 14:50:46 +00:00
Nick O'Leary	109fa5f04e	Ensure global creds object is initialised when adding first cred	2024-02-07 10:02:22 +00:00