Skip to content

Commit 781557a

Browse files
committed
1 parent 03829b1 commit 781557a

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"global": "^4.3.0",
104104
"hoist-non-react-statics": "^3.3.0",
105105
"loader-utils": "^1.1.0",
106-
"lodash.merge": "^4.6.1",
106+
"lodash": "^4.17.11",
107107
"prop-types": "^15.6.1",
108108
"react-lifecycles-compat": "^3.0.4",
109109
"shallowequal": "^1.0.2",

src/reconciler/proxies.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { resetClassProxies } from '../proxy/createClassProxy'
33
import { isCompositeComponent, isReactClass } from '../internal/reactUtils'
44
import configuration from '../configuration'
55

6-
const merge = require('lodash.merge')
6+
const merge = require('lodash/merge')
77

88
let proxiesByID
99
let blackListedProxies

yarn.lock

+5-5
Original file line numberDiff line numberDiff line change
@@ -4559,11 +4559,6 @@ lodash.merge@^4.0.2:
45594559
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.0.tgz#69884ba144ac33fe699737a6086deffadd0f89c5"
45604560
integrity sha1-aYhLoUSsM/5plzemCG3v+t0PicU=
45614561

4562-
lodash.merge@^4.6.1:
4563-
version "4.6.1"
4564-
resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
4565-
integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==
4566-
45674562
lodash.sortby@^4.7.0:
45684563
version "4.7.0"
45694564
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
45894584
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
45904585
integrity sha1-eCA6TRwyiuHYbcpkYONptX9AVa4=
45914586

4587+
lodash@^4.17.11:
4588+
version "4.17.11"
4589+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
4590+
integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
4591+
45924592
lodash@^4.17.5:
45934593
version "4.17.5"
45944594
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"

0 commit comments

Comments
 (0)