@node-red/registry 4.0.9 → 4.1.0-beta.2

package/lib/externalModules.js

@@ -92,7 +92,7 @@ function requireModule(module) {
 
     const parsedModule = parseModuleName(module);
 
-    if (BUILTIN_MODULES.indexOf(parsedModule.module) !== -1) {
+    if (parsedModule.builtin) {
         return require(parsedModule.module + parsedModule.subpath);
     }
     if (!knownExternalModules[parsedModule.module]) {
@@ -113,7 +113,7 @@ function importModule(module) {
 
     const parsedModule = parseModuleName(module);
 
-    if (BUILTIN_MODULES.indexOf(parsedModule.module) !== -1) {
+    if (parsedModule.builtin) {
         return import(parsedModule.module + parsedModule.subpath);
     }
     if (!knownExternalModules[parsedModule.module]) {
@@ -135,15 +135,22 @@ function importModule(module) {
 }
 
 function parseModuleName(module) {
-    var match = /((?:@[^/]+\/)?[^/@]+)(\/[^/@]+)?(?:@([\s\S]+))?/.exec(module);
+    const match = /((?:@[^/]+\/)?[^/@]+)(\/[^/@]+)?(?:@([\s\S]+))?/.exec(module);
     if (match) {
+        const moduleName = match[1]
+        let isBuiltIn = false
+        if (/^node:/.test(moduleName)) {
+            isBuiltIn = BUILTIN_MODULES.includes(moduleName.substring(5))
+        } else {
+            isBuiltIn = BUILTIN_MODULES.includes(moduleName)
+        }
         return {
             spec: module,
-            module: match[1],
+            module: moduleName,
             subpath: match[2] || '',
             version: match[3],
-            builtin: BUILTIN_MODULES.indexOf(match[1]) !== -1,
-            known: !!knownExternalModules[match[1]]
+            builtin: isBuiltIn,
+            known: !!knownExternalModules[moduleName]
         }
     }
     return null;

package/lib/loader.js

@@ -406,6 +406,7 @@ async function loadPlugin(plugin) {
     }
     try {
         var r = require(plugin.file);
+        r = r.__esModule ? r.default : r
         if (typeof r === "function") {
 
             var red = registryUtil.createNodeApi(plugin);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@node-red/registry",
-    "version": "4.0.9",
+    "version": "4.1.0-beta.2",
     "license": "Apache-2.0",
     "main": "./lib/index.js",
     "repository": {
@@ -16,11 +16,11 @@
         }
     ],
     "dependencies": {
-        "@node-red/util": "4.0.9",
+        "@node-red/util": "4.1.0-beta.2",
         "clone": "2.1.2",
-        "fs-extra": "11.2.0",
-        "semver": "7.6.3",
+        "fs-extra": "11.3.0",
+        "semver": "7.7.1",
         "tar": "7.4.3",
-        "uglify-js": "3.17.4"
+        "uglify-js": "3.19.3"
     }
 }