Skip to content

Commit

Permalink
Merge pull request #942 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu authored Sep 8, 2020
2 parents 5008e24 + 3d59031 commit d2891a1
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 12 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"@babel/cli": "7.11.6",
"@babel/core": "7.11.6",
"@babel/register": "7.11.5",
"@blackflux/eslint-plugin-rules": "1.3.33",
"@blackflux/eslint-plugin-rules": "1.3.34",
"@blackflux/robo-config-plugin": "3.9.9",
"babel-eslint": "10.1.0",
"chai": "4.2.0",
Expand All @@ -59,7 +59,7 @@
"eslint-plugin-markdown": "1.0.2",
"eslint-plugin-mocha": "8.0.0",
"js-gardener": "2.0.167",
"node-tdd": "2.18.3",
"node-tdd": "2.18.4",
"nyc": "15.1.0",
"semantic-release": "17.1.1",
"babel-preset-latest-node": "4.1.0"
Expand Down Expand Up @@ -114,6 +114,6 @@
"lodash.isequal": "4.5.0",
"object-align": "1.0.12",
"xml-js": "1.6.11",
"yaml-boost": "1.9.23"
"yaml-boost": "1.9.24"
}
}
33 changes: 24 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -309,10 +309,10 @@
lodash "^4.17.19"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.3.33":
version "1.3.33"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.33.tgz#2de4d878f869b532de9e610c6fe19c90f971e534"
integrity sha512-LG7V/Z5ixbMfaFTdV0+tE0dHgGWQ1A6J0tqpg2Y/C4ezOdGx/Jib49E10ukzWhUohuXkanZfRLqo7YEnUrQLOw==
"@blackflux/eslint-plugin-rules@1.3.34":
version "1.3.34"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.34.tgz#af261056050d95831bc4be013edc4995e5beada3"
integrity sha512-ZeWKTwqvNmD5Yg7xtsEYc8/xzZ5uX0FHGn8/bgsaX85pPTl2MVp2LAU4UQ3kR0vfYX8B4I4S3bDd5rGYgdN7gQ==
dependencies:
smart-fs "1.11.16"

Expand Down Expand Up @@ -4942,18 +4942,18 @@ node-sass-tilde-importer@^1.0.2:
dependencies:
find-parent-dir "^0.3.0"

node-tdd@2.18.3:
version "2.18.3"
resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.18.3.tgz#2c9212d92322b752c8aa5b78f2727caa574e0d0e"
integrity sha512-Ez+LDUVJltrjooiZFROL8thF3hCfAaDIm6BlFQTyXzkJ/OtC8E9FsdB9Nivn0Ck8C9krAqCFXXJace/A8y1TRA==
node-tdd@2.18.4:
version "2.18.4"
resolved "https://registry.yarnpkg.com/node-tdd/-/node-tdd-2.18.4.tgz#0a4dae16f3072646e23105d7b41664c29c9597d6"
integrity sha512-d4vvfv9+Ch8Ty3/b3tVVoA9sTjDTt+hiXWqy4b/8/H8KCYsUz285QocZe6S1LVzK0izXxrpiCv2Mm3+hdbaErQ==
dependencies:
callsites "3.1.0"
joi-strict "1.2.3"
lodash.clonedeep "4.5.0"
lodash.get "4.4.2"
minimist "1.2.5"
nock "13.0.4"
object-scan "13.1.2"
object-scan "13.1.4"
smart-fs "1.11.16"
timekeeper "2.2.0"
tmp "0.2.1"
Expand Down Expand Up @@ -5372,6 +5372,11 @@ object-scan@13.1.2:
resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-13.1.2.tgz#d190cdfd8821b6496afd2305568c5e7aaa539e24"
integrity sha512-MurZBgumqnz1rM+cQ/3lGM33Mr+MXTvGUg3H1Ylcad4Q71XbBmsFKcqWq6lFc+70W1t3xCsTWYrXT/doZt9LeA==

object-scan@13.1.4:
version "13.1.4"
resolved "https://registry.yarnpkg.com/object-scan/-/object-scan-13.1.4.tgz#dab76506cef35300ab744cfce5ecf27ad0734de0"
integrity sha512-pwc5F73RyduRMz/C+JvEllvV5nPhYj86vpdIykUnsEY6PI5gpRWuilSP3K0qhAxOyTryW6ZW2pHhweb+6ojThA==

object-treeify@1.1.26:
version "1.1.26"
resolved "https://registry.yarnpkg.com/object-treeify/-/object-treeify-1.1.26.tgz#80b882036cb5d0fddc16e8a2affa98ba96f89a74"
Expand Down Expand Up @@ -8046,6 +8051,16 @@ yaml-boost@1.9.23:
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yaml-boost@1.9.24:
version "1.9.24"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.24.tgz#f5ab1d3809a0030a83f2ae3ef53b242f298e9b02"
integrity sha512-L5gUF+fZxpvcS+gDnuxCBbnOtW5WJY9ZvxiTbf2PbXMwnpRtykiJVFGd80zjFUGUbEvywIEuUxaVnr/EgxlHkQ==
dependencies:
js-yaml "3.14.0"
lodash.get "4.4.2"
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

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

0 comments on commit d2891a1

Please sign in to comment.