Skip to content

Commit bd67666

Browse files
authored
Merge branch 'master' into renovate/mocha-4.x
2 parents b160178 + 2787753 commit bd67666

File tree

2 files changed

+97
-85
lines changed

2 files changed

+97
-85
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
"husky": "^0.13.1",
7878
"istanbul": "^0.4.5",
7979
"mocha": "^4.0.0",
80-
"nyc": "^10.1.2",
80+
"nyc": "^11.0.0",
8181
"rimraf": "^2.6.0",
8282
"semantic-release": "^11.0.0"
8383
}

yarn.lock

Lines changed: 96 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,6 +1043,10 @@ babylon@^6.11.0, babylon@^6.13.0, babylon@^6.15.0:
10431043
version "6.16.1"
10441044
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.16.1.tgz#30c5a22f481978a9e7f8cdfdf496b11d94b404d3"
10451045

1046+
babylon@^6.18.0:
1047+
version "6.18.0"
1048+
resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
1049+
10461050
balanced-match@^0.4.1:
10471051
version "0.4.2"
10481052
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
@@ -1160,10 +1164,6 @@ camelcase@^2.0.0:
11601164
version "2.1.1"
11611165
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
11621166

1163-
camelcase@^3.0.0:
1164-
version "3.0.0"
1165-
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
1166-
11671167
camelcase@^4.1.0:
11681168
version "4.1.0"
11691169
resolved "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -2080,7 +2080,7 @@ find-parent-dir@^0.3.0:
20802080
version "0.3.0"
20812081
resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
20822082

2083-
find-up@^1.0.0, find-up@^1.1.2:
2083+
find-up@^1.0.0:
20842084
version "1.1.2"
20852085
resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
20862086
dependencies:
@@ -2132,7 +2132,7 @@ for-own@^0.1.4:
21322132
dependencies:
21332133
for-in "^1.0.1"
21342134

2135-
foreground-child@^1.3.3, foreground-child@^1.5.3:
2135+
foreground-child@^1.5.3, foreground-child@^1.5.6:
21362136
version "1.5.6"
21372137
resolved "https://registry.yarnpkg.com/foreground-child/-/foreground-child-1.5.6.tgz#4fd71ad2dfde96789b980a5c0a295937cb2f5ce9"
21382138
dependencies:
@@ -2921,13 +2921,17 @@ istanbul-lib-coverage@^1.0.2:
29212921
version "1.0.2"
29222922
resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.0.2.tgz#87a0c015b6910651cb3b184814dfb339337e25e1"
29232923

2924-
istanbul-lib-hook@^1.0.5:
2925-
version "1.0.5"
2926-
resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.0.5.tgz#6ca3d16d60c5f4082da39f7c5cd38ea8a772b88e"
2924+
istanbul-lib-coverage@^1.1.1:
2925+
version "1.1.1"
2926+
resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz#73bfb998885299415c93d38a3e9adf784a77a9da"
2927+
2928+
istanbul-lib-hook@^1.1.0:
2929+
version "1.1.0"
2930+
resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-1.1.0.tgz#8538d970372cb3716d53e55523dd54b557a8d89b"
29272931
dependencies:
29282932
append-transform "^0.4.0"
29292933

2930-
istanbul-lib-instrument@^1.6.2, istanbul-lib-instrument@^1.7.0:
2934+
istanbul-lib-instrument@^1.6.2:
29312935
version "1.7.0"
29322936
resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.7.0.tgz#b8e0dc25709bb44e17336ab47b7bb5c97c23f659"
29332937
dependencies:
@@ -2939,27 +2943,40 @@ istanbul-lib-instrument@^1.6.2, istanbul-lib-instrument@^1.7.0:
29392943
istanbul-lib-coverage "^1.0.2"
29402944
semver "^5.3.0"
29412945

