Merge pull request #4662 from Timic3/fix/common-module-import

Add .cjs (common JS) as a viable extension
Unitech · Apr 14, 2020 · 03d0b28 · 03d0b28
2 parents d8a6d38 + 7323438
commit 03d0b28
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/Common.js b/lib/Common.js
@@ -278,6 +278,8 @@ Common.isConfigFile = function (filename) {
     return 'yaml';
   if (filename.indexOf('.config.js') !== -1)
     return 'js';
+  if (filename.indexOf('.config.cjs') !== -1)
+    return 'js';
   if (filename.indexOf('.config.mjs') !== -1)
     return 'mjs';
   return null;
@@ -310,7 +312,7 @@ Common.parseConfig = function(confObj, filename) {
            filename.indexOf('.yaml') > -1) {
     return yamljs.parse(confObj.toString());
   }
-  else if (filename.indexOf('.config.js') > -1 || filename.indexOf('.config.mjs') > -1) {
+  else if (filename.indexOf('.config.js') > -1 || filename.indexOf('.config.cjs') > -1 || filename.indexOf('.config.mjs') > -1) {
     var confPath = require.resolve(path.resolve(filename));
     delete require.cache[confPath];
     return require(confPath);