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 #433 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Mar 17, 2020
2 parents ae4c1f6 + 862b420 commit f71833f
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 6 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"@babel/core": "7.8.7",
"@babel/plugin-proposal-object-rest-spread": "7.8.3",
"@babel/register": "7.8.6",
"@blackflux/eslint-plugin-rules": "1.3.24",
"@blackflux/eslint-plugin-rules": "1.3.26",
"@blackflux/robo-config-plugin": "3.1.0",
"babel-eslint": "10.1.0",
"chai": "4.2.0",
Expand Down
34 changes: 29 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,12 @@
lodash "^4.17.13"
to-fast-properties "^2.0.0"

"@blackflux/eslint-plugin-rules@1.3.24":
version "1.3.24"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.24.tgz#283811b7ef1c59d9159e6525fdaf37c455124021"
integrity sha512-T1Cc/7M2z/gmDVJiCtuki38zdVB6Rls6fI3TnR0RFicXnecfy60IfQjaULkbU4xBmyFG68yZtJbKJnOJovo8RA==
"@blackflux/eslint-plugin-rules@1.3.26":
version "1.3.26"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.26.tgz#d0083298ef832f042eeb846915fe8b4c28b50a72"
integrity sha512-f50X8byhWqzpTnU74tzN/IdePYIGaZRmvE9LjyA9u0Jkb/3yZ+J7HqEGQNxD9FWaKKGDLX22Y+/cPBIgDOC+ow==
dependencies:
smart-fs "1.11.8"
smart-fs "1.11.10"

"@blackflux/robo-config-plugin@3.1.0":
version "3.1.0"
Expand Down Expand Up @@ -6604,6 +6604,20 @@ 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==

smart-fs@1.11.10:
version "1.11.10"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.10.tgz#4a6c58a98e0c4a184705929556296cf19548158e"
integrity sha512-x848XvuVMoeoDp/KPK7kapHEJjH3bPHPErLOefJZQQvkOzZot8Z4/CnShj8mR/N1V0zb6mgpIPwbwfNe8zTvUA==
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.11"
xml-js "1.6.11"
yaml-boost "1.9.21"

smart-fs@1.11.8:
version "1.11.8"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.8.tgz#c3c268da7794018a5f81488bc63d281c3e2d1dd9"
Expand Down Expand Up @@ -7795,6 +7809,16 @@ yaml-boost@1.9.20:
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

yaml-boost@1.9.21:
version "1.9.21"
resolved "https://registry.yarnpkg.com/yaml-boost/-/yaml-boost-1.9.21.tgz#2b9b07972e9d25c4a889582f75a9c88e23869dd2"
integrity sha512-gYpJMWhXZjnkR8vdRukqCe6h+hwX9t4Pa2amNKWXEt/sXRTztZ3nH6SwR8pI9Dbae03TM79sClCDXw/tiYULgA==
dependencies:
js-yaml "3.13.1"
lodash.get "4.4.2"
lodash.mergewith "4.6.2"
lodash.set "4.3.2"

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

0 comments on commit f71833f

Please sign in to comment.