diff --git a/.eslintrc b/.eslintrc index 15193ec..7f3aebf 100644 --- a/.eslintrc +++ b/.eslintrc @@ -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"] diff --git a/index.js b/index.js index 8acec92..5f3c4b7 100644 --- a/index.js +++ b/index.js @@ -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 diff --git a/package.json b/package.json index b50e867..0d2e23b 100644 --- a/package.json +++ b/package.json @@ -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",