Skip to content
This repository has been archived by the owner on Sep 28, 2020. It is now read-only.

Updates to ESLint 2.0.0 #81

Merged
merged 1 commit into from
Feb 17, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ rules:
object-curly-spacing: [2, "never"]
array-bracket-spacing: [2, "never"]
space-unary-ops: [2, {"words": true, "nonwords": false}]
space-after-keywords: [2, "always"]
keyword-spacing: [2, {"after": true}]
space-before-blocks: [2, "always"]
space-before-function-paren: [2, "never"]
space-in-parens: [2, "never"]
Expand Down
3 changes: 1 addition & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ function lint(input, config, webpack) {
res.warningCount === 1 &&
res.results[0].messages[0] &&
res.results[0].messages[0].message &&
res.results[0].messages[0].message.indexOf(".eslintignore") > -1 &&
res.results[0].messages[0].message.indexOf("--no-ignore") > -1
res.results[0].messages[0].message.indexOf("ignore") > 1
)) {
// quiet filter done now
// eslint allow rules to be specified in the input between comments
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
"index.js"
],
"peerDependencies": {
"eslint": "^1.6.0"
"eslint": ">=1.6.0 <3.0.0"
},
"dependencies": {
"loader-utils": "^0.2.7",
"object-assign": "^4.0.1"
},
"devDependencies": {
"eslint": "^1.6.0",
"eslint": "^2.0.0",
"eslint-friendly-formatter": "^1.0.3",
"npmpub": "^3.0.1",
"tape": "^4.0.0",
Expand Down