Skip to content

Commit

Permalink
Merge pull request #1018 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu authored Nov 20, 2020
2 parents f6ca359 + 97e7803 commit 0c6ecc7
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 44 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/cli": "7.12.1",
"@babel/core": "7.12.3",
"@babel/register": "7.12.1",
"@blackflux/eslint-plugin-rules": "1.3.41",
"@blackflux/eslint-plugin-rules": "1.3.42",
"@blackflux/robo-config-plugin": "3.10.14",
"babel-eslint": "10.1.0",
"chai": "4.2.0",
Expand All @@ -45,7 +45,7 @@
"eslint-plugin-json": "2.1.2",
"eslint-plugin-markdown": "1.0.2",
"eslint-plugin-mocha": "8.0.0",
"js-gardener": "2.0.180",
"js-gardener": "2.0.181",
"nyc": "15.1.0",
"semantic-release": "17.2.3",
"babel-preset-latest-node": "5.1.1"
Expand Down
77 changes: 35 additions & 42 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -319,12 +319,12 @@
lodash "^4.17.19"
to-fast-properties "^2.0.0"

"@blackflux/[email protected].41":
version "1.3.41"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.41.tgz#94d364ea312d6143c3f2b0bb6d9f1bc5f1e951ef"
integrity sha512-hs7mrTpfkWZuEGlmhPYnmUPOWHy95S0zc7RmaBlQNii1+Rt1Nolw9s9RhZTBUKyX/J3aifu+LWdBqAXyDzyLPw==
"@blackflux/[email protected].42":
version "1.3.42"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.42.tgz#4768f66318d0585d2a9ac09dc80a40795db2b124"
integrity sha512-DHz3zipJRzrxKDFzhBcHpgygkjKk+1Ab/Rz5O532yDk3UQqwwWGqePTgMhGdzVAoePvx7CyOQEf9WCkIwUuwDA==
dependencies:
smart-fs "1.12.0"
smart-fs "1.12.1"

"@blackflux/[email protected]":
version "3.10.14"
Expand Down Expand Up @@ -3927,24 +3927,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==

[email protected]:
version "1.2.5"
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.2.5.tgz#bba6adbaedd949f9dda1ef921520e719ddee845d"
integrity sha512-UvAuLlApA0+18Tk4hA0oJ5mTumtFx7HOKIwXIrVMa4d8J5xCli0XzhMS7HLFJhNms+e5cgssvB8PZeoJGpBhKQ==
dependencies:
"@hapi/joi" "17.1.1"

[email protected]:
version "1.2.6"
resolved "https://registry.yarnpkg.com/joi-strict/-/joi-strict-1.2.6.tgz#2aed6ae784efa2adbf66175a198eb6d650418f1f"
integrity sha512-ShSxfxxoRA/ETL885BNCc+fOCYSoQgkc0ObTT4LWKcU3TBlKsGaxDuyYLOP17oie8dir2ZUvT6YvABpdfj2t8Q==
dependencies:
"@hapi/joi" "17.1.1"

[email protected].180:
version "2.0.180"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.180.tgz#51916b6c792ab6f84c9dffeb41731f689cf5d198"
integrity sha512-v30lxgngNnYwygpNvkAcWRorvBA7DVFR2vH3hy1oElQhA6UxWZsRD15xcVbaPSzS+Em+csqV2YMOoYF7/Na15A==
[email protected].181:
version "2.0.181"
resolved "https://registry.yarnpkg.com/js-gardener/-/js-gardener-2.0.181.tgz#e9cbeab8ecc74275d9613615cb8652c0bf19a496"
integrity sha512-g1qXgUBHtZOT6knCigs/12F+WvGNbomK149x4DBfhkPf9he37EtEhi6Z2Rywya+W7dRYO4KJ6thRrLlvF2RLRg==
dependencies:
chalk "4.1.0"
fancy-log "1.3.3"
Expand All @@ -3955,7 +3948,7 @@ [email protected]:
lodash.get "4.4.2"
mocha "8.2.1"
npm-check "5.9.2"
robo-config "3.10.2"
robo-config "3.10.3"

js-tokens@^3.0.0:
version "3.0.2"
Expand Down Expand Up @@ -5338,10 +5331,10 @@ object-copy@^0.1.0:
define-property "^0.2.5"
kind-of "^3.0.3"

