Merge 593eb220a6 into bb01f26f06

packages/node_modules/@node-red/registry/lib/loader.js

@@ -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 {

packages/node_modules/@node-red/registry/lib/localfilesystem.js

@@ -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) {