frodovdr
/
node-red
mirror of https://github.com/node-red/node-red.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dev' into monaco2

This commit is contained in:
Steve-Mcl 2021-05-01 21:56:45 +01:00
parent a72bdfdacc b0e4fb7602
commit 0a80186a92
5 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/node_modules/@node-red/editor-client/src/js/ui/tab-info.js vendored
View File

@ -499,7 +499,7 @@ RED.sidebar.info = (function() {
if (tipCount === -1) { if (tipCount === -1) {
do { do {
tipCount++; tipCount++;
} while(RED._("infotips:info.tip"+tipCount)!=="infotips:info.tip"+tipCount); } while(RED._("infotips:info.tip"+tipCount)!=="info.tip"+tipCount);
} }
startTimeout = setTimeout(setTip,startDelay); startTimeout = setTimeout(setTip,startDelay);
} }

2
packages/node_modules/@node-red/nodes/core/common/20-inject.html vendored
View File

@ -455,7 +455,7 @@
var propertyValue = $('<input/>',{class:"node-input-prop-property-value",type:"text"}) var propertyValue = $('<input/>',{class:"node-input-prop-property-value",type:"text"})
.css("width","calc(70% - 30px)") .css("width","calc(70% - 30px)")
.appendTo(row) .appendTo(row)
.typedInput({default:'str',types:['msg','flow','global','str','num','bool','json','bin','date','jsonata','env']}); .typedInput({default:'str',types:['flow','global','str','num','bool','json','bin','date','jsonata','env','msg']});
propertyName.typedInput('value',prop.p); propertyName.typedInput('value',prop.p);

2
packages/node_modules/@node-red/registry/lib/externalModules.js vendored
View File

@ -194,7 +194,7 @@ async function installModule(moduleDetails) {
"module": moduleDetails.module, "module": moduleDetails.module,
"version": moduleDetails.version, "version": moduleDetails.version,
"dir": installDir, "dir": installDir,
"args": ["--production"] "args": ["--production","--engine-strict"]
} }
return hooks.trigger("preInstall", triggerPayload).then((result) => { return hooks.trigger("preInstall", triggerPayload).then((result) => {
// preInstall passed // preInstall passed

2
packages/node_modules/@node-red/registry/lib/installer.js vendored
View File

@ -175,7 +175,7 @@ async function installModule(module,version,url) {
"dir": installDir, "dir": installDir,
"isExisting": isExisting, "isExisting": isExisting,
"isUpgrade": isUpgrade, "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) => { return hooks.trigger("preInstall", triggerPayload).then((result) => {

7
test/unit/@node-red/registry/lib/externalModules_spec.js
View File

@ -48,13 +48,14 @@ describe("externalModules api", function() {
beforeEach(function() { beforeEach(function() {
sinon.stub(exec,"run").callsFake(async function(cmd, args, options) { sinon.stub(exec,"run").callsFake(async function(cmd, args, options) {
let error; let error;
if (args[2] === "moduleNotFound") { let moduleName = args[args.length-1];
if (moduleName === "moduleNotFound") {
error = new Error(); error = new Error();
error.stderr = "E404"; error.stderr = "E404";
} else if (args[2] === "moduleVersionNotFound") { } else if (moduleName === "moduleVersionNotFound") {
error = new Error(); error = new Error();
error.stderr = "ETARGET"; error.stderr = "ETARGET";
} else if (args[2] === "moduleFail") { } else if (moduleName === "moduleFail") {
error = new Error(); error = new Error();
error.stderr = "Some unexpected install error"; error.stderr = "Some unexpected install error";
} }