Skip to content
This repository has been archived by the owner on Jan 23, 2021. It is now read-only.

Commit

Permalink
Merge pull request #328 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Dec 21, 2019
2 parents 15c0567 + c2da3d2 commit 90659ad
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 11 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,12 @@
"@babel/core": "7.7.7",
"@babel/plugin-proposal-object-rest-spread": "7.7.7",
"@babel/register": "7.7.7",
"@blackflux/eslint-plugin-rules": "1.3.19",
"@blackflux/eslint-plugin-rules": "1.3.20",
"@blackflux/robo-config-plugin": "3.0.3",
"babel-eslint": "10.0.3",
"chai": "4.2.0",
"coveralls": "3.0.9",
"eslint": "6.7.2",
"eslint": "6.8.0",
"eslint-config-airbnb-base": "14.0.0",
"eslint-plugin-import": "2.19.1",
"eslint-plugin-json": "2.0.1",
Expand Down
37 changes: 28 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,12 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.3.19":
version "1.3.19"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.19.tgz#0277a6f89b38106131a34968a2f90542432c9e94"
integrity sha512-Db8ympfFqCrlKIw/KAAfl7jXhVdlGtgzmhC3bOdBfW16t51ne2YCK/e66FUR5wq64yGhh3vceHC14zT5EhrVCQ==
"@blackflux/eslint-plugin-rules@1.3.20":
version "1.3.20"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.20.tgz#1fdd2ea3ba426ae7bfbbf71b3f550fcfa2285a2b"
integrity sha512-S8I8vhzK+ymomi2yinq0gfBEaMmWpRySlZjgJuDbiBtzhNjniza2OkMdZph97jrQrCzQTxIY1s2scxorxJDt3A==
dependencies:
smart-fs "1.11.3"
smart-fs "1.11.4"

"@blackflux/robo-config-plugin@3.0.3":
version "3.0.3"
Expand Down Expand Up @@ -2162,10 +2162,10 @@ eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==

eslint@6.7.2:
version "6.7.2"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1"
integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==
eslint@6.8.0:
version "6.8.0"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
dependencies:
"@babel/code-frame" "^7.0.0"
ajv "^6.10.0"
Expand Down Expand Up @@ -5154,6 +5154,11 @@ oauth-sign@~0.9.0:
resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==

object-align@1.0.10:
version "1.0.10"
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.10.tgz#88acc804a7a8d168f0752263fff1b2503cb660d9"
integrity sha512-WiZLaIy3m2zsFk8yFNZCWo66bkdLRbgTBLa4MK0W/wdk6vbYia6+xIZ8QD9j98fvMhRf31QunNQUfILD6wn6HA==

object-align@1.0.9:
version "1.0.9"
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.9.tgz#f1b1e236cc08606d8e85062ad7eaa4234569110a"
Expand Down Expand Up @@ -6588,6 +6593,20 @@ smart-fs@1.11.3:
xml-js "1.6.11"
yaml-boost "1.9.18"

smart-fs@1.11.4:
version "1.11.4"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.4.tgz#3b5fd216f27d3438f5e7a2e08c0b63e3c4b39d93"
integrity sha512-2NL60nagM+/OMTvxpfCpvHxsI2UnijPkKm+F4bn2I90dXf5dQzxUavly48W3y9iXdO/2XopjqdnybUorbMB+JA==
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.10"
xml-js "1.6.11"
yaml-boost "1.9.18"

snapdragon-node@^2.0.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
Expand Down

0 comments on commit 90659ad

Please sign in to comment.