Skip to content
This repository has been archived by the owner on Sep 19, 2019. It is now read-only.

Commit

Permalink
Merge pull request #397 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Jun 11, 2019
2 parents b4dc147 + 720c343 commit 478294c
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 50 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,13 @@
"@babel/core": "7.4.5",
"@babel/plugin-proposal-object-rest-spread": "7.4.4",
"@babel/register": "7.4.4",
"@blackflux/eslint-plugin-rules": "1.0.18",
"@blackflux/eslint-plugin-rules": "1.0.19",
"@blackflux/robo-config-plugin": "1.10.5",
"babel-eslint": "10.0.1",
"chai": "4.2.0",
"coveralls": "3.0.4",
"eslint": "5.16.0",
"js-gardener": "2.0.38",
"js-gardener": "2.0.39",
"nyc": "14.1.1",
"semantic-release": "15.13.12"
},
Expand Down
87 changes: 39 additions & 48 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,12 @@
lodash "^4.17.11"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.0.18":
version "1.0.18"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.0.18.tgz#f32e4cf5244153e03b557442df33dd9ea91af14c"
integrity sha512-SZ5vSitKH5yyXxvse136LqBNIr6Be9EQa+7I27rHytksD+DgSro/H1oy1JlP7vAIK3t98YbnbdUTzYTgsJ9t1w==
"@blackflux/eslint-plugin-rules@1.0.19":
version "1.0.19"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.0.19.tgz#a69814cfbdce775ca3125c565c56c8cdd09242df"
integrity sha512-xKTJ37cgTbuBTUMwHTahYB7oWTBsls2LC8HbQi2dEcOSuID042AkrODNVwblcxkJ5DfJOVxcRWlqRrgS925TPA==
dependencies:
smart-fs "1.7.9"
smart-fs "1.8.0"

"@blackflux/robo-config-plugin@1.10.5":
version "1.10.5"
Expand Down Expand Up @@ -2880,11 +2880,6 @@ highlight-es@^1.0.0:
is-es2016-keyword "^1.0.0"
js-tokens "^3.0.0"

hoek@6.x.x:
version "6.1.3"
resolved "https://registry.yarnpkg.com/hoek/-/hoek-6.1.3.tgz#73b7d33952e01fe27a38b0457294b79dd8da242c"
integrity sha512-YXXAAhmF9zpQbC7LEcREFtXfGq5K1fmd+4PHkBq8NUqmzW3G+Dq10bI/i0KucLRwss3YYFQ0fSfoxBZYiGUqtQ==

homedir-polyfill@^1.0.1:
version "1.0.3"
resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
Expand Down Expand Up @@ -3430,13 +3425,6 @@ isarray@1.0.0, isarray@^1.0.0, isarray@~1.0.0:
resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=

isemail@3.x.x:
version "3.2.0"
resolved "https://registry.yarnpkg.com/isemail/-/isemail-3.2.0.tgz#59310a021931a9fb06bbb51e155ce0b3f236832c"
integrity sha512-zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg==
dependencies:
punycode "2.x.x"

isexe@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
Expand Down Expand Up @@ -3537,19 +3525,10 @@ joi-strict@1.0.2:
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.0.2.tgz#cb0bd00cfc3260d6a259324367acef76fcc433ae"
integrity sha512-IHOFYARRhGFk8iAbTI0rvYVsXBYW39dSKNLAxrdPC4SYYYE4hrEVNluXwy+8td/p+K8COyhQLm42osBlBpz4GQ==

joi@14.3.1:
version "14.3.1"
resolved "https://registry.yarnpkg.com/joi/-/joi-14.3.1.tgz#164a262ec0b855466e0c35eea2a885ae8b6c703c"
integrity sha512-LQDdM+pkOrpAn4Lp+neNIFV3axv1Vna3j38bisbQhETPMANYRbFJFUyOZcOClYvM/hppMhGWuKSFEK9vjrB+bQ==
dependencies:
hoek "6.x.x"
isemail "3.x.x"
topo "3.x.x"

