Skip to content

Commit

Permalink
Merge pull request #773 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 9a28f95 + f1197ff commit 14d8dc1
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 21 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@
"@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.2",
"@blackflux/eslint-plugin-rules": "1.1.3",
"@blackflux/robo-config-plugin": "2.4.4",
"aws-sdk": "2.507.0",
"babel-eslint": "10.0.2",
"chai": "4.2.0",
"coveralls": "3.0.6",
"eslint": "6.1.0",
"js-gardener": "2.0.60",
"js-gardener": "2.0.61",
"mocha": "6.2.0",
"nock": "10.0.6",
"nyc": "14.1.1",
Expand Down
48 changes: 29 additions & 19 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.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==
"@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.3"
smart-fs "1.9.4"

"@blackflux/robo-config-plugin@2.4.4":
version "2.4.4"
Expand Down Expand Up @@ -3659,10 +3659,10 @@ joi-strict@1.0.4:
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.0.4.tgz#8bf55f7b4d6accd5b530ac98276131b59e982254"
integrity sha512-ChSFFa+Z3iD9x9QsBFMEHwXrwt2Gq2OD1fg+Mgje1Tx+Pqt7ma+LXgMdzVoC7GHCxhO3ySDVBtDumES/yycMXg==

js-gardener@2.0.60:
version "2.0.60"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.60.tgz#5bf43234a2bc31e491222a88e3804f4b56bcd0f3"
integrity sha512-BQBrqypnvIdQ/exF+gUgHESsahR8DKciEMGZz3yJ6xcv/c3dvruhKIE+CT5QQr2/B9e3EoB/jRCDQq3o2AX1nA==
js-gardener@2.0.61:
version "2.0.61"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.61.tgz#58ed898eb4ee542e10fc5fc9603fd7d9efd4d048"
integrity sha512-yfZ3JXkN+kQThbG6PYndOfO/1z/wE5LxbTjhH3LFtnyZXKv18NWkiTB9tFEMtVvq+l/d6i34NJ/9A/h0MW1Wsg==
dependencies:
"@hapi/joi" "15.1.0"
chalk "2.4.2"
Expand All @@ -3681,7 +3681,7 @@ js-gardener@2.0.60:
lodash.get "4.4.2"
mocha "6.2.0"
npm-check "5.9.0"
robo-config "3.1.1"
robo-config "3.1.2"
tmp "0.1.0"

js-tokens@^3.0.0, js-tokens@^3.0.2:
Expand Down Expand Up @@ -6259,10 +6259,10 @@ rimraf@2, rimraf@2.6.3, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6
dependencies:
glob "^7.1.3"

robo-config@3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.1.1.tgz#0311d56d4b679296c5d497d3de057f18fa2090b9"
integrity sha512-3GPWn0dxqoObwbxl1J8DQE4p8nOp9f8CH6NQa3dXS7Dlgbhpf4s8LUr24fuKtRea0TT7kWAbotrfZsw+5Z6ozQ==
robo-config@3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.1.2.tgz#ef69bc53ef4416801778b30aa105417eef33d13f"
integrity sha512-kCVzK+6juQNkPCOPyUvHD/tEtcUw8tVYTVkUK0hN5BRFLTN2RYmJHxTGVC+6lsSbFO/rzPwfvwOXoYkLfSB+Rw==
dependencies:
"@hapi/joi" "15.1.0"
app-root-path "2.2.1"
Expand Down Expand Up @@ -6500,18 +6500,18 @@ 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==
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.10"
yaml-boost "1.9.11"

snapdragon-node@^2.0.1:
version "2.1.1"
Expand Down Expand Up @@ -7612,6 +7612,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 14d8dc1

Please sign in to comment.