Skip to content

Commit 553d6d4

Browse files
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] <support@github.com>
1 parent 0660e4e commit 553d6d4

File tree

1 file changed

+34
-34
lines changed

1 file changed

+34
-34
lines changed

yarn.lock

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@ babel-helper-builder-react-jsx@^6.24.1:
727727

728728
babel-plugin-syntax-jsx@^6.18.0, babel-plugin-syntax-jsx@^6.8.0:
729729
version "6.18.0"
730-
resolved "http://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
730+
resolved "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
731731
integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
732732

733733
babel-plugin-transform-jsx-hyperdom-binding@^1.5.0:
@@ -1010,7 +1010,7 @@ browser-stdout@1.3.0:
10101010

10111011
browserify-aes@^1.0.0, browserify-aes@^1.0.4:
10121012
version "1.2.0"
1013-
resolved "http://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
1013+
resolved "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
10141014
integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==
10151015
dependencies:
10161016
buffer-xor "^1.0.3"
@@ -1041,7 +1041,7 @@ browserify-des@^1.0.0:
10411041

10421042
browserify-rsa@^4.0.0:
10431043
version "4.0.1"
1044-
resolved "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
1044+
resolved "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524"
10451045
integrity sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=
10461046
dependencies:
10471047
bn.js "^4.1.0"
@@ -1168,7 +1168,7 @@ buffer-xor@^1.0.3:
11681168

11691169
buffer@^4.3.0:
11701170
version "4.9.1"
1171-
resolved "http://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
1171+
resolved "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298"
11721172
integrity sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=
11731173
dependencies:
11741174
base64-js "^1.0.2"
@@ -1353,7 +1353,7 @@ chai@3.5.0:
13531353

13541354
chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
13551355
version "1.1.3"
1356-
resolved "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
1356+
resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
13571357
integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
13581358
dependencies:
13591359
ansi-styles "^2.2.1"
@@ -1657,7 +1657,7 @@ combined-stream@1.0.6, combined-stream@~1.0.6:
16571657

16581658
commander@2.9.0:
16591659
version "2.9.0"
1660-
resolved "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
1660+
resolved "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz#9c99094176e12240cb22d6c5146098400fe0f7d4"
16611661
integrity sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=
16621662
dependencies:
16631663
graceful-readlink ">= 1.0.0"
@@ -1674,7 +1674,7 @@ commander@^2.18.0, commander@^2.19.0, commander@^2.9.0, commander@~2.20.0:
16741674

16751675
commander@~1.2.0:
16761676
version "1.2.0"
1677-
resolved "http://registry.npmjs.org/commander/-/commander-1.2.0.tgz#fd5713bfa153c7d6cc599378a5ab4c45c535029e"
1677+
resolved "https://registry.npmjs.org/commander/-/commander-1.2.0.tgz#fd5713bfa153c7d6cc599378a5ab4c45c535029e"
16781678
integrity sha1-/VcTv6FTx9bMWZN4patMRcU1Ap4=
16791679
dependencies:
16801680
keypress "0.1.x"
@@ -1779,7 +1779,7 @@ content-type@~1.0.4:
17791779

17801780
convert-source-map@~1.1.0:
17811781
version "1.1.3"
1782-
resolved "http://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
1782+
resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz#4829c877e9fe49b3161f3bf3673888e204699860"
17831783
integrity sha1-SCnId+n+SbMWHzvzZziI4gRpmGA=
17841784

17851785
cookie@0.3.1:
@@ -1842,7 +1842,7 @@ create-error-class@^3.0.0:
18421842

18431843
create-hash@^1.1.0, create-hash@^1.1.2:
18441844
version "1.2.0"
1845-
resolved "http://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
1845+
resolved "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
18461846
integrity sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==
18471847
dependencies:
18481848
cipher-base "^1.0.1"
@@ -1853,7 +1853,7 @@ create-hash@^1.1.0, create-hash@^1.1.2:
18531853

18541854
create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
18551855
version "1.1.7"
1856-
resolved "http://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
1856+
resolved "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
18571857
integrity sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==
18581858
dependencies:
18591859
cipher-base "^1.0.3"
@@ -1994,7 +1994,7 @@ date-now@^0.1.4:
19941994

