Add RED.import to support importing ES6 modules

packages/node_modules/@node-red/nodes/core/function/10-function.js

@@ -290,6 +290,7 @@ module.exports = function(RED) {
             };
             sandbox.promisify = util.promisify;
         }
+        const moduleLoadPromises = [];
 
         if (node.hasOwnProperty("libs")) {
             let moduleErrors = false;
@@ -303,25 +304,20 @@ module.exports = function(RED) {
                         return;
                     }
                     sandbox[vname] = null;
-                    try {
                     var spec = module.module;
                     if (spec && (spec !== "")) {
-                            var lib = RED.require(module.module);
+                        RED.import(module.module).then(lib => {
                             sandbox[vname] = lib;
-                        }
-                    } catch (e) {
-                        //TODO: NLS error message
-                        node.error(RED._("function.error.moduleLoadError",{module:module.spec, error:e.toString()}))
+                        }).catch(err => {
+                            node.error(RED._("function.error.moduleLoadError",{module:module.spec, error:err.toString()}))
                             moduleErrors = true;
+                            throw err;
+                        });
                     }
                 }
             });
-            if (moduleErrors) {
-                throw new Error(RED._("function.error.externalModuleLoadError"));
         }
-        }
-
-
+        Promise.all(moduleLoadPromises).then(() => {
             const RESOLVING = 0;
             const RESOLVED = 1;
             const ERROR = 2;
@@ -496,6 +492,9 @@ module.exports = function(RED) {
                 updateErrorInfo(err);
                 node.error(err);
             }
+        }).catch(err => {
+            throw new Error(RED._("function.error.externalModuleLoadError"));
+        });
     }
     RED.nodes.registerType("function",FunctionNode, {
         dynamicModuleList: "libs",

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

@@ -48,7 +48,7 @@ async function refreshExternalModules() {
     const externalModuleDir = getInstallDir();
     try {
         const pkgFile = JSON.parse(await fs.readFile(path.join(externalModuleDir,"package.json"),"utf-8"));
-        knownExternalModules = pkgFile.dependencies;
+        knownExternalModules = pkgFile.dependencies || {};
     } catch(err) {
         knownExternalModules = {};
     }
@@ -101,6 +101,31 @@ function requireModule(module) {
     const moduleDir = path.join(externalModuleDir,"node_modules",module);
     return require(moduleDir);
 }
+function importModule(module) {
+    if (!registryUtil.checkModuleAllowed( module, null,installAllowList,installDenyList)) {
+        const e = new Error("Module not allowed");
+        e.code = "module_not_allowed";
+        throw e;
+    }
+
+    const parsedModule = parseModuleName(module);
+
+    if (BUILTIN_MODULES.indexOf(parsedModule.module) !== -1) {
+        return import(parsedModule.module);
+    }
+    if (!knownExternalModules[parsedModule.module]) {
+        const e = new Error("Module not allowed");
+        e.code = "module_not_allowed";
+        throw e;
+    }
+    const externalModuleDir = getInstallDir();
+    const moduleDir = path.join(externalModuleDir,"node_modules",module);
+    // Import needs the full path to the module's main .js file
+    const moduleFile = require.resolve(moduleDir);
+    return import(moduleFile);
+}
+
+
 
 function parseModuleName(module) {
     var match = /((?:@[^/]+\/)?[^/@]+)(?:@([\s\S]+))?/.exec(module);
@@ -254,5 +279,6 @@ module.exports = {
     register: register,
     registerSubflow: registerSubflow,
     checkFlowDependencies: checkFlowDependencies,
-    require: requireModule
+    require: requireModule,
+    import: importModule
 }

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

@@ -50,6 +50,16 @@ function requireModule(name) {
         return require("./externalModules").require(name);
     }
 }
+function importModule(name) {
+    var moduleInfo = require("./index").getModuleInfo(name);
+    if (moduleInfo && moduleInfo.path) {
+        var relPath = path.relative(__dirname, moduleInfo.path);
+        return import(relPath);
+    } else {
+        // Require it here to avoid the circular dependency
+        return require("./externalModules").import(name);
+    }
+}
 
 function createNodeApi(node) {
     var red = {
@@ -61,6 +71,7 @@ function createNodeApi(node) {
         util: runtime.util,
         version: runtime.version,
         require: requireModule,
+        import: importModule,
         comms: {
             publish: function(topic,data,retain) {
                 events.emit("comms",{