Skip to content

Commit

Permalink
feature: add mjs support
Browse files Browse the repository at this point in the history
  • Loading branch information
wallet77 committed Feb 21, 2018
1 parent 0d00936 commit 935afab
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions lib/Common.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,17 @@ Common.prepareAppConf = function(opts, app) {
* @param {string} filename
* @return {mixed} null if not conf file, json or yaml if conf
*/
Common.isConfigFile = function(filename) {
if (typeof(filename) != 'string')
Common.isConfigFile = function (filename) {
if (typeof (filename) !== 'string')
return null;
if (filename.indexOf('.json') != -1)
if (filename.indexOf('.json') !== -1)
return 'json';
if (filename.indexOf('.yml') > -1 || filename.indexOf('.yaml') > -1)
return 'yaml';
if (filename.indexOf('.config.js') != -1)
if (filename.indexOf('.config.js') !== -1)
return 'js';
if (filename.indexOf('.config.mjs') !== -1)
return 'mjs';
return null;
};

Expand Down Expand Up @@ -288,7 +290,7 @@ Common.parseConfig = function(confObj, filename) {
filename.indexOf('.yaml') > -1) {
return yamljs.parse(confObj.toString());
}
else if (filename.indexOf('.config.js') > -1) {
else if (filename.indexOf('.config.js') > -1 || filename.indexOf('.config.mjs') > -1) {
var confPath = require.resolve(path.resolve(filename));
delete require.cache[confPath];
return require(confPath);
Expand Down

0 comments on commit 935afab

Please sign in to comment.