Skip to content

Commit

Permalink
Merge pull request #482 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Feb 25, 2020
2 parents 8dde810 + 7c3e87a commit 08788fb
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 18 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.1.0",
"eslint-plugin-markdown": "1.0.2",
"eslint-plugin-mocha": "6.3.0",
"js-gardener": "2.0.134",
"js-gardener": "2.0.135",
"nyc": "15.0.0",
"semantic-release": "17.0.4"
},
Expand Down
27 changes: 10 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3809,24 +3809,17 @@ java-properties@^1.0.0:
resolved "https://registry.yarnpkg.com/java-properties/-/java-properties-1.0.2.tgz#ccd1fa73907438a5b5c38982269d0e771fe78211"
integrity sha512-qjdpeo2yKlYTH7nFdK0vbZWuTCesk4o63v5iVOlhMQPfuIZQfW/HI35SjfhA+4qpg36rnFSvUK5b1m+ckIblQQ==

joi-strict@1.1.11:
version "1.1.11"
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.11.tgz#4a08c14772f10f1ef06ec1a9dbabc1b8aedc5753"
integrity sha512-CxN0zLwlKPVjWFFDTvAv8rdmjdsFhAkWNCM1kYMqVwG3zCWG+akyO6bufMA4ovKsm9IYaOklTGi+OKLj3mHg5w==
dependencies:
"@hapi/joi" "16.1.8"

joi-strict@1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.2.0.tgz#45801a951603e4e80377cb4b703d69c8b92d5026"
integrity sha512-Dwk/uPoRGz2fQuf1fgyq8v9H/H/EqdOt3/e5FpVKXVfbt7aTJOQs8danj+EqKwxRnHtmW9hNNnz0jpym1oEiuA==
dependencies:
"@hapi/joi" "16.1.8"

js-gardener@2.0.134:
version "2.0.134"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.134.tgz#ea8ab14c24526cc5dd0ae5affa0975af7bb2c364"
integrity sha512-O4GhK8NP8TI/I7us1L2Y1tECXHiHwrQ9MvII3v/Aw45zWrvuhLDnTE+VkXccUUprevJVDTCQem3zCSi8qq42aQ==
js-gardener@2.0.135:
version "2.0.135"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.135.tgz#5ddba1301622cd9e44ff0d795f835fc21b8b45cb"
integrity sha512-fOudiysHtV/GYG51TMAU7rnLvr0phOUH4Jw9HvNToeQwwb2fvbIogZs9BLBJ8wSOrDynJhKn2Wk/CQvNtKY/Tw==
dependencies:
chalk "3.0.0"
fancy-log "1.3.3"
Expand All @@ -3837,7 +3830,7 @@ js-gardener@2.0.134:
lodash.get "4.4.2"
mocha "7.0.1"
npm-check "5.9.0"
robo-config "3.4.24"
robo-config "3.4.25"

js-tokens@^3.0.0, js-tokens@^3.0.2:
version "3.0.2"
Expand Down Expand Up @@ -6450,14 +6443,14 @@ rimraf@^3.0.0:
dependencies:
glob "^7.1.3"

robo-config@3.4.24:
version "3.4.24"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.4.24.tgz#27fb7bb31a6cb3ed175df1d47ccfb9af48097d10"
integrity sha512-Hz7n5NptiISeefEbZMKKI/Nj/YfWRiqzQ043sPOA9LRiOy401CYYmQIfeyyBwdOL0Y7yyjtw/WKd4c3lPwnS7g==
robo-config@3.4.25:
version "3.4.25"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.4.25.tgz#92df1a88d0281217c74a81ebc66592b45ca7cde3"
integrity sha512-gty1Gx2SZcTxKNKq07fuhWjPb4dBDBu/jbLzb0D7t4YFl0A9Xkg9unNQ/9rsxecPXc0trjocl5u1MU7WJY9oMA==
dependencies:
app-root-path "3.0.0"
deepmerge "4.2.2"
joi-strict "1.1.11"
joi-strict "1.2.0"
lodash.clonedeep "4.5.0"
lodash.difference "4.5.0"
lodash.get "4.4.2"
Expand Down

0 comments on commit 08788fb

Please sign in to comment.