Skip to content

Commit 6ab5f8c

Browse files
committed
chore(*): fix yarn.lock
(It turns out cherry-picking it from master wasn't a great idea :/)
1 parent becfeb5 commit 6ab5f8c

File tree

1 file changed

+47
-15
lines changed

1 file changed

+47
-15
lines changed

yarn.lock

Lines changed: 47 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1203,7 +1203,15 @@ concat-map@0.0.1:
12031203
version "0.0.1"
12041204
resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
12051205

1206-
concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@~1.4.1, concat-stream@~1.4.5:
1206+
concat-stream@^1.4.6, concat-stream@^1.4.7:
1207+
version "1.6.0"
1208+
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7"
1209+
dependencies:
1210+
inherits "^2.0.3"
1211+
readable-stream "^2.2.2"
1212+
typedarray "^0.0.6"
1213+
1214+
concat-stream@~1.4.1, concat-stream@~1.4.5:
12071215
version "1.4.10"
12081216
resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.4.10.tgz#acc3bbf5602cb8cc980c6ac840fa7d8603e3ef36"
12091217
dependencies:
@@ -1621,10 +1629,9 @@ dgeni-packages@^0.16.4:
16211629
marked "^0.3.2"
16221630
minimatch "^3.0.2"
16231631
mkdirp "^0.5.1"
1632+
mkdirp-promise "^5.0.0"
16241633
node-html-encoder "0.0.2"
16251634
nunjucks "^2.4.2"
1626-
q "~1.4.1"
1627-
q-io "~1.13.2"
16281635
semver "^5.2.0"
16291636
shelljs "^0.7.0"
16301637
spdx-license-list "^2.1.0"
@@ -2222,7 +2229,7 @@ find-up@^1.0.0:
22222229
path-exists "^2.0.0"
22232230
pinkie-promise "^2.0.0"
22242231

2225-
findup-sync@0.4.2, findup-sync@^0.4.2:
2232+
findup-sync@0.4.2:
22262233
version "0.4.2"
22272234
resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.2.tgz#a8117d0f73124f5a4546839579fe52d7129fb5e5"
22282235
dependencies:
@@ -2231,6 +2238,15 @@ findup-sync@0.4.2, findup-sync@^0.4.2:
22312238
micromatch "^2.3.7"
22322239
resolve-dir "^0.1.0"
22332240

2241+
findup-sync@^0.4.2:
2242+
version "0.4.3"
2243+
resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.4.3.tgz#40043929e7bc60adf0b7f4827c4c6e75a0deca12"
2244+
dependencies:
2245+
detect-file "^0.1.0"
2246+
is-glob "^2.0.1"
2247+
micromatch "^2.3.7"
2248+
resolve-dir "^0.1.0"
2249+
22342250
findup-sync@~0.3.0:
22352251
version "0.3.0"
22362252
resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-0.3.0.tgz#37930aa5d816b777c03445e1966cc6790a4c0b16"
@@ -3086,7 +3102,7 @@ inherits@1:
30863102
version "1.0.2"
30873103
resolved "https://registry.yarnpkg.com/inherits/-/inherits-1.0.2.tgz#ca4309dadee6b54cc0b8d247e8d7c7a0975bdc9b"
30883104

3089-
inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.0, inherits@~2.0.1:
3105+
inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1:
30903106
version "2.0.3"
30913107
resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
30923108

@@ -3969,10 +3985,14 @@ lodash@4.16.2:
39693985
version "4.16.2"
39703986
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.16.2.tgz#3e626db827048a699281a8a125226326cfc0e652"
39713987

3972-
lodash@4.17.2, lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.7.0, lodash@^4.8.0:
3988+
lodash@4.17.2:
39733989
version "4.17.2"
39743990
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.2.tgz#34a3055babe04ce42467b607d700072c7ff6bf42"
39753991

3992+
lodash@^4.0.0, lodash@^4.13.1, lodash@^4.14.0, lodash@^4.17.2, lodash@^4.3.0, lodash@^4.5.0, lodash@^4.7.0, lodash@^4.8.0:
3993+
version "4.17.4"
3994+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
3995+
39763996
lodash@~1.0.1:
39773997
version "1.0.2"
39783998
resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551"
@@ -4218,6 +4238,10 @@ minimist@^0.2.0:
42184238
version "0.2.0"
42194239
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.2.0.tgz#4dffe525dae2b864c66c2e23c6271d7afdecefce"
42204240

4241+
mkdirp-promise@^5.0.0:
4242+
version "5.0.0"
4243+
resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.0.tgz#b8bc7d6eab71c2b2e37cb06ea48a459d14366ea2"
4244+
42214245
mkdirp@0.3.0:
42224246
version "0.3.0"
42234247
resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.3.0.tgz#1bbf5ab1ba827af23575143490426455f481fe1e"
@@ -4979,10 +5003,14 @@ pump@^0.3.5:
49795003
end-of-stream "~1.0.0"
49805004
once "~1.2.0"
49815005

4982-
punycode@1.3.2, punycode@>=0.2.0:
5006+
punycode@1.3.2:
49835007
version "1.3.2"
49845008
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
49855009

5010+
punycode@>=0.2.0:
5011+
version "2.1.0"
5012+
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.0.tgz#5f863edc89b96db09074bad7947bf09056ca4e7d"
5013+
49865014
punycode@^1.4.1:
49875015
version "1.4.1"
49885016
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -4991,7 +5019,7 @@ punycode@~1.2.3:
49915019
version "1.2.4"
49925020
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.2.4.tgz#54008ac972aec74175def9cba6df7fa9d3918740"
49935021

4994-
q-io@^1.10.9, q-io@~1.13.2:
5022+
q-io@^1.10.9:
49955023
version "1.13.2"
49965024
resolved "https://registry.yarnpkg.com/q-io/-/q-io-1.13.2.tgz#eea130d481ddb5e1aa1bc5a66855f7391d06f003"
49975025
dependencies:
@@ -5120,7 +5148,7 @@ read@~1.0.4:
51205148
dependencies:
51215149
mute-stream "~0.0.4"
51225150

5123-
readable-stream@1.1, "readable-stream@>=1.1.13-1 <1.2.0-0", readable-stream@^1.0.27-1, readable-stream@^1.1.13, readable-stream@^1.1.13-1, readable-stream@~1.1.8, readable-stream@~1.1.9:
5151+
readable-stream@1.1, "readable-stream@>=1.1.13-1 <1.2.0-0", readable-stream@^1.0.27-1, readable-stream@^1.0.33-1, readable-stream@^1.1.13, readable-stream@^1.1.13-1, readable-stream@~1.1.8, readable-stream@~1.1.9:
51245152
version "1.1.14"
51255153
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
51265154
dependencies:
@@ -5129,7 +5157,7 @@ readable-stream@1.1, "readable-stream@>=1.1.13-1 <1.2.0-0", readable-stream@^1.0
51295157
isarray "0.0.1"
51305158
string_decoder "~0.10.x"
51315159

5132-
"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@^1.0.33-1, readable-stream@~1.0.0, readable-stream@~1.0.17, readable-stream@~1.0.2, readable-stream@~1.0.26, readable-stream@~1.0.31:
5160+
"readable-stream@>=1.0.33-1 <1.1.0-0", readable-stream@~1.0.0, readable-stream@~1.0.17, readable-stream@~1.0.2, readable-stream@~1.0.26, readable-stream@~1.0.31:
51335161
version "1.0.34"
51345162
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
51355163
dependencies:
@@ -5138,7 +5166,7 @@ readable-stream@1.1, "readable-stream@>=1.1.13-1 <1.2.0-0", readable-stream@^1.0
51385166
isarray "0.0.1"
51395167
string_decoder "~0.10.x"
51405168

5141-
readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5:
5169+
readable-stream@^2.0.0, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2:
51425170
version "2.2.2"
51435171
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
51445172
dependencies:
@@ -5493,14 +5521,18 @@ rx-lite@^3.1.2:
54935521
version "3.1.2"
54945522
resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-3.1.2.tgz#19ce502ca572665f3b647b10939f97fd1615f102"
54955523

5496-
rx@^2.2.27, rx@~2.3.20:
5497-
version "2.3.25"
5498-
resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.25.tgz#2f7c0550532777b41fa692bb790a7886eaff9731"
5524+
rx@^2.2.27:
5525+
version "2.5.3"
5526+
resolved "https://registry.yarnpkg.com/rx/-/rx-2.5.3.tgz#21adc7d80f02002af50dae97fd9dbf248755f566"
54995527

55005528
rx@^4.1.0:
55015529
version "4.1.0"
55025530
resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
55035531

5532+
rx@~2.3.20:
5533+
version "2.3.25"
5534+
resolved "https://registry.yarnpkg.com/rx/-/rx-2.3.25.tgz#2f7c0550532777b41fa692bb790a7886eaff9731"
5535+
55045536
samsam@1.1.2, samsam@~1.1:
55055537
version "1.1.2"
55065538
resolved "https://registry.yarnpkg.com/samsam/-/samsam-1.1.2.tgz#bec11fdc83a9fda063401210e40176c3024d1567"
@@ -6306,7 +6338,7 @@ type-is@~1.6.13:
63066338
media-typer "0.3.0"
63076339
mime-types "~2.1.13"
63086340

6309-
typedarray@~0.0.5:
6341+
typedarray@^0.0.6, typedarray@~0.0.5:
63106342
version "0.0.6"
63116343
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
63126344

0 commit comments

Comments
 (0)