From 07f94aeb9e9104d90bfeaa919a7f84473558a714 Mon Sep 17 00:00:00 2001
From: Rodrigo Fernandes <rtfrodrigo@gmail.com>
Date: Wed, 8 May 2019 23:42:42 +0100
Subject: [PATCH] fix: Remove lodash.merge for merge

---
 package.json |  2 +-
 src/utils.js |  6 ++----
 yarn.lock    | 10 +++++-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index 9a5be92..1ec480d 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
   "dependencies": {
     "diff": "^4.0.1",
     "hogan.js": "^3.0.2",
-    "lodash.merge": "^4.6.1",
+    "merge": "^1.2.1",
     "whatwg-fetch": "^3.0.0"
   },
   "devDependencies": {
diff --git a/src/utils.js b/src/utils.js
index aa4af8a..395d267 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -6,7 +6,7 @@
  */
 
 (function() {
-  var merge = require('lodash.merge');
+  var merge = require('merge');
 
   function Utils() {
   }
@@ -41,9 +41,7 @@
   };
 
   Utils.prototype.safeConfig = function(cfg, defaultConfig) {
-    var newCfg = {};
-    merge(newCfg, defaultConfig, cfg);
-    return newCfg;
+    return merge.recursive(true, defaultConfig, cfg);
   };
 
   module.exports.Utils = new Utils();
diff --git a/yarn.lock b/yarn.lock
index db3cb64..8be0caa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2227,11 +2227,6 @@ lodash.memoize@~3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
   integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
-lodash.merge@^4.6.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
-  integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==
-
 lodash@^4.17.11, lodash@^4.17.4:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
@@ -2291,6 +2286,11 @@ merge2@^1.2.3:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
   integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
 
+merge@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
+  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
+
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"