Skip to content

Commit d5fa3d2

Browse files
Merge pull request #86 from ekonstantinidis/use-eslint
Move to eslint
2 parents db62bee + ff8c442 commit d5fa3d2

File tree

3 files changed

+22
-55
lines changed

3 files changed

+22
-55
lines changed

.eslintrc

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"ecmaFeatures": {
3+
"blockBindings": true,
4+
"forOf": true,
5+
"jsx": true
6+
},
7+
"parser": "babel-eslint",
8+
"rules": {
9+
"max-len": [1, 100, 2],
10+
"indent": [2, 2],
11+
"semi": 2,
12+
"strict": 0,
13+
"quotes": [1, "single", "avoid-escape"]
14+
}
15+
}

main.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ var iconIdle = path.join(__dirname, 'images', 'tray-idleTemplate.png');
1313
var iconActive = path.join(__dirname, 'images', 'tray-active.png');
1414

1515
var autoStart = new AutoLaunch({
16-
name: 'Gitify',
17-
path: process.execPath.match(/.*?\.app/)[0]
16+
name: 'Gitify',
17+
path: process.execPath.match(/.*?\.app/)[0]
1818
});
1919

2020
app.on('ready', function(){
@@ -94,7 +94,7 @@ app.on('ready', function(){
9494
});
9595

9696
ipc.on('update-icon', function(event, arg) {
97-
if (arg === "TrayActive") {
97+
if (arg === 'TrayActive') {
9898
appIcon.setImage(iconActive);
9999
} else {
100100
appIcon.setImage(iconIdle);

package.json

+4-52
Original file line numberDiff line numberDiff line change
@@ -10,53 +10,8 @@
1010
"watch": "npm run build && grunt build && npm run watch-js & grunt watch",
1111
"start": "electron .",
1212
"dist": "electron-packager . Gitify --overwrite --platform=darwin --arch=x64 --version=0.30.2 --asar=true --icon=images/app-icon.icns --prune --ignore='src' --ignore='coverage'",
13-
"test": "jsxhint --reporter=node_modules/jshint-stylish 'src/**/*.js', 'index.js' --exclude 'Gruntfile.js' && jscs 'src/js/' && jest"
14-
},
15-
"jshintConfig": {
16-
"browserify": true,
17-
"unused": true,
18-
"undef": true,
19-
"globals": {
20-
"console": false
21-
}
22-
},
23-
"jscsConfig": {
24-
"esprima": "esprima-fb",
25-
"disallowMultipleVarDecl": "exceptUndefined",
26-
"validateQuoteMarks": {
27-
"mark": "'",
28-
"escape": false
29-
},
30-
"validateParameterSeparator": ", ",
31-
"validateIndentation": 2,
32-
"requireSpacesInFunction": {
33-
"beforeOpeningRoundBrace": true,
34-
"beforeOpeningCurlyBrace": true
35-
},
36-
"requireSpacesInConditionalExpression": {
37-
"afterTest": true,
38-
"beforeConsequent": true,
39-
"afterConsequent": true,
40-
"beforeAlternate": true
41-
},
42-
"disallowTrailingWhitespace": true,
43-
"maximumLineLength": 100,
44-
"requireCurlyBraces": true,
45-
"disallowMixedSpacesAndTabs": true,
46-
"requireSpaceBeforeBinaryOperators": true,
47-
"safeContextKeyword": [
48-
"self"
49-
],
50-
"disallowMultipleLineBreaks": true,
51-
"disallowMultipleLineStrings": true,
52-
"disallowSpaceAfterObjectKeys": true,
53-
"disallowNewlineBeforeBlockStatements": true,
54-
"disallowTrailingComma": true,
55-
"requireCommaBeforeLineBreak": true,
56-
"requireSpaceBetweenArguments": true,
57-
"requireSpaceBeforeBlockStatements": true,
58-
"requireSpaceBeforeObjectValues": true,
59-
"requireSpacesInForStatement": true
13+
"lint": "eslint 'src/js/' 'src/js/app.js' 'main.js'",
14+
"test": "npm run lint && jest"
6015
},
6116
"jest": {
6217
"scriptPreprocessor": "src/js/__tests__/preprocessor.js",
@@ -71,7 +26,6 @@
7126
"src/js/components/settings.js": true,
7227
"src/js/components/footer.js": true,
7328
"src/js/components/search-input.js": true,
74-
"src/js/components/settings.js": true,
7529
"src/js/stores/auth.js": true,
7630
"src/js/stores/notifications.js": true,
7731
"src/js/stores/search.js": true,
@@ -137,18 +91,16 @@
13791
"watchify": "=3.3.1"
13892
},
13993
"devDependencies": {
94+
"babel-eslint": "=4.0.10",
14095
"electron-packager": "=5.0.1",
14196
"electron-prebuilt": "=0.30.2",
142-
"esprima-fb": "^15001.1001.0-dev-harmony-fb",
97+
"eslint": "=1.2.1",
14398
"grunt": "=0.4.5",
14499
"grunt-contrib-clean": "=0.6.0",
145100
"grunt-contrib-copy": "=0.8.0",
146101
"grunt-contrib-less": "=1.0.1",
147102
"grunt-contrib-watch": "=0.6.1",
148103
"jest-cli": "=0.4.17",
149-
"jscs": "=2.0.0",
150-
"jshint-stylish": "=2.0.1",
151-
"jsxhint": "=0.15.1",
152104
"less": "=2.5.1"
153105
}
154106
}

0 commit comments

Comments
 (0)