2942-
istanbul-lib-report@^1.0.0:
2943-
version "1.0.0"
2944-
resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.0.0.tgz#d83dac7f26566b521585569367fe84ccfc7aaecb"
2946+
istanbul-lib-instrument@^1.9.1:
2947+
version "1.9.1"
2948+
resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.9.1.tgz#250b30b3531e5d3251299fdd64b0b2c9db6b558e"
29452949
dependencies:
2946-
istanbul-lib-coverage "^1.0.2"
2950+
babel-generator "^6.18.0"
2951+
babel-template "^6.16.0"
2952+
babel-traverse "^6.18.0"
2953+
babel-types "^6.18.0"
2954+
babylon "^6.18.0"
2955+
istanbul-lib-coverage "^1.1.1"
2956+
semver "^5.3.0"
2957+
2958+
istanbul-lib-report@^1.1.2:
2959+
version "1.1.2"
2960+
resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-1.1.2.tgz#922be27c13b9511b979bd1587359f69798c1d425"
2961+
dependencies:
2962+
istanbul-lib-coverage "^1.1.1"
29472963
mkdirp "^0.5.1"
29482964
path-parse "^1.0.5"
29492965
supports-color "^3.1.2"
29502966

2951-
istanbul-lib-source-maps@^1.1.1:
2952-
version "1.1.1"
2953-
resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.1.1.tgz#f8c8c2e8f2160d1d91526d97e5bd63b2079af71c"
2967+
istanbul-lib-source-maps@^1.2.2:
2968+
version "1.2.2"
2969+
resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.2.tgz#750578602435f28a0c04ee6d7d9e0f2960e62c1c"
29542970
dependencies:
2955-
istanbul-lib-coverage "^1.0.2"
2971+
debug "^3.1.0"
2972+
istanbul-lib-coverage "^1.1.1"
29562973
mkdirp "^0.5.1"
2957-
rimraf "^2.4.4"
2974+
rimraf "^2.6.1"
29582975
source-map "^0.5.3"
29592976

2960-
istanbul-reports@^1.0.2:
2961-
version "1.0.2"
2962-
resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.0.2.tgz#4e8366abe6fa746cc1cd6633f108de12cc6ac6fa"
2977+
istanbul-reports@^1.1.3:
2978+
version "1.1.3"
2979+
resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-1.1.3.tgz#3b9e1e8defb6d18b1d425da8e8b32c5a163f2d10"
29632980
dependencies:
29642981
handlebars "^4.0.3"
29652982

@@ -3625,9 +3642,9 @@ number-is-nan@^1.0.0:
36253642
version "1.0.1"
36263643
resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
36273644

3628-
nyc@^10.1.2:
3629-
version "10.2.0"
3630-
resolved "https://registry.yarnpkg.com/nyc/-/nyc-10.2.0.tgz#facd90240600c9aa4dd81ea99c2fb6a85c53de0c"
3645+
nyc@^11.0.0:
3646+
version "11.4.1"
3647+
resolved "https://registry.yarnpkg.com/nyc/-/nyc-11.4.1.tgz#13fdf7e7ef22d027c61d174758f6978a68f4f5e5"
36313648
dependencies:
36323649
archy "^1.0.0"
36333650
arrify "^1.0.1"
@@ -3636,26 +3653,26 @@ nyc@^10.1.2:
36363653
debug-log "^1.0.1"
36373654
default-require-extensions "^1.0.0"
36383655
find-cache-dir "^0.1.1"
3639-
find-up "^1.1.2"
3656+
find-up "^2.1.0"
36403657
foreground-child "^1.5.3"
36413658
glob "^7.0.6"
3642-
istanbul-lib-coverage "^1.0.2"
3643-
istanbul-lib-hook "^1.0.5"
3644-
istanbul-lib-instrument "^1.7.0"
3645-
istanbul-lib-report "^1.0.0"
3646-
istanbul-lib-source-maps "^1.1.1"
3647-
istanbul-reports "^1.0.2"
3659+
istanbul-lib-coverage "^1.1.1"
3660+
istanbul-lib-hook "^1.1.0"
3661+
istanbul-lib-instrument "^1.9.1"
3662+
istanbul-lib-report "^1.1.2"
3663+
istanbul-lib-source-maps "^1.2.2"
3664+
istanbul-reports "^1.1.3"
36483665
md5-hex "^1.2.0"
36493666
merge-source-map "^1.0.2"
36503667
micromatch "^2.3.11"
36513668
mkdirp "^0.5.0"
36523669
resolve-from "^2.0.0"
36533670
rimraf "^2.5.4"
36543671
signal-exit "^3.0.1"
3655-
spawn-wrap "1.2.4"
3656-
test-exclude "^4.0.0"
3657-
yargs "^7.0.2"
3658-
yargs-parser "^4.0.2"
3672+
spawn-wrap "^1.4.2"
3673+
test-exclude "^4.1.1"
3674+
yargs "^10.0.3"
3675+
yargs-parser "^8.0.0"
36593676

