Merge pull request #142 from quetzaluz/fix-141

Upgrade: lodash.merge to prevent potential vulnerability (fix #141)
broccolijs · Jul 23, 2019 · 905d8d6 · 905d8d6
2 parents 801fd17 + a343e12
commit 905d8d6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -45,7 +45,7 @@
     "find-index": "^1.1.0",
     "fs-extra": "^4.0.3",
     "fs-tree-diff": "^0.5.7",
-    "lodash.merge": "^4.3.1",
+    "lodash.merge": "^4.6.2",
     "lodash.omit": "^4.1.0",
     "lodash.uniq": "^4.2.0",
     "walk-sync": "^0.3.2"

diff --git a/yarn.lock b/yarn.lock
@@ -1090,9 +1090,9 @@ lodash.keys@~2.3.0:
     lodash._shimkeys "~2.3.0"
     lodash.isobject "~2.3.0"
 
-lodash.merge@^4.3.1:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
 
 lodash.noop@~2.3.0:
   version "2.3.0"