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 #62 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Jul 23, 2019
2 parents f7f12bf + 6448566 commit f14008b
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 48 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
"@babel/core": "7.5.5",
"@babel/plugin-proposal-object-rest-spread": "7.5.5",
"@babel/register": "7.5.5",
"@blackflux/eslint-plugin-rules": "1.0.25",
"@blackflux/eslint-plugin-rules": "1.0.26",
"@blackflux/robo-config-plugin": "2.1.4",
"babel-eslint": "10.0.2",
"chai": "4.2.0",
"coveralls": "3.0.5",
"eslint": "6.1.0",
"js-gardener": "2.0.54",
"js-gardener": "2.0.55",
"nyc": "14.1.1",
"semantic-release": "15.13.18"
},
Expand Down
102 changes: 56 additions & 46 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.0.25":
version "1.0.25"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.0.25.tgz#f4fa42bd9d1d6e56df254e60c29baab1df35b440"
integrity sha512-xhKBkuojpfKG7JCEqnqvp4/tN5wlGV6B3V4FSE5bgDown8HxVmi+UTmJW1JSLM5PTBDwYdAoglcAA08+2ckQ5Q==
"@blackflux/eslint-plugin-rules@1.0.26":
version "1.0.26"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.0.26.tgz#8344477a5855632833fc2b3f39e7b5db702dd1f6"
integrity sha512-l9eJHQM+b4b7rGK2ffYN4q8NbCLhIThzqe3sL/siPDA2M5EzV0/A0f7svG56pKNW9QL6zC1a/t3UsqemMR9now==
dependencies:
smart-fs "1.9.1"
smart-fs "1.9.2"

"@blackflux/robo-config-plugin@2.1.4":
version "2.1.4"
Expand Down Expand Up @@ -3559,20 +3559,15 @@ java-properties@^1.0.0:
resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-1.0.2.tgz#ccd1fa73907438a5b5c38982269d0e771fe78211"
integrity sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ==

joi-strict@1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.0.3.tgz#a00636fdb677815a2134e3c5035c71a40dad9177"
integrity sha512-fTepIytNXkt+LwDET9bQildo8MrQGQtmPd3586dj4JtWbyIK98nk4+cxmcZBg8Rk/NLhHWMpwrrO9x+71mnHpA==

joi-strict@1.0.4:
version "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.54:
version "2.0.54"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.54.tgz#67cf9933d382cb1c397ce897416d592cf605e997"
integrity sha512-6gK0ylnGQqrWg7fXKbehshtQ5NLXGsXPz6S4MZfQzYT7H3Gu/rmjMVmwgCkODxfifXWVooMI9QUNdHWTPsFnJQ==
js-gardener@2.0.55:
version "2.0.55"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.55.tgz#9996b7cfbfce29ae67e7d4bf065964ff9f10fd65"
integrity sha512-ctqCMei7ANVVxNAYFU50fHk4mL3lulRq+jjMFrDDOVcmFGby1gXUIDSZVl85l7fIMkVXcyCQgJBnzGa15dsF0A==
dependencies:
"@hapi/joi" "15.1.0"
chalk "2.4.2"
Expand All @@ -3591,7 +3586,7 @@ js-gardener@2.0.54:
lodash.get "4.4.2"
mocha "6.2.0"
npm-check "5.9.0"
robo-config "3.0.30"
robo-config "3.0.31"
tmp "0.1.0"

js-tokens@^3.0.0, js-tokens@^3.0.2:
Expand Down Expand Up @@ -4984,6 +4979,11 @@ object-align@1.0.1:
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.1.tgz#91eba86ed342a011e13ff1534a48b9ce0298cff2"
integrity sha512-rBfg93vNLK4thCFXK9ioC8zbnZwb5jK7f4AV8A8aF7z4ohiZe73lxqT1YQRREdWFiE/D/EdodI19mjaA/bZLYw==

object-align@1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.2.tgz#14f003e9a50fbe18acb79b736b655924a06a5ade"
integrity sha512-YNGCcw5RcGCDpehATXUGvg0ZNJ9cPz0TtnhIvDYO3IlB304ps+T5S5KlkiA8NCn/d212BwkARuxC4RVQQxQtfg==

object-assign@^4.0.1, object-assign@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
Expand All @@ -4998,25 +4998,25 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"

object-deep-contain@1.0.12:
version "1.0.12"
resolved "https://registry.yarnpkg.com/object-deep-contain/-/object-deep-contain-1.0.12.tgz#5bc86a9b84952ef7c3790f20955bcd69bb005a45"
integrity sha512-Ec77vo98lDXd+6IKvrZD93HnJc0+kpZ1lkLmqXsPkpgMzTutgVlDSX2K3QENL02SEnDMom/a8uiAJPkUE+dzWw==
object-deep-contain@1.0.13:
version "1.0.13"
resolved "https://registry.yarnpkg.com/object-deep-contain/-/object-deep-contain-1.0.13.tgz#2d7b94ad5a2e2da535701d1f0d67ce4c2135f8cf"
integrity sha512-GYKKbftOzyjAfF6m5gL3YLs2MoE2Z3RtyTvJCljfoUleRIHtObSbCgQzUL2W5lZA9bHOjOh9Qy8Jzo8pZth5eA==

object-keys@^1.0.11, object-keys@^1.0.12:
version "1.1.1"
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==