19951995
debug@2.2.0:
19961996
version "2.2.0"
1997-
resolved "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
1997+
resolved "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz#f87057e995b1a1f6ae6a4960664137bc56f039da"
19981998
integrity sha1-+HBX6ZWxofauaklgZkE3vFbwOdo=
19991999
dependencies:
20002000
ms "0.7.1"
@@ -2050,7 +2050,7 @@ debug@^4.1.1:
20502050

20512051
debug@~0.7.2:
20522052
version "0.7.4"
2053-
resolved "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
2053+
resolved "https://registry.npmjs.org/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
20542054
integrity sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=
20552055

20562056
decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
@@ -2159,7 +2159,7 @@ destroy@~1.0.4:
21592159

21602160
detect-browser@1.5.0:
21612161
version "1.5.0"
2162-
resolved "http://registry.npmjs.org/detect-browser/-/detect-browser-1.5.0.tgz#926a90065cd6c358b2aa631a14434844798fead3"
2162+
resolved "https://registry.npmjs.org/detect-browser/-/detect-browser-1.5.0.tgz#926a90065cd6c358b2aa631a14434844798fead3"
21632163
integrity sha1-kmqQBlzWw1iyqmMaFENIRHmP6tM=
21642164

21652165
detect-browser@1.6.2:
@@ -2207,7 +2207,7 @@ diff@^3.1.0, diff@^3.2.0:
22072207

22082208
diffie-hellman@^5.0.0:
22092209
version "5.0.3"
2210-
resolved "http://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
2210+
resolved "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
22112211
integrity sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==
22122212
dependencies:
22132213
bn.js "^4.1.0"
@@ -2394,7 +2394,7 @@ electron-window@^0.8.0:
23942394

23952395
electron@1.8.2:
23962396
version "1.8.2"
2397-
resolved "http://registry.npmjs.org/electron/-/electron-1.8.2.tgz#a817cd733c2972b3c7cc4f777caf6e424b88014d"
2397+
resolved "https://registry.npmjs.org/electron/-/electron-1.8.2.tgz#a817cd733c2972b3c7cc4f777caf6e424b88014d"
23982398
integrity sha512-0TV5Hy92g8ACnPn+PVol6a/2uk+khzmRtWxhah/FcKs6StCytm5hD14QqOdZxEdJN8HljXIVCayN/wJX+0wDiQ==
23992399
dependencies:
24002400
"@types/node" "^8.0.24"
@@ -3975,7 +3975,7 @@ http-cache-semantics@^3.8.0:
39753975

39763976
http-errors@1.6.3, http-errors@~1.6.3:
39773977
version "1.6.3"
3978-
resolved "http://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
3978+
resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
39793979
integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
39803980
dependencies:
39813981
depd "~1.1.2"
@@ -4857,7 +4857,7 @@ json5@^1.0.1:
48574857

48584858
jsonfile@^2.1.0:
48594859
version "2.4.0"
4860-
resolved "http://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
4860+
resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
48614861
integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
48624862
optionalDependencies:
48634863
graceful-fs "^4.1.6"
@@ -5485,9 +5485,9 @@ meow@^3.1.0:
54855485
trim-newlines "^1.0.0"
54865486

54875487
merge@^1.2.0:
5488-
version "1.2.0"
5489-
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
5490-
integrity sha1-dTHjnUlJwoGma4xabgJl6LBYlNo=
5488+
version "1.2.1"
5489+
resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
5490+
integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
54915491

54925492
micromatch@^2.1.5:
54935493
version "2.3.11"
@@ -5598,17 +5598,17 @@ minimatch@^3.0.2, minimatch@^3.0.4:
55985598

55995599
minimist@0.0.8:
56005600
version "0.0.8"
5601-
resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
5601+
resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
56025602
integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
56035603

56045604
minimist@1.2.0, minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
56055605
version "1.2.0"
5606-
resolved "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
5606+
resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
56075607
integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
56085608

56095609
minimist@~0.0.1:
56105610
version "0.0.10"
5611-
resolved "http://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
5611+
resolved "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
56125612
integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
56135613

56145614
minipass@^2.2.1, minipass@^2.3.3:
@@ -5684,14 +5684,14 @@ mixin-deep@^1.2.0:
56845684

