Skip to content

Move to eslint #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
manosim merged 2 commits into from
Aug 22, 2015
Merged

Move to eslint #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6641882
Move to eslint
Aug 22, 2015
ff8c442
Linting indentation
Aug 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .eslintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"ecmaFeatures": {
"blockBindings": true,
"forOf": true,
"jsx": true
},
"parser": "babel-eslint",
"rules": {
"max-len": [1, 100, 2],
"indent": [2, 2],
"semi": 2,
"strict": 0,
"quotes": [1, "single", "avoid-escape"]
}
}
6 changes: 3 additions & 3 deletions main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ var iconIdle = path.join(__dirname, 'images', 'tray-idleTemplate.png');
var iconActive = path.join(__dirname, 'images', 'tray-active.png');

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

app.on('ready', function(){
Expand Down Expand Up @@ -94,7 +94,7 @@ app.on('ready', function(){
});

ipc.on('update-icon', function(event, arg) {
if (arg === "TrayActive") {
if (arg === 'TrayActive') {
appIcon.setImage(iconActive);
} else {
appIcon.setImage(iconIdle);
Expand Down
56 changes: 4 additions & 52 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,53 +10,8 @@
"watch": "npm run build && grunt build && npm run watch-js & grunt watch",
"start": "electron .",
"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'",
"test": "jsxhint --reporter=node_modules/jshint-stylish 'src/**/*.js', 'index.js' --exclude 'Gruntfile.js' && jscs 'src/js/' && jest"
},
"jshintConfig": {
"browserify": true,
"unused": true,
"undef": true,
"globals": {
"console": false
}
},
"jscsConfig": {
"esprima": "esprima-fb",
"disallowMultipleVarDecl": "exceptUndefined",
"validateQuoteMarks": {
"mark": "'",
"escape": false
},
"validateParameterSeparator": ", ",
"validateIndentation": 2,
"requireSpacesInFunction": {
"beforeOpeningRoundBrace": true,
"beforeOpeningCurlyBrace": true
},
"requireSpacesInConditionalExpression": {
"afterTest": true,
"beforeConsequent": true,
"afterConsequent": true,
"beforeAlternate": true
},
"disallowTrailingWhitespace": true,
"maximumLineLength": 100,
"requireCurlyBraces": true,
"disallowMixedSpacesAndTabs": true,
"requireSpaceBeforeBinaryOperators": true,
"safeContextKeyword": [
"self"
],
"disallowMultipleLineBreaks": true,
"disallowMultipleLineStrings": true,
"disallowSpaceAfterObjectKeys": true,
"disallowNewlineBeforeBlockStatements": true,
"disallowTrailingComma": true,
"requireCommaBeforeLineBreak": true,
"requireSpaceBetweenArguments": true,
"requireSpaceBeforeBlockStatements": true,
"requireSpaceBeforeObjectValues": true,
"requireSpacesInForStatement": true
"lint": "eslint 'src/js/' 'src/js/app.js' 'main.js'",
"test": "npm run lint && jest"
},
"jest": {
"scriptPreprocessor": "src/js/__tests__/preprocessor.js",
Expand All @@ -71,7 +26,6 @@
"src/js/components/settings.js": true,
"src/js/components/footer.js": true,
"src/js/components/search-input.js": true,
"src/js/components/settings.js": true,
"src/js/stores/auth.js": true,
"src/js/stores/notifications.js": true,
"src/js/stores/search.js": true,
Expand Down Expand Up @@ -137,18 +91,16 @@
"watchify": "=3.3.1"
},
"devDependencies": {
"babel-eslint": "=4.0.10",
"electron-packager": "=5.0.1",
"electron-prebuilt": "=0.30.2",
"esprima-fb": "^15001.1001.0-dev-harmony-fb",
"eslint": "=1.2.1",
"grunt": "=0.4.5",
"grunt-contrib-clean": "=0.6.0",
"grunt-contrib-copy": "=0.8.0",
"grunt-contrib-less": "=1.0.1",
"grunt-contrib-watch": "=0.6.1",
"jest-cli": "=0.4.17",
"jscs": "=2.0.0",
"jshint-stylish": "=2.0.1",
"jsxhint": "=0.15.1",
"less": "=2.5.1"
}
}