object-scan@10.0.4:
version "10.0.4"
resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-10.0.4.tgz#be557db3f469f178a3d4b65350efc3db0532d454"
integrity sha512-WH1x2ZiPQTOn1Uy71HarIQeDFJxXe57+bubdaLK1dm9MC3pP/LxmAiwhFAM0nFHJF101M4wKG3twrPT1MtOlYg==
object-scan@10.0.5:
version "10.0.5"
resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-10.0.5.tgz#b08b8e2e7e0b7ee16402f6df7140d553bfd28c9d"
integrity sha512-d8h5hYgH5RrAa4LZ6A/PopWlnmUL4hoeA283FVTl3+qnN22+KDbFXUfij4AyAQ5sui4C9R4hE8EEpvj7QQ6SEQ==

object-treeify@1.1.13:
version "1.1.13"
resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.13.tgz#3486b5af304d4e3c32b44baa3a43db47366860b3"
integrity sha512-ehsS6DoiwkFqFMpnAejKgiZtJrnTVgjHN2VgOTjHnZhZZ8l3U2brNpudQzijj4+kMKTbe8gCZBUc0jqQxNSfyg==
object-treeify@1.1.14:
version "1.1.14"
resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.14.tgz#6b1b6ec691710c43e1b36f117a2a51f215999132"
integrity sha512-UcEXe/df7Ui/Ov/rrKMu9/ba60JwYGbhqsj0bKgpFB2oMFz9qyFK69ddSQRFyqV1R6b5+3OT3USHl+BsIt02aA==

object-visit@^1.0.0:
version "1.0.1"
Expand Down Expand Up @@ -6140,22 +6140,22 @@ 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.0.30:
version "3.0.30"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.0.30.tgz#f57bf3665560652016638b6b2eaa3181a28ac6e5"
integrity sha512-PgkNA7wue2ACLcswQZevxJ2x2Ls4PQZUC7si2VkbbXr+wSrKvBrEcvD/le0FAmYiGMyNTYZTqnpHMds0UukJyw==
robo-config@3.0.31:
version "3.0.31"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.0.31.tgz#86324d407eca3d7bd491842fb245b3d31b5f5dfc"
integrity sha512-AqKMP82WMFh+l8ODZ5P8JR9cQzK4DzCUw2GcxfOtcUHpLq3GAoo1ISe0UXBon6XCuo/aiDV7UjYJyX8a82moag==
dependencies:
"@hapi/joi" "15.1.0"
app-root-path "2.2.1"
deepmerge "4.0.0"
joi-strict "1.0.3"
joi-strict "1.0.4"
lodash.clonedeep "4.5.0"
lodash.difference "4.5.0"
lodash.get "4.4.2"
object-deep-contain "1.0.12"
object-scan "10.0.4"
object-treeify "1.1.13"
smart-fs "1.9.0"
object-deep-contain "1.0.13"
object-scan "10.0.5"
object-treeify "1.1.14"
smart-fs "1.9.1"

run-async@^0.1.0:
version "0.1.0"
Expand Down Expand Up @@ -6363,10 +6363,10 @@ smart-buffer@4.0.2:
resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.0.2.tgz#5207858c3815cc69110703c6b94e46c15634395d"
integrity sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==

smart-fs@1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.9.0.tgz#0a3326f0c459ab34cad23ff8958e9dbefba2f65b"
integrity sha512-cp5jeLH+c709jRp74G1pjrS0ywLTZ/X0SQAmz2Vf2vTd9s2MwTmQ//vdr8k9/Cj7uce5zxqtuTqZc7gzpy3PgA==
smart-fs@1.9.1:
version "1.9.1"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.9.1.tgz#551a11228b4f2e4b6d6adb830a198cd5e6974d5a"
integrity sha512-xlI7cfGrKa9kEMd8Uga2cz/sWJoMJGDqqLmlqT4PnNMPYpEPbv5nm18T+NE63VlNonnhUhkNVGxWaqsK01rMRg==
dependencies:
fs-extra "8.1.0"
json-stringify-pretty-compact "2.0.0"
Expand All @@ -6376,18 +6376,18 @@ smart-fs@1.9.0:
xml-js "1.6.11"
yaml-boost "1.9.9"

smart-fs@1.9.1:
version "1.9.1"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.9.1.tgz#551a11228b4f2e4b6d6adb830a198cd5e6974d5a"
integrity sha512-xlI7cfGrKa9kEMd8Uga2cz/sWJoMJGDqqLmlqT4PnNMPYpEPbv5nm18T+NE63VlNonnhUhkNVGxWaqsK01rMRg==
smart-fs@1.9.2:
version "1.9.2"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.9.2.tgz#d516a3004c61f86585f0f8ed0f9b82d96d9b8abe"
integrity sha512-PfHv+bi2e+lJe5qDo7xvSfgHDRlR7mPyE3EgrUmJ8aeqNUTBrzF67tRcLeLr7t4oz3jfukXOWKOcATiwbJx2fA==
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.1"
object-align "1.0.2"
xml-js "1.6.11"
yaml-boost "1.9.9"
yaml-boost "1.9.10"

snapdragon-node@^2.0.1:
version "2.1.1"
Expand Down Expand Up @@ -7445,6 +7445,16 @@ yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.3.tgz#b4b049e314be545e3ce802236d6cd22cd91c3de9"
integrity sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==

yaml-boost@1.9.10:
version "1.9.10"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.10.tgz#4a9bc4a092576389c680fe0bc6033f3a2bdcfdb2"
integrity sha512-MZMcHMzKzL1Y9MVj6vO2Txk1TRBojlvjXsRBcsgkk08OxL3tuAa+H8pZXF4y5kOLlZfVYusrDZmOhog1hiHsWw==
dependencies:
js-yaml "3.13.1"
lodash.get "4.4.2"
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yaml-boost@1.9.9:
version "1.9.9"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.9.tgz#9657a87b93bae480a644a05b66be2217490cb85a"
Expand Down

0 comments on commit f14008b

Please sign in to comment.