config 1.30.0 → 1.31.0

package/History.md

@@ -1,3 +1,8 @@
+1.31.0 / 2018-05-22
+===================
+
+  * Load new coffeescript module instead of coffee-script - bastbijl
+
 1.30.0 / 2018-02-26
 ===================
 

package/README.md

@@ -155,15 +155,15 @@ Contributors
 </tr><tr><td><img src=https://avatars2.githubusercontent.com/u/1246875?v=4><a href="https://github.com/jaylynch">jaylynch</a></td>
 <td><img src=https://avatars1.githubusercontent.com/u/145742?v=4><a href="https://github.com/jberrisch">jberrisch</a></td>
 <td><img src=https://avatars1.githubusercontent.com/u/9355665?v=4><a href="https://github.com/kgoerlitz">kgoerlitz</a></td>
+<td><img src=https://avatars3.githubusercontent.com/u/8650543?v=4><a href="https://github.com/leonardovillela">leonardovillela</a></td>
 <td><img src=https://avatars3.githubusercontent.com/u/1918551?v=4><a href="https://github.com/nitzan-shaked">nitzan-shaked</a></td>
 <td><img src=https://avatars3.githubusercontent.com/u/3058150?v=4><a href="https://github.com/robertrossmann">robertrossmann</a></td>
-<td><img src=https://avatars2.githubusercontent.com/u/498929?v=4><a href="https://github.com/roncli">roncli</a></td>
-</tr><tr><td><img src=https://avatars2.githubusercontent.com/u/1355559?v=4><a href="https://github.com/superoven">superoven</a></td>
+</tr><tr><td><img src=https://avatars2.githubusercontent.com/u/498929?v=4><a href="https://github.com/roncli">roncli</a></td>
+<td><img src=https://avatars2.githubusercontent.com/u/1355559?v=4><a href="https://github.com/superoven">superoven</a></td>
 <td><img src=https://avatars2.githubusercontent.com/u/54934?v=4><a href="https://github.com/wmertens">wmertens</a></td>
 <td><img src=https://avatars3.githubusercontent.com/u/2842176?v=4><a href="https://github.com/XadillaX">XadillaX</a></td>
 <td><img src=https://avatars1.githubusercontent.com/u/4425455?v=4><a href="https://github.com/ncuillery">ncuillery</a></td>
 <td><img src=https://avatars0.githubusercontent.com/u/2015295?v=4><a href="https://github.com/patrickpilch">patrickpilch</a></td>
-<td><img src=https://avatars1.githubusercontent.com/u/618330?v=4><a href="https://github.com/adityabansod">adityabansod</a></td>
 </tr></table>
 
 License

package/lib/config.js

@@ -33,7 +33,8 @@ var DEFAULT_CLONE_DEPTH = 20,
     gitCryptTestRegex = /^.GITCRYPT/; // regular expression to test for gitcrypt files.
 
 // Define soft dependencies so transpilers don't include everything
-var COFFEE_DEP = "coffee-script",
+var COFFEE_2_DEP = "coffeescript",
+COFFEE_DEP = "coffee-script",
 ICED_DEP = "iced-coffee-script",
 JS_YAML_DEP = "js-yaml",
 YAML_DEP = "yaml",
