fix: add lodash.merge as dep

gaearon · Nov 21, 2018 · 1de55d6 · 1de55d6
1 parent 80f0cf1
commit 1de55d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/package.json b/package.json
@@ -101,6 +101,7 @@
     "global": "^4.3.0",
     "hoist-non-react-statics": "^2.5.0",
     "loader-utils": "^1.1.0",
+    "lodash.merge": "^4.6.1",
     "prop-types": "^15.6.1",
     "react-lifecycles-compat": "^3.0.4",
     "shallowequal": "^1.0.2",

diff --git a/yarn.lock b/yarn.lock
@@ -4539,6 +4539,11 @@ lodash.merge@^4.0.2:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
   integrity sha1-aYhLoUSsM/5plzemCG3v+t0PicU=
 
+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.sortby@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438"