36603677
oauth-sign@~0.8.1:
36613678
version "0.8.2"
@@ -3714,12 +3731,6 @@ os-homedir@^1.0.0, os-homedir@^1.0.1:
37143731
version "1.0.2"
37153732
resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
37163733

3717-
os-locale@^1.4.0:
3718-
version "1.4.0"
3719-
resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-1.4.0.tgz#20f9f17ae29ed345e8bde583b13d2009803c14d9"
3720-
dependencies:
3721-
lcid "^1.0.0"
3722-
37233734
os-locale@^2.0.0:
37243735
version "2.1.0"
37253736
resolved "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
@@ -4339,13 +4350,13 @@ right-align@^0.1.1:
43394350
dependencies:
43404351
align-text "^0.1.1"
43414352

4342-
rimraf@2, rimraf@^2.2.8, rimraf@^2.3.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1:
4353+
rimraf@2, rimraf@^2.2.8, rimraf@^2.5.1, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1:
43434354
version "2.6.1"
43444355
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.1.tgz#c2338ec643df7a1b7fe5c54fa86f57428a55f33d"
43454356
dependencies:
43464357
glob "^7.0.5"
43474358

4348-
rimraf@^2.5.2:
4359+
rimraf@^2.5.2, rimraf@^2.6.2:
43494360
version "2.6.2"
43504361
resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
43514362
dependencies:
@@ -4440,11 +4451,7 @@ shelljs@^0.7.5:
44404451
interpret "^1.0.0"
44414452
rechoir "^0.6.2"
44424453

4443-
signal-exit@^2.0.0:
4444-
version "2.1.2"
4445-
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-2.1.2.tgz#375879b1f92ebc3b334480d038dc546a6d558564"
4446-
4447-
signal-exit@^3.0.0, signal-exit@^3.0.1:
4454+
signal-exit@^3.0.0, signal-exit@^3.0.1, signal-exit@^3.0.2:
44484455
version "3.0.2"
44494456
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
44504457

@@ -4498,16 +4505,16 @@ spawn-error-forwarder@~1.0.0:
44984505
version "1.0.0"
44994506
resolved "https://registry.npmjs.org/spawn-error-forwarder/-/spawn-error-forwarder-1.0.0.tgz#1afd94738e999b0346d7b9fc373be55e07577029"
45004507

4501-
spawn-wrap@1.2.4:
4502-
version "1.2.4"
4503-
resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.2.4.tgz#920eb211a769c093eebfbd5b0e7a5d2e68ab2e40"
4508+
spawn-wrap@^1.4.2:
4509+
version "1.4.2"
4510+
resolved "https://registry.yarnpkg.com/spawn-wrap/-/spawn-wrap-1.4.2.tgz#cff58e73a8224617b6561abdc32586ea0c82248c"
45044511
dependencies:
4505-
foreground-child "^1.3.3"
4512+
foreground-child "^1.5.6"
45064513
mkdirp "^0.5.0"
45074514
os-homedir "^1.0.1"
4508-
rimraf "^2.3.3"
4509-
signal-exit "^2.0.0"
4510-
which "^1.2.4"
4515+
rimraf "^2.6.2"
4516+
signal-exit "^3.0.2"
4517+
which "^1.3.0"
45114518

45124519
spdx-correct@~1.0.0:
45134520
version "1.0.2"
@@ -4599,7 +4606,7 @@ string-length@^1.0.0:
45994606
dependencies:
46004607
strip-ansi "^3.0.0"
46014608

4602-
string-width@^1.0.1, string-width@^1.0.2:
4609+
string-width@^1.0.1:
46034610
version "1.0.2"
46044611
resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
46054612
dependencies:
@@ -4725,7 +4732,7 @@ tar@^2.2.1:
47254732
fstream "^1.0.2"
47264733
inherits "2"
47274734