@@ -661,6 +662,9 @@ util.loadFileConfigs = function(configDir) {
   // Override, NODE_ENV if NODE_CONFIG_ENV is specified.
   NODE_ENV = util.initParam('NODE_CONFIG_ENV', NODE_ENV);
 
+  // Split files name, for loading multiple files.
+  NODE_ENV = NODE_ENV.split(',');
+
   CONFIG_DIR = configDir || util.initParam('NODE_CONFIG_DIR', Path.join( process.cwd(), 'config') );
   if (CONFIG_DIR.indexOf('.') === 0) {
     CONFIG_DIR = Path.join(process.cwd() , CONFIG_DIR);
@@ -691,22 +695,26 @@ util.loadFileConfigs = function(configDir) {
   env.HOSTNAME = hostName;
 
   // Read each file in turn
-  var baseNames = ['default', NODE_ENV];
+  var baseNames = ['default'].concat(NODE_ENV);
 
   // #236: Also add full hostname when they are different.
   if ( hostName ) {
     var firstDomain = hostName.split('.')[0];
 
-    // Backward compatibility
-    baseNames.push(firstDomain, firstDomain + '-' + NODE_ENV);
+    NODE_ENV.forEach(function(env) {
+      // Backward compatibility
+      baseNames.push(firstDomain, firstDomain + '-' + env);
 
-    // Add full hostname when it is not the same
-    if ( hostName != firstDomain ) {
-      baseNames.push(hostName, hostName + '-' + NODE_ENV);
-    }
+      // Add full hostname when it is not the same
+      if ( hostName != firstDomain ) {
+        baseNames.push(hostName, hostName + '-' + env);
+      }
+    });
   }
 
-  baseNames.push('local', 'local-' + NODE_ENV);
+  NODE_ENV.forEach(function(env) {
+    baseNames.push('local', 'local-' + env);
+  });
 
   var extNames = ['js', 'ts', 'json', 'json5', 'hjson', 'toml', 'coffee', 'iced', 'yaml', 'yml', 'cson', 'properties', 'xml'];
   baseNames.forEach(function(baseName) {
@@ -919,7 +927,14 @@ util.parseFile = function(fullFilename) {
         //  Coffee = require("coffee-script");
         //}
 
-        Coffee = require(COFFEE_DEP);
+        try {
+          // Try to load coffeescript
+          Coffee = require(COFFEE_2_DEP);
+        }
+        catch (e) {
+          // If it doesn't exist, try to load it using the deprecated module name
+          Coffee = require(COFFEE_DEP);
+        }
 
         // coffee-script >= 1.7.0 requires explicit registration for require() to work
         if (Coffee.register) {
@@ -1711,15 +1726,20 @@ util.runStrictnessChecks = function (config) {
     return Path.basename(src.name);
   });
 
-
-  // Throw an exception if there's no explicit config file for NODE_ENV
-  var anyFilesMatchEnv = sourceFilenames.some(function (filename) {
-      return filename.match(NODE_ENV);
+  NODE_ENV.forEach(function(env) {
+    // Throw an exception if there's no explicit config file for NODE_ENV
+    var anyFilesMatchEnv = sourceFilenames.some(function (filename) {
+        return filename.match(env);
+    });
+    // development is special-cased because it's the default value
+    if (env && (env !== 'development') && !anyFilesMatchEnv) {
+      _warnOrThrow("NODE_ENV value of '"+env+"' did not match any deployment config file names.");
+    }
+    // Throw if NODE_ENV matches' default' or 'local'
+    if ((env === 'default') || (env === 'local')) {
+      _warnOrThrow("NODE_ENV value of '"+env+"' is ambiguous.");
+    }
   });
-  // development is special-cased because it's the default value
-  if (NODE_ENV && (NODE_ENV !== 'development') && !anyFilesMatchEnv) {
-    _warnOrThrow("NODE_ENV value of '"+NODE_ENV+"' did not match any deployment config file names.");
-  }
 
   // Throw an exception if there's no explict config file for NODE_APP_INSTANCE
   var anyFilesMatchInstance = sourceFilenames.some(function (filename) {
@@ -1729,11 +1749,6 @@ util.runStrictnessChecks = function (config) {
     _warnOrThrow("NODE_APP_INSTANCE value of '"+APP_INSTANCE+"' did not match any instance config file names.");
   }
 
-  // Throw if NODE_ENV matches' default' or 'local'
-  if ((NODE_ENV === 'default') || (NODE_ENV === 'local')) {
-    _warnOrThrow("NODE_ENV value of '"+NODE_ENV+"' is ambiguous.");
-  }
-
   function _warnOrThrow (msg) {
     var beStrict = process.env.NODE_CONFIG_STRICT_MODE;
     var prefix = beStrict ? 'FATAL: ' : 'WARNING: ';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "config",
-  "version": "1.30.0",
+  "version": "1.31.0",
   "main": "./lib/config.js",
   "description": "Configuration control for production node deployments",
   "author": "Loren West <open_source@lorenwest.com>",
@@ -19,12 +19,11 @@
   },
   "license": "MIT",
   "dependencies": {
-    "json5": "0.4.0",
-    "os-homedir": "1.0.2"
+    "json5": "^1.0.1"
   },
   "devDependencies": {
     "@types/node": "^7.0.8",
-    "coffee-script": ">=1.7.0",
+    "coffeescript": "2.2.4",
     "cson": "^3.0.1",
     "hjson": "^1.2.0",
     "js-yaml": "^3.2.2",

package/ISSUE_TEMPLATE.md

@@ -1,24 +0,0 @@
-**Note: for support questions, please use [StackOverflow](https://stackoverflow.com/questions/tagged/node-config) and tag your question with `node-config`**. *This repository's issues are reserved for feature requests and bug reports.*
-
-Before submitting a bug report, please search the issue tracker the wiki first. Many issues have already been discussed.
-
-The wiki is located at: https://github.com/lorenwest/node-config/wiki
-
-### I'm submitting a ... 
-  - [  ] bug report
-  - [  ] feature request
-  - [  ] support request or question => Please do not submit support request or questions here, see note at the top of this template.
-
-### What is the current behavior?
-*If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem*:
-
-### What is the expected behavior?
-
-### Please tell us about your environment:
-
- -  node-config version: x.x.x
- -  node-version: x.x.x
- 
-### Other information
-
-(e.g. are you using an environment besides Node.js?)