Skip to content

Commit 7c9ff66

Browse files
Chlodochar6iz
authored andcommitted
added javascript styling rules (#2748)
* added javascript styling rules * use nodejs 4.4.7 instead of 0.10.x
1 parent 7697ffd commit 7c9ff66

File tree

5 files changed

+39
-17
lines changed

5 files changed

+39
-17
lines changed

.eslintignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
**/vendor/**
2+
**/dist/**
3+
**/node_modules/**
4+
**/server.js
5+
**/venv/**
6+
Gruntfile.js

.eslintrc.json

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"extends": "standard",
3+
"parserOptions": {
4+
"ecmaFeatures": {
5+
"jsx": false
6+
},
7+
"ecmaVersion": 6,
8+
"sourceType": "module"
9+
},
10+
"env": {
11+
"browser": true,
12+
"jquery": true
13+
},
14+
"globals": {
15+
"google": true,
16+
"centerLat": true,
17+
"centerLng": true
18+
},
19+
"rules": {
20+
"semi": 0
21+
}
22+
}

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ python:
55
env:
66
- FLASK=0.11.1
77
install:
8+
- nvm install 4.4.7
89
- pip install Flask==$FLASK
910
- pip install -r requirements.txt
1011
- npm install grunt-cli -g
1112
- npm install
1213
script:
13-
- npm run lint
1414
- npm run build
1515
- nosetests

Gruntfile.js

+4-13
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,8 @@ module.exports = function(grunt) {
1515
}
1616
}
1717
},
18-
jshint: {
19-
files: ['Gruntfile.js', 'js/*.js', '!js/vendor/**/*.js'],
20-
options: {
21-
reporter: require('jshint-stylish'),
22-
globals: {
23-
jQuery: true,
24-
console: true,
25-
module: true,
26-
document: true
27-
}
28-
}
18+
eslint: {
19+
src: ['static/js/*.js', '!js/vendor/**/*.js']
2920
},
3021
babel: {
3122
options: {
@@ -114,7 +105,7 @@ module.exports = function(grunt) {
114105
});
115106

116107
grunt.loadNpmTasks('grunt-contrib-uglify');
117-
grunt.loadNpmTasks('grunt-contrib-jshint');
108+
grunt.loadNpmTasks('grunt-eslint');
118109
grunt.loadNpmTasks('grunt-contrib-watch');
119110
grunt.loadNpmTasks('grunt-sass');
120111
grunt.loadNpmTasks('grunt-contrib-copy');
@@ -128,7 +119,7 @@ module.exports = function(grunt) {
128119

129120
grunt.registerTask('js-build', ['babel', 'uglify', 'minjson']);
130121
grunt.registerTask('css-build', ['sass', 'cssmin']);
131-
grunt.registerTask('js-lint', ['jshint']);
122+
grunt.registerTask('js-lint', ['eslint']);
132123

133124
grunt.registerTask('build', ['clean', 'js-build', 'css-build']);
134125
grunt.registerTask('lint', ['js-lint']);

package.json

+6-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@
55
"main": "Gruntfile.js",
66
"dependencies": {
77
"babel-preset-es2015": "^6.9.0",
8+
"eslint": "^3.1.1",
9+
"eslint-config-standard": "^5.3.5",
10+
"eslint-plugin-promise": "^2.0.0",
11+
"eslint-plugin-standard": "^2.0.0",
812
"grunt": "^0.4.5",
913
"grunt-babel": "^6.0.0",
1014
"grunt-cli": "^1.2.0",
@@ -13,17 +17,16 @@
1317
"grunt-contrib-connect": "latest",
1418
"grunt-contrib-copy": "latest",
1519
"grunt-contrib-cssmin": "latest",
16-
"grunt-contrib-jshint": "latest",
1720
"grunt-contrib-uglify": "latest",
1821
"grunt-contrib-watch": "latest",
22+
"grunt-eslint": "^19.0.0",
1923
"grunt-html-validation": "^0.1.18",
2024
"grunt-include-file": "^0.1.1",
2125
"grunt-legacssy": "latest",
2226
"grunt-minjson": "latest",
2327
"grunt-sass": "latest",
2428
"grunt-unused": "latest",
25-
"grunt-usemin": "latest",
26-
"jshint-stylish": "latest"
29+
"grunt-usemin": "latest"
2730
},
2831
"scripts": {
2932
"postinstall": "./node_modules/.bin/grunt build",

0 commit comments

Comments
 (0)