Skip to content

Commit

Permalink
Merge pull request #71 from blackflux/dev
Browse files Browse the repository at this point in the history 
[Gally]: master <- dev
  • Loading branch information
@simlu
simlu committed Mar 21, 2019
2 parents 6f711a7 + 6088a69 commit c983a19
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 47 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"chai": "4.2.0",
"coveralls": "3.0.3",
"eslint": "5.15.3",
"js-gardener": "1.38.5",
"js-gardener": "1.38.6",
"nyc": "13.3.0",
"semantic-release": "15.13.3",
"tmp": "0.0.33"
Expand Down Expand Up @@ -97,7 +97,7 @@
"lodash.difference": "4.5.0",
"object-deep-contain": "1.0.4",
"object-scan": "5.0.3",
"object-treeify": "1.0.3",
"object-treeify": "1.1.2",
"smart-fs": "1.5.0"
}
}
66 changes: 21 additions & 45 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,7 @@ debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
dependencies:
ms "^2.1.1"

debuglog@*, debuglog@^1.0.1:
debuglog@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=
Expand Down Expand Up @@ -2922,7 +2922,7 @@ import-lazy@^2.1.0:
resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=

imurmurhash@*, imurmurhash@^0.1.4:
imurmurhash@^0.1.4:
version "0.1.4"
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
Expand Down Expand Up @@ -3457,10 +3457,10 @@ joi@14.3.1:
isemail "3.x.x"
topo "3.x.x"

js-gardener@1.38.5:
version "1.38.5"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-1.38.5.tgz#6428af5bd19b03bfe08479a0580d154d0c491516"
integrity sha512-j82jyBMvVLoWCzcHcJn5ZcPQpN+WrR/oLbsVb9nAQ6xz/kN/3IgjOzkNzsjE2/+UhtM2kTS0fHIjFSSt4ZT+dw==
js-gardener@1.38.6:
version "1.38.6"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-1.38.6.tgz#2da56df5eef9a029d4693c3d9ae7672d357b7483"
integrity sha512-wn92rvGYTU993NvHZ6CkqWCikSfadW3Ko8iUPxBkuSyKWvsmkdbenDJft4hJrwVbamotVAZqzJV8apMN+HhbIg==
dependencies:
chalk "2.4.2"
eslint "5.15.3"
Expand All @@ -3475,7 +3475,7 @@ js-gardener@1.38.5:
flow-bin "0.95.1"
fs-extra "7.0.1"
glob "7.1.3"
js-yaml "3.12.2"
js-yaml "3.13.0"
lodash.defaults "4.2.0"
lodash.defaultsdeep "4.6.0"
lodash.difference "4.5.0"
Expand Down Expand Up @@ -3508,14 +3508,22 @@ js-yaml@3.12.0:
argparse "^1.0.7"
esprima "^4.0.0"

js-yaml@3.12.2, js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.4.2, js-yaml@^3.6.1, js-yaml@^3.9.0:
js-yaml@3.12.2:
version "3.12.2"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.2.tgz#ef1d067c5a9d9cb65bd72f285b5d8105c77f14fc"
integrity sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"

js-yaml@3.13.0, js-yaml@^3.11.0, js-yaml@^3.12.0, js-yaml@^3.4.2, js-yaml@^3.6.1, js-yaml@^3.9.0:
version "3.13.0"
resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.0.tgz#38ee7178ac0eea2c97ff6d96fff4b18c7d8cf98e"
integrity sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==
dependencies:
argparse "^1.0.7"
esprima "^4.0.0"

jsbn@~0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
Expand Down Expand Up @@ -3762,11 +3770,6 @@ lockfile@^1.0.4:
dependencies:
signal-exit "^3.0.2"

lodash._baseindexof@*:
version "3.1.0"
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw=

lodash._baseuniq@~4.6.0:
version "4.6.0"
resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
Expand All @@ -3775,33 +3778,11 @@ lodash._baseuniq@~4.6.0:
lodash._createset "~4.0.0"
lodash._root "~3.0.0"

lodash._bindcallback@*:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=

lodash._cacheindexof@*:
version "3.0.2"
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI=

lodash._createcache@*:
version "3.1.2"
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM=
dependencies:
lodash._getnative "^3.0.0"

lodash._createset@~4.0.0:
version "4.0.3"
resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY=

lodash._getnative@*, lodash._getnative@^3.0.0:
version "3.9.1"
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=

lodash._root@~3.0.0:
version "3.0.1"
resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
Expand Down Expand Up @@ -3882,11 +3863,6 @@ lodash.omit@4.5.0:
resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
integrity sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=

lodash.restparam@*:
version "3.6.1"
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=

lodash.set@4.3.2, lodash.set@^4.3.2:
version "4.3.2"
resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
Expand Down Expand Up @@ -4884,10 +4860,10 @@ object-scan@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-treeify@1.0.3:
version "1.0.3"
resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.0.3.tgz#1b7ae4a50041854404bb5d33c8d6a3ecf82c6d4c"
integrity sha512-OuUqK0ZimDghCKurBOBzDvNl6WEGf612lOUj6j6rRC2oF1ehcVxeO6kYC1LUKfXj4UydmbhhnTV9LwynpwKsPQ==
object-treeify@1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.2.tgz#18432542e5f2181ed732b5f49e195987cc584991"
integrity sha512-Z7kf0fQ9rFQR9LTRXBryGVy7uuRj8ohnL6HRuRXJ6Ybi9K8lkGUVMxh7/7UHNPCZ4UhyEXpdv9RA+cHCFK/USw==

object-visit@^1.0.0:
version "1.0.1"
Expand Down Expand Up @@ -5677,7 +5653,7 @@ readable-stream@~1.1.10:
isarray "0.0.1"
string_decoder "~0.10.x"

readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
readdir-scoped-modules@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
integrity sha1-n6+jfShr5dksuuve4DDcm19AZ0c=
Expand Down

0 comments on commit c983a19

Please sign in to comment.