config 3.3.10 → 3.3.12

package/lib/config.js

@@ -7,7 +7,6 @@
 const DeferredConfig = require('../defer').DeferredConfig;
 const RawConfig = require('../raw').RawConfig;
 let Parser = require('../parser');
-const Utils = require('util');
 const Path = require('path');
 const FileSystem = require('fs');
 
@@ -1003,12 +1002,12 @@ util.cloneDeep = function cloneDeep(parent, depth, circular, prototype) {
       return parent;
     }
 
-    if (Utils.isArray(parent)) {
+    if (Array.isArray(parent)) {
       child = [];
-    } else if (Utils.isRegExp(parent)) {
+    } else if (parent instanceof RegExp) {
       child = new RegExp(parent.source, util.getRegExpFlags(parent));
       if (parent.lastIndex) child.lastIndex = parent.lastIndex;
-    } else if (Utils.isDate(parent)) {
+    } else if (parent instanceof Date) {
       child = new Date(parent.getTime());
     } else if (useBuffer && Buffer.isBuffer(parent)) {
       child = Buffer.alloc(parent.length);

package/package.json

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

package/parser.js

@@ -1,12 +1,21 @@
 // External libraries are lazy-loaded only if these file types exist.
-const util = require("util");
+
+// webpack can't solve dynamic module
+// @see https://github.com/node-config/node-config/issues/755
+// @see https://webpack.js.org/guides/dependency-management/#require-with-expression
+const JSON5Module = require('json5');
+
+// webpack resolves json5 with module field out of the box which lead to this usage
+// @see https://github.com/node-config/node-config/issues/755
+// @see https://github.com/json5/json5/issues/240
+const JSON5 = JSON5Module.default || JSON5Module;
+
 var Yaml = null,
     VisionmediaYaml = null,
     Coffee = null,
     Iced = null,
     CSON = null,
     PPARSER = null,
-    JSON5 = null,
     TOML = null,
     HJSON = null,
     XML = null;
@@ -51,7 +60,7 @@ Parser.xmlParser = function(filename, content) {
 Parser.jsParser = function(filename, content) {
   var configObject = require(filename);
 
-  if (configObject.__esModule && util.isObject(configObject.default)) {
+  if (configObject.__esModule && isObject(configObject.default)) {
     return configObject.default
   }
   return configObject;
@@ -160,15 +169,10 @@ Parser.jsonParser = function(filename, content) {
    * This is due to issues with removing supported comments.
    * More information can be found here: https://github.com/node-config/node-config/issues/715
    */
-    JSON5 = require(JSON5_DEP);
-
-    return JSON5.parse(content);
+  return JSON5.parse(content);
 };
 
 Parser.json5Parser = function(filename, content) {
-  if (!JSON5) {
-    JSON5 = require(JSON5_DEP);
-  }
   return JSON5.parse(content);
 };
 
@@ -361,3 +365,7 @@ Parser.setFilesOrder = function(name, newIndex) {
   }
   return order;
 };
+
+function isObject(arg) {
+  return (arg !== null) && (typeof arg === 'object');
+}