8000 New: Add support for eslint v2+ (#15) · gulpjs/eslint-config-gulp@ac89b00 · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Commit ac89b00

Browse files
gucong3000phated
authored andcommitted
New: Add support for eslint v2+ (#15)
1 parent 3d484f6 commit ac89b00

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

eslint.json renamed to eslint.js

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1-
{
1+
'use strict';
2+
var eslintVersion;
3+
try {
4+
eslintVersion = parseFloat(require("eslint").linter.version || require("eslint/package.json").version);
5+
} catch (ex) {
6+
eslintVersion = 1;
7+
}
8+
9+
var config = {
210
"env": {
311
"node": true
412
},
@@ -23,7 +31,14 @@
2331
"object-curly-spacing": [2, "always"],
2432
"quotes": [2, "single", "avoid-escape"],
2533
"semi": [2, "always"],
26-
"space-after-keywords": [2, "always"],
2734
"space-unary-ops": 2
2835
}
36+
};
37+
38+
if (eslintVersion >= 2) {
39+
config.rules["keyword-spacing"] = 2;
40+
} else {
41+
config.rules["space-after-keywords"] = [2, "always"];
2942
}
43+
44+
module.exports = config;

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
"engines": {
1010
"node": ">= 0.10"
1111
},
12-
"main": "eslint.json",
12+
"main": "eslint.js",
1313
"files": [
1414
"LICENSE",
15-
"eslint.json",
15+
"eslint.js",
1616
"test.json"
1717
],
1818
"scripts": {

test.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": "./eslint.json",
2+
"extends": "./eslint.js",
33
"env": {
44
"mocha": true
55
},

0 commit comments

Comments
 (0)
0