mirror of
https://github.com/node-red/node-red.git
synced 2025-03-01 10:36:34 +00:00
Merge 4920611b69f124757f4c97b3f97c6f3fe7854f5c into 2feb290ae3c6cd88c16e4c27c2006a569e0146e2
This commit is contained in:
commit
a07b7e7b4f
@ -265,7 +265,7 @@ async function loadNodeConfig(fileInfo) {
|
|||||||
module: module,
|
module: module,
|
||||||
name: name,
|
name: name,
|
||||||
file: file,
|
file: file,
|
||||||
template: file.replace(/\.js$/,".html"),
|
template: file.replace(/\.[^.]+$/, '.html'),
|
||||||
enabled: isEnabled,
|
enabled: isEnabled,
|
||||||
loaded:false,
|
loaded:false,
|
||||||
version: version,
|
version: version,
|
||||||
|
@ -72,11 +72,11 @@ function getLocalFile(file) {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
fs.statSync(file.replace(/\.js$/,".html"));
|
fs.statSync(file.replace(/\.[\w]?js$/, '.html'));
|
||||||
return {
|
return {
|
||||||
file: file,
|
file: file,
|
||||||
module: "node-red",
|
module: "node-red",
|
||||||
name: path.basename(file).replace(/^\d+-/,"").replace(/\.js$/,""),
|
name: path.basename(file).replace(/^\d+-/,"").replace(/\.[\w]?js$/,""),
|
||||||
version: settings.version
|
version: settings.version
|
||||||
};
|
};
|
||||||
} catch(err) {
|
} catch(err) {
|
||||||
@ -114,7 +114,7 @@ function getLocalNodeFiles(dir, skipValidNodeRedModules) {
|
|||||||
files.forEach(function(fn) {
|
files.forEach(function(fn) {
|
||||||
var stats = fs.statSync(path.join(dir,fn));
|
var stats = fs.statSync(path.join(dir,fn));
|
||||||
if (stats.isFile()) {
|
if (stats.isFile()) {
|
||||||
if (/\.js$/.test(fn)) {
|
if (/\.[\w]?js$/.test(fn)) {
|
||||||
var info = getLocalFile(path.join(dir,fn));
|
var info = getLocalFile(path.join(dir,fn));
|
||||||
if (info) {
|
if (info) {
|
||||||
result.push(info);
|
result.push(info);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user