Skip to content

Commit

Permalink
Merge pull request #682 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Sep 22, 2019
2 parents 3e66148 + ea18120 commit c9d8629
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
"eslint-plugin-markdown": "1.0.0",
"eslint-plugin-mocha": "6.1.1",
"js-gardener": "2.0.99",
"node-tdd": "2.5.11",
"node-tdd": "2.5.12",
"nyc": "14.1.1",
"semantic-release": "15.13.24"
},
Expand Down Expand Up @@ -101,7 +101,7 @@
"dependencies": {
"app-root-path": "2.2.1",
"deepmerge": "4.0.0",
"joi-strict": "1.1.5",
"joi-strict": "1.1.6",
"lodash.clonedeep": "4.5.0",
"lodash.difference": "4.5.0",
"lodash.get": "4.4.2",
Expand Down
33 changes: 28 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,11 @@
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.1.tgz#61395b5ed94c4cb19c2dc4c85969cff3d40d583f"
integrity sha512-DYuHzu978pP1XW1GD3HGvLnAFjbQTIgc2+V153FGkbS2pgo9haigCdwBnUDrbhaOkgiJlbZvoEqDrcxSLHpiWA==

"@hapi/address@^2.1.2":
version "2.1.2"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.2.tgz#1c794cd6dbf2354d1eb1ef10e0303f573e1c7222"
integrity sha512-O4QDrx+JoGKZc6aN64L04vqa7e41tIiLU+OvKdcYaEMP97UttL0f9GIi9/0A4WAMx0uBd6SidDIhktZhgOcN8Q==

"@hapi/formula@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-1.2.0.tgz#994649c7fea1a90b91a0a1e6d983523f680e10cd"
Expand All @@ -205,6 +210,17 @@
"@hapi/pinpoint" "^1.0.2"
"@hapi/topo" "^3.1.3"

"@hapi/joi@16.1.4":
version "16.1.4"
resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.4.tgz#b039fe474a0ab838c1a90620c53a208fcef75d99"
integrity sha512-m7ctezhxjob+dSpXnCNlgAj6rrEpdSsaWu3GWL3g1AybQCU36mlAo9IwGFJwIxD+oHgdO6mYyviYlaejX+qN6g==
dependencies:
"@hapi/address" "^2.1.2"
"@hapi/formula" "^1.2.0"
"@hapi/hoek" "^8.2.4"
"@hapi/pinpoint" "^1.0.2"
"@hapi/topo" "^3.1.3"

"@hapi/pinpoint@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-1.0.2.tgz#025b7a36dbbf4d35bf1acd071c26b20ef41e0d13"
Expand Down Expand Up @@ -3566,6 +3582,13 @@ joi-strict@1.1.5:
dependencies:
"@hapi/joi" "16.1.2"

joi-strict@1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.6.tgz#3aa7608dc7776cfb8d3e9ea677b64c9879871c60"
integrity sha512-691Ut0N7toXMeqDMfY7f7A0NrWOhdC8kPec1n4ydgAKv8WxXK7vdSHwA754PlIkR4TFE3bnkO9ijrziw7rIJfg==
dependencies:
"@hapi/joi" "16.1.4"

js-gardener@2.0.99:
version "2.0.99"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.99.tgz#e4e0b00789cf27610e1ac7d05d0ff2df3ac45dfc"
Expand Down Expand Up @@ -4608,13 +4631,13 @@ node-pre-gyp@^0.12.0:
semver "^5.3.0"
tar "^4"

node-tdd@2.5.11:
version "2.5.11"
resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.5.11.tgz#5a19005b16267f99db358615615e50abb14aac24"
integrity sha512-/bfaJ9zTwxiU432nbEQxMXmwyXfd/Yw0GHZyxEhCldvI0pNu8KmQddRKK92Hhzj5ROGEd0cfWqntrRCSNUh9jA==
node-tdd@2.5.12:
version "2.5.12"
resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.5.12.tgz#5d2faccff59acf200ea3a6a3f0d0d9906b1f8527"
integrity sha512-ljUAGV2yaJ3QL0CSwcXkycJ9vW5eOfDMpDDq/08ekIBxBEZK/ReD7nhTU/jDWRrtzEFlfYwa8xWh9i+aAz6dzA==
dependencies:
callsites "3.1.0"
joi-strict "1.1.5"
joi-strict "1.1.6"
lodash.get "4.4.2"
nock "11.3.5"
smart-fs "1.9.14"
Expand Down

0 comments on commit c9d8629

Please sign in to comment.