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 #501 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Aug 11, 2019
2 parents f0a990d + e3d623d commit 97fba9f
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"@babel/core": "7.5.5",
"@babel/plugin-proposal-object-rest-spread": "7.5.5",
"@babel/register": "7.5.5",
"@blackflux/eslint-plugin-rules": "1.1.1",
"@blackflux/eslint-plugin-rules": "1.1.3",
"@blackflux/robo-config-plugin": "2.4.4",
"babel-eslint": "10.0.2",
"chai": "4.2.0",
Expand Down
33 changes: 28 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,12 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.1.1":
version "1.1.1"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.1.1.tgz#0efbd22d60b1acdada1806309cb0191229c67e74"
integrity sha512-o98zbc40PYNF5ApVM3/lFPS79b98cPWM7BEnwhGK737TAozpUwFE+iK/+jbNpYX5hC/eyXkd7GBTktTbtB1Yeg==
"@blackflux/eslint-plugin-rules@1.1.3":
version "1.1.3"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.1.3.tgz#4ecf0c606b46d58ec30c7f4447fa371fdb7efa82"
integrity sha512-PLrBC8THXBOKJYfbgmPJO7qbuYY4wsi6a65ccfyinq2SatLd9ZVWbTnZ8BKzBz5o8zQMUJQ1Jc0eAxwWB3hX+g==
dependencies:
smart-fs "1.9.2"
smart-fs "1.9.4"

"@blackflux/robo-config-plugin@2.4.4":
version "2.4.4"
Expand Down Expand Up @@ -6418,6 +6418,19 @@ smart-fs@1.9.2:
xml-js "1.6.11"
yaml-boost "1.9.10"

smart-fs@1.9.4:
version "1.9.4"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.9.4.tgz#c555e443285e9050f3de82372c1bfb7429726e9f"
integrity sha512-7o51vHHOE9vODZ+FkfARhwwyfVSNxpBuiSwBgTB0/PkWmR7A6ny1mvzMDOAOmEQyEudvi0Jbolh8DFJ9n5AwmA==
dependencies:
fs-extra "8.1.0"
json-stringify-pretty-compact "2.0.0"
lodash.clonedeep "4.5.0"
lodash.isequal "4.5.0"
object-align "1.0.2"
xml-js "1.6.11"
yaml-boost "1.9.11"

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 @@ -7506,6 +7519,16 @@ yaml-boost@1.9.10:
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yaml-boost@1.9.11:
version "1.9.11"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.11.tgz#a0b00c158290d1c284a7a5b0b870e267c7165976"
integrity sha512-OkoXmRbHUL0kIP6BCVRyUNn3XOZIvelwfqP9SePc7HzCljP73XVA9CT+PuEuFF0T6C1ldW23It9p8J1nT7acOQ==
dependencies:
js-yaml "3.13.1"
lodash.get "4.4.2"
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yargs-parser@13.0.0:
version "13.0.0"
resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
Expand Down

0 comments on commit 97fba9f

Please sign in to comment.