4728-
test-exclude@^4.0.0, test-exclude@^4.0.3:
4735+
test-exclude@^4.0.3:
47294736
version "4.0.3"
47304737
resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.0.3.tgz#86a13ce3effcc60e6c90403cf31a27a60ac6c4e7"
47314738
dependencies:
@@ -4735,6 +4742,16 @@ test-exclude@^4.0.0, test-exclude@^4.0.3:
47354742
read-pkg-up "^1.0.1"
47364743
require-main-filename "^1.0.1"
47374744

4745+
test-exclude@^4.1.1:
4746+
version "4.1.1"
4747+
resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-4.1.1.tgz#4d84964b0966b0087ecc334a2ce002d3d9341e26"
4748+
dependencies:
4749+
arrify "^1.0.1"
4750+
micromatch "^2.3.11"
4751+
object-assign "^4.1.0"
4752+
read-pkg-up "^1.0.1"
4753+
require-main-filename "^1.0.1"
4754+
47384755
text-extensions@^1.0.0:
47394756
version "1.7.0"
47404757
resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.7.0.tgz#faaaba2625ed746d568a23e4d0aacd9bf08a8b39"
@@ -4981,20 +4998,22 @@ vinyl@^1.1.1:
49814998
clone-stats "^0.0.1"
49824999
replace-ext "0.0.1"
49835000

4984-
which-module@^1.0.0:
4985-
version "1.0.0"
4986-
resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
4987-
49885001
which-module@^2.0.0:
49895002
version "2.0.0"
49905003
resolved "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
49915004

4992-
which@^1.1.1, which@^1.2.12, which@^1.2.4, which@^1.2.9:
5005+
which@^1.1.1, which@^1.2.12, which@^1.2.9:
49935006
version "1.2.14"
49945007
resolved "https://registry.yarnpkg.com/which/-/which-1.2.14.tgz#9a87c4378f03e827cecaf1acdf56c736c01c14e5"
49955008
dependencies:
49965009
isexe "^2.0.0"
49975010

5011+
which@^1.3.0:
5012+
version "1.3.0"
5013+
resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
5014+
dependencies:
5015+
isexe "^2.0.0"
5016+
49985017
wide-align@^1.1.0:
49995018
version "1.1.0"
50005019
resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.0.tgz#40edde802a71fea1f070da3e62dcda2e7add96ad"
@@ -5060,41 +5079,34 @@ yallist@^2.0.0:
50605079
version "2.1.2"
50615080
resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
50625081

5063-
yargs-parser@^4.0.2:
5064-
version "4.2.1"
5065-
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-4.2.1.tgz#29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"
5066-
dependencies:
5067-
camelcase "^3.0.0"
5068-
5069-
yargs-parser@^5.0.0:
5070-
version "5.0.0"
5071-
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
5072-
dependencies:
5073-
camelcase "^3.0.0"
5074-
50755082
yargs-parser@^7.0.0:
50765083
version "7.0.0"
50775084
resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
50785085
dependencies:
50795086
camelcase "^4.1.0"
50805087

5081-
yargs@^7.0.2:
5082-
version "7.0.2"
5083-
resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.0.2.tgz#115b97df1321823e8b8648e8968c782521221f67"
5088+
yargs-parser@^8.0.0:
5089+
version "8.1.0"
5090+
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950"
5091+
dependencies:
5092+
camelcase "^4.1.0"
5093+
5094+
yargs@^10.0.3:
5095+
version "10.0.3"
5096+
resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.0.3.tgz#6542debd9080ad517ec5048fb454efe9e4d4aaae"
50845097
dependencies:
5085-
camelcase "^3.0.0"
50865098
cliui "^3.2.0"
50875099
decamelize "^1.1.1"
5100+
find-up "^2.1.0"
50885101
get-caller-file "^1.0.1"
5089-
os-locale "^1.4.0"
5090-
read-pkg-up "^1.0.1"
5102+
os-locale "^2.0.0"
50915103
require-directory "^2.1.1"
50925104
require-main-filename "^1.0.1"
50935105
set-blocking "^2.0.0"
5094-
string-width "^1.0.2"
5095-
which-module "^1.0.0"
5106+
string-width "^2.0.0"
5107+
which-module "^2.0.0"
50965108
y18n "^3.2.1"
5097-
yargs-parser "^5.0.0"
5109+
yargs-parser "^8.0.0"
50985110

50995111
yargs@^8.0.2:
51005112
version "8.0.2"

0 commit comments

Comments
 (0)