Skip to content

Commit 56a7fe2

Browse files
committed
Merge branch 'master' into fix-make-issue-linting-work
2 parents d7bdcbb + a530981 commit 56a7fe2

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
},
9393
"devDependencies": {
9494
"docsify-cli": "4.1.12",
95-
"eslint": "4.13.1",
95+
"eslint": "4.14.0",
9696
"eslint-config-prettier": "2.9.0",
9797
"husky": "0.14.3",
9898
"lerna": "2.5.1",

yarn.lock

+10-6
Original file line numberDiff line numberDiff line change
@@ -2091,7 +2091,7 @@ debug@2, [email protected], debug@^2.1.1, debug@^2.2.0, debug@^2.4.1, debug@^2.6.8:
20912091
dependencies:
20922092
ms "2.0.0"
20932093

2094-
debug@^3.0.1, debug@^3.1.0:
2094+
debug@^3.1.0:
20952095
version "3.1.0"
20962096
resolved "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
20972097
dependencies:
@@ -2572,21 +2572,25 @@ eslint-scope@^3.7.1:
25722572
esrecurse "^4.1.0"
25732573
estraverse "^4.1.1"
25742574

2575-
2576-
version "4.13.1"
2577-
resolved "https://registry.npmjs.org/eslint/-/eslint-4.13.1.tgz#0055e0014464c7eb7878caf549ef2941992b444f"
2575+
eslint-visitor-keys@^1.0.0:
2576+
version "1.0.0"
2577+
resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
2578+
2579+
2580+
version "4.14.0"
2581+
resolved "https://registry.npmjs.org/eslint/-/eslint-4.14.0.tgz#96609768d1dd23304faba2d94b7fefe5a5447a82"
25782582
dependencies:
25792583
ajv "^5.3.0"
25802584
babel-code-frame "^6.22.0"
25812585
chalk "^2.1.0"
25822586
concat-stream "^1.6.0"
25832587
cross-spawn "^5.1.0"
2584-
debug "^3.0.1"
2588+
debug "^3.1.0"
25852589
doctrine "^2.0.2"
25862590
eslint-scope "^3.7.1"
2591+
eslint-visitor-keys "^1.0.0"
25872592
espree "^3.5.2"
25882593
esquery "^1.0.0"
2589-
estraverse "^4.2.0"
25902594
esutils "^2.0.2"
25912595
file-entry-cache "^2.0.0"
25922596
functional-red-black-tree "^1.0.1"

0 commit comments

Comments
 (0)