Skip to content

Commit

Permalink
jshint -> eslint
Browse files Browse the repository at this point in the history
  • Loading branch information
Vitaly Puzrin committed Feb 16, 2016
1 parent 7eeaa99 commit a0c9861
Show file tree
Hide file tree
Showing 14 changed files with 237 additions and 219 deletions.
5 changes: 5 additions & 0 deletions .eslintignore
@@ -0,0 +1,5 @@
node_modules/
doc/
lib/ndoc/plugins/parsers/javascript
lib/ndoc/plugins/renderers/html/javascript
tests/prototype
126 changes: 126 additions & 0 deletions .eslintrc.yml
@@ -0,0 +1,126 @@
env:
node: true
browser: true

rules:
accessor-pairs: 2
array-bracket-spacing: [ 2, "always", { "singleValue": true, "objectsInArrays": true, "arraysInArrays": true } ]
block-scoped-var: 2
block-spacing: 2
brace-style: [ 2, '1tbs', { "allowSingleLine": true } ]
#callback-return: 2
comma-dangle: 2
comma-spacing: 2
comma-style: 2
computed-property-spacing: [ 2, never ]
#consistent-return: 2
consistent-this: [ 2, self ]
curly: [ 2, 'multi-line' ]
# dot-notation: [ 2, { allowKeywords: true } ]
dot-location: [ 2, 'property' ]
eol-last: 2
eqeqeq: 2
func-style: [ 2, declaration ]
guard-for-in: 2
handle-callback-err: 2
indent: [ 2, 2, { VariableDeclarator: { var: 2, let: 2, const: 3 }, SwitchCase: 1 } ]
# key-spacing: [ 2, { "align": "value" } ]
keyword-spacing: 2
linebreak-style: 2
max-depth: [ 1, 3 ]
max-nested-callbacks: [ 1, 7 ]
# string can exceed 80 chars, but should not overflow github website :)
max-len: [ 2, 120, 1000 ]
new-cap: 2
new-parens: 2
no-alert: 2
no-array-constructor: 2
no-bitwise: 2
no-caller: 2
no-case-declarations: 2
no-catch-shadow: 2
no-cond-assign: 2
no-console: 1
no-constant-condition: 2
no-control-regex: 2
no-debugger: 1
no-delete-var: 2
no-div-regex: 2
no-dupe-args: 2
no-dupe-keys: 2
no-duplicate-case: 2
no-else-return: 2
# no-empty: 1
no-empty-character-class: 2
no-empty-pattern: 2
no-eq-null: 2
no-eval: 2
no-ex-assign: 2
no-extend-native: 2
no-extra-bind: 2
no-extra-boolean-cast: 2
no-extra-semi: 2
no-fallthrough: 2
no-floating-decimal: 2
no-func-assign: 2
no-implied-eval: 2
no-inner-declarations: 2
no-invalid-regexp: 2
no-irregular-whitespace: 2
no-iterator: 2
no-labels: 2
no-label-var: 2
no-lone-blocks: 1
no-lonely-if: 2
no-loop-func: 2
no-mixed-requires: [ 1, { "grouping": true } ]
no-mixed-spaces-and-tabs: 2
no-native-reassign: 2
no-negated-in-lhs: 2
no-new: 2
no-new-func: 2
no-new-object: 2
no-new-require: 2
no-new-wrappers: 2
no-obj-calls: 2
no-octal: 2
no-octal-escape: 2
no-path-concat: 2
no-proto: 2
no-redeclare: 2
# no-regex-spaces: 2
no-return-assign: 2
no-self-compare: 2
no-sequences: 2
# no-shadow: 2
no-shadow-restricted-names: 2
no-sparse-arrays: 2
no-throw-literal: 2
no-trailing-spaces: 2
no-undef: 2
no-undef-init: 2
no-undefined: 2
no-unexpected-multiline: 2
no-unreachable: 2
no-unused-expressions: 2
no-unused-vars: 2
no-use-before-define: 2
no-void: 2
no-with: 2
object-curly-spacing: [ 2, always, { "objectsInObjects": true, "arraysInObjects": true } ]
operator-assignment: 1
semi: 2
semi-spacing: 2
space-before-blocks: 2
space-before-function-paren: [ 2, { "anonymous": "always", "named": "never" } ]
space-in-parens: [ 2, never ]
space-infix-ops: 2
space-unary-ops: 2
#spaced-comment: [ 1, always, { exceptions: [ '/', '=' ] } ]
strict: [ 2, global ]
quotes: [ 2, single, avoid-escape ]
quote-props: [ 1, 'as-needed', { "keywords": true } ]
radix: 2
use-isnan: 2
valid-typeof: 2
yoda: [ 2, never, { "exceptRange": true } ]
9 changes: 0 additions & 9 deletions .jshintignore

This file was deleted.

78 changes: 0 additions & 78 deletions .jshintrc

This file was deleted.

6 changes: 2 additions & 4 deletions .travis.yml
@@ -1,6 +1,4 @@
language: node_js
node_js:
- 0.6
- 0.8
before_script: "make dev-deps"
script: "make test"
- 4
- 5
18 changes: 1 addition & 17 deletions Makefile
Expand Up @@ -23,29 +23,13 @@ help:
echo "make lint - Lint sources with JSHint"
echo "make test - Lint sources and run all tests"
echo "make doc - Build API docs"
echo "make dev-deps - Install developer dependencies"
echo "make gh-pages - Build and push API docs into gh-pages branch"
echo "make publish - Set new version tag and publish npm package"
echo "make todo - Find and list all TODOs"


lint:
if test ! `which jshint` ; then \
echo "You need 'jshint' installed in order to run lint." >&2 ; \
echo " $ make dev-deps" >&2 ; \
exit 128 ; \
fi
jshint . --show-non-errors


dev-deps:
@if test ! `which npm` ; then \
echo "You need 'npm' installed." >&2 ; \
echo " See: http://npmjs.org/" >&2 ; \
exit 128 ; \
fi
npm install -g jshint
npm install
./node_modules/.bin/eslint .


publish:
Expand Down
6 changes: 3 additions & 3 deletions bin/ndoc.js
Expand Up @@ -30,13 +30,13 @@ function exit(err) {
////////////////////////////////////////////////////////////////////////////////


NDoc.cli.addArgument(['--noenv'], {
NDoc.cli.addArgument([ '--noenv' ], {
help: 'Ignore .ndocrc',
action: 'storeTrue'
});


if (-1 === process.argv.indexOf('--noenv') && fs.existsSync('.ndocrc')) {
if (process.argv.indexOf('--noenv') === -1 && fs.existsSync('.ndocrc')) {
NDoc.cli.readEnvFile('.ndocrc');
}

Expand Down Expand Up @@ -79,7 +79,7 @@ options.aliases.forEach(function (pair) {
// Post-process some of the options
//

options.title = template(options.title || '', {'package': options.package});
options.title = template(options.title || '', { 'package': options.package });
options.index = options.index || '';

//
Expand Down
2 changes: 2 additions & 0 deletions index.js
@@ -1 +1,3 @@
'use strict';

module.exports = require('./lib/ndoc');

0 comments on commit a0c9861

Please sign in to comment.