Skip to content

Commit

Permalink
Merge pull request #324 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Oct 23, 2019
2 parents e79e320 + 5a379b8 commit 9d08f8b
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"eslint-plugin-json": "2.0.1",
"eslint-plugin-markdown": "1.0.1",
"eslint-plugin-mocha": "6.2.0",
"js-gardener": "2.0.109",
"js-gardener": "2.0.110",
"nyc": "14.1.1",
"semantic-release": "15.13.27"
},
Expand Down
38 changes: 19 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1659,10 +1659,10 @@ deep-is@~0.1.3:
resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=

deepmerge@4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.1.1.tgz#ee0866e4019fe62c1276b9062d4c4803d9aea14c"
integrity sha512-+qO5WbNBKBaZez95TffdUDnGIo4+r5kmsX8aOb7PDHvXsTbghAmleuxjs6ytNaf5Eg4FGBXDS5vqO61TRi6BMg==
deepmerge@4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.1.tgz#018a3e5dfe82b95e35e36a9a29ba15ddb194e40f"
integrity sha512-32P7FIV6JKt0hPMFNlWFytzVGpppYHFKdnhFUEMXheWc8Lw4HnHEzJa5yxhaQedDAXv2SI6zD7+UbqnC5k9g9Q==

default-require-extensions@^2.0.0:
version "2.0.0"
Expand Down Expand Up @@ -2674,10 +2674,10 @@ glob@7.1.3:
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@7.1.4, glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
version "7.1.4"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
glob@7.1.5, glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.3, glob@^7.1.4:
version "7.1.5"
resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.5.tgz#6714c69bee20f3c3e64c4dd905553e532b40cdc0"
integrity sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==
dependencies:
fs.realpath "^1.0.0"
inflight "^1.0.4"
Expand Down Expand Up @@ -3561,21 +3561,21 @@ joi-strict@1.1.7:
dependencies:
"@hapi/joi" "16.1.7"

js-gardener@2.0.109:
version "2.0.109"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.109.tgz#ab0c47a579b566f013a69c3408ee36ceb07e6bce"
integrity sha512-5JCp/N8cZO0L6vGZ1D8j9Oizq26RmK+ljkAdSibad5f/HwK6UCqeNQOLzN2P8AdJBA4tBClBhc+pyVNuUdRscg==
js-gardener@2.0.110:
version "2.0.110"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.110.tgz#7b2415cb2b522df704523343338deb7a096863cc"
integrity sha512-/Lc39BfT8OK6pEyZDmOB3mxHXYXRsPeO6GBwwz1FTLwG0ix6Q4Z0b9bVEyOL6tbEyQGqTOSx0YAqWufATI/ewg==
dependencies:
chalk "2.4.2"
fancy-log "1.3.3"
glob "7.1.4"
glob "7.1.5"
joi-strict "1.1.7"
js-yaml "3.13.1"
lodash.difference "4.5.0"
lodash.get "4.4.2"
mocha "6.2.2"
npm-check "5.9.0"
robo-config "3.4.5"
robo-config "3.4.7"

js-tokens@^3.0.0, js-tokens@^3.0.2:
version "3.0.2"
Expand Down Expand Up @@ -6120,13 +6120,13 @@ rimraf@2.6.3:
dependencies:
glob "^7.1.3"

robo-config@3.4.5:
version "3.4.5"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.4.5.tgz#98b5c1f748dac12c277a98768b23047c2ba2dcd0"
integrity sha512-QxkOPsqRjGTuk8+uUNdVXXxw36g6UF3J5MkmlP+9wAUBpZv9JvcwECFXpLlm5Nci2c1APdJd0LF+qGX4ogIRxw==
robo-config@3.4.7:
version "3.4.7"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.4.7.tgz#3ee3bfefe58b63465316e188d5f9c555838acce9"
integrity sha512-C1Fhb9TXER880rymL2i7GQAXAMDDnWWyGE5buG52jR9/fgL7FQ1mWyEbbD4DWtgj5c1+C8t3fR6+yWqSM/z01A==
dependencies:
app-root-path "2.2.1"
deepmerge "4.1.1"
deepmerge "4.2.1"
joi-strict "1.1.7"
lodash.clonedeep "4.5.0"
lodash.difference "4.5.0"
Expand Down

0 comments on commit 9d08f8b

Please sign in to comment.