From 5ff1468cfd7143b98a917f451bb30f41ca601465 Mon Sep 17 00:00:00 2001 From: Domenic Denicola Date: Sat, 10 Jun 2017 23:48:17 -0400 Subject: [PATCH] Various cleanups and updates - Switch from JSHint to ESLint, and pass it - Update Mocha and other dev dependencies (except Chai, see #101, and CoffeeScript, see #99) - Run tests on Travis even if lint fails - Add .editorconfig - Add package-lock.json --- .editorconfig | 9 + .eslintignore | 1 + .eslintrc.json | 229 ++++++++ .jshintrc | 25 - .travis.yml | 3 +- lib/sinon-chai.js | 36 +- package-lock.json | 1318 +++++++++++++++++++++++++++++++++++++++++++++ package.json | 12 +- test/common.js | 6 +- 9 files changed, 1594 insertions(+), 45 deletions(-) create mode 100644 .editorconfig create mode 100644 .eslintignore create mode 100644 .eslintrc.json delete mode 100644 .jshintrc create mode 100644 package-lock.json diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..911234f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true +charset = utf-8 +indent_style = space +indent_size = 4 diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..404abb2 --- /dev/null +++ b/.eslintignore @@ -0,0 +1 @@ +coverage/ diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 0000000..f34ba89 --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,229 @@ +{ + "root": true, + "env": { + "node": true, + "amd": true, + "es6": false + }, + "parserOptions": { + "ecmaVersion": 5 + }, + "rules": { + // Possible errors + "no-await-in-loop": "off", + "comma-dangle": ["error", "never"], + "no-cond-assign": ["error", "except-parens"], + "no-console": "off", + "no-constant-condition": "error", + "no-control-regex": "error", + "no-debugger": "error", + "no-dupe-args": "error", + "no-dupe-keys": "error", + "no-duplicate-case": "error", + "no-empty": "error", + "no-empty-character-class": "error", + "no-ex-assign": "error", + "no-extra-boolean-cast": "error", + "no-extra-parens": ["error", "all", { "conditionalAssign": false, "nestedBinaryExpressions": false }], + "no-extra-semi": "error", + "no-func-assign": "error", + "no-inner-declarations": "off", + "no-invalid-regexp": "error", + "no-irregular-whitespace": "error", + "no-obj-calls": "error", + "no-prototype-builtins": "error", + "no-regex-spaces": "error", + "no-sparse-arrays": "error", + "no-template-curly-in-string": "error", + "no-unexpected-multiline": "error", + "no-unreachable": "error", + "no-unsafe-finally": "off", + "no-unsafe-negation": "error", + "use-isnan": "error", + "valid-jsdoc": "off", + "valid-typeof": "error", + + // Best practices + "accessor-pairs": "error", + "array-callback-return": "error", + "block-scoped-var": "off", + "class-methods-use-this": "error", + "complexity": "off", + "consistent-return": "error", + "curly": ["error", "all"], + "default-case": "off", + "dot-location": ["error", "property"], + "dot-notation": "error", + "eqeqeq": "error", + "guard-for-in": "off", + "no-alert": "error", + "no-caller": "error", + "no-case-declarations": "error", + "no-div-regex": "off", + "no-else-return": "error", + "no-empty-function": "error", + "no-empty-pattern": "error", + "no-eq-null": "error", + "no-eval": "error", + "no-extend-native": "error", + "no-extra-bind": "error", + "no-extra-label": "error", + "no-fallthrough": "error", + "no-floating-decimal": "error", + "no-global-assign": "error", + "no-implicit-coercion": "error", + "no-implicit-globals": "error", + "no-implied-eval": "off", + "no-invalid-this": "error", + "no-iterator": "error", + "no-labels": ["error", { "allowLoop": true }], + "no-lone-blocks": "error", + "no-loop-func": "off", + "no-magic-numbers": "off", + "no-multi-spaces": "error", + "no-multi-str": "error", + "no-new": "error", + "no-new-func": "error", + "no-new-wrappers": "error", + "no-octal": "error", + "no-octal-escape": "error", + "no-param-reassign": "off", + "no-process-env": "error", + "no-proto": "error", + "no-redeclare": "error", + "no-restricted-properties": "off", + "no-return-assign": ["error", "except-parens"], + "no-return-await": "error", + "no-script-url": "off", + "no-self-assign": "error", + "no-self-compare": "error", + "no-sequences": "error", + "no-throw-literal": "error", + "no-unmodified-loop-condition": "error", + "no-unused-expressions": "error", + "no-unused-labels": "error", + "no-useless-call": "error", + "no-useless-concat": "error", + "no-useless-escape": "error", + "no-useless-return": "error", + "no-void": "error", + "no-warning-comments": "off", + "no-with": "error", + "radix": ["error", "as-needed"], + "require-await": "error", + "vars-on-top": "off", + "wrap-iife": ["error", "outside"], + "yoda": ["error", "never"], + + // Strict Mode + "strict": ["error", "global"], + + // Variables + "init-declarations": "off", + "no-catch-shadow": "error", + "no-delete-var": "error", + "no-label-var": "error", + "no-restricted-globals": "off", + "no-shadow": "error", + "no-shadow-restricted-names": "error", + "no-undef": "error", + "no-undef-init": "error", + "no-undefined": "off", + "no-unused-vars": "error", + "no-use-before-define": ["error", "nofunc"], + + // Node.js and CommonJS + "callback-return": "off", + "global-require": "error", + "handle-callback-err": "error", + "no-mixed-requires": ["error", true], + "no-new-require": "error", + "no-path-concat": "error", + "no-process-exit": "error", + "no-restricted-imports": "off", + "no-restricted-modules": "off", + "no-sync": "off", + + // Stylistic Issues + "array-bracket-spacing": ["error", "never"], + "block-spacing": ["error", "always"], + "brace-style": ["error", "1tbs", { "allowSingleLine": false }], + "camelcase": ["error", { "properties": "always" }], + "capitalized-comments": ["error", "always", { "ignoreConsecutiveComments": true }], + "comma-spacing": ["error", { "before": false, "after": true }], + "comma-style": ["error", "last"], + "computed-property-spacing": ["error", "never"], + "consistent-this": "off", + "eol-last": "error", + "func-call-spacing": ["error", "never"], + "func-name-matching": ["error", "always"], + "func-names": ["error", "never"], + "func-style": ["error", "declaration"], + "id-blacklist": "off", + "id-length": "off", + "id-match": "off", + "indent": ["error", 4, { "SwitchCase": 1 }], + "jsx-quotes": "off", + "key-spacing": ["error", { "beforeColon": false, "afterColon": true, "mode": "strict" }], + "keyword-spacing": ["error", { "before": true, "after": true }], + "line-comment-position": "off", + "linebreak-style": ["error", "unix"], + "lines-around-comment": "off", + "lines-around-directive": "off", + "max-depth": "off", + "max-len": ["error", 120, { "ignoreUrls": true }], + "max-lines": "off", + "max-nested-callbacks": "off", + "max-params": "off", + "max-statements": "off", + "max-statements-per-line": ["error", { "max": 1 }], + "multiline-ternary": "off", + "new-cap": "error", + "new-parens": "error", + "newline-after-var": "off", + "newline-before-return": "off", + "newline-per-chained-call": "off", + "no-array-constructor": "error", + "no-bitwise": "off", + "no-continue": "off", + "no-inline-comments": "off", + "no-lonely-if": "error", + "no-mixed-operators": "error", + "no-mixed-spaces-and-tabs": "error", + "no-multiple-empty-lines": "error", + "no-negated-condition": "off", + "no-nested-ternary": "error", + "no-new-object": "error", + "no-plusplus": "off", + "no-restricted-syntax": "off", + "no-tabs": "error", + "no-ternary": "off", + "no-trailing-spaces": "error", + "no-underscore-dangle": "off", + "no-unneeded-ternary": "error", + "no-whitespace-before-property": "error", + "object-curly-newline": ["error", { "multiline": true }], + "object-curly-spacing": ["error", "always"], + "object-property-newline": "off", + "one-var": ["error", "never"], + "one-var-declaration-per-line": ["error", "initializations"], + "operator-assignment": ["error", "always"], + "operator-linebreak": ["error", "after"], + "padded-blocks": ["error", "never"], + "quote-props": ["error", "as-needed"], + "quotes": ["error", "double", { "avoidEscape": true, "allowTemplateLiterals": true }], + "require-jsdoc": "off", + "semi": ["error", "always"], + "semi-spacing": "error", + "sort-keys": "off", + "sort-vars": "off", + "space-before-blocks": ["error", "always"], + "space-before-function-paren": ["error", { "anonymous": "always", "named": "never" }], + "space-in-parens": ["error", "never"], + "space-infix-ops": "error", + "space-unary-ops": ["error", { "words": true, "nonwords": false }], + "spaced-comment": ["error", "always", { "markers": ["///"] }], + "unicode-bom": ["error", "never"], + "wrap-regex": "off" + } +} diff --git a/.jshintrc b/.jshintrc deleted file mode 100644 index 35f8514..0000000 --- a/.jshintrc +++ /dev/null @@ -1,25 +0,0 @@ -{ - "bitwise": true, - "camelcase": true, - "curly": true, - "eqeqeq": true, - "globalstrict": true, - "immed": true, - "indent": 4, - "latedef": "nofunc", - "maxlen": 120, - "newcap": true, - "noarg": true, - "node": true, - "nonew": true, - "quotmark": "double", - "trailing": true, - "undef": true, - "unused": true, - "white": true, - - "predef": [ - "define", - "chai" - ] -} diff --git a/.travis.yml b/.travis.yml index d7ed39c..075e527 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,4 +11,5 @@ env: - CHAI_VERSION=^2.0.0 SINON_VERSION=^2.1.0 - CHAI_VERSION=^3.0.0 SINON_VERSION=^2.1.0 script: - npm run lint && npm run test-travis + - test $TRAVIS_NODE_VERSION == "0.10" || npm run lint + - npm run test-travis diff --git a/lib/sinon-chai.js b/lib/sinon-chai.js index c573790..34ff97f 100644 --- a/lib/sinon-chai.js +++ b/lib/sinon-chai.js @@ -1,6 +1,7 @@ -(function (sinonChai) { - "use strict"; +"use strict"; +/* eslint-disable no-invalid-this */ +(function (sinonChai) { // Module systems magic dance. /* istanbul ignore else */ @@ -14,11 +15,10 @@ }); } else { // Other environment (usually