pull/4356/merge
hlovdal 2025-03-18 07:32:23 +00:00 committed by GitHub
commit 8a483ddf69
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 28 deletions

1
.ackrc Normal file
View File

@ -0,0 +1 @@
--noignore-dir=packages/node_modules

View File

@ -46,7 +46,8 @@ If you've got a bug-fix or similar for us, then you are most welcome to
get it raised - just make sure you link back to the issue it's fixing and
try to include some tests!
All contributors need to sign the OpenJS Foundation's Contributor License Agreement.
All contributors need to sign the OpenJS Foundation's
[Contributor License Agreement](https://openjsf.org/about/the-openjs-foundation-cla/).
It is an online process and quick to do. If you raise a pull-request without
having signed the CLA, you will be prompted to do so automatically.

View File

@ -65,7 +65,7 @@ function loadModuleTypeFiles(module, type) {
moduleFn = parts.slice(0,nmi+2).join(path.sep);
}
if (!moduleFn) {
// shortcut - skip calling statSync on empty string
// shortcut - skip calling statSync on empty string
break; // Module not found, don't attempt to load its nodes
}
try {
@ -347,7 +347,6 @@ async function loadPluginConfig(fileInfo) {
function loadNodeSet(node) {
if (!node.enabled) {
return Promise.resolve(node);
} else {
}
try {
var loadPromise = null;
@ -377,7 +376,6 @@ function loadNodeSet(node) {
} catch(err) {
node.err = err;
var stack = err.stack;
var message;
if (stack) {
var filePath = node.file;
try {

View File

@ -250,7 +250,7 @@ function scanDirForNodesModules(dir,moduleName,packageDetails) {
/*
1. if !exist(package.json) || !package.json.has(node-red) => look for node_modules
2. exist(package.json) && package.json.has(node-red) => load this only
3. in original scan of nodesDir, ignore if:(exist(package.json) && package.json.has(node-red))
3. in original scan of nodesDir, ignore if:(exist(package.json) && package.json.has(node-red))
*/
if (nodesDir) {
for (let dirIndex = 0; dirIndex < nodesDir.length; dirIndex++) {
@ -542,7 +542,7 @@ function getPackageList() {
return list;
}
/**
* Gets the package json object for the supplied `dir`.
* Gets the package json object for the supplied `dir`.
* If there is no package.json or the `node-red` section is missing, `result.isNodeRedModule` will be `false`.
* If there is no package.json `isPackage` will be `false`.
* If an error occurs, `result.error` will contain the error.
@ -550,7 +550,7 @@ function getPackageList() {
*/
function getPackageDetails(dir) {
const result = {
/** @type {string} The package directory */
/** @type {string} The package directory */
moduleDir: dir,
/** @type {string} The full file path of package.json for this package */
packageFile: null,
@ -579,7 +579,7 @@ function getPackageList() {
result.isNodeRedModule = typeof result.package['node-red'] === 'object'
if(result.isNodeRedModule) {
result.isNodeRedModule = true;
result.allowed = registryUtil.checkModuleAllowed(pkg.name,pkg.version,loadAllowList,loadDenyList)
result.allowed = registryUtil.checkModuleAllowed(pkg.name,pkg.version,loadAllowList,loadDenyList)
}
}
} catch(err) {

View File

@ -539,25 +539,6 @@ function checkTypeInUse(id) {
}
}
function updateMissingTypes() {
var subflowInstanceRE = /^subflow:(.+)$/;
activeFlowConfig.missingTypes = [];
for (var id in activeFlowConfig.allNodes) {
if (activeFlowConfig.allNodes.hasOwnProperty(id)) {
var node = activeFlowConfig.allNodes[id];
if (node.type !== 'tab' && node.type !== 'subflow') {
var subflowDetails = subflowInstanceRE.exec(node.type);
if ( (subflowDetails && !activeFlowConfig.subflows[subflowDetails[1]]) || (!subflowDetails && !typeRegistry.get(node.type)) ) {
if (activeFlowConfig.missingTypes.indexOf(node.type) === -1) {
activeFlowConfig.missingTypes.push(node.type);
}
}
}
}
}
}
async function addFlow(flow, user) {
var i,node;
if (!flow.hasOwnProperty('nodes')) {
@ -830,7 +811,7 @@ module.exports = {
get:getNode,
eachNode: eachNode,
/**
* Gets the current flow configuration
*/