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 #358 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Jan 8, 2020
2 parents 60ad8b4 + da5bc54 commit a2a6be4
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@babel/core": "7.7.7",
"@babel/plugin-proposal-object-rest-spread": "7.7.7",
"@babel/register": "7.7.7",
"@blackflux/eslint-plugin-rules": "1.3.23",
"@blackflux/eslint-plugin-rules": "1.3.24",
"@blackflux/robo-config-plugin": "3.0.8",
"babel-eslint": "10.0.3",
"chai": "4.2.0",
Expand Down
34 changes: 29 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.3.23":
version "1.3.23"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.23.tgz#8a58acb2f1259ad52548752d719cb2d3f7a8bd10"
integrity sha512-7tal9zQJGpCZ1UJJgf53uqxuysR9IrcR0IActCmC7DgDqOkVchNhHCOMlHZI+0zl7gc5QLB408VXohAC5qW52g==
"@blackflux/eslint-plugin-rules@1.3.24":
version "1.3.24"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.24.tgz#283811b7ef1c59d9159e6525fdaf37c455124021"
integrity sha512-T1Cc/7M2z/gmDVJiCtuki38zdVB6Rls6fI3TnR0RFicXnecfy60IfQjaULkbU4xBmyFG68yZtJbKJnOJovo8RA==
dependencies:
smart-fs "1.11.7"
smart-fs "1.11.8"

"@blackflux/robo-config-plugin@3.0.8":
version "3.0.8"
Expand Down Expand Up @@ -6654,6 +6654,20 @@ smart-fs@1.11.7:
xml-js "1.6.11"
yaml-boost "1.9.19"

smart-fs@1.11.8:
version "1.11.8"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.8.tgz#c3c268da7794018a5f81488bc63d281c3e2d1dd9"
integrity sha512-QOK7QsswqAzpfnjNVomKM+07CzcGxKV+e845XPW3SbKdIV/XoIUetQjZG9lbyBZQxjlI2AfR5VjNaX9bkowd/w==
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.11"
xml-js "1.6.11"
yaml-boost "1.9.20"

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 @@ -7798,6 +7812,16 @@ yaml-boost@1.9.19:
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yaml-boost@1.9.20:
version "1.9.20"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.20.tgz#51fa0d0b7686907050da711ced00ba186e070900"
integrity sha512-saLEL+ngKoy60TGy30QhWbaHaVee+f3Nk7tvRnJXf39Y+N72KOSyYEK/U0hMjULUkxagN4opVt3Ib8/+xmJr6g==
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 a2a6be4

Please sign in to comment.