[email protected].27:
version "1.0.27"
resolved "https://registry.yarnpkg.com/object-deep-contain/-/object-deep-contain-1.0.27.tgz#16aecab563c29a15987a2cf9dcc9367ca7cb2348"
integrity sha512-VTMi2nYRKwNqysc5LASl6Amtq7AaxUh64WZ+frQMUU3puY0B4jF6+f7t4yEDU3auqCMnCSRUNDQWN4rw9RStSQ==
[email protected].28:
version "1.0.28"
resolved "https://registry.yarnpkg.com/object-deep-contain/-/object-deep-contain-1.0.28.tgz#a9a820657ac22b475631dbf9b7555792f5cbcefa"
integrity sha512-rlu9yObPELlwx7qkB5yCfT/PVwyBM3Ct5owNxVmH0lXMvZF+KXf/MfpJNs0JIYOB9IjlC2ImqFcfWCNEua1xZQ==

object-inspect@^1.7.0:
version "1.8.0"
Expand All @@ -5353,15 +5346,15 @@ object-keys@^1.0.12, object-keys@^1.1.1:
resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==

object-scan@13.3.9:
version "13.3.9"
resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-13.3.9.tgz#c2000db1732f0cbafff8ec304f739f432f179ee0"
integrity sha512-Fj1x3aP1jUGtz/CQ8JTl6Is9zCkl6xnaK5PRdQk19YTkHfn/Wx8V2KiglJWx1ijjBUeiKDKK/RGnnJh9vucL4w==
object-scan@13.6.6:
version "13.6.6"
resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-13.6.6.tgz#e44677a7f5411b96bf5d5f66ce627e94ea09e599"
integrity sha512-Ag+m0/43i2HhbxMptWA9gZT0XvEQAv2fsvPkUQzvZTgo8sGcFgqdXEDFtru1VnYSTZpBWcEePy8dI0yyyFI5wA==

[email protected].28:
version "1.1.28"
resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.28.tgz#2aba57f393cd991ce35d318d2ede33623c2b040a"
integrity sha512-FoBGZexpq9jJr6mDgV8wv711vreKyzRcw65TKeXzHh98+TNmPZfGYznpel3WceM869WsnSCyUuK46rPUG9+Rpg==
[email protected].29:
version "1.1.29"
resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.29.tgz#53a0fe8346ca0936ed9f3b5dfb24438d534a7e17"
integrity sha512-XnPIMyiv6fJeb/z3Bz+u43Fcw3C9fs1uoRITd8x3mau/rsSAUhx7qpIO10Q/dzJeMleJesccUSMiFx8FF+ruBA==

object-visit@^1.0.0:
version "1.0.1"
Expand Down Expand Up @@ -6509,22 +6502,22 @@ rimraf@^3.0.0:
dependencies:
glob "^7.1.3"

[email protected].2:
version "3.10.2"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.10.2.tgz#5fcea169f9dc24a9b2e7a35a2b18583fa36f9a87"
integrity sha512-+imnbE2PoxZNaE3j7dT1udhsVU4kbbr4ib6u2jvEZmm+ca20qSx5cG6Pyx2wUjHLD7OEa6EyFoc5/yxfK0XMvQ==
[email protected].3:
version "3.10.3"
resolved "https://registry.yarnpkg.com/robo-config/-/robo-config-3.10.3.tgz#ce318ced0a0da5153b2f93350b0e6e6d46b68379"
integrity sha512-JaFUdAllPzWbOKID8ciS0EZ+/3j2wujASCcIEg7iLdtgym6iSxVmRrfeYOJXzgogujN0+xPOFOR0ojAbsNKCYQ==
dependencies:
app-root-path "3.0.0"
deepmerge "4.2.2"
joi-strict "1.2.5"
joi-strict "1.2.6"
lodash.clonedeep "4.5.0"
lodash.difference "4.5.0"
lodash.get "4.4.2"
mustache "4.0.1"
object-deep-contain "1.0.27"
object-scan "13.3.9"
object-treeify "1.1.28"
smart-fs "1.12.0"
object-deep-contain "1.0.28"
object-scan "13.6.6"
object-treeify "1.1.29"
smart-fs "1.12.1"

run-async@^0.1.0:
version "0.1.0"
Expand Down Expand Up @@ -6746,10 +6739,10 @@ 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==

[email protected].0:
version "1.12.0"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.12.0.tgz#f037223264db763ffc7e97ae89f656f96434aca1"
integrity sha512-hJEeZSKK952wOT8H9Hd3cr8C8Sn4YCv5k5Cp8duJy7PTNJ4Eo88SeGq8KoCFFF7d3HKlFEfNSMdiZz+dEkE5AA==
[email protected].1:
version "1.12.1"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.12.1.tgz#df3e942585dbc8f49e68e30a6f91cd89e7787adc"
integrity sha512-rirYS3KrVY32mJYzO2YFbBqraHO7nPKe8yZHKAgxpDVK8hVEVNeOpjqykq9Zrg1P8n+5bl1l32gLy2wt7387OQ==
dependencies:
fs-extra "9.0.1"
js-yaml "3.14.0"
Expand Down

0 comments on commit 0c6ecc7

Please sign in to comment.