Skip to content

Commit

Permalink
Merge pull request #770 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 fe0c752 + 207a4f7 commit 9a28f95
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 11 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@
"@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.0",
"@blackflux/robo-config-plugin": "2.4.3",
"@blackflux/eslint-plugin-rules": "1.1.2",
"@blackflux/robo-config-plugin": "2.4.4",
"aws-sdk": "2.507.0",
"babel-eslint": "10.0.2",
"chai": "4.2.0",
Expand Down
31 changes: 22 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,17 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.1.0":
version "1.1.0"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.1.0.tgz#fb48926234c07f5b2a2b46f5b3a5f88b8d4bc2ac"
integrity sha512-YW7D/rnCZn6zZUGTgd28X/yaKHaKFj5o4iuV0lptEejz7iNE+WrDjZNZ3oTVmn0JxARP0gn5ZcyeYef6ToIkdw==
"@blackflux/eslint-plugin-rules@1.1.2":
version "1.1.2"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.1.2.tgz#97e76bf383f7634988c75cc24b05bab0db11270e"
integrity sha512-QGpFr1zTF75tVq94+8teil4Hq0h5ATRUMeLeuhh9NShTOh9uKltZvCL15bttUPdfM0MCP5wJxb/OuYviwUZHGQ==
dependencies:
smart-fs "1.9.2"
smart-fs "1.9.3"

"@blackflux/robo-config-plugin@2.4.3":
version "2.4.3"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.4.3.tgz#f1453ab8a575c9574cba1263a1c3cddcdd12ce36"
integrity sha512-DQU+vmV+0IQ+XsYB+FQZiv18hfrX+mU6gHmO76bb9SfUc2uoN5TVtCNb7+ylFjht5yp72ZUyKz7luk4WPocwPQ==
"@blackflux/robo-config-plugin@2.4.4":
version "2.4.4"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.4.4.tgz#af85de73343ff6e1b5c3409a994e139c77bb4145"
integrity sha512-lJXhk/BvcH6xyD0+l3OrH+8vKUMKu1kVDSYxDOln/K6fZwdSGyUYwhh2lFVNvtEYXoqjt34GV9kDrcGS7veKVg==

"@hapi/address@2.x.x":
version "2.0.0"
Expand Down Expand Up @@ -6500,6 +6500,19 @@ smart-fs@1.9.2:
xml-js "1.6.11"
yaml-boost "1.9.10"

smart-fs@1.9.3:
version "1.9.3"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.9.3.tgz#e31c7df571591e79084878ce58f4d7c2b0211ab2"
integrity sha512-bxaxG5nWGSwZQH0nldCdBL2Pb9bxHf2PLfrPwFH9j8AKUaiWO1tbWzMCHxDZpkMcIqwdLKH4Esfz8E8lYSZffQ==
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.10"

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

0 comments on commit 9a28f95

Please sign in to comment.