Bump lodash version (#301)

acss-io · Jun 30, 2017 · 1bd685f · 1bd685f
1 parent 2dedf26
commit 1bd685f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -29,7 +29,7 @@
   "dependencies": {
     "chalk": "^1.0.0",
     "commander": "^2.8.0",
-    "lodash": "^3.6.0",
+    "lodash": "^4.0.0",
     "object-assign": "^4.0.0",
     "xregexp": "^3.0.0"
   },

diff --git a/src/lib/utils.js b/src/lib/utils.js
@@ -34,7 +34,7 @@ utils.handleMergeArrays = function (a, b) {
 // merge atomizer configs into a single config
 utils.mergeConfigs = function (configs/*:Config[]*/)/*:Config*/ {
     // TODO: Offer option to warn on conflicts
-    return _.merge.apply(null, configs.concat(utils.handleMergeArrays));
+    return _.mergeWith.apply(null, configs.concat(utils.handleMergeArrays));
 };
 
 // returns a repeated string by X amount
@@ -52,4 +52,4 @@ utils.repeatString = function (pattern/*:string*/, count/*:integer*/) {
     return result + pattern;
 };
 
-module.exports = utils;
+module.exports = utils;