Skip to content

Commit

Permalink
Merge pull request #2181 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu authored Sep 15, 2020
2 parents a4e638f + b17421e commit 80e66d3
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"promise-pool-ext": "1.3.7",
"request": "2.88.2",
"request-promise-native": "1.0.9",
"smart-fs": "1.11.20"
"smart-fs": "1.11.21"
},
"devDependencies": {
"@babel/cli": "7.11.6",
Expand Down
29 changes: 29 additions & 0 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5547,6 +5547,11 @@ [email protected]:
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.13.tgz#17d2680e047db7d0a4c6f659fa86da9bb925e476"
integrity sha512-vqLf2gEwYCReZ2HbLIvLbznfICEM54JMoMGGYc04+l+pewumuz/9ltOqvDtJpQs/Zin/x2UaCOK/XIMtMYL0Hw==

[email protected]:
version "1.0.14"
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.14.tgz#e040ee0e017e9d575f56edbb33b36b94303c2cf1"
integrity sha512-RtMw2ieTSZIqLJu2CKr0ZDATPVkB8UmLrjQ/9v3UnzYMeJeKfFphLtZKtNFhzTjv/btljjLGgbVMWN5s4EWHEQ==

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 Down Expand Up @@ -7139,6 +7144,20 @@ [email protected]:
xml-js "1.6.11"
yaml-boost "1.9.24"

[email protected]:
version "1.11.21"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.21.tgz#d5523d37bf1afb6faf2a331bfae0978a6473d589"
integrity sha512-Yib4y28L2j+cxNV6zdt4R2iPtxN0pidUDHJXXY7anwJIZnVrlNeV9gfM6KqjkLbMKeaWE9GmL6JnxGei685Vjw==
dependencies:
fs-extra "9.0.1"
js-yaml "3.14.0"
json-stringify-pretty-compact "2.0.0"
lodash.clonedeep "4.5.0"
lodash.isequal "4.5.0"
object-align "1.0.14"
xml-js "1.6.11"
yaml-boost "1.9.25"

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 Expand Up @@ -8427,6 +8446,16 @@ [email protected]:
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

[email protected]:
version "1.9.25"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.25.tgz#5f173899bd88db6b0a5892eab85dbf6c03497ea7"
integrity sha512-QMURDXDBM9pLlJ4fAM5TzOmjay2p2bs5dBB/BZ6YNvm/9+oLU14jORwc8jzAwYF1usuSclNDdPlUlGd6xAUBHg==
dependencies:
js-yaml "3.14.0"
lodash.get "4.4.2"
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yaml@^1.7.2:
version "1.10.0"
resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
Expand Down

0 comments on commit 80e66d3

Please sign in to comment.