Comparing version 0.1.1 to 0.1.2
@@ -12,3 +12,3 @@ 'use strict'; | ||
var assign = require('lodash.assign'); | ||
var merge = require('lodash.merge'); | ||
var isObject = require('lodash.isobject'); | ||
@@ -73,3 +73,3 @@ var isString = require('lodash.isstring'); | ||
}).then(function (value) { | ||
defaults = assign(value, defaults); | ||
defaults = merge(value, defaults); | ||
}); | ||
@@ -76,0 +76,0 @@ }); |
{ | ||
"name": "app-conf", | ||
"version": "0.1.1", | ||
"version": "0.1.2", | ||
"description": "", | ||
@@ -28,3 +28,2 @@ "keywords": [], | ||
"glob": "^4.0.5", | ||
"lodash.assign": "^2.4.1", | ||
"lodash.findkey": "^2.4.1", | ||
@@ -36,2 +35,3 @@ "lodash.flatten": "^2.4.1", | ||
"lodash.map": "^2.4.1", | ||
"lodash.merge": "^2.4.1", | ||
"strip-json-comments": "^1.0.1" | ||
@@ -38,0 +38,0 @@ }, |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
6987
+ Addedlodash.merge@^2.4.1
+ Addedlodash._basemerge@2.4.1(transitive)
+ Addedlodash._shimisplainobject@2.4.1(transitive)
+ Addedlodash.foreach@2.4.1(transitive)
+ Addedlodash.isplainobject@2.4.1(transitive)
+ Addedlodash.merge@2.4.1(transitive)
- Removedlodash.assign@^2.4.1
- Removedlodash.assign@2.4.1(transitive)