Skip to content

Commit

Permalink
Merge pull request #501 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Mar 16, 2020
2 parents 69c73e1 + c585cb9 commit 0f4401a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@
"eslint": "6.8.0",
"eslint-config-airbnb-base": "14.1.0",
"eslint-plugin-import": "2.20.1",
"eslint-plugin-json": "2.1.0",
"eslint-plugin-json": "2.1.1",
"eslint-plugin-markdown": "1.0.2",
"eslint-plugin-mocha": "6.3.0",
"js-gardener": "2.0.137",
"js-gardener": "2.0.138",
"nyc": "15.0.0",
"semantic-release": "17.0.4"
},
Expand Down Expand Up @@ -99,6 +99,6 @@
"tempDir": "./coverage/.nyc_output"
},
"dependencies": {
"@hapi/joi": "17.1.0"
"@hapi/joi": "17.1.1"
}
}
38 changes: 19 additions & 19 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.4.tgz#5d67ed43f3fd41a69d4b9ff7b56e7c0d1d0a81e5"
integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==

"@hapi/address@^4.0.0":
version "4.0.0"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.0.tgz#36affb4509b5a6adc628bcc394450f2a7d51d111"
integrity sha512-GDDpkCdSUfkQCznmWUHh9dDN85BWf/V8TFKQ2JLuHdGB4Yy3YTEGBzZxoBNxfNBEvreSR/o+ZxBBSNNEVzY+lQ==
"@hapi/address@^4.0.1":
version "4.0.1"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-4.0.1.tgz#267301ddf7bc453718377a6fb3832a2f04a721dd"
integrity sha512-0oEP5UiyV4f3d6cBL8F3Z5S7iWSX39Knnl0lY8i+6gfmmIBj44JCBNtcMgwyS+5v7j3VYavNay0NFHDS+UGQcw==
dependencies:
"@hapi/hoek" "^9.0.0"

Expand Down Expand Up @@ -228,12 +228,12 @@
"@hapi/pinpoint" "^1.0.2"
"@hapi/topo" "^3.1.3"

"@hapi/joi@17.1.0":
version "17.1.0"
resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.0.tgz#cc4000b6c928a6a39b9bef092151b6bdee10ce55"
integrity sha512-ob67RcPlwRWxBzLCnWvcwx5qbwf88I3ykD7gcJLWOTRfLLgosK7r6aeChz4thA3XRvuBfI0KB1tPVl2EQFlPXw==
"@hapi/joi@17.1.1":
version "17.1.1"
resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-17.1.1.tgz#9cc8d7e2c2213d1e46708c6260184b447c661350"
integrity sha512-p4DKeZAoeZW4g3u7ZeRo+vCDuSDgSvtsB/NpfjXEHTUjSeINAi/RrVOWiVQ1isaoLzMvFEhe8n5065mQq1AdQg==
dependencies:
"@hapi/address" "^4.0.0"
"@hapi/address" "^4.0.1"
"@hapi/formula" "^2.0.0"
"@hapi/hoek" "^9.0.0"
"@hapi/pinpoint" "^2.0.0"
Expand Down Expand Up @@ -2138,13 +2138,13 @@ eslint-plugin-import@2.20.1:
read-pkg-up "^2.0.0"
resolve "^1.12.0"

eslint-plugin-json@2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/eslint-plugin-json/-/eslint-plugin-json-2.1.0.tgz#2829174f58148e229227c479c402f2875be04935"
integrity sha512-Qxy3JQVRb/Qh1RdJsg+LXhMLPGp8rTiEktpgKZPMOwJTTXe56zLCrazfdPZIDctETVbR/YFk0y1dSsVcKXu6Jg==
eslint-plugin-json@2.1.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-json/-/eslint-plugin-json-2.1.1.tgz#7b9c4da2121f6f48d44efceb9a99ac0d4d12b299"
integrity sha512-Ktsab8ij33V2KFLhh4alC1FYztdmbV32DeMZYYUCZm4kKLW1s4DrleKKgtbAHSJsmshCK5QGOZtfyc2r3jCRsg==
dependencies:
lodash "^4.17.15"
vscode-json-languageservice "^3.4.12"
vscode-json-languageservice "^3.5.1"

eslint-plugin-markdown@1.0.2:
version "1.0.2"
Expand Down Expand Up @@ -3781,10 +3781,10 @@ joi-strict@1.2.0:
dependencies:
"@hapi/joi" "16.1.8"

js-gardener@2.0.137:
version "2.0.137"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.137.tgz#f5b9103e57db89c2002f64f19a988bc1fb75872b"
integrity sha512-9YHN3NGojbs1KJmhr7oOkHGrXk5mHVbthzIRgCauynxB5O65p7NIleYSo+LHHOchiNNDq6ygjo3B9uvuUD0hNA==
js-gardener@2.0.138:
version "2.0.138"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.138.tgz#0808691e21431edf8f455ef902e2e528175af102"
integrity sha512-y7R6W9Wo04FiCdSHOuZ//6iftbwNKKDfMZyxhAcGSiZe2dEpcWq9ZymZR3b0ZFNNnAkVbgP1yKn9AAfRIyRJPQ==
dependencies:
chalk "3.0.0"
fancy-log "1.3.3"
Expand Down Expand Up @@ -7563,7 +7563,7 @@ vfile@^2.0.0:
unist-util-stringify-position "^1.0.0"
vfile-message "^1.0.0"

vscode-json-languageservice@^3.4.12:
vscode-json-languageservice@^3.5.1:
version "3.5.1"
resolved "https://registry.yarnpkg.com/vscode-json-languageservice/-/vscode-json-languageservice-3.5.1.tgz#75779d466107cbc8c4cc9828df100df71c1870f8"
integrity sha512-F8jPqcAC1mbQOMKvGYS4dGEw9JCZxVEi7tc5ASZLfcfwKq2URZKB4fOtdy1GEsTLsrW11tVrBjEPntpXzqp/NA==
Expand Down

0 comments on commit 0f4401a

Please sign in to comment.