From 56e54ca9bb291e3dcee3451c8c404c398485af79 Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Sat, 20 Feb 2016 11:49:28 +0200 Subject: Remove JSHint and JSCS. --- .eslintrc | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++++------- .jscsrc | 28 --------------------------- .jshintrc | 17 ----------------- Gruntfile.js | 24 +---------------------- README.md | 2 +- package.json | 2 -- 6 files changed, 57 insertions(+), 78 deletions(-) delete mode 100644 .jscsrc delete mode 100644 .jshintrc diff --git a/.eslintrc b/.eslintrc index 91f00bd..98b0431 100644 --- a/.eslintrc +++ b/.eslintrc @@ -7,55 +7,103 @@ "block-scoped-var": 2, "brace-style": [2, "stroustrup"], "camelcase": 2, - "comma-spacing": [2, {"before": false, "after": true}], + "comma-dangle": 2, + "comma-spacing": [2, { "before": false, "after": true }], "comma-style": [2, "last"], + "consistent-return": 2, "consistent-this": [2, "self"], "curly": 2, "eol-last": 2, "eqeqeq": 2, + "func-names": 0, + "func-style": [0, "expression"], + "guard-for-in": 2, + "handle-callback-err": 2, "indent": [2, 2], - "key-spacing": [2, {"beforeColon": false, "afterColon": true}], + "key-spacing": [2, { "beforeColon": false, "afterColon": true }], "keyword-spacing": 2, "new-cap": 2, + "newline-after-var": [0, "always"], "new-parens": 2, "no-array-constructor": 2, "no-bitwise": 2, + "no-cond-assign": 2, "no-constant-condition": 0, + "no-control-regex": 2, + "no-debugger": 2, + "no-delete-var": 2, "no-dupe-args": 2, + "no-dupe-keys": 2, "no-duplicate-case": 2, + "no-else-return": 2, + "no-empty": 2, + "no-empty-character-class": 2, + "no-eq-null": 2, "no-eval": 2, - "no-extra-strict": 0, + "no-ex-assign": 2, + "no-extra-boolean-cast": 2, + "no-extra-parens": 2, + "no-extra-semi": 2, + "no-fallthrough": 2, "no-floating-decimal": 2, + "no-func-assign": 2, + "no-implicit-coercion": 2, "no-implied-eval": 2, "no-inline-comments": 0, + "no-inner-declarations": 2, + "no-invalid-regexp": 2, "no-irregular-whitespace": 2, + "no-lone-blocks": 2, + "no-lonely-if": 2, + "no-loop-func": 2, + "no-mixed-requires": 2, "no-mixed-spaces-and-tabs": 2, - "no-multiple-empty-lines": 0, + "no-multiple-empty-lines": 2, "no-multi-spaces": 2, + "no-multi-str": 2, + "no-negated-in-lhs": 2, "no-new-object": 2, + "no-obj-calls": 2, + "no-octal": 2, "no-param-reassign": 0, + "no-path-concat": 2, "no-process-env": 2, + "no-redeclare": 2, + "no-regex-spaces": 2, "no-reserved-keys": 0, + "no-return-assign": 2, "no-self-compare": 2, + "no-sequences": 2, "no-spaced-func": 2, + "no-sparse-arrays": 2, "no-throw-literal": 2, "no-trailing-spaces": 2, + "no-undef": 2, "no-underscore-dangle": 0, + "no-unexpected-multiline": 2, + "no-unreachable": 2, + "no-unused-expressions": 2, + "no-unused-vars": 2, + "no-useless-call": 2, + "no-useless-concat": 2, "no-void": 2, "object-curly-spacing": [2, "never"], "one-var": [2, "never"], "operator-assignment": [2, "always"], "padded-blocks": 0, - "quotes": 0, + "quote-props": [2, "as-needed"], + "quotes": [2, "single"], "radix": 2, "semi": [2, "always"], - "semi-spacing": [2, {"before": false, "after": true}], + "semi-spacing": [2, { "before": false, "after": true }], "space-before-blocks": [2, "always"], "spaced-comment": [2, "always"], "space-in-parens": [2, "never"], - "space-unary-ops": [2, {"words": true, "nonwords": false}], + "space-unary-ops": [2, { "words": true, "nonwords": false }], "strict": [2, "global"], + "use-isnan": 2, "vars-on-top": 0, + "valid-typeof": 2, "wrap-iife": [2, "inside"], "yoda": [2, "never"] } diff --git a/.jscsrc b/.jscsrc deleted file mode 100644 index ca2e01c..0000000 --- a/.jscsrc +++ /dev/null @@ -1,28 +0,0 @@ -{ - "disallowEmptyBlocks": true, - "disallowKeywords": ["with"], - "disallowMixedSpacesAndTabs": true, - "disallowMultipleLineStrings": true, - "disallowMultipleVarDecl": true, - "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"], - "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"], - "disallowSpacesInCallExpression": true, - "disallowSpacesInsideBrackets": true, - "disallowTrailingWhitespace": true, - "requireCapitalizedConstructors": true, - "requireCommaBeforeLineBreak": true, - "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch", "case", "default"], - "requireLineFeedAtFileEnd": true, - "requireOperatorBeforeLineBreak": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="], - "requireParenthesesAroundIIFE": true, - "requireSpaceAfterBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="], - "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"], - "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", "<", ">=", "<="], - "requireSpacesInConditionalExpression": true, - "requireSpacesInFunctionExpression": { "beforeOpeningCurlyBrace": true }, - "requireSpacesInForStatement": true, - "validateIndentation": 2, - "validateLineBreaks": "LF", - "validateParameterSeparator": ", ", - "validateQuoteMarks": "'" -} diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index ea5d0b4..0000000 --- a/.jshintrc +++ /dev/null @@ -1,17 +0,0 @@ -{ - "bitwise": true, - "curly": true, - "eqeqeq": true, - "forin": true, - "futurehostile": true, - "immed": true, - "latedef": true, - "newcap": true, - "noarg": true, - "node": true, - "noempty": true, - "plusplus": false, - "predef": ["exports"], - "sub": true, - "undef": true -} diff --git a/Gruntfile.js b/Gruntfile.js index b240dbf..8810d4b 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -12,17 +12,6 @@ module.exports = function (grunt) { // Project configuration. grunt.initConfig({ - jshint: { - options: { - jshintrc: '.jshintrc' - }, - all: [ - 'Gruntfile.js', - 'tasks/*.js', - '<%= nodeunit.tests %>' - ] - }, - eslint: { options: { config: '.eslintrc' @@ -34,17 +23,6 @@ module.exports = function (grunt) { ] }, - jscs: { - options: { - config: '.jscsrc' - }, - all: [ - 'Gruntfile.js', - 'tasks/*.js', - '<%= nodeunit.tests %>' - ] - }, - // Before generating any new files, remove any previously-created files. clean: { tests: ['tmp'] @@ -81,7 +59,7 @@ module.exports = function (grunt) { // These plugins provide necessary tasks. require('load-grunt-tasks')(grunt, {scope: 'devDependencies'}); - grunt.registerTask('lint', ['jshint', 'eslint', 'jscs']); + grunt.registerTask('lint', ['eslint']); // Whenever the "test" task is run, first clean the "tmp" dir, then run this // plugin's task(s), then test the result. diff --git a/README.md b/README.md index 4f62d69..d054511 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@ grunt.initConfig({ ``` ## Contributing -The project's coding style is laid out in the JSHint and JSCS configurations. Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/). +The project's coding style is laid out in the ESLint configuration. Add unit tests for any new or changed functionality. Lint and test your code using [Grunt](http://gruntjs.com/). ## License and copyright diff --git a/package.json b/package.json index 15df528..459f776 100644 --- a/package.json +++ b/package.json @@ -25,10 +25,8 @@ "devDependencies": { "grunt": "^0.4.5", "grunt-contrib-clean": "^1.0.0", - "grunt-contrib-jshint": "^1.0.0", "grunt-contrib-nodeunit": "^1.0.0", "grunt-eslint": "^18.0.0", - "grunt-jscs": "^2.7.0", "load-grunt-tasks": "^3.1.0" }, "peerDependencies": { -- cgit v1.2.3