Skip to content
This repository has been archived by the owner on Jan 23, 2021. It is now read-only.

Commit

Permalink
Merge pull request #300 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Nov 29, 2019
2 parents 2fc31b8 + 7be1adb commit 5eff279
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 11 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@babel/core": "7.7.4",
"@babel/plugin-proposal-object-rest-spread": "7.7.4",
"@babel/register": "7.7.4",
"@blackflux/eslint-plugin-rules": "1.3.16",
"@blackflux/eslint-plugin-rules": "1.3.17",
"@blackflux/robo-config-plugin": "3.0.1",
"babel-eslint": "10.0.3",
"chai": "4.2.0",
Expand All @@ -53,7 +53,7 @@
"eslint-plugin-json": "2.0.1",
"eslint-plugin-markdown": "1.0.1",
"eslint-plugin-mocha": "6.2.2",
"js-gardener": "2.0.115",
"js-gardener": "2.0.116",
"nyc": "14.1.1",
"semantic-release": "15.13.31"
},
Expand Down
47 changes: 38 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,12 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.3.16":
version "1.3.16"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.16.tgz#51806086b35c0e21368d31a818c59c5ec72f3ecb"
integrity sha512-X7EqucFoi/Ig7gE9FN1NyxG0BrNuohPO5DM1skBy3ORuDb7+yhhFC+yoMY+gWAbzaDo6ODrRPasYRLTm9OSXWg==
"@blackflux/eslint-plugin-rules@1.3.17":
version "1.3.17"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.17.tgz#7204e0e5988ac7fad789910aa9b6451b938a596b"
integrity sha512-8ce/6Z34ejFjn5Jnj4CAO66DnXa3QCoptYOoQG/0widibXzOY0Cb6xrCAOpDvRypPHHCkCZlFwc0WFHzgCY68w==
dependencies:
smart-fs "1.11.0"
smart-fs "1.11.2"

"@blackflux/robo-config-plugin@3.0.1":
version "3.0.1"
Expand Down Expand Up @@ -3729,10 +3729,10 @@ joi-strict@1.1.8:
dependencies:
"@hapi/joi" "16.1.7"

js-gardener@2.0.115:
version "2.0.115"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.115.tgz#58acf55135daf02fc7649a3be8f3744e0afd6f44"
integrity sha512-N0x1hp+IiDydwQsv09dNUHA+Bz6DlCvIpf/igMOM9Ia2dmPfW14Q5eVxUa4getDKbmi+/R5FMVNAqiBbyWGpnQ==
js-gardener@2.0.116:
version "2.0.116"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.116.tgz#ddce9f496f72045e477e7f4060fc7ba178bcfec2"
integrity sha512-gHr8aIxQ86lNIhsZ1ElQ5GomAN2hzviy6fn8K9ksbOt6UDLiiTiszsWo3uPWWXUqS9x0gBMgGb4I4MbV+7xIHA==
dependencies:
chalk "3.0.0"
fancy-log "1.3.3"
Expand Down Expand Up @@ -5108,6 +5108,11 @@ object-align@1.0.8:
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.8.tgz#ff549c2e80a2e5ace2d22275afe9497a5842ba54"
integrity sha512-/2D+LEr8M9F1GEuiJBdiIrytv9o2Oh+eaO4G2pm84JJ0a6vD/cKt9ZXZxEKbo/agPFPJCLSm0Aa1Ssg5apGwvA==

object-align@1.0.9:
version "1.0.9"
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.9.tgz#f1b1e236cc08606d8e85062ad7eaa4234569110a"
integrity sha512-TcJYEU56ChboC286wnbiZA2R0xt3L05i9Y+M+tiSZBvo74qGKZl/uadN4O+wABoaKQEj0zVFPDUmfjk8QkkhHg==

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 @@ -6522,6 +6527,20 @@ smart-fs@1.11.0:
xml-js "1.6.11"
yaml-boost "1.9.17"

smart-fs@1.11.2:
version "1.11.2"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.2.tgz#e3a2c8bc103f5d1becf80def29c3bab67c5fc47b"
integrity sha512-hqwEn6rC6l5cehd7n7zsXe2zmcpHRk2r+QfmEzf/yIlzA+eM0Qtrk/R/Rz5KvHQgefqMOo+vkDntGII+tHli1g==
dependencies:
fs-extra "8.1.0"
js-yaml "3.13.1"
json-stringify-pretty-compact "2.0.0"
lodash.clonedeep "4.5.0"
lodash.isequal "4.5.0"
object-align "1.0.9"
xml-js "1.6.11"
yaml-boost "1.9.18"

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 @@ -7652,6 +7671,16 @@ yaml-boost@1.9.17:
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yaml-boost@1.9.18:
version "1.9.18"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.18.tgz#7b7423af4f8641a1048c3dfc7473308b82a7a9f2"
integrity sha512-/YrAJLcELw85HOPSzgRwV3f7crqz8rL9NqOlCzB+Tzs8SnUPoRTyGvUiVrA34u6Gkb5Yw6NIHd1r9seROLV+kA==
dependencies:
js-yaml "3.13.1"
lodash.get "4.4.2"
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yaml@^1.7.2:
version "1.7.2"
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.7.2.tgz#f26aabf738590ab61efaca502358e48dc9f348b2"
Expand Down

0 comments on commit 5eff279

Please sign in to comment.