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

Commit b13781e

Browse files
committed
Updates to ESLint 2.0.0
1 parent 65f54fe commit b13781e

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

.eslintrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ rules:
3030
object-curly-spacing: [2, "never"]
3131
array-bracket-spacing: [2, "never"]
3232
space-unary-ops: [2, {"words": true, "nonwords": false}]
33-
space-after-keywords: [2, "always"]
33+
keyword-spacing: [2, {"after": true}]
3434
space-before-blocks: [2, "always"]
3535
space-before-function-paren: [2, "never"]
3636
space-in-parens: [2, "never"]

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
"index.js"
1717
],
1818
"peerDependencies": {
19-
"eslint": "^1.6.0"
19+
"eslint": ">=1.6.0 <2.1.0"
2020
},
2121
"dependencies": {
2222
"loader-utils": "^0.2.7",
2323
"object-assign": "^4.0.1"
2424
},
2525
"devDependencies": {
26-
"eslint": "^1.6.0",
26+
"eslint": "^2.0.0",
2727
"eslint-friendly-formatter": "^1.0.3",
2828
"npmpub": "^3.0.1",
2929
"tape": "^4.0.0",

test/eslintignore.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ test("eslint-loader ignores files present in .eslintignore", function(t) {
99
{
1010
entry: "./test/fixtures/ignore.js",
1111
eslint: assign({}, conf.eslint, {
12-
// we want to enable ignore, so eslint will parse .eslintignore and
13-
// should skip the file specified above
12+
quiet: true,
1413
ignore: true,
1514
}),
1615
}

0 commit comments

Comments
 (0)