56855685
mkdirp@0.5.1, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0:
56865686
version "0.5.1"
5687-
resolved "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
5687+
resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
56885688
integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
56895689
dependencies:
56905690
minimist "0.0.8"
56915691

56925692
mocha@3.2.0:
56935693
version "3.2.0"
5694-
resolved "http://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz#7dc4f45e5088075171a68896814e6ae9eb7a85e3"
5694+
resolved "https://registry.npmjs.org/mocha/-/mocha-3.2.0.tgz#7dc4f45e5088075171a68896814e6ae9eb7a85e3"
56955695
integrity sha1-fcT0XlCIB1FxpoiWgU5q6et6heM=
56965696
dependencies:
56975697
browser-stdout "1.3.0"
@@ -5755,7 +5755,7 @@ module-deps@^4.0.8:
57555755

57565756
moment@~2.0.0:
57575757
version "2.0.0"
5758-
resolved "http://registry.npmjs.org/moment/-/moment-2.0.0.tgz#2bbc5b44c321837693ab6efcadbd46ed946211fe"
5758+
resolved "https://registry.npmjs.org/moment/-/moment-2.0.0.tgz#2bbc5b44c321837693ab6efcadbd46ed946211fe"
57595759
integrity sha1-K7xbRMMhg3aTq278rb1G7ZRiEf4=
57605760

57615761
move-concurrently@^1.0.1:
@@ -6458,7 +6458,7 @@ parents@^1.0.0, parents@^1.0.1:
64586458

64596459
parse-asn1@^5.0.0:
64606460
version "5.1.1"
6461-
resolved "http://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
6461+
resolved "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
64626462
integrity sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==
64636463
dependencies:
64646464
asn1.js "^4.0.0"
@@ -6809,7 +6809,7 @@ psl@^1.1.24:
68096809

68106810
public-encrypt@^4.0.0:
68116811
version "4.0.2"
6812-
resolved "http://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
6812+
resolved "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
68136813
integrity sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==
68146814
dependencies:
68156815
bn.js "^4.1.0"
@@ -7001,7 +7001,7 @@ read-pkg@^2.0.0:
70017001

70027002
"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6:
70037003
version "2.3.6"
7004-
resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
7004+
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
70057005
integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
70067006
dependencies:
70077007
core-util-is "~1.0.0"
@@ -7014,7 +7014,7 @@ read-pkg@^2.0.0:
70147014

70157015
readable-stream@~1.1.9:
70167016
version "1.1.14"
7017-
resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
7017+
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
70187018
integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
70197019
dependencies:
70207020
core-util-is "~1.0.0"
@@ -7024,7 +7024,7 @@ readable-stream@~1.1.9:
70247024

70257025
readable-stream@~2.0.0:
70267026
version "2.0.6"
7027-
resolved "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
7027+
resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e"
70287028
integrity sha1-j5A0HmilPMySh4jaz80Rs265t44=
70297029
dependencies:
70307030
core-util-is "~1.0.0"
@@ -7529,15 +7529,15 @@ setprototypeof@1.1.1:
75297529

75307530
sha.js@^2.4.0, sha.js@^2.4.8, sha.js@~2.4.4:
75317531
version "2.4.11"
7532-
resolved "http://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
7532+
resolved "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7"
75337533
integrity sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==
75347534
dependencies:
75357535
inherits "^2.0.1"
75367536
safe-buffer "^5.0.1"
75377537

75387538
shasum@^1.0.0:
75397539
version "1.0.2"
7540-
resolved "http://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f"
7540+
resolved "https://registry.npmjs.org/shasum/-/shasum-1.0.2.tgz#e7012310d8f417f4deb5712150e5678b87ae565f"
75417541
integrity sha1-5wEjENj0F/TetXEhUOVni4euVl8=
75427542
dependencies:
75437543
json-stable-stringify "~0.0.0"
@@ -8283,7 +8283,7 @@ through2@~0.2.3:
82838283

82848284
through@2, "through@>=2.2.7 <3", through@^2.3.6, through@~2.3, through@~2.3.1:
82858285
version "2.3.8"
8286-
resolved "http://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
8286+
resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
82878287
integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
82888288

82898289
timed-out@^4.0.0:

0 commit comments

Comments
 (0)