frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 393658c54dede66d3df43d85871e4a1db577d99b into bb01f26f068b8e083e35fdf19dc9b36f8cf67068

Browse Source
This commit is contained in:
hlovdal 2024-12-02 18:06:22 +01:00 committed by GitHub
commit 9a3a5172d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 53 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
packages/node_modules/@node-red/registry/lib/loader.js vendored
View File

@ -350,30 +350,19 @@ function loadNodeSet(node) {
} else {
}
try {
var loadPromise = null;
var r = require(node.file);
r = r.__esModule ? r.default : r
if (typeof r === "function") {
var red = registryUtil.createNodeApi(node);
var promise = r(red);
if (promise != null && typeof promise.then === "function") {
loadPromise = promise.then(function() {
node.enabled = true;
node.loaded = true;
return node;
}).catch(function(err) {
node.err = err;
return node;
});
}
}
if (loadPromise == null) {
node.enabled = true;
node.loaded = true;
loadPromise = Promise.resolve(node);
}
return loadPromise;
let importPromise = import(node.file);
return importPromise
.then(function(moduleNamespaceObject) {
// CJS will always have default, ESM might have default. (details in note below)
let r = moduleNamespaceObject.default ? moduleNamespaceObject.default : moduleNamespaceObject;
// Babel related workaround. (references in note below)
r = r.__esModule ? r.default : r;
return createLoadPromise(node, r);
})
.catch(function(err) {
node.err = err;
return Promise.resolve(node);
});
} catch(err) {
node.err = err;
var stack = err.stack;
@ -397,6 +386,45 @@ function loadNodeSet(node) {
}
return Promise.resolve(node);
}
// Notes on default:
// https://nodejs.org/api/esm.html#import-expressions
// "When importing CommonJS modules, the module.exports object is provided as the default export."
// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import
// "The module namespace object is a sealed object ... with the default export available as a key called `default`."
// Notes on __esModule:
// Workaround originally added in commit 326f3469, merged in pull request #3669.
// Related links:
// https://github.com/nodejs/node/issues/40891
// https://github.com/evanw/esbuild/issues/1591
// https://babeljs.io/docs/babel-plugin-transform-modules-commonjs
// https://stackoverflow.com/questions/50943704/whats-the-purpose-of-object-definepropertyexports-esmodule-value-0
function createLoadPromise(node, r) {
var loadPromise = null;
if (typeof r === "function") {
var red = registryUtil.createNodeApi(node);
var promise = r(red);
if (promise != null && typeof promise.then === "function") {
loadPromise = promise.then(function () {
node.enabled = true;
node.loaded = true;
return node;
}).catch(function (err) {
node.err = err;
return node;
});
}
}
if (loadPromise == null) {
node.enabled = true;
node.loaded = true;
loadPromise = Promise.resolve(node);
}
return loadPromise;
}
}
async function loadPlugin(plugin) {

2
test/unit/@node-red/registry/lib/loader_spec.js
View File

@ -626,7 +626,7 @@ describe("red/nodes/registry/loader",function() {
node.enabled.should.be.true();
nodes.registerType.called.should.be.false();
node.should.have.property('err');
node.err.toString().should.eql("Error: fail to require (line:1)");
node.err.toString().should.eql("Error: fail to require");
done();
}).catch(function(err) {