Skip to content

Commit

Permalink
Merge pull request #1310 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu authored Jun 17, 2020
2 parents f157600 + 20335f5 commit 2161a7f
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 12 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"node-tdd": "2.11.4",
"nyc": "15.1.0",
"semantic-release": "17.0.8",
"smart-fs": "1.11.13"
"smart-fs": "1.11.14"
},
"engines": {
"node": ">= 10"
Expand Down Expand Up @@ -112,7 +112,7 @@
"lodash.get": "4.4.2",
"mocha": "8.0.1",
"npm-check": "5.9.2",
"robo-config": "3.8.0"
"robo-config": "3.8.1"
},
"peerDependencies": {
"eslint": "^6.2.0 || ^7.0.0"
Expand Down
34 changes: 24 additions & 10 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2749,7 +2749,7 @@ fs-extra@9.0.0:
jsonfile "^6.0.1"
universalify "^1.0.0"

fs-extra@^9.0.0:
fs-extra@9.0.1, fs-extra@^9.0.0:
version "9.0.1"
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.0.1.tgz#910da0062437ba4c39fedd863f1675ccfefcb9fc"
integrity sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==
Expand Down Expand Up @@ -5321,10 +5321,10 @@ object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.1:
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==

object-scan@13.1.0:
version "13.1.0"
resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-13.1.0.tgz#97f4648455fe8b207cd797abf77bc6ac8777e48d"
integrity sha512-97xvtdijuenZUTRUvkgXLj+ilFiH/X+VmD7B8jDDAggUKQi/3mXZ/bzIwEOi4auvA/yQfC2Px0jy0FB+qIu/TA==
object-scan@13.1.1:
version "13.1.1"
resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-13.1.1.tgz#99b4c11cf91e2de8919066d52eab7bfdd757f502"
integrity sha512-dlrrdiU8BrOEN+dKl+uX7ly4Az18wHi+Abg4nl5ZS3w025FixgFMwsmptRfyHPkgQ3iD4YM5Mbxf1ISuVXU4KQ==

object-treeify@1.1.25:
version "1.1.25"
Expand Down Expand Up @@ -6465,10 +6465,10 @@ rimraf@^3.0.0:
dependencies:
glob "^7.1.3"

robo-config@3.8.0:
version "3.8.0"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.8.0.tgz#b73fcc454ef43a7843fad72f568dfd4811961f72"
integrity sha512-v2CxL01cJm8vCwO0kKpQ4c7GPTe2e5W2x+8E9mU91OxKCVukE1CRs/c94j7vvU1VZgaCcj4/X64gePk1ebNUuA==
robo-config@3.8.1:
version "3.8.1"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.8.1.tgz#09932183096a1007d2575e0c5d4d962c082d8c4b"
integrity sha512-WI0lFf8gAex4sdyqrkSRExQia5l3fKYPgnaeurfoeJQKJpuRHIEWgFZiyH1flbibV4BZnvg0SSA78imLcNC7iQ==
dependencies:
app-root-path "3.0.0"
deepmerge "4.2.2"
Expand All @@ -6477,7 +6477,7 @@ robo-config@3.8.0:
lodash.difference "4.5.0"
lodash.get "4.4.2"
object-deep-contain "1.0.24"
object-scan "13.1.0"
object-scan "13.1.1"
object-treeify "1.1.25"
smart-fs "1.11.13"

Expand Down Expand Up @@ -6725,6 +6725,20 @@ smart-fs@1.11.13:
xml-js "1.6.11"
yaml-boost "1.9.22"

smart-fs@1.11.14:
version "1.11.14"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.14.tgz#deb05c5c7249424467334990567e9e36d22ee26e"
integrity sha512-+7Gc5Raujv9bdg7niPm+mHVk5n0neulK9RGwx7CdX8UGXkj7MTPbmzFHEW+z1jY/6F7zPMZ8U6CZueXr9N80NA==
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.11"
xml-js "1.6.11"
yaml-boost "1.9.22"

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

0 comments on commit 2161a7f

Please sign in to comment.