Skip to content

Commit

Permalink
Merge pull request #66 from blackflux/dev
Browse files Browse the repository at this point in the history
[Gally]: master <- dev
  • Loading branch information
simlu committed Mar 19, 2019
2 parents 6c4d58d + cf34766 commit 9452529
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 6 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"babel-eslint": "10.0.1",
"chai": "4.2.0",
"coveralls": "3.0.3",
"eslint": "5.15.2",
"eslint": "5.15.3",
"js-gardener": "1.38.4",
"nyc": "13.3.0",
"semantic-release": "15.13.3",
Expand Down Expand Up @@ -98,6 +98,6 @@
"object-deep-contain": "1.0.4",
"object-scan": "5.0.3",
"object-treeify": "1.0.1",
"smart-fs": "1.4.1"
"smart-fs": "1.5.0"
}
}
50 changes: 46 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2026,6 +2026,48 @@ eslint@5.15.2:
table "^5.2.3"
text-table "^0.2.0"

eslint@5.15.3:
version "5.15.3"
resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.15.3.tgz#c79c3909dc8a7fa3714fb340c11e30fd2526b8b5"
integrity sha512-vMGi0PjCHSokZxE0NLp2VneGw5sio7SSiDNgIUn2tC0XkWJRNOIoHIg3CliLVfXnJsiHxGAYrkw0PieAu8+KYQ==
dependencies:
"@babel/code-frame" "^7.0.0"
ajv "^6.9.1"
chalk "^2.1.0"
cross-spawn "^6.0.5"
debug "^4.0.1"
doctrine "^3.0.0"
eslint-scope "^4.0.3"
eslint-utils "^1.3.1"
eslint-visitor-keys "^1.0.0"
espree "^5.0.1"
esquery "^1.0.1"
esutils "^2.0.2"
file-entry-cache "^5.0.1"
functional-red-black-tree "^1.0.1"
glob "^7.1.2"
globals "^11.7.0"
ignore "^4.0.6"
import-fresh "^3.0.0"
imurmurhash "^0.1.4"
inquirer "^6.2.2"
js-yaml "^3.12.0"
json-stable-stringify-without-jsonify "^1.0.1"
levn "^0.3.0"
lodash "^4.17.11"
minimatch "^3.0.4"
mkdirp "^0.5.1"
natural-compare "^1.4.0"
optionator "^0.8.2"
path-is-inside "^1.0.2"
progress "^2.0.0"
regexpp "^2.0.1"
semver "^5.5.1"
strip-ansi "^4.0.0"
strip-json-comments "^2.0.1"
table "^5.2.3"
text-table "^0.2.0"

espree@^5.0.1:
version "5.0.1"
resolved "https://registry.yarnpkg.com/espree/-/espree-5.0.1.tgz#5d6526fa4fc7f0788a5cf75b15f30323e2f81f7a"
Expand Down Expand Up @@ -6105,10 +6147,10 @@ smart-buffer@^1.0.13:
resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-1.1.15.tgz#7f114b5b65fab3e2a35aa775bb12f0d1c649bf16"
integrity sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=

smart-fs@1.4.1:
version "1.4.1"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.4.1.tgz#b545df578c1c1c7b6d2bee671d8365d7951dd13c"
integrity sha512-/a32iPZT3TTpVL07issDfUNU5JKMoY3md38MZaSlrXcrkcS0oob5ny2bcQunbfnP+b99zlZMtdwQcKcCihBhqA==
smart-fs@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/smart-fs/-/smart-fs-1.5.0.tgz#9eea21733b31da042d9178859a9d5813d4b8c8f2"
integrity sha512-+CwFIwJ+hF5BqlBhKD+KDegtAIIZXkrAPwI2vEIl2PtqiJ715k7af44g4KjREESVIjOlN2r7QBMgtuocaxDpSQ==
dependencies:
fs-extra "7.0.1"
lodash.clonedeep "4.5.0"
Expand Down

0 comments on commit 9452529

Please sign in to comment.