Merge pull request #3132 from hardillb/v1.x-docker-release

Check out corect node-red-docker branch for a release

.github/workflows/build.yml

@@ -18,12 +18,8 @@ jobs:
         uses: actions/checkout@v2
         with:
             repository: 'node-red/node-red-docker'
+            ref: 'v1.x'
             path: 'node-red-docker'
-      - name: Check out node-red.github.io repository
-        uses: actions/checkout@v2
-        with:
-            repository: 'node-red/node-red.github.io'
-            path: 'node-red.github.io'
       - uses: actions/setup-node@v1
         with:
             node-version: '12'
@@ -42,18 +38,4 @@ jobs:
 
             Once this is merged, you will need to create a new release with the tag `v${{ env.newVersion }}`.
 
-            This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary
-      - run: node ./node-red/.github/scripts/update-node-red-website.js
-      - name: Create Website Pull Request
-        uses: peter-evans/create-pull-request@v2
-        with:
-          token: ${{ secrets.NR_REPO_TOKEN }}
-          committer: GitHub <noreply@github.com>
-          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          path: 'node-red.github.io'
-          commit-message: 'Bump to ${{ env.newVersion }}'
-          title: '🚀 Update to Node-RED ${{ env.newVersion }} release'
-          body: |
-            Updates the Node-RED Website repo for the ${{ env.newVersion }} release.
-
             This PR was auto-generated by a GitHub Action. Any questions, speak to @knolleary

CHANGELOG.md

@@ -1,3 +1,45 @@
+### 1.3.7 Maintenance Release
+
+Runtime
+
+ - Update to latest tar module
+
+### 1.3.6 Maintenance Release
+
+Editor
+
+ - Keep proper track of moved/changed state in undo/redo history Fixes #2999
+ - Fix typo in zh-CN translation (#3003) @JiyeYu
+ - Do not assign z property to tab node when updating flow Fixes #3010
+ - Ensure RED.clipboard.import displays the right library Fixes #3021
+ - Handle node icon paths for scoped modules Fixes #3013
+ - Emit nodes:change for any updated config node when node deleted/added (#3047) @knolleary
+ - Fix padding of compact notification Closes #3045
+ - Fix scriptFile handling in themes (#3054) @bonanitech
+ - Fix grip on horizontally displayed panels separator (#3055) @bonanitech
+ - Avoid prototype pollution in RED.view.calculateTextDimensions
+ - Fix focus outline overlap in button-groups Fixes #3070
+
+Runtime
+
+ - Ensure context get/set key is a string (#2993) @Steve-Mcl
+ - Update to latest 6.x ws module
+ - Fix handling of boolean subflow module properties Fixes #3000
+ - Fix over-greeding matching whilst parsing commit history Fixes #3006
+ - Fix allow Flow.getNode to return subflowInstance nodes (#3004) @KazuhiroItoh
+ - Update to latest node-red-admin
+ - Support loading external module sub path Fixes #3023
+ - Add necessary modules and remove unnecessary module in dependencies (#3058) @kazuhitoyokoi
+ - Update dependencies
+
+Nodes
+
+ - CSV: Ensure CSV node tries to parse number when set to do so (trim whitespace)
+ - Switch: Fix handling empty rules (#2991) @HiroyasuNishiyama
+ - Watch node throws errors if new files deleted (#2997) @hardillb
+ - Add full ast parsing in Function node to spot node.done calls Fixes #2998
+
+
 ### 1.3.5 Maintenance Release
 
 Editor

package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.3.5",
+    "version": "1.3.7",
     "description": "Low-code programming for event-driven applications",
     "homepage": "http://nodered.org",
     "license": "Apache-2.0",
@@ -74,7 +74,7 @@
         "raw-body": "2.4.1",
         "request": "2.88.0",
         "semver": "6.3.0",
-        "tar": "6.1.0",
+        "tar": "6.1.11",
         "uglify-js": "3.13.3",
         "ws": "6.2.2",
         "xml2js": "0.4.23"

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

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

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/editor-client",
-    "version": "1.3.5",
+    "version": "1.3.7",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/nodes",
-    "version": "1.3.5",
+    "version": "1.3.7",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "1.3.5",
+    "version": "1.3.7",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,11 +16,11 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "1.3.5",
+        "@node-red/util": "1.3.7",
         "clone": "2.1.2",
         "fs-extra": "8.1.0",
         "semver": "6.3.0",
-        "tar": "6.1.0",
+        "tar": "6.1.11",
         "uglify-js": "3.13.3"
     }
 }

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/runtime",
-    "version": "1.3.5",
+    "version": "1.3.7",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,8 +16,8 @@
         }
     ],
     "dependencies": {
-        "@node-red/registry": "1.3.5",
+        "@node-red/registry": "1.3.7",
-        "@node-red/util": "1.3.5",
+        "@node-red/util": "1.3.7",
         "async-mutex": "0.3.1",
         "clone": "2.1.2",
         "express": "4.17.1",

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

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/util",
-    "version": "1.3.5",
+    "version": "1.3.7",
     "license": "Apache-2.0",
     "repository": {
         "type": "git",

packages/node_modules/node-red/package.json

@@ -1,6 +1,6 @@
 {
     "name": "node-red",
-    "version": "1.3.5",
+    "version": "1.3.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.3.5",
+        "@node-red/editor-api": "1.3.7",
-        "@node-red/runtime": "1.3.5",
+        "@node-red/runtime": "1.3.7",
-        "@node-red/util": "1.3.5",
+        "@node-red/util": "1.3.7",
-        "@node-red/nodes": "1.3.5",
+        "@node-red/nodes": "1.3.7",
         "basic-auth": "2.0.1",
         "bcryptjs": "2.4.3",
         "express": "4.17.1",

scripts/generate-publish-script.js

@@ -4,6 +4,8 @@ const path = require("path");
 const fs = require("fs-extra");
 const should = require("should");
 
+const LATEST = "2";
+
 function generateScript() {
     return new Promise((resolve, reject) => {
         const packages = [
@@ -18,7 +20,13 @@ function generateScript() {
         const rootPackage = require(path.join(__dirname,"..","package.json"));
         const version = rootPackage.version;
 
-        const tagArg = /-/.test(version) ? "--tag next" : ""
+        const versionParts = version.split(".");
+        let tagArg = "";
+        if (versionParts[0] !== LATEST) {
+            tagArg = `--tag v${versionParts[0]}-maintenance`
+        } else if (/-/.test(version))  {
+            tagArg = "--tag next"
+        }
 
         const lines = [];