Skip to content

Commit

Permalink
Merge pull request #1258 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Mar 17, 2020
2 parents b3b560e + 0fb3dbb commit b567eb6
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 27 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@babel/core": "7.8.7",
"@babel/plugin-proposal-object-rest-spread": "7.8.3",
"@babel/register": "7.8.6",
"@blackflux/eslint-plugin-rules": "1.3.24",
"@blackflux/eslint-plugin-rules": "1.3.26",
"@blackflux/robo-config-plugin": "3.1.0",
"babel-eslint": "10.1.0",
"chai": "4.2.0",
Expand All @@ -46,7 +46,7 @@
"eslint-plugin-markdown": "1.0.2",
"eslint-plugin-mocha": "6.3.0",
"js-gardener": "2.0.139",
"lambda-tdd": "2.11.30",
"lambda-tdd": "2.11.31",
"mocha": "7.1.0",
"nock": "12.0.3",
"nyc": "15.0.0",
Expand Down
64 changes: 39 additions & 25 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,12 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.3.24":
version "1.3.24"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.24.tgz#283811b7ef1c59d9159e6525fdaf37c455124021"
integrity sha512-T1Cc/7M2z/gmDVJiCtuki38zdVB6Rls6fI3TnR0RFicXnecfy60IfQjaULkbU4xBmyFG68yZtJbKJnOJovo8RA==
"@blackflux/eslint-plugin-rules@1.3.26":
version "1.3.26"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.26.tgz#d0083298ef832f042eeb846915fe8b4c28b50a72"
integrity sha512-f50X8byhWqzpTnU74tzN/IdePYIGaZRmvE9LjyA9u0Jkb/3yZ+J7HqEGQNxD9FWaKKGDLX22Y+/cPBIgDOC+ow==
dependencies:
smart-fs "1.11.8"
smart-fs "1.11.10"

"@blackflux/robo-config-plugin@3.1.0":
version "3.1.0"
Expand Down Expand Up @@ -4067,18 +4067,18 @@ lambda-serverless-api@6.11.3:
route-recognizer "0.3.4"
swagger-parser "9.0.1"

lambda-tdd@2.11.30:
version "2.11.30"
resolved "https://registry.yarnpkg.com/lambda-tdd/-/lambda-tdd-2.11.30.tgz#31de86c07bd1bb62f8030fa2838d91d4863e047f"
integrity sha512-p0lBpEe5T/L0hDi1gQwvcmjftpad9hFEWidF4XnyJj2S72Dd1tMlnwQUnRPrLb+rGe869pg+hIRHR5/b0OGUig==
lambda-tdd@2.11.31:
version "2.11.31"
resolved "https://registry.yarnpkg.com/lambda-tdd/-/lambda-tdd-2.11.31.tgz#a94b8fe707e21388e2c49f7e3cc94f4399c29227"
integrity sha512-W6fv80SIdEcibtrTwq8s9Tju7OUs92MK4VeikNQ+QY/wp9uuq7l1u1F9oCKZaNeXQUo3ywLkf4fViW4IGLOoXg==
dependencies:
app-root-path "3.0.0"
glob "7.1.6"
joi-strict "1.2.0"
js-yaml "3.13.1"
lambda-wrapper "0.3.0"
lodash.get "4.4.2"
node-tdd "2.9.11"
node-tdd "2.10.0"
smart-fs "1.11.9"

lambda-wrapper@0.3.0:
Expand Down Expand Up @@ -4916,16 +4916,6 @@ nice-try@^1.0.4:
resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==

nock@12.0.2:
version "12.0.2"
resolved "https://registry.yarnpkg.com/nock/-/nock-12.0.2.tgz#47617b34738e026b29d2294b4579e35b27e6a4d3"
integrity sha512-pTckyfP8QHvwXP/oX+zQuSIL3S/mWTd84ba4pOGZlS/FgRZyljv4C3ZyOjgMilvkydSaERML/aJEF13EBUuDTQ==
dependencies:
debug "^4.1.0"
json-stringify-safe "^5.0.1"
lodash "^4.17.13"
propagate "^2.0.0"

nock@12.0.3:
version "12.0.3"
resolved "https://registry.yarnpkg.com/nock/-/nock-12.0.3.tgz#83f25076dbc4c9aa82b5cdf54c9604c7a778d1c9"
Expand Down Expand Up @@ -5017,16 +5007,16 @@ node-sass-tilde-importer@^1.0.2:
dependencies:
find-parent-dir "^0.3.0"

node-tdd@2.9.11:
version "2.9.11"
resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.9.11.tgz#2c58cf145d969714e5420385e7c26be638c33c87"
integrity sha512-yzKh/nlgoqrawgBJyr08J2+0XNl6gzcgOslGWN69Tcoqp8kk46GNdSUL5EIpgCIMeJg20LAoIxzOGF6wUrLqNA==
node-tdd@2.10.0:
version "2.10.0"
resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.10.0.tgz#56660622699f01348d6bde729f47dc18952aed03"
integrity sha512-A2BI/Aei4FO7JRyGpMPCZHnExX4yO1YsHLnkVtNqi4aCgXGJ9vMoeY2STzZCKLO90XI/2bxyp2WjWYAo6FHuZg==
dependencies:
callsites "3.1.0"
joi-strict "1.2.1"
lodash.get "4.4.2"
minimist "1.2.5"
nock "12.0.2"
nock "12.0.3"
smart-fs "1.11.9"
timekeeper "2.2.0"
tmp "0.1.0"
Expand Down Expand Up @@ -6908,6 +6898,20 @@ smart-buffer@^4.1.0:
resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==

smart-fs@1.11.10:
version "1.11.10"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.10.tgz#4a6c58a98e0c4a184705929556296cf19548158e"
integrity sha512-x848XvuVMoeoDp/KPK7kapHEJjH3bPHPErLOefJZQQvkOzZot8Z4/CnShj8mR/N1V0zb6mgpIPwbwfNe8zTvUA==
dependencies:
fs-extra "8.1.0"
js-yaml "3.13.1"
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.21"

smart-fs@1.11.8:
version "1.11.8"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.8.tgz#c3c268da7794018a5f81488bc63d281c3e2d1dd9"
Expand Down Expand Up @@ -8176,6 +8180,16 @@ yaml-boost@1.9.20:
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yaml-boost@1.9.21:
version "1.9.21"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.21.tgz#2b9b07972e9d25c4a889582f75a9c88e23869dd2"
integrity sha512-gYpJMWhXZjnkR8vdRukqCe6h+hwX9t4Pa2amNKWXEt/sXRTztZ3nH6SwR8pI9Dbae03TM79sClCDXw/tiYULgA==
dependencies:
js-yaml "3.13.1"
lodash.get "4.4.2"
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

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

0 comments on commit b567eb6

Please sign in to comment.