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 #336 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Dec 23, 2019
2 parents fefc84b + cb16ac2 commit 5fa0eac
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 11 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.20",
"@blackflux/eslint-plugin-rules": "1.3.21",
"@blackflux/robo-config-plugin": "3.0.4",
"babel-eslint": "10.0.3",
"chai": "4.2.0",
Expand Down
30 changes: 20 additions & 10 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.20":
version "1.3.20"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.20.tgz#1fdd2ea3ba426ae7bfbbf71b3f550fcfa2285a2b"
integrity sha512-S8I8vhzK+ymomi2yinq0gfBEaMmWpRySlZjgJuDbiBtzhNjniza2OkMdZph97jrQrCzQTxIY1s2scxorxJDt3A==
"@blackflux/eslint-plugin-rules@1.3.21":
version "1.3.21"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.21.tgz#633ede4fbb6c18482a6e8adecc5920562d530e7d"
integrity sha512-tUsg+8zD4Yze/Y3dRmCcfbHJ7NkE3/a5D/QxmSUbm3wXFQOcrRfZ08dKr2n7GWo4ubVEAeqo95QWMLaozGD/iQ==
dependencies:
smart-fs "1.11.4"
smart-fs "1.11.5"

"@blackflux/robo-config-plugin@3.0.4":
version "3.0.4"
Expand Down Expand Up @@ -6646,10 +6646,10 @@ smart-fs@1.11.3:
xml-js "1.6.11"
yaml-boost "1.9.18"

smart-fs@1.11.4:
version "1.11.4"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.4.tgz#3b5fd216f27d3438f5e7a2e08c0b63e3c4b39d93"
integrity sha512-2NL60nagM+/OMTvxpfCpvHxsI2UnijPkKm+F4bn2I90dXf5dQzxUavly48W3y9iXdO/2XopjqdnybUorbMB+JA==
smart-fs@1.11.5:
version "1.11.5"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.5.tgz#01c0f7a073c9937266ae51045870c9878eb1b4b6"
integrity sha512-lcBoa8tclM4ySLOR3wZ/IjDptw5AQWRzNuBtTl8QPmxCSsBo6jz/AtepopBYKWCjtMBXOZc/F/ksxPJQP89beA==
dependencies:
fs-extra "8.1.0"
js-yaml "3.13.1"
Expand All @@ -6658,7 +6658,7 @@ smart-fs@1.11.4:
lodash.isequal "4.5.0"
object-align "1.0.10"
xml-js "1.6.11"
yaml-boost "1.9.18"
yaml-boost "1.9.19"

snapdragon-node@^2.0.1:
version "2.1.1"
Expand Down Expand Up @@ -7804,6 +7804,16 @@ yaml-boost@1.9.18:
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yaml-boost@1.9.19:
version "1.9.19"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.19.tgz#cf5b303c2237d4fc340c59213ef378764aa12383"
integrity sha512-+RNGBTYyqAEIVJlR+FsZuzLPfYmWXRxFvi5wNV7Z+OCCGoSLLP/m8+FIdroRXIzRkzksq/fQPf7efyjXoM+Pjw==
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 5fa0eac

Please sign in to comment.