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 #347 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu authored Dec 31, 2019
2 parents 4797688 + 08b0f27 commit 86d0191
Show file tree
Hide file tree
Showing 2 changed files with 25 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.7.7",
"@babel/plugin-proposal-object-rest-spread": "7.7.7",
"@babel/register": "7.7.7",
"@blackflux/eslint-plugin-rules": "1.3.22",
"@blackflux/eslint-plugin-rules": "1.3.23",
"@blackflux/robo-config-plugin": "3.0.5",
"babel-eslint": "10.0.3",
"chai": "4.2.0",
Expand Down
29 changes: 24 additions & 5 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.22":
version "1.3.22"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.22.tgz#171ace29b3f801df59192fe61ac08fbd05faa821"
integrity sha512-X6JMtJmeQyKyMHBvZ5+kewKWgApITKimH4bQJX7DoZlwmSEUUkEZ4p0EyiT5uxayjb27hatMnEtokOKUWbEuxA==
"@blackflux/eslint-plugin-rules@1.3.23":
version "1.3.23"
resolved "https://registry.yarnpkg.com/@blackflux/eslint-plugin-rules/-/eslint-plugin-rules-1.3.23.tgz#8a58acb2f1259ad52548752d719cb2d3f7a8bd10"
integrity sha512-7tal9zQJGpCZ1UJJgf53uqxuysR9IrcR0IActCmC7DgDqOkVchNhHCOMlHZI+0zl7gc5QLB408VXohAC5qW52g==
dependencies:
smart-fs "1.11.5"
smart-fs "1.11.7"

"@blackflux/robo-config-plugin@3.0.5":
version "3.0.5"
Expand Down Expand Up @@ -5159,6 +5159,11 @@ object-align@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.11:
version "1.0.11"
resolved "https://registry.yarnpkg.com/object-align/-/object-align-1.0.11.tgz#bf34cf06781c438da39ef81eea636213a23a3cdc"
integrity sha512-Rot2IoiS3yva4L4rYtkLc+kOtCQZxlBhEERrwyvyCb1KKK+hENYcHT5+vXsK3TOij/7m7eDNuNxxxUEmFTH2yw==

object-assign@^4.0.1, object-assign@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
Expand Down Expand Up @@ -6608,6 +6613,20 @@ smart-fs@1.11.5:
xml-js "1.6.11"
yaml-boost "1.9.19"

smart-fs@1.11.7:
version "1.11.7"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.11.7.tgz#6f917c2e4b354ba0920e39fc4c48cb1019c14d91"
integrity sha512-WLSNToKZGpwVMLpnqs8dd+7fpUMhwOD7xafFBaUapH8o8dydnGtx8ZIywZfGW13Wl6KB7I+ysILTJX5VcRZheg==
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.19"

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 86d0191

Please sign in to comment.