Skip to content

Commit

Permalink
Merge pull request #475 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Apr 20, 2019
2 parents 148738e + 7903072 commit b24af59
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 26 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@
"@babel/core": "7.4.3",
"@babel/plugin-proposal-object-rest-spread": "7.4.3",
"@babel/register": "7.4.0",
"@blackflux/eslint-plugin-rules": "1.0.4",
"@blackflux/eslint-plugin-rules": "1.0.5",
"@blackflux/robo-config-plugin": "1.7.4",
"aws-sdk": "2.441.0",
"babel-eslint": "10.0.1",
"chai": "4.2.0",
"coveralls": "3.0.3",
"eslint": "5.16.0",
"js-gardener": "2.0.9",
"js-gardener": "2.0.10",
"mocha": "6.1.4",
"nock": "10.0.6",
"nyc": "14.0.0",
Expand Down
54 changes: 30 additions & 24 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.4":
version "1.0.4"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.0.4.tgz#b8c97c9add0a9dd11860b2ea900305bfc69e317e"
integrity sha512-TtH5/11HCpSsRv8jpPAZoQpg5J22KYj+JTG4GY5/PdqqC28rOiCYxSIRyKls7IYH9hkX1JnFOBFggU7sMk+oZA==
"@blackflux/eslint-plugin-rules@1.0.5":
version "1.0.5"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.0.5.tgz#380a811272cbce6ce314c4696c7219e98503e73f"
integrity sha512-PUH0ZJ63ga2bku4XEpk2g43IYkHgDv+iYO46yNP7vsyEIGiBB+xMjP+NqMC8hx1tUmxM99lTACDjbqcZUDnoZQ==
dependencies:
smart-fs "1.6.2"
smart-fs "1.7.0"

"@blackflux/robo-config-plugin@1.7.4":
version "1.7.4"
Expand Down Expand Up @@ -3533,10 +3533,10 @@ joi@14.3.1:
isemail "3.x.x"
topo "3.x.x"

js-gardener@2.0.9:
version "2.0.9"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.9.tgz#eedce962147846808b66bd7c5b0eb78850d98de5"
integrity sha512-5Xi1nYoiBCaH2kl0kGr53XpM5rkJ3xK90tgAgHnqU7ffBPE4q19nfv0Bv0xh1Ln1Wuvp9b0exeie97wOVf4BQA==
js-gardener@2.0.10:
version "2.0.10"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.10.tgz#56d7211f1ce1efd98992e7b04b4256208169279a"
integrity sha512-6qEfwAgKzQ/Sme0DJ3w2+sfoXNiLzNPHLi5F7YFzOvhMo3jcGSwc1b1NgMTMy5HweKSU3cCxCw7/EzIPG+8+wA==
dependencies:
chalk "2.4.2"
eslint "5.16.0"
Expand All @@ -3554,7 +3554,7 @@ js-gardener@2.0.9:
lodash.get "4.4.2"
mocha "6.1.4"
npm-check "5.9.0"
robo-config "2.1.4"
robo-config "2.2.0"
tmp "0.1.0"

js-tokens@^3.0.0, js-tokens@^3.0.2:
Expand Down Expand Up @@ -3605,6 +3605,11 @@ json-stable-stringify-without-jsonify@^1.0.1:
resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=

json-stringify-pretty-compact@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/json-stringify-pretty-compact/-/json-stringify-pretty-compact-2.0.0.tgz#e77c419f52ff00c45a31f07f4c820c2433143885"
integrity sha512-WRitRfs6BGq4q8gTgOy4ek7iPFXjbra0H3PmDLKm2xnZ+Gh1HUhiKGgCZkSPNULlP7mvfu6FV/mOLhCarspADQ==

json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
Expand Down Expand Up @@ -5987,10 +5992,10 @@ 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@2.1.4:
version "2.1.4"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-2.1.4.tgz#bc73a02a3a2380b271e86fde733463ee3aa49114"
integrity sha512-w5ZdEMefoAPdQJh05ysl6Ec+Moufs3e71Oq+PxXg52z4z2vwKi7SL7gTXZymCce3caCm0zaTM1qiUvmL2TgLGA==
robo-config@2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-2.2.0.tgz#971ac4616985ce23006b6005ffa36260d9656eea"
integrity sha512-vRfgJfy5UYH523FxnqKalkEoR1aR0PEFIRmyINUPxY5C1OPAn4O7qlci0pxe1+zKT3YKyaEkSRCQze5od7tkjQ==
dependencies:
app-root-path "2.2.1"
deepmerge "3.2.0"
Expand All @@ -6001,7 +6006,7 @@ robo-config@2.1.4:
object-deep-contain "1.0.6"
object-scan "5.0.8"
object-treeify "1.1.7"
smart-fs "1.6.2"
smart-fs "1.7.0"

run-async@^0.1.0:
version "0.1.0"
Expand Down Expand Up @@ -6215,16 +6220,17 @@ smart-buffer@^1.0.13:
resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
integrity sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=

smart-fs@1.6.2:
version "1.6.2"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.6.2.tgz#df77ee37aae60ef4904a3d618f2426dfd9459b32"
integrity sha512-xV1PrwCRtdT5JCWw5kBXe+i9cTTBI8c1LrIaIqMUBdcZdkX2mtx40GVE+laHbVMvOVobE9gksDtb0SGZaUGy1w==
smart-fs@1.7.0:
version "1.7.0"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.7.0.tgz#1070582f97e62b0ce5f7799f01c504165cddc97e"
integrity sha512-8CCINxYBu0l5QdiWlo3v7tkVrWq+IDkNBocoLqLU5VA7gUTwzgB8Cl7j3qxlRagpm3//iHEEdYbTSuXM3VhlrQ==
dependencies:
fs-extra "7.0.1"
json-stringify-pretty-compact "2.0.0"
lodash.clonedeep "4.5.0"
lodash.isequal "4.5.0"
xml-js "1.6.11"
yaml-boost "1.9.1"
yaml-boost "1.9.2"

snapdragon-node@^2.0.1:
version "2.1.1"
Expand Down Expand Up @@ -7297,10 +7303,10 @@ yallist@^3.0.0, yallist@^3.0.2:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==

yaml-boost@1.9.1:
version "1.9.1"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.1.tgz#d74cafcaeb782375988f671fe56ea594725ba3d3"
integrity sha512-prfw7xkd8c6EVABd32EaYm24eUAIv2AOUJuetg+5d9377MrAIP5CXRYsFWfK/4AoLtsTm/FicLDuez/X3tDzNA==
yaml-boost@1.9.2:
version "1.9.2"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.2.tgz#fe149e7185341625699907e6bb51eb6c82ca829b"
integrity sha512-/D168ktcWPhJkp4fqNBFDlpQ/SBDoQRugB92uU3fRsic3pLY/JffCcvWyaDOIppVbtU8QaH3hiDvs+beWa1E+w==
dependencies:
js-yaml "3.13.1"
lodash.get "4.4.2"
Expand Down

0 comments on commit b24af59

Please sign in to comment.