Merge pull request #1195 from kontrollanten/update-lodash

chore(deps): update lodash

Author: theKashey

package.json

@@ -103,7 +103,7 @@
     "global": "^4.3.0",
     "hoist-non-react-statics": "^3.3.0",
     "loader-utils": "^1.1.0",
-    "lodash.merge": "^4.6.1",
+    "lodash": "^4.17.11",
     "prop-types": "^15.6.1",
     "react-lifecycles-compat": "^3.0.4",
     "shallowequal": "^1.0.2",

src/reconciler/proxies.js

@@ -3,7 +3,7 @@ import { resetClassProxies } from '../proxy/createClassProxy'
 import { isCompositeComponent, isReactClass } from '../internal/reactUtils'
 import configuration from '../configuration'
 
-const merge = require('lodash.merge')
+const merge = require('lodash/merge')
 
 let proxiesByID
 let blackListedProxies

yarn.lock

@@ -4559,11 +4559,6 @@ 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"
@@ -4589,6 +4584,11 @@ lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.15.0, lodash@^4.17.4, l
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
   integrity sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=
 
+lodash@^4.17.11:
+  version "4.17.11"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
+  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
+
 lodash@^4.17.5:
   version "4.17.5"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"