1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 18:29:17 +02:00

Update to eslint-2.0-beta.1 since eslint its getting better at indents (not yet ready to automatic fix)

This commit is contained in:
Gunther Brunner 2016-01-21 22:13:55 +09:00
parent 42e9648da1
commit 25f81aa80f
5 changed files with 16 additions and 7 deletions

View file

@ -134,13 +134,10 @@
"semi-spacing": [2, {"before": false, "after": true}], "semi-spacing": [2, {"before": false, "after": true}],
"semi": [2, "never"], "semi": [2, "never"],
"sort-vars": 0, // optaionlly set `[2, {"ignoreCase": true}]` "sort-vars": 0, // optaionlly set `[2, {"ignoreCase": true}]`
"space-after-keywords": [2, "always"],
"space-before-keywords": [2, "always"],
"space-before-blocks": [2, "always"], // optionally set `[2, {"functions": "never", "keywords": "always"}]` "space-before-blocks": [2, "always"], // optionally set `[2, {"functions": "never", "keywords": "always"}]`
"space-before-function-paren": [2, "never"], // optionally set `[2, {"anonymous": "always", "named": "never"}]` "space-before-function-paren": [2, "never"], // optionally set `[2, {"anonymous": "always", "named": "never"}]`
"space-in-parens": [2, "never"], // optionally set `[2, "always", {"exceptions": ["empty"]}]` "space-in-parens": [2, "never"], // optionally set `[2, "always", {"exceptions": ["empty"]}]`
"space-infix-ops": 2, "space-infix-ops": 2,
"space-return-throw-case": 2,
"space-unary-ops": [2, {"words": true, "nonwords": false}], "space-unary-ops": [2, {"words": true, "nonwords": false}],
"spaced-comment": [1, "always", {"exceptions": ["/"]}], // optionally set `[2, "always", {"exceptions": ["-", "+"], "markers": ["/"]}]` "spaced-comment": [1, "always", {"exceptions": ["/"]}], // optionally set `[2, "always", {"exceptions": ["-", "+"], "markers": ["/"]}]`
"wrap-regex": 0, // TODO: 2 is ok but the division edge case is too edgy "wrap-regex": 0, // TODO: 2 is ok but the division edge case is too edgy
@ -154,6 +151,9 @@
"no-path-concat": 2, // `2` is default "no-path-concat": 2, // `2` is default
"no-process-exit": 0, // `2` is default "no-process-exit": 0, // `2` is default
"no-restricted-modules": 0, // no default, optionally set `[2, "fs", "os"]` "no-restricted-modules": 0, // no default, optionally set `[2, "fs", "os"]`
"no-sync": 1 // `2` is default "no-sync": 1, // `2` is default
// eslint v2
"keyword-spacing": 2
} }
} }

View file

@ -52,6 +52,7 @@ gulp.task('eslint', function() {
gulp.task('eslint-cli', function(done) { gulp.task('eslint-cli', function(done) {
var cli = new EslintCLIEngine({ var cli = new EslintCLIEngine({
cache: true cache: true
, fix: false
}) })
var report = cli.executeOnFiles([ var report = cli.executeOnFiles([

View file

@ -89,7 +89,7 @@
"chai": "^3.4.1", "chai": "^3.4.1",
"css-loader": "^0.23.1", "css-loader": "^0.23.1",
"del": "^2.0.1", "del": "^2.0.1",
"eslint": "^1.10.3", "eslint": "^2.0.0-beta.1",
"eslint-loader": "^1.2.0", "eslint-loader": "^1.2.0",
"event-stream": "^3.3.2", "event-stream": "^3.3.2",
"exports-loader": "^0.6.2", "exports-loader": "^0.6.2",

View file

@ -5,8 +5,7 @@
"commonjs": true, "commonjs": true,
"browser": true, "browser": true,
"node": false, "node": false,
"jasmine": true, "jasmine": true
"protractor": true
}, },
"rules": { "rules": {
// TODO: for now lets just mute them // TODO: for now lets just mute them

9
res/test/.eslintrc Normal file
View file

@ -0,0 +1,9 @@
// TODO: Some day use eslint-plugin-angular
// https://github.com/Gillespie59/eslint-plugin-angular
{
"env": {
"browser": true,
"node": true,
"protractor": true
}
}