Merge pull request #4193 from kazuhitoyokoi/prep-310-beta3-jp

Add Japanese translations for v3.1.0-beta.3

CHANGELOG.md

@@ -1,3 +1,38 @@
+#### 3.1.0-beta.3: Beta Release
+
+Editor
+
+ - Select the item that is specified in a deep link URL (#4113) @Steve-Mcl
+ - Update to Monaco 0.38.0 (#4189) @Steve-Mcl
+ - Place subflow outputs/inputs relative to current view (#4183) @knolleary
+ - Enable RED.view.select to select group by id (#4184) @knolleary
+ - Combine existing env vars when merging groups (#4182) @knolleary
+ - Avoid creating empty global-config node if not needed (#4153) @knolleary
+ - Fix group selection when using lasso (#4108) @knolleary
+ - Use editor path in generating localStorage keys (#4151) @mw75
+ - Ensure no node credentials are included when exporting to clipboard (#4112) @knolleary
+ - Fix jsonata expression test ui (#4097) @knolleary
+ - Fix search button in palette popover (#4096) @knolleary
+
+Runtime
+
+ - Allow options object on each httpStatic configuration (#4109) @kevinGodell
+ - Ensure non-zero exit codes for errors (#4181) @knolleary
+ - Ensure external modules are installed synchronously (#4180) @knolleary
+ - Update dependecies include got (#4155) @knolleary
+ - Add Japanese translations for v3.1 beta.2 (#4158) @kazuhitoyokoi
+ - Ensure express server options are applied consistently (#4178) @knolleary
+ - Remove version info from theme endpoint (#4179) @knolleary
+ - Add Japanese translations for welcome tour of 3.1.0 beta.2 (#4145) @kazuhitoyokoi
+ - Added SHA-256 and SHA-512-256 digest authentication (#4100) @sroebert
+ - Add "timers" types to known types (#4103) @Steve-Mcl
+
+Nodes
+
+ - Allow Catch/Status nodes to be scoped to their group (#4185) @NetHans
+ - MQTT: Option to disable MQTT topic unsubscribe on disconnect (#4078) @flying7eleven
+
+
 #### 3.1.0-beta.2: Beta Release
 
 Editor

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "3.1.0-beta.2",
+    "version": "3.1.0-beta.3",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -79,7 +79,7 @@
         "uglify-js": "3.17.4",
         "uuid": "9.0.0",
         "ws": "7.5.6",
-        "xml2js": "0.6.0"
+        "xml2js": "0.5.0"
     },
     "optionalDependencies": {
         "bcrypt": "5.1.0"

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-api",
-    "version": "3.1.0-beta.2",
+    "version": "3.1.0-beta.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "3.1.0-beta.2",
-        "@node-red/editor-client": "3.1.0-beta.2",
+        "@node-red/util": "3.1.0-beta.3",
+        "@node-red/editor-client": "3.1.0-beta.3",
         "bcryptjs": "2.4.3",
         "body-parser": "1.20.2",
         "clone": "2.1.2",

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

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

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

@@ -1,15 +1,15 @@
 export default {
-    version: "3.1.0-beta.2",
+    version: "3.1.0-beta.3",
     steps: [
         {
             titleIcon: "fa fa-map-o",
             title: {
-                "en-US": "Welcome to Node-RED 3.1 Beta 2!",
-                "ja": "Node-RED 3.1 ベータ2へようこそ!"
+                "en-US": "Welcome to Node-RED 3.1 Beta 3!",
+                "ja": "Node-RED 3.1 ベータ3へようこそ!"
             },
             description: {
-                "en-US": "<p>This is the second beta release for 3.1.0 and we have a few new features to tell you about.</p>",
-                "ja": "<p>これは3.1.0の2回目のベータリリースです。いくつかの新機能について説明します。</p>"
+                "en-US": "<p>This is the third beta release for 3.1.0. This is mostly a bug fix release, so you can skip this tour if you've tried the other betas.</p><p>If not, stick around to see what's new in Node-RED 3.1.</p>",
+                "ja": "<p>これは3.1.0の3回目のベータリリースです。不具合修正のリリースのため、もし他のベータ版を試したことがある場合は、このツアーを読み飛ばしてもかまいません。</p><p>そうでない場合は、Node-RED 3.1の新機能を確認してください。</p>"
             }
         },
         {

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

@@ -702,7 +702,8 @@ module.exports = function(RED) {
                 node.options.rejectUnauthorized = (node.verifyservercert == "true" || node.verifyservercert === true);
             }
         }
-
+        node.v5 = () => node.options && node.options.protocolVersion == 5
+        node.subscriptionIdentifiersAvailable = () => node.v5() && node.serverProperties && node.serverProperties.subscriptionIdentifiersAvailable
         n.autoConnect = n.autoConnect === "false" || n.autoConnect === false ? false : true;
         node.setOptions(n, true);
 
@@ -925,7 +926,12 @@ module.exports = function(RED) {
             };
             node.subscriptions[topic][ref] = sub;
             if (node.connected) {
+                const subIdsAvailable = node.subscriptionIdentifiersAvailable()
                 node._clientOn('message',sub.handler);
+                // if the broker doesn't support subscription identifiers (e.g. AWS core), then don't send them
+                if (options.properties && options.properties.subscriptionIdentifier && subIdsAvailable !== true) {
+                    delete options.properties.subscriptionIdentifier
+                }
                 node.client.subscribe(topic, options);
             }
         };

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

@@ -33,7 +33,14 @@ module.exports = function(RED) {
                     parseString(value, options, function (err, result) {
                         if (err) { done(err); }
                         else {
-                            RED.util.setMessageProperty(msg,node.property,result);
+                            // TODO: With xml2js@0.5.0, they return an object with
+                            //       a null prototype. This could cause unexpected
+                            //       issues. So for now, we have to reconstruct
+                            //       the object with a proper prototype.
+                            // Once https://github.com/Leonidas-from-XIV/node-xml2js/pull/674
+                            // is merged, we can revisit and hopefully remove this hack
+                            value = fixObj(result)
+                            RED.util.setMessageProperty(msg,node.property,value);
                             send(msg);
                             done();
                         }
@@ -45,4 +52,18 @@ module.exports = function(RED) {
         });
     }
     RED.nodes.registerType("xml",XMLNode);
+
+
+    function fixObj(obj) {
+        const res = {}
+        const keys = Object.keys(obj)
+        keys.forEach(k => {
+            if (typeof obj[k] === 'object' && obj[k]) {
+                res[k] = fixObj(obj[k])
+            } else {
+                res[k] = obj[k]
+            }
+        })
+        return res
+    }
 }

packages/node_modules/@node-red/nodes/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "3.1.0-beta.2",
+    "version": "3.1.0-beta.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",
@@ -44,7 +44,7 @@
         "tough-cookie": "4.1.2",
         "uuid": "9.0.0",
         "ws": "7.5.6",
-        "xml2js": "0.6.0",
+        "xml2js": "0.5.0",
         "iconv-lite": "0.6.3"
     }
 }

packages/node_modules/@node-red/registry/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "3.1.0-beta.2",
+    "version": "3.1.0-beta.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,7 +16,7 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "3.1.0-beta.2",
+        "@node-red/util": "3.1.0-beta.3",
         "clone": "2.1.2",
         "fs-extra": "11.1.1",
         "semver": "7.5.0",

packages/node_modules/@node-red/runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "3.1.0-beta.2",
+    "version": "3.1.0-beta.3",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "3.1.0-beta.2",
-        "@node-red/util": "3.1.0-beta.2",
+        "@node-red/registry": "3.1.0-beta.3",
+        "@node-red/util": "3.1.0-beta.3",
         "async-mutex": "0.4.0",
         "clone": "2.1.2",
         "express": "4.18.2",

packages/node_modules/@node-red/util/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "3.1.0-beta.2",
+    "version": "3.1.0-beta.3",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/node-red/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "3.1.0-beta.2",
+    "version": "3.1.0-beta.3",
     "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": "3.1.0-beta.2",
-        "@node-red/runtime": "3.1.0-beta.2",
-        "@node-red/util": "3.1.0-beta.2",
-        "@node-red/nodes": "3.1.0-beta.2",
+        "@node-red/editor-api": "3.1.0-beta.3",
+        "@node-red/runtime": "3.1.0-beta.3",
+        "@node-red/util": "3.1.0-beta.3",
+        "@node-red/nodes": "3.1.0-beta.3",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.18.2",