js-gardener@2.0.38:
version "2.0.38"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.38.tgz#7b08df204e4571b53d10b7234ffede236cd32305"
integrity sha512-MmShpcfo8zfBRS3iAWFBa/kXjfY5lf5TtgRf7BKyXyhYhAlWqGIVRDknNbzMA2Qz7U5R8F/asyEO8vG883siag==
js-gardener@2.0.39:
version "2.0.39"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.39.tgz#57bf5412a2331fd561b136e32f1768622ca8c6bf"
integrity sha512-Z4plm97GwpcERRwv1+9pwaHVEJkF3Xk67wZSqXIFxmOFkWwMIxe+xDFSTUCPGFnRaCuprHyJH60kUoBrlqeu/A==
dependencies:
"@hapi/joi" "15.0.3"
chalk "2.4.2"
Expand All @@ -3568,7 +3547,7 @@ js-gardener@2.0.38:
lodash.get "4.4.2"
mocha "6.1.4"
npm-check "5.9.0"
robo-config "3.0.18"
robo-config "3.0.21"
tmp "0.1.0"

js-tokens@^3.0.0, js-tokens@^3.0.2:
Expand Down Expand Up @@ -4928,6 +4907,11 @@ oauth-sign@~0.9.0:
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==

object-align@1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.0.tgz#b3a32e8ca6e0fc4bf827e88eadaa64268c050a39"
integrity sha512-bb2pxv0UCIZ+g7sMarmX7xKE9hmGE2lUOadwVswbIvEI51dRSmLsq7TmJwbd7FMH9PL+HMGbGcaEL35+yu0IDA==

object-assign@^4.0.1, object-assign@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
Expand Down Expand Up @@ -5559,16 +5543,16 @@ pumpify@^1.3.3:
inherits "^2.0.3"
pump "^2.0.0"

punycode@2.x.x, punycode@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==

punycode@^1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=

punycode@^2.1.0:
version "2.1.1"
resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==

q@^1.5.1:
version "1.5.1"
resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
Expand Down Expand Up @@ -6043,14 +6027,15 @@ rimraf@2, rimraf@2.6.3, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6
dependencies:
glob "^7.1.3"

robo-config@3.0.18:
version "3.0.18"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.0.18.tgz#b5e04f037a82376fed8eb120a7dfedf47868dcaa"
integrity sha512-IFGQK3kH7rJsFG3dU4pGAyjySEWibxaN+dA84Vwn+3Wu+qeZL6tWDQSq25abDJSM7WMod+Y9olrQ0VYyFh4hYw==
robo-config@3.0.21:
version "3.0.21"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.0.21.tgz#e3f2805153b3d0c6c32729ec1c449ae1ae8324fe"
integrity sha512-Ioui5XUG7iCKJl5LLTkz2Xp0OmKUtLtgaQhI0cwnTaRRSwRg27PtbDy15S6uAx57I/rXzcKrxXyAj6u04IRMIA==
dependencies:
"@hapi/joi" "15.0.3"
app-root-path "2.2.1"
deepmerge "3.2.0"
joi "14.3.1"
joi-strict "1.0.2"
lodash.clonedeep "4.5.0"
lodash.difference "4.5.0"
lodash.get "4.4.2"
Expand Down Expand Up @@ -6289,6 +6274,19 @@ smart-fs@1.7.9:
xml-js "1.6.11"
yaml-boost "1.9.7"

smart-fs@1.8.0:
version "1.8.0"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.8.0.tgz#2ba54a11ce82b0c32b09b4b9ce0d3d6afda4287d"
integrity sha512-E8JPp2LacrCCuLTsADyEL0ZmB4ZjhLVPOvAJi0snKMHqNr33mKgH/DRcgV0aGKbnyc7YACBdMmmRT5v6uLy/2Q==
dependencies:
fs-extra "8.0.1"
json-stringify-pretty-compact "2.0.0"
lodash.clonedeep "4.5.0"
lodash.isequal "4.5.0"
object-align "1.0.0"
xml-js "1.6.11"
yaml-boost "1.9.7"

snapdragon-node@^2.0.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
Expand Down Expand Up @@ -6817,13 +6815,6 @@ to-regex@^3.0.1, to-regex@^3.0.2:
regex-not "^1.0.2"
safe-regex "^1.1.0"

topo@3.x.x:
version "3.0.3"
resolved "https://registry.yarnpkg.com/topo/-/topo-3.0.3.tgz#d5a67fb2e69307ebeeb08402ec2a2a6f5f7ad95c"
integrity sha512-IgpPtvD4kjrJ7CRA3ov2FhWQADwv+Tdqbsf1ZnPUSAtCJ9e1Z44MmoSGDXGk4IppoZA7jd/QRkNddlLJWlUZsQ==
dependencies:
hoek "6.x.x"

tough-cookie@~2.4.3:
version "2.4.3"
resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
Expand Down

0 comments on commit 478294c

Please sign in to comment.