Skip to content

Commit

Permalink
Merge pull request #256 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu authored Sep 18, 2019
2 parents 915b51b + 6672a5f commit 981a28a
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 38 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@babel/plugin-proposal-object-rest-spread": "7.5.5",
"@babel/register": "7.6.0",
"@blackflux/eslint-plugin-rules": "1.3.12",
"@blackflux/robo-config-plugin": "2.6.8",
"@blackflux/robo-config-plugin": "2.6.9",
"babel-eslint": "10.0.3",
"chai": "4.2.0",
"coveralls": "3.0.6",
Expand All @@ -52,7 +52,7 @@
"eslint-plugin-json": "1.4.0",
"eslint-plugin-markdown": "1.0.0",
"eslint-plugin-mocha": "6.1.1",
"js-gardener": "2.0.96",
"js-gardener": "2.0.97",
"nyc": "14.1.1",
"semantic-release": "15.13.24"
},
Expand Down
54 changes: 18 additions & 36 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -174,17 +174,17 @@
dependencies:
smart-fs "1.9.14"

"@blackflux/robo-config-plugin@2.6.8":
version "2.6.8"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.6.8.tgz#58bd672fa76bd9221e1d3c1bb13bc51fd73485e9"
integrity sha512-CqXGjFEua9lOYzLYVVEGR0e3PYxxBFnCNWKqRLORg66lA1Sw4sKhSGfD+hUMm/ugdr+bUo9T2GyUI+OPqP19vA==
"@blackflux/robo-config-plugin@2.6.9":
version "2.6.9"
resolved "https://registry.yarnpkg.com/@blackflux/robo-config-plugin/-/robo-config-plugin-2.6.9.tgz#1d7ee6ba7ff18390640ccdfba99ed409e41b04e5"
integrity sha512-vGqZHG1NrlzdoasWPK8A1JTsI/LLVEx+x4zylAF3BJC55TIRWDOoFo8uqi5Y4zKtKWfR7SPkWFqudd28Luls2Q==

"@hapi/address@2.x.x", "@hapi/address@^2.1.1":
"@hapi/address@^2.1.1":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.1.1.tgz#61395b5ed94c4cb19c2dc4c85969cff3d40d583f"
integrity sha512-DYuHzu978pP1XW1GD3HGvLnAFjbQTIgc2+V153FGkbS2pgo9haigCdwBnUDrbhaOkgiJlbZvoEqDrcxSLHpiWA==

"@hapi/formula@1.x.x", "@hapi/formula@^1.2.0":
"@hapi/formula@^1.2.0":
version "1.2.0"
resolved "https://registry.yarnpkg.com/@hapi/formula/-/formula-1.2.0.tgz#994649c7fea1a90b91a0a1e6d983523f680e10cd"
integrity sha512-UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA==
Expand All @@ -194,17 +194,6 @@
resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.2.4.tgz#684a14f4ca35d46f44abc87dfc696e5e4fe8a020"
integrity sha512-Ze5SDNt325yZvNO7s5C4fXDscjJ6dcqLFXJQ/M7dZRQCewuDj2iDUuBi6jLQt+APbW9RjjVEvLr35FXuOEqjow==

"@hapi/joi@16.0.1":
version "16.0.1"
resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.0.1.tgz#37c78878db0bc04c35996515e0aa186c0e2b5398"
integrity sha512-5TdjUnNAaK7+lWZ2HRXtgOnxe4VBoJLoX0XOrfkmw+2n4/VJ6wwOJMoD7u/F9alLsP31kOWDbnQhtS0WAKwD4Q==
dependencies:
"@hapi/address" "2.x.x"
"@hapi/formula" "1.x.x"
"@hapi/hoek" "8.x.x"
"@hapi/pinpoint" "1.x.x"
"@hapi/topo" "3.x.x"

