diff options
| author | Chris Rebert <github@rebertia.com> | 2015-03-23 23:41:00 +0300 |
|---|---|---|
| committer | Chris Rebert <github@rebertia.com> | 2015-03-23 23:41:00 +0300 |
| commit | cd0753157d3977b7c7fce8263febaa9c2be663dc (patch) | |
| tree | f21daf50ca70a9ae26b92fc8d587ebf3169c5484 | |
| parent | 887e5b4c876f1a6d56c7fb7016c448b196cac187 (diff) | |
| parent | e6d246672102cf0e73544d1068c7ce96ad99a020 (diff) | |
Merge pull request #17 from twbs/eslint
Upgrade to grunt-eslint ^9.0.0
| -rw-r--r-- | .eslintrc | 6 | ||||
| -rw-r--r-- | Gruntfile.js | 3 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/browser/mq4-hover-shim.js | 2 |
4 files changed, 8 insertions, 5 deletions
@@ -18,7 +18,10 @@ "no-array-constructor": 2, "no-bitwise": 2, "no-constant-condition": 0, + "no-dupe-args": 2, + "no-duplicate-case": 2, "no-eval": 2, + "no-extra-strict": 0, "no-floating-decimal": 2, "no-implied-eval": 2, "no-inline-comments": 0, @@ -30,7 +33,6 @@ "no-process-env": 2, "no-reserved-keys": 0, "no-self-compare": 2, - "no-space-before-semi": 2, "no-spaced-func": 2, "no-throw-literal": 2, "no-trailing-spaces": 2, @@ -41,6 +43,7 @@ "quotes": 0, "radix": 2, "semi": [2, "always"], + "semi-spacing": [2, {"before": false, "after": true}], "space-after-keywords": [2, "always", {"checkFunctionKeyword": true}], "space-before-blocks": [2, "always"], "space-before-function-parentheses": [2, {"anonymous": "always", "named": "never"}], @@ -49,6 +52,7 @@ "space-return-throw-case": 2, "space-unary-ops": [2, {"words": true, "nonwords": false}], "spaced-line-comment": [2, "always"], + "strict": [2, "global"], "vars-on-top": 0, "wrap-iife": [2, "inside"], "yoda": [2, "never"] diff --git a/Gruntfile.js b/Gruntfile.js index ac0db8d..14203d0 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,8 +1,7 @@ /*eslint-env node */ +'use strict'; module.exports = function (grunt) { - 'use strict'; - grunt.util.linefeed = '\n'; require('load-grunt-tasks')(grunt); diff --git a/package.json b/package.json index 5862e16..83ed3d3 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "grunt-browserify": "^3.2.1", "grunt-contrib-jshint": "^0.11.0", "grunt-contrib-nodeunit": "^0.4.1", - "grunt-eslint": "^7.0.0", + "grunt-eslint": "^9.0.0", "grunt-jscs": "^1.5.0", "jscs-jsdoc": "^0.4.0", "load-grunt-tasks": "^3.0.0", diff --git a/src/browser/mq4-hover-shim.js b/src/browser/mq4-hover-shim.js index 91c5525..b8800ce 100644 --- a/src/browser/mq4-hover-shim.js +++ b/src/browser/mq4-hover-shim.js @@ -1,4 +1,4 @@ -/*eslint-env browser */ +/*eslint-env browser, es6 */ /*eslint no-var:2*/ /* jshint browser: true, esnext: true */ /* jshint -W080 */ |