From d1aa1fd4d8154afaa6d3d9124d1855763d7df344 Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Tue, 27 Apr 2021 11:15:16 +0100 Subject: [PATCH 1/5] reorder inject typedinput to de-empahsise context options --- .../node_modules/@node-red/nodes/core/common/20-inject.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html index 22b98cc9c..870192480 100644 --- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html +++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html @@ -455,7 +455,7 @@ var propertyValue = $('',{class:"node-input-prop-property-value",type:"text"}) .css("width","calc(70% - 30px)") .appendTo(row) - .typedInput({default:'str',types:['msg','flow','global','str','num','bool','json','bin','date','jsonata','env']}); + .typedInput({default:'str',types:['str','num','bool','json','bin','date','jsonata','env','global','flow','msg']}); propertyName.typedInput('value',prop.p); From 19d391fa05f36e30cfa6cdee414717e985b23308 Mon Sep 17 00:00:00 2001 From: Dave Conway-Jones Date: Tue, 27 Apr 2021 11:28:01 +0100 Subject: [PATCH 2/5] only move msg. instead --- .../node_modules/@node-red/nodes/core/common/20-inject.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html index 870192480..c892c4867 100644 --- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html +++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html @@ -455,7 +455,7 @@ var propertyValue = $('',{class:"node-input-prop-property-value",type:"text"}) .css("width","calc(70% - 30px)") .appendTo(row) - .typedInput({default:'str',types:['str','num','bool','json','bin','date','jsonata','env','global','flow','msg']}); + .typedInput({default:'str',types:['flow','global','str','num','bool','json','bin','date','jsonata','env','msg']}); propertyName.typedInput('value',prop.p); From 676f790933b9a1f403e0f961c25a1230ba4d0c80 Mon Sep 17 00:00:00 2001 From: nileio Date: Wed, 28 Apr 2021 22:40:17 +1000 Subject: [PATCH 3/5] add engine-strict flag to npm install args --- packages/node_modules/@node-red/registry/lib/externalModules.js | 2 +- packages/node_modules/@node-red/registry/lib/installer.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/node_modules/@node-red/registry/lib/externalModules.js b/packages/node_modules/@node-red/registry/lib/externalModules.js index 726c5384e..c69859420 100644 --- a/packages/node_modules/@node-red/registry/lib/externalModules.js +++ b/packages/node_modules/@node-red/registry/lib/externalModules.js @@ -194,7 +194,7 @@ async function installModule(moduleDetails) { "module": moduleDetails.module, "version": moduleDetails.version, "dir": installDir, - "args": ["--production"] + "args": ["--production","--engine-strict"] } return hooks.trigger("preInstall", triggerPayload).then((result) => { // preInstall passed diff --git a/packages/node_modules/@node-red/registry/lib/installer.js b/packages/node_modules/@node-red/registry/lib/installer.js index e3aec476b..e06beeeef 100644 --- a/packages/node_modules/@node-red/registry/lib/installer.js +++ b/packages/node_modules/@node-red/registry/lib/installer.js @@ -175,7 +175,7 @@ async function installModule(module,version,url) { "dir": installDir, "isExisting": isExisting, "isUpgrade": isUpgrade, - "args": ['--no-audit','--no-update-notifier','--no-fund','--save','--save-prefix=~','--production'] + "args": ['--no-audit','--no-update-notifier','--no-fund','--save','--save-prefix=~','--production','--engine-strict'] } return hooks.trigger("preInstall", triggerPayload).then((result) => { From 00caa13a12cc693717b465b4c7acc75df84c3970 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Thu, 29 Apr 2021 11:04:19 +0100 Subject: [PATCH 4/5] Update externalModules_spec to handle variable npm args length --- test/unit/@node-red/registry/lib/externalModules_spec.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/unit/@node-red/registry/lib/externalModules_spec.js b/test/unit/@node-red/registry/lib/externalModules_spec.js index 5a2e8cb36..02b5a7b24 100644 --- a/test/unit/@node-red/registry/lib/externalModules_spec.js +++ b/test/unit/@node-red/registry/lib/externalModules_spec.js @@ -48,13 +48,14 @@ describe("externalModules api", function() { beforeEach(function() { sinon.stub(exec,"run").callsFake(async function(cmd, args, options) { let error; - if (args[2] === "moduleNotFound") { + let moduleName = args[args.length-1]; + if (moduleName === "moduleNotFound") { error = new Error(); error.stderr = "E404"; - } else if (args[2] === "moduleVersionNotFound") { + } else if (moduleName === "moduleVersionNotFound") { error = new Error(); error.stderr = "ETARGET"; - } else if (args[2] === "moduleFail") { + } else if (moduleName === "moduleFail") { error = new Error(); error.stderr = "Some unexpected install error"; } From b0e4fb760223004fb48db5485b5a686725d5d781 Mon Sep 17 00:00:00 2001 From: Nick O'Leary Date: Fri, 30 Apr 2021 13:54:25 +0100 Subject: [PATCH 5/5] Fix infotip display following i18n update --- .../node_modules/@node-red/editor-client/src/js/ui/tab-info.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js index bf03d2146..48d867554 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js @@ -499,7 +499,7 @@ RED.sidebar.info = (function() { if (tipCount === -1) { do { tipCount++; - } while(RED._("infotips:info.tip"+tipCount)!=="infotips:info.tip"+tipCount); + } while(RED._("infotips:info.tip"+tipCount)!=="info.tip"+tipCount); } startTimeout = setTimeout(setTip,startDelay); }