"@hapi/joi@16.1.1":
version "16.1.1"
resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-16.1.1.tgz#67a47cf46b163782ab69802b17ac4a86fb89f83e"
Expand All @@ -216,12 +205,12 @@
"@hapi/pinpoint" "^1.0.2"
"@hapi/topo" "^3.1.3"

"@hapi/pinpoint@1.x.x", "@hapi/pinpoint@^1.0.2":
"@hapi/pinpoint@^1.0.2":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@hapi/pinpoint/-/pinpoint-1.0.2.tgz#025b7a36dbbf4d35bf1acd071c26b20ef41e0d13"
integrity sha512-dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ==

"@hapi/topo@3.x.x", "@hapi/topo@^3.1.3":
"@hapi/topo@^3.1.3":
version "3.1.3"
resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.3.tgz#c7a02e0d936596d29f184e6d7fdc07e8b5efce11"
integrity sha512-JmS9/vQK6dcUYn7wc2YZTqzIKubAQcJKu2KCKAru6es482U5RT5fP1EXCPtlXpiK7PR0On/kpQKI4fRKkzpZBQ==
Expand Down Expand Up @@ -3570,24 +3559,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.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.3.tgz#7ffd4c722826d3082f67d3f51f21cd445635c5f7"
integrity sha512-xHfMrEb/C6tYWWz6c+oZA0Ch4fWJ7gV5JierV+9tsaUbJAIzxNIhOJUSf1S9AP9TWm4TmD2oIllaxPfldqg0VA==
dependencies:
"@hapi/joi" "16.0.1"

joi-strict@1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.1.4.tgz#282935d3b33891e4067b32de2c1149b661aa9121"
integrity sha512-2p/p3r36aEiOEOS73oFbLq2bkVOeUs3LIitKS2rQpV2W1fg7Co3uhC6THs0j9JWOhKuKUC9RdMm9i7TNxhfvTw==
dependencies:
"@hapi/joi" "16.1.1"

js-gardener@2.0.96:
version "2.0.96"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.96.tgz#b610e14a4dc3115e49cae65ea5dfc25b299b94b7"
integrity sha512-Qj3zJPNOgWcWJJ/ig+P/3CGj5J7vFo1CO8Qm8IG+HFjmMqYYfVakq0fLVxkxu7ZFaA9L62sssJN4OSKTJomtWQ==
js-gardener@2.0.97:
version "2.0.97"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.97.tgz#6725d63b1d6a81879230943132d1cc6820d26269"
integrity sha512-/cqZEG56fAtANbQvRtqZf+Oyx1zuxSrJf9zuam8XZJi6LMAkR6Z60bvMk7rh6mW8OS1KJc6CeMMjWS0gbq2nsg==
dependencies:
chalk "2.4.2"
fancy-log "1.3.3"
Expand All @@ -3598,7 +3580,7 @@ js-gardener@2.0.96:
lodash.get "4.4.2"
mocha "6.2.0"
npm-check "5.9.0"
robo-config "3.3.10"
robo-config "3.3.11"

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

robo-config@3.3.10:
version "3.3.10"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.3.10.tgz#710a4ed555bda1d84e25ef0141e1dc3db8535658"
integrity sha512-ZZNwHISQV8LBZ2uqV64lF4k2w/v+kKCBxTVl+4usvXvze7lAa1P9UQvn4HAXU4r8E6sOBhH1ZZUdTs4H+gkZdg==
robo-config@3.3.11:
version "3.3.11"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.3.11.tgz#78920be4234f081d69ddc8a14eb10d67e7f68873"
integrity sha512-4nADVmqHaGuAAC8j76+3z2bJY0Hf8Lie0Ywlueyir9eW7PSkcoGLuXq+xtBsLif3HHZECmjMkmxfHeFay5S5fg==
dependencies:
app-root-path "2.2.1"
deepmerge "4.0.0"
joi-strict "1.1.3"
joi-strict "1.1.4"
lodash.clonedeep "4.5.0"
lodash.difference "4.5.0"
lodash.get "4.4.2"
Expand Down

0 comments on commit 981a28a

Please sign in to comment.