config 3.3.2 → 3.3.3

package/History.md

@@ -1,3 +1,11 @@
+3.3.3 / 2020-11-26
+==================
+
+* FIX #460 - Strict mode warning refer to appropriate env variable @iCodeOkay
+* Use Buffer.alloc and Buffer.from instead of contrsuctor @Fcmam5
+* Add support for experimental .cjs modules @lenkan
+
+
 3.3.2 / 2020-09-24
 ==================
 

package/lib/config.js

@@ -15,7 +15,7 @@ var deferConfig = require('../defer').deferConfig,
 // Static members
 var DEFAULT_CLONE_DEPTH = 20,
     NODE_CONFIG, CONFIG_DIR, RUNTIME_JSON_FILENAME, NODE_ENV, APP_INSTANCE,
-    HOST, HOSTNAME, ALLOW_CONFIG_MUTATIONS, CONFIG_SKIP_GITCRYPT,
+    HOST, HOSTNAME, ALLOW_CONFIG_MUTATIONS, CONFIG_SKIP_GITCRYPT, NODE_ENV_VAR_NAME,
     NODE_CONFIG_PARSER,
     env = {},
     privateUtil = {},
@@ -513,11 +513,26 @@ util.loadFileConfigs = function(configDir) {
   var t = this,
       config = {};
 
-  // Initialize parameters from command line, environment, or default
-  NODE_ENV = util.initParam('NODE_ENV', 'development');
+  // Specify variables that can be used to define the environment
+  var node_env_var_names = ['NODE_CONFIG_ENV', 'NODE_ENV'];
 
-  // Override, NODE_ENV if NODE_CONFIG_ENV is specified.
-  NODE_ENV = util.initParam('NODE_CONFIG_ENV', NODE_ENV);
+  // Loop through the variables to try and set environment
+  for (node_env_var_name of node_env_var_names) {
+    NODE_ENV = util.initParam(node_env_var_name);
+    if (!!NODE_ENV) {
+      NODE_ENV_VAR_NAME = node_env_var_name;
+      break;
+    }
+  }
+
+  // If we haven't successfully set the environment using the variables, we'll default it
+  if (!NODE_ENV) {
+    NODE_ENV = 'development';
+  }
+
+  node_env_var_names.forEach(node_env_var_name => {
+    env[node_env_var_name] = NODE_ENV;
+  });
 
   // Split files name, for loading multiple files.
   NODE_ENV = NODE_ENV.split(',');
@@ -952,7 +967,7 @@ util.cloneDeep = function cloneDeep(parent, depth, circular, prototype) {
     } else if (Utils.isDate(parent)) {
       child = new Date(parent.getTime());
     } else if (useBuffer && Buffer.isBuffer(parent)) {
-      child = new Buffer(parent.length);
+      child = Buffer.alloc(parent.length);
       parent.copy(child);
       return child;
     } else {
@@ -1409,11 +1424,11 @@ util.runStrictnessChecks = function (config) {
     });
     // 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.");
+      _warnOrThrow(NODE_ENV_VAR_NAME+" 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.");
+      _warnOrThrow(NODE_ENV_VAR_NAME+" value of '"+env+"' is ambiguous.");
     }
   });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "config",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "main": "./lib/config.js",
   "description": "Configuration control for production node deployments",
   "author": "Loren West <open_source@lorenwest.com>",

package/parser.js

@@ -304,9 +304,10 @@ Parser.numberParser = function(filename, content) {
   return Number.isNaN(numberValue) ? undefined : numberValue;
 };
 
-var order = ['js', 'ts', 'json', 'json5', 'hjson', 'toml', 'coffee', 'iced', 'yaml', 'yml', 'cson', 'properties', 'xml',
+var order = ['js', 'cjs', 'ts', 'json', 'json5', 'hjson', 'toml', 'coffee', 'iced', 'yaml', 'yml', 'cson', 'properties', 'xml',
   'boolean', 'number'];
 var definitions = {
+  cjs: Parser.jsParser,
   coffee: Parser.coffeeParser,
   cson: Parser.csonParser,
   hjson: Parser.hjsonParser,