Skip to content

Commit 503f648

Browse files
chore(deps): bump merge from 1.2.0 to 1.2.1
Bumps [merge](https://github.com/yeikos/js.merge) from 1.2.0 to 1.2.1. - [Release notes](https://github.com/yeikos/js.merge/releases) - [Commits](swordev/merge@v1.2.0...v1.2.1) Signed-off-by: dependabot[bot] <[email protected]>
1 parent 4b54dc8 commit 503f648

File tree

1 file changed

+46
-40
lines changed

1 file changed

+46
-40
lines changed

yarn.lock

+46-40
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
# yarn lockfile v1
33

44

5+
"@babel/runtime@^7.4.5":
6+
version "7.5.5"
7+
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.5.5.tgz#74fba56d35efbeca444091c7850ccd494fd2f132"
8+
dependencies:
9+
regenerator-runtime "^0.13.2"
10+
511
612
version "0.1.30"
713
resolved "https://registry.npmjs.org/@types/detect-indent/-/detect-indent-0.1.30.tgz#dc682bb412b4e65ba098e70edad73b4833fb910d"
@@ -3738,9 +3744,11 @@ [email protected]:
37383744
version "4.2.0"
37393745
resolved "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz#72d9d0754f7fe25ca2d01ad8f8f9a9449a89526d"
37403746

3741-
hoist-non-react-statics@^2.2.1:
3742-
version "2.5.5"
3743-
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-2.5.5.tgz#c5903cf409c0dfd908f388e619d86b9c1174cb47"
3747+
hoist-non-react-statics@^3.3.0:
3748+
version "3.3.0"
3749+
resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.0.tgz#b09178f0122184fb95acf525daaecb4d8f45958b"
3750+
dependencies:
3751+
react-is "^16.7.0"
37443752

37453753
home-or-tmp@^2.0.0:
37463754
version "2.0.0"
@@ -3958,18 +3966,18 @@ interpret@^1.0.0:
39583966
version "1.0.3"
39593967
resolved "https://registry.npmjs.org/interpret/-/interpret-1.0.3.tgz#cbc35c62eeee73f19ab7b10a801511401afc0f90"
39603968

3961-
invariant@^2.0.0:
3962-
version "2.2.4"
3963-
resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
3964-
dependencies:
3965-
loose-envify "^1.0.0"
3966-
39673969
invariant@^2.2.2:
39683970
version "2.2.2"
39693971
resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.2.tgz#9e1f56ac0acdb6bf303306f338be3b204ae60360"
39703972
dependencies:
39713973
loose-envify "^1.0.0"
39723974

3975+
invariant@^2.2.4:
3976+
version "2.2.4"
3977+
resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
3978+
dependencies:
3979+
loose-envify "^1.0.0"
3980+
39733981
invert-kv@^1.0.0:
39743982
version "1.0.0"
39753983
resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"
@@ -5135,14 +5143,6 @@ locate-path@^2.0.0:
51355143
p-locate "^2.0.0"
51365144
path-exists "^3.0.0"
51375145

5138-
lodash-es@^4.2.0:
5139-
version "4.17.11"
5140-
resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.11.tgz#145ab4a7ac5c5e52a3531fb4f310255a152b4be0"
5141-
5142-
lodash-es@^4.2.1:
5143-
version "4.17.10"
5144-
resolved "https://registry.npmjs.org/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05"
5145-
51465146
lodash._basecopy@^3.0.0:
51475147
version "3.0.1"
51485148
resolved "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
@@ -5271,7 +5271,7 @@ lodash@^4.15.0:
52715271
version "4.17.10"
52725272
resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
52735273

5274-
lodash@^4.17.11, lodash@^4.2.0:
5274+
lodash@^4.17.11:
52755275
version "4.17.11"
52765276
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
52775277

@@ -5345,7 +5345,7 @@ longest@^1.0.1:
53455345
version "1.0.1"
53465346
resolved "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
53475347

5348-
loose-envify@^1.0.0, loose-envify@^1.1.0:
5348+
loose-envify@^1.0.0:
53495349
version "1.3.1"
53505350
resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz#d1a8ad33fa9ce0e713d65fdd0ac8b748d478c848"
53515351
dependencies:
@@ -5507,8 +5507,8 @@ meow@^3.3.0, meow@^3.7.0:
55075507
trim-newlines "^1.0.0"
55085508

55095509
merge@^1.1.3:
5510-
version "1.2.0"
5511-
resolved "https://registry.npmjs.org/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
5510+
version "1.2.1"
5511+
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
55125512

55135513
micromatch@^2.1.5, micromatch@^2.3.11:
55145514
version "2.3.11"
@@ -6395,7 +6395,7 @@ prompts@^0.1.4:
63956395
clorox "^1.0.1"
63966396
sisteransi "^0.1.0"
63976397

6398-
prop-types@^15.5.10:
6398+
prop-types@^15.7.2:
63996399
version "15.7.2"
64006400
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
64016401
dependencies:
@@ -6530,20 +6530,24 @@ rc@^1.2.7:
65306530
minimist "^1.2.0"
65316531
strip-json-comments "~2.0.1"
65326532

6533+
react-is@^16.7.0, react-is@^16.8.6:
6534+
version "16.9.0"
6535+
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.9.0.tgz#21ca9561399aad0ff1a7701c01683e8ca981edcb"
6536+
65336537
react-is@^16.8.1:
65346538
version "16.8.6"
65356539
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.6.tgz#5bbc1e2d29141c9fbdfed456343fe2bc430a6a16"
65366540

6537-
react-redux@5.0.6:
6538-
version "5.0.6"
6539-
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-5.0.6.tgz#23ed3a4f986359d68b5212eaaa681e60d6574946"
6541+
react-redux@^7.1.0:
6542+
version "7.1.0"
6543+
resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.1.0.tgz#72af7cf490a74acdc516ea9c1dd80e25af9ea0b2"
65406544
dependencies:
6541-
hoist-non-react-statics "^2.2.1"
6542-
invariant "^2.0.0"
6543-
lodash "^4.2.0"
6544-
lodash-es "^4.2.0"
6545-
loose-envify "^1.1.0"
6546-
prop-types "^15.5.10"
6545+
"@babel/runtime" "^7.4.5"
6546+
hoist-non-react-statics "^3.3.0"
6547+
invariant "^2.2.4"
6548+
loose-envify "^1.4.0"
6549+
prop-types "^15.7.2"
6550+
react-is "^16.8.6"
65476551

65486552
read-cmd-shim@^1.0.1:
65496553
version "1.0.1"
@@ -6688,14 +6692,12 @@ redis@^2.7.1:
66886692
redis-commands "^1.2.0"
66896693
redis-parser "^2.6.0"
66906694

6691-
redux@^3.7.2:
6692-
version "3.7.2"
6693-
resolved "https://registry.npmjs.org/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b"
6695+
redux@^4.0.1:
6696+
version "4.0.4"
6697+
resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.4.tgz#4ee1aeb164b63d6a1bcc57ae4aa0b6e6fa7a3796"
66946698
dependencies:
6695-
lodash "^4.2.1"
6696-
lodash-es "^4.2.1"
6697-
loose-envify "^1.1.0"
6698-
symbol-observable "^1.0.3"
6699+
loose-envify "^1.4.0"
6700+
symbol-observable "^1.2.0"
66996701

67006702
regenerate@^1.2.1:
67016703
version "1.3.2"
@@ -6705,6 +6707,10 @@ regenerator-runtime@^0.11.0:
67056707
version "0.11.0"
67066708
resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz#7e54fe5b5ccd5d6624ea6255c3473be090b802e1"
67076709

6710+
regenerator-runtime@^0.13.2:
6711+
version "0.13.3"
6712+
resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
6713+
67086714
regenerator-transform@^0.10.0:
67096715
version "0.10.1"
67106716
resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz#1e4996837231da8b7f3cf4114d71b5691a0680dd"
@@ -7749,9 +7755,9 @@ symbol-observable@^1.0.1:
77497755
version "1.0.4"
77507756
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
77517757

7752-
symbol-observable@^1.0.3:
7758+
symbol-observable@^1.2.0:
77537759
version "1.2.0"
7754-
resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
7760+
resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
77557761

77567762
symbol-tree@^3.2.1:
77577763
version "3.2.2"

0 commit comments

Comments
 (0)