diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a278b223..ed34b9fad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,9 +27,8 @@ jobs: with: node-version: '12' - run: node ./node-red/.github/scripts/update-node-red-docker.js - with: - env: - ACTIONS_ALLOW_UNSECURE_COMMANDS: true + env: + ACTIONS_ALLOW_UNSECURE_COMMANDS: true - name: Create Docker Pull Request uses: peter-evans/create-pull-request@v2 with: diff --git a/.travis.yml b/.travis.yml index 315eb07a8..4cd0dffe1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,5 +11,11 @@ matrix: before_script: - npm install -g coveralls - node_js: "12" + script: + - ./node_modules/.bin/grunt no-coverage - node_js: "10" + script: + - ./node_modules/.bin/grunt no-coverage - node_js: "8" + script: + - ./node_modules/.bin/grunt no-coverage diff --git a/CHANGELOG.md b/CHANGELOG.md index e9d7ba010..c12019755 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,23 @@ +### 1.2.6: Maintenance Release + + +Editor + + - Update Japanese translations for 1.2.5 (#2764) @kazuhitoyokoi + - Library: properly handle symlinked folders (#2768) @natcl + +Runtime + + - Support Windows paths when installing tarball by path name Fixes #2769 + - Fix unsecure command usage in GH Action + +Nodes + + - Update MQTT to latest to fix Node 8 URL breakage + + + + ### 1.2.5: Maintenance Release Editor diff --git a/Gruntfile.js b/Gruntfile.js index 6272e9818..b01763ab0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -623,6 +623,11 @@ module.exports = function(grunt) { 'Builds editor content then runs code style checks and unit tests on all components', ['build','verifyPackageDependencies','jshint:editor','nyc:all']); + grunt.registerTask('no-coverage', + 'Builds editor content then runs code style checks and unit tests on all components without code coverage', + ['build','verifyPackageDependencies','jshint:editor','simplemocha:all']); + + grunt.registerTask('test-core', 'Runs code style check and unit tests on core runtime code', ['build','nyc:core']); diff --git a/package.json b/package.json index 15abf0507..3ff26d859 100644 --- a/package.json +++ b/package.json @@ -56,7 +56,7 @@ "memorystore": "1.6.4", "mime": "2.4.6", "moment-timezone": "0.5.32", - "mqtt": "4.2.5", + "mqtt": "4.2.6", "multer": "1.4.2", "mustache": "4.0.1", "node-red-admin": "^0.2.6", @@ -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.4", + "marked": "1.2.5", "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-client/locales/ja/editor.json b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json index 723bee1cd..f5774d57d 100644 --- a/packages/node_modules/@node-red/editor-client/locales/ja/editor.json +++ b/packages/node_modules/@node-red/editor-client/locales/ja/editor.json @@ -1089,6 +1089,7 @@ "en-US": "英語", "ja": "日本語", "ko": "韓国語", + "ru": "ロシア語", "zh-CN": "中国語(簡体)", "zh-TW": "中国語(繁体)" } diff --git a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js index 7b5b820b7..910043d33 100644 --- a/packages/node_modules/@node-red/nodes/core/function/89-trigger.js +++ b/packages/node_modules/@node-red/nodes/core/function/89-trigger.js @@ -179,7 +179,10 @@ module.exports = function(RED) { /* istanbul ignore else */ if (node.op1type !== "nul") { var msg2 = RED.util.cloneMessage(msg); - node.topics[topic].tout = setInterval(function() { node.send(RED.util.cloneMessage(msg2)); }, delayDuration); + node.topics[topic].tout = setInterval(function() { + if (node.op1type === "date") { msg2.payload = Date.now(); } + node.send(RED.util.cloneMessage(msg2)); + }, delayDuration); } } else { @@ -209,6 +212,7 @@ module.exports = function(RED) { } else { msg2.payload = node.topics[topic].m2; + if (node.op2type === "date") { msg2.payload = Date.now(); } if (node.second === true) { node.send([null,msg2]); } else { node.send(msg2); } } diff --git a/packages/node_modules/@node-red/nodes/package.json b/packages/node_modules/@node-red/nodes/package.json index bf7f3a362..07c107af7 100644 --- a/packages/node_modules/@node-red/nodes/package.json +++ b/packages/node_modules/@node-red/nodes/package.json @@ -31,7 +31,7 @@ "is-utf8": "0.2.1", "js-yaml": "3.14.0", "media-typer": "1.1.0", - "mqtt": "4.2.5", + "mqtt": "4.2.6", "multer": "1.4.2", "mustache": "4.0.1", "on-headers": "1.0.2", diff --git a/packages/node_modules/@node-red/registry/lib/installer.js b/packages/node_modules/@node-red/registry/lib/installer.js index 19cdd7e27..03f9eb11c 100644 --- a/packages/node_modules/@node-red/registry/lib/installer.js +++ b/packages/node_modules/@node-red/registry/lib/installer.js @@ -35,7 +35,7 @@ var settings; const moduleRe = /^(@[^/@]+?[/])?[^/@]+?$/; const slashRe = process.platform === "win32" ? /\\|[/]/ : /[/]/; const pkgurlRe = /^(https?|git(|\+https?|\+ssh|\+file)):\/\//; -const localtgzRe = /^\/.+tgz$/; +const localtgzRe = /^([a-zA-Z]:|\/).+tgz$/; function init(runtime) { events = runtime.events; diff --git a/packages/node_modules/@node-red/runtime/locales/ja/runtime.json b/packages/node_modules/@node-red/runtime/locales/ja/runtime.json index ff871e3c2..6f3d07c6d 100644 --- a/packages/node_modules/@node-red/runtime/locales/ja/runtime.json +++ b/packages/node_modules/@node-red/runtime/locales/ja/runtime.json @@ -169,6 +169,7 @@ "error-invalid-default-module": "デフォルトコンテキストストアが不明: '__storage__'", "unknown-store": "不明なコンテキストストア '__name__' が指定されました。デフォルトストアを使用します。", "localfilesystem": { + "invalid-json": "コンテキストファイル '__file__' のJSONが不正", "error-circular": "コンテキスト __scope__ は永続化できない循環参照を含んでいます", "error-write": "コンテキスト書込みエラー: __message__" }