From 1cacdbe3621b137f8f9e7184465681be429d142d Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 7 Aug 2015 01:37:06 -0700 Subject: Upgrade ESLint to 1.0.0 --- .eslintrc | 27 +++++++++++++++++++++------ Gruntfile.js | 2 +- package.json | 2 +- src/nodejs/index.js | 2 +- src/nodejs/postprocessor.js | 2 +- 5 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.eslintrc b/.eslintrc index 25ac1d7..2182f31 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,27 +1,36 @@ { + "extends": "eslint:recommended", "ecmaFeatures": { "blockBindings": true }, "rules": { + "array-bracket-spacing": [2, "never"], + "arrow-parens": 2, + "arrow-spacing": [2, {"before": true, "after": true}], "block-scoped-var": 2, "brace-style": [2, "stroustrup"], "camelcase": 2, + "constructor-super": 2, "comma-spacing": [2, {"before": false, "after": true}], "comma-style": [2, "last"], + "computed-property-spacing": [2, "never"], "consistent-this": [2, "self"], "curly": 2, + "dot-location": [2, "property"], "eol-last": 2, "eqeqeq": 2, "key-spacing": [2, {"beforeColon": false, "afterColon": true}], + "linebreak-style": [2, "unix"], "new-cap": 2, "new-parens": 2, "no-array-constructor": 2, "no-bitwise": 2, + "no-const-assign": 2, "no-constant-condition": 0, "no-dupe-args": 2, "no-duplicate-case": 2, + "no-empty-character-class": 2, "no-eval": 2, - "no-extra-strict": 0, "no-floating-decimal": 2, "no-implied-eval": 2, "no-inline-comments": 0, @@ -32,28 +41,34 @@ "no-new-object": 2, "no-param-reassign": 0, "no-process-env": 2, - "no-reserved-keys": 0, "no-self-compare": 2, "no-spaced-func": 2, + "no-this-before-super": 2, "no-throw-literal": 2, "no-trailing-spaces": 2, "no-underscore-dangle": 0, + "no-unexpected-multiline": 2, + "no-unneeded-ternary": 2, + "no-useless-call": 2, "no-void": 2, "one-var": [2, "never"], + "object-curly-spacing": [2, "never"], "operator-assignment": [2, "always"], + "operator-linebreak": [2, "after"], "padded-blocks": 0, + "prefer-const": 2, + "prefer-spread": 2, + "quote-props": [2, "as-needed", {"keywords": true}], "quotes": 0, "radix": 2, "semi": [2, "always"], "semi-spacing": [2, {"before": false, "after": true}], - "space-after-keywords": [2, "always", {"checkFunctionKeyword": true}], + "space-after-keywords": [2, "always"], "space-before-blocks": [2, "always"], - "space-before-function-parentheses": [2, {"anonymous": "always", "named": "never"}], - "space-in-brackets": [2, "never"], + "space-before-function-paren": [2, {"anonymous": "always", "named": "never"}], "space-in-parens": [2, "never"], "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"], diff --git a/Gruntfile.js b/Gruntfile.js index 14203d0..f9b47b8 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,4 +1,4 @@ -/*eslint-env node */ +/* eslint-env node */ 'use strict'; module.exports = function (grunt) { diff --git a/package.json b/package.json index d7a7ef6..93ade32 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "grunt-browserify": "^4.0.0", "grunt-contrib-jshint": "^0.11.0", "grunt-contrib-nodeunit": "^0.4.1", - "grunt-eslint": "^10.0.0", + "grunt-eslint": "^17.0.0", "grunt-jscs": "^1.5.0", "jscs-jsdoc": "^0.4.0", "load-grunt-tasks": "^3.0.0", diff --git a/src/nodejs/index.js b/src/nodejs/index.js index bdb02e6..0e656dc 100644 --- a/src/nodejs/index.js +++ b/src/nodejs/index.js @@ -1,4 +1,4 @@ -/*eslint-env node */ +/* eslint-env node */ 'use strict'; var path = require('path'); diff --git a/src/nodejs/postprocessor.js b/src/nodejs/postprocessor.js index 00aaa2b..1e3af99 100644 --- a/src/nodejs/postprocessor.js +++ b/src/nodejs/postprocessor.js @@ -1,4 +1,4 @@ -/*eslint-env node */ +/* eslint-env node */ /*! * Postprocessor for shimming @media (hover: hover) from Media Queries Level 4 * https://github.com/twbs/mq4-hover-shim -- cgit v1.2.3