Skip to content

Commit

Permalink
Merge pull request #441 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Apr 15, 2019
2 parents 164c149 + e268c4d commit 3e66efa
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 37 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@
"@babel/plugin-proposal-object-rest-spread": "7.4.3",
"@babel/register": "7.4.0",
"@blackflux/eslint-plugin-rules": "1.0.2",
"@blackflux/robo-config-plugin": "1.3.2",
"@blackflux/robo-config-plugin": "1.3.3",
"aws-sdk": "2.437.0",
"babel-eslint": "10.0.1",
"chai": "4.2.0",
"coveralls": "3.0.3",
"eslint": "5.16.0",
"js-gardener": "2.0.2",
"js-gardener": "2.0.3",
"mocha": "6.1.3",
"nock": "10.0.6",
"nyc": "13.3.0",
Expand Down
59 changes: 24 additions & 35 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,10 @@
dependencies:
smart-fs "1.6.1"

"@blackflux/robo-config-plugin@1.3.2":
version "1.3.2"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-1.3.2.tgz#c877fabfefe2557ab1a005d7030016e9323c1a85"
integrity sha512-tqNpB18dQVmvIZsZTofg5kZupwlGf5tzLqG5MAq+31ycP0FFQg9uJLMWKp5MRj18I97cJCqhud/whDH24YCbhA==
"@blackflux/robo-config-plugin@1.3.3":
version "1.3.3"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-1.3.3.tgz#9c39c2f14c1f2defba922cc8cdb621c3e970f05a"
integrity sha512-WzWMQ5ULLnVxoZhrvJwWQ+w3RTl2bYDC/sf6sOKK4oDvb1W2lRq7k4RWfjN6xoSNbmylTOc26/a9Gys3+LfOmQ==

"@mrmlnc/readdir-enhanced@^2.2.1":
version "2.2.1"
Expand Down Expand Up @@ -3522,10 +3522,10 @@ joi@14.3.1:
isemail "3.x.x"
topo "3.x.x"

js-gardener@2.0.2:
version "2.0.2"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.2.tgz#575bf67318cc2a1dc06cf5c1008066f12eda5bc6"
integrity sha512-jchilaHcbEBymaCjaYj25JDmF+NKFkx/HESc01pqU9B1rGXixu38Fd/EAAEorFjAdW3HErE7/PywT3UHomRYtw==
js-gardener@2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.3.tgz#2cf2a46e80992250ee27490aaf29206eac0f2677"
integrity sha512-dvCxKylSfDVppB6A1z2lAXRfQf5u1Nyr6wD9J4AkaDhmlZTchniiXz5wVZKl+lNYwWw7OyqvCrDuLpp7P6GOdw==
dependencies:
chalk "2.4.2"
eslint "5.16.0"
Expand All @@ -3543,7 +3543,7 @@ js-gardener@2.0.2:
lodash.get "4.4.2"
mocha "6.1.3"
npm-check "5.9.0"
robo-config "1.23.1"
robo-config "1.23.2"
tmp "0.1.0"

js-tokens@^3.0.0, js-tokens@^3.0.2:
Expand Down Expand Up @@ -4907,15 +4907,15 @@ object-keys@^1.0.11, object-keys@^1.0.12:
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==

object-scan@5.0.3:
version "5.0.3"
resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-5.0.3.tgz#041c9a3d930cc0938752b71e3a126b8e137205ca"
integrity sha512-xc1d6G+kN5WRdHgx/izJLi/GXIJ/A6HPZL8fKPn0ivsZztETRxKGgYxQWAqZwlCksh86mhD7WAMt/oECOLk/qA==
object-scan@5.0.4:
version "5.0.4"
resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-5.0.4.tgz#7ee3cb0b7e4015861146436f91db4df6a12d0ff2"
integrity sha512-jsMJ5sZJ4y4i/Y37djde0uooD+/whq7mitXm4AjGWEK4ey94I6zGZdgyUJzxMHYqDcLnsO0oeeXd5Zbbr/LSjg==

object-treeify@1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.5.tgz#fd2965624b3ce91db68d329e9075f1a05ef87f85"
integrity sha512-umRaMLZj0AN3URpG3GxcoGjIX4196maSZfMinECxrNSdPZrNiQw+CCUuqP+oKERWXJ9DkwHkZ+VCzd+jSf8B+A==
object-treeify@1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.6.tgz#42c643e1154bc1cb17c9517ff9b972fd56a58fe2"
integrity sha512-zOSm9z2sVS+90/IeyRY8BbSefps7ZP99+eCKRM73xAzVxIcaMFU0vIXWT9q9QZhWMMWh3aHmqVaQbXpodqug0g==

object-visit@^1.0.0:
version "1.0.1"
Expand Down Expand Up @@ -5979,10 +5979,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@1.23.1:
version "1.23.1"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-1.23.1.tgz#8ffed4db50ced2e3641e6d5e42cc2c958b5c4323"
integrity sha512-U+RrqDuursDoD2jcuMODcLfT/oF4qI8DK80vZqdTETr39sUatRG+HS0In6pz7AAUgbRScRJz6O/EyvWYaa571Q==
robo-config@1.23.2:
version "1.23.2"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-1.23.2.tgz#bcf96266b56cf53c672b83579925fb3407f80c3e"
integrity sha512-JHuadwAwa8a++nI4BvHTV/X/ZjBhI/wjbF/njUhu2EyDowKa0+SqZfJmnWyKuR8yFJhCKySuDvt4L1mdK80s5w==
dependencies:
app-root-path "2.2.1"
deepmerge "3.2.0"
Expand All @@ -5991,9 +5991,9 @@ robo-config@1.23.1:
lodash.difference "4.5.0"
lodash.get "4.4.2"
object-deep-contain "1.0.4"
object-scan "5.0.3"
object-treeify "1.1.5"
smart-fs "1.6.0"
object-scan "5.0.4"
object-treeify "1.1.6"
smart-fs "1.6.1"

run-async@^0.1.0:
version "0.1.0"
Expand Down Expand Up @@ -6202,17 +6202,6 @@ smart-buffer@^1.0.13:
resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
integrity sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=

smart-fs@1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.6.0.tgz#5426905042b7efed6f3aa2b8110b2e401760df87"
integrity sha512-0lCETMA4Ifux+megsUx2Qjz4/43mamnSd409BgEumi0QxqHXtqkRgqhPfVqMz+qKq4YOrbAaFgHixhdDkQTu4A==
dependencies:
fs-extra "7.0.1"
lodash.clonedeep "4.5.0"
lodash.isequal "4.5.0"
xml-js "1.6.11"
yaml-boost "1.9.0"

smart-fs@1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.6.1.tgz#36e57fad0629a72078b07670e245ddf066bdd7c6"
Expand Down

0 comments on commit 3e66efa

Please sign in to comment.