From 341127399df0a9832e5e9e7ba0f475ce0a1b6277 Mon Sep 17 00:00:00 2001
From: Pez Cuckow <email@pezcuckow.com>
Date: Fri, 10 Nov 2023 17:15:54 +0100
Subject: [PATCH 1/3] Support file names that end in cjs/mjs/xjs

---
 packages/node_modules/@node-red/registry/lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/registry/lib/loader.js b/packages/node_modules/@node-red/registry/lib/loader.js
index 27783be7f..87564c6cc 100644
--- a/packages/node_modules/@node-red/registry/lib/loader.js
+++ b/packages/node_modules/@node-red/registry/lib/loader.js
@@ -265,7 +265,7 @@ async function loadNodeConfig(fileInfo) {
         module: module,
         name: name,
         file: file,
-        template: file.replace(/\.js$/,".html"),
+        template: file.replace(/\.(\w)?js$/,".html"),
         enabled: isEnabled,
         loaded:false,
         version: version,

From 0589e1f4700d19d44bcd5612e11ec9e5d8b3734d Mon Sep 17 00:00:00 2001
From: Pez Cuckow <email@pezcuckow.com>
Date: Fri, 10 Nov 2023 17:16:21 +0100
Subject: [PATCH 2/3] Handle all file suffixes

---
 packages/node_modules/@node-red/registry/lib/loader.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node_modules/@node-red/registry/lib/loader.js b/packages/node_modules/@node-red/registry/lib/loader.js
index 87564c6cc..14e71f56a 100644
--- a/packages/node_modules/@node-red/registry/lib/loader.js
+++ b/packages/node_modules/@node-red/registry/lib/loader.js
@@ -265,7 +265,7 @@ async function loadNodeConfig(fileInfo) {
         module: module,
         name: name,
         file: file,
-        template: file.replace(/\.(\w)?js$/,".html"),
+        template: file.replace(/\.[^.]+$/, '.html'),
         enabled: isEnabled,
         loaded:false,
         version: version,

From 4920611b69f124757f4c97b3f97c6f3fe7854f5c Mon Sep 17 00:00:00 2001
From: Pez Cuckow <email@pezcuckow.com>
Date: Mon, 8 Jan 2024 15:06:48 +0100
Subject: [PATCH 3/3] Allow .cjs, .mjs as well as .js

---
 .../node_modules/@node-red/registry/lib/localfilesystem.js  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/node_modules/@node-red/registry/lib/localfilesystem.js b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
index 0c231552f..fb5c1e70b 100644
--- a/packages/node_modules/@node-red/registry/lib/localfilesystem.js
+++ b/packages/node_modules/@node-red/registry/lib/localfilesystem.js
@@ -72,11 +72,11 @@ function getLocalFile(file) {
         return null;
     }
     try {
-        fs.statSync(file.replace(/\.js$/,".html"));
+        fs.statSync(file.replace(/\.[\w]?js$/, '.html'));
         return {
             file:    file,
             module:  "node-red",
-            name:    path.basename(file).replace(/^\d+-/,"").replace(/\.js$/,""),
+            name:    path.basename(file).replace(/^\d+-/,"").replace(/\.[\w]?js$/,""),
             version: settings.version
         };
     } catch(err) {
@@ -114,7 +114,7 @@ function getLocalNodeFiles(dir, skipValidNodeRedModules) {
     files.forEach(function(fn) {
         var stats = fs.statSync(path.join(dir,fn));
         if (stats.isFile()) {
-            if (/\.js$/.test(fn)) {
+            if (/\.[\w]?js$/.test(fn)) {
                 var info = getLocalFile(path.join(dir,fn));
                 if (info) {
                     result.push(info);