From 9498c47552e9aa6d92eb3812f1f0b8bd836a0a6e Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Tue, 29 Mar 2022 11:32:27 +0900 Subject: [PATCH 1/8] Add subflow information to README.md if node infomation exists --- templates/subflow/README.md.mustache | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/subflow/README.md.mustache b/templates/subflow/README.md.mustache index cae8709..a3b2239 100644 --- a/templates/subflow/README.md.mustache +++ b/templates/subflow/README.md.mustache @@ -9,6 +9,8 @@ Run the following command in your Node-RED user directory - typically `~/.node-r npm install {{&projectName}} +{{#nodeRead}} ## Information {{&nodeRead}} +{{/nodeRead}} From 9bd0152c92e65c04e9bae1ccfdddbef3012d62f9 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Tue, 29 Mar 2022 11:34:25 +0900 Subject: [PATCH 2/8] Change JSON indents from tabs to spaces --- lib/subflow/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/subflow/index.js b/lib/subflow/index.js index 8a3d0a4..daf2fe5 100644 --- a/lib/subflow/index.js +++ b/lib/subflow/index.js @@ -54,7 +54,7 @@ function createJSON(dstPath, flow, encoding, key) { else { sf.flow = newFlow; } - const data = JSON.stringify(sf, null, "\t"); + const data = JSON.stringify(sf, null, 4); fs.writeFileSync(dstPath, data); } From 07e6af68cf7c9c5b2b99c983e6dfd63de28dc8d3 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Tue, 29 Mar 2022 11:41:08 +0900 Subject: [PATCH 3/8] Change package.json indents from 4 spaces to 2 spaces --- templates/webofthings/package.json.mustache | 68 ++++++++++----------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/templates/webofthings/package.json.mustache b/templates/webofthings/package.json.mustache index a134e96..bf9f73d 100644 --- a/templates/webofthings/package.json.mustache +++ b/templates/webofthings/package.json.mustache @@ -1,37 +1,37 @@ { - "name": "{{&projectName}}", - "version": "{{&projectVersion}}", - "description": "Node-RED node for {{&nodeName}}", - "main": "node.js", - "scripts": { - "test": "mocha \"test/**/*_spec.js\"" - }, - "node-red": { - "nodes": { - "{{&nodeName}}": "node.js" - } - }, - "keywords": [ - {{#keywords}} - "{{name}}"{{^last}}, {{/last}} - {{/keywords}} - ], - "dependencies": { - "https-proxy-agent": "5.0.0", - "request": "2.88.2", - "ws": "8.5.0", - "url-template": "2.0.8", - "ajv": "8.10.0", - "coap": "1.0.3" - }, - "devDependencies": { - "node-red": "2.2.2", - "node-red-node-test-helper": "0.2.7" - }, - "license": "{{&licenseName}}", - "wot": { - {{#wotmeta}} - "{{name}}": "{{value}}"{{^last}}, {{/last}} - {{/wotmeta}} + "name": "{{&projectName}}", + "version": "{{&projectVersion}}", + "description": "Node-RED node for {{&nodeName}}", + "main": "node.js", + "scripts": { + "test": "mocha \"test/**/*_spec.js\"" + }, + "node-red": { + "nodes": { + "{{&nodeName}}": "node.js" } + }, + "keywords": [ + {{#keywords}} + "{{name}}"{{^last}}, {{/last}} + {{/keywords}} + ], + "dependencies": { + "https-proxy-agent": "5.0.0", + "request": "2.88.2", + "ws": "8.5.0", + "url-template": "2.0.8", + "ajv": "8.10.0", + "coap": "1.0.3" + }, + "devDependencies": { + "node-red": "2.2.2", + "node-red-node-test-helper": "0.2.7" + }, + "license": "{{&licenseName}}", + "wot": { + {{#wotmeta}} + "{{name}}": "{{value}}"{{^last}}, {{/last}} + {{/wotmeta}} + } } From 76c7b2b8c507a5f5418e3cfd68147343f8be9b1b Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Tue, 29 Mar 2022 11:44:09 +0900 Subject: [PATCH 4/8] Add the supported version information of Node.js and Node-RED --- templates/function/package.json.mustache | 4 ++++ templates/swagger/package.json.mustache | 4 ++++ templates/webofthings/package.json.mustache | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/templates/function/package.json.mustache b/templates/function/package.json.mustache index 095a498..bf1f3cb 100644 --- a/templates/function/package.json.mustache +++ b/templates/function/package.json.mustache @@ -6,7 +6,11 @@ "scripts": { "test": "mocha \"test/**/*_spec.js\" --timeout 3000" }, + "engines": { + "node": ">=12.0.0" + }, "node-red": { + "version": ">=1.3.7", "nodes": { "{{&nodeName}}": "node.js" } diff --git a/templates/swagger/package.json.mustache b/templates/swagger/package.json.mustache index 67049b0..a15d634 100644 --- a/templates/swagger/package.json.mustache +++ b/templates/swagger/package.json.mustache @@ -6,7 +6,11 @@ "scripts": { "test": "mocha \"test/**/*_spec.js\" --timeout 3000" }, + "engines": { + "node": ">=12.0.0" + }, "node-red": { + "version": ">=1.3.7", "nodes": { "{{&nodeName}}": "node.js" } diff --git a/templates/webofthings/package.json.mustache b/templates/webofthings/package.json.mustache index bf9f73d..4b18e4b 100644 --- a/templates/webofthings/package.json.mustache +++ b/templates/webofthings/package.json.mustache @@ -6,7 +6,11 @@ "scripts": { "test": "mocha \"test/**/*_spec.js\"" }, + "engines": { + "node": ">=12.0.0" + }, "node-red": { + "version": ">=1.3.7", "nodes": { "{{&nodeName}}": "node.js" } From c46251c2bdd02306da8a7b07c68ba72783d45565 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Tue, 29 Mar 2022 11:46:40 +0900 Subject: [PATCH 5/8] Add the supported version information of Node.js and Node-RED --- templates/subflow/package.json.mustache | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/subflow/package.json.mustache b/templates/subflow/package.json.mustache index 9902cc9..a492866 100644 --- a/templates/subflow/package.json.mustache +++ b/templates/subflow/package.json.mustache @@ -7,7 +7,11 @@ "{{name}}"{{^last}}, {{/last}} {{/keywords}} ], + "engines": { + "node": ">=12.0.0" + }, "node-red": { + "version": ">=1.3.7", "nodes": { "{{&nodeName}}": "subflow.js" } From abffe424d28a165d798cc912bafca5c5a73a24d8 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Tue, 29 Mar 2022 18:51:31 +0900 Subject: [PATCH 6/8] Use keywords in subflow for package.json --- lib/subflow/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/subflow/index.js b/lib/subflow/index.js index daf2fe5..bd9e7c5 100644 --- a/lib/subflow/index.js +++ b/lib/subflow/index.js @@ -79,6 +79,7 @@ module.exports = async function(data, options) { if (!data.license || (data.license === "")) { data.license = "unknown"; } + data.keywords = data.keywords || meta.keywords; data.info = meta.info; var params = { From bc65f0ce8e54047f96f286b751d03b1270f508ad Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Tue, 29 Mar 2022 21:13:47 +0900 Subject: [PATCH 7/8] Use file-type@16.5.3 in swagger node to avoid loading error --- templates/swagger/package.json.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/swagger/package.json.mustache b/templates/swagger/package.json.mustache index a15d634..5d7b4f3 100644 --- a/templates/swagger/package.json.mustache +++ b/templates/swagger/package.json.mustache @@ -23,7 +23,7 @@ "dependencies": { "q": "1.5.1", "request": "2.88.2", - "file-type": "17.1.1" + "file-type": "16.5.3" }, "devDependencies": { "mocha": "9.2.1", From b77eca1a59e903da64c9083fc6ec5346bfd1f100 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Tue, 29 Mar 2022 21:59:59 +0900 Subject: [PATCH 8/8] Fix parse error when generating node from yaml file --- lib/swagger/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/swagger/index.js b/lib/swagger/index.js index 2c6d0f5..360802f 100644 --- a/lib/swagger/index.js +++ b/lib/swagger/index.js @@ -24,7 +24,7 @@ async function getSpec(src, data) { let response = await axios.get(src, requestOptions); spec = response.data; } else if (/\.yaml$/.test(src)) { - spec = yamljs.load(util.skipBom(await fs.promises.readFile(src))); + spec = yamljs.load(src); } else if (/\.json/.test(src)) { spec = JSON.parse(util.skipBom(await fs.promises.readFile(src))); } else {