Skip to content

Commit

Permalink
tools: update eslint config
Browse files Browse the repository at this point in the history
The no-reserved-keys rule doesn't exist anymore and we don't need ES3
compatibility.
escape and unescape are now known by eslint.
--reset flag was removed and it is now the default behavior.

PR-URL: nodejs#2286
Reviewed-By: Roman Reiss <[email protected]>
  • Loading branch information
targos authored and Myles Borins committed Feb 11, 2016
1 parent 7faf877 commit abeb1be
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
6 changes: 1 addition & 5 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,6 @@ rules:
no-duplicate-case: 2
## disallow assignment of exceptional params
no-ex-assign: 2
## disallow use of reserved words as keys like enum, class
no-reserved-keys: 2
## disallow unreachable code
no-unreachable: 2
## require valid typeof compared string like typeof foo === 'strnig'
Expand All @@ -44,7 +42,7 @@ rules:
## use single quote, we can use double quote when escape chars
quotes: [2, "single", "avoid-escape"]
## 2 space indentation
indent: [2, 2]
indent: [2, 2, {SwitchCase: 1}]
## add space after comma
comma-spacing: 2
## put semi-colon
Expand Down Expand Up @@ -112,5 +110,3 @@ globals:
DTRACE_NET_SERVER_CONNECTION : false
LTTNG_NET_SERVER_CONNECTION : false
COUNTER_NET_SERVER_CONNECTION : false
escape : false
unescape : false
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ bench-idle:

jslint:
$(NODE) tools/eslint/bin/eslint.js src lib test tools/eslint-rules \
--rulesdir tools/eslint-rules --reset --quiet
--rulesdir tools/eslint-rules --quiet

CPPLINT_EXCLUDE ?=
CPPLINT_EXCLUDE += src/node_lttng.cc
Expand Down
2 changes: 1 addition & 1 deletion vcbuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ goto jslint
:jslint
if not defined jslint goto exit
echo running jslint
%config%\node tools\eslint\bin\eslint.js src lib test tools\eslint-rules --rulesdir tools\eslint-rules --reset --quiet
%config%\node tools\eslint\bin\eslint.js src lib test tools\eslint-rules --rulesdir tools\eslint-rules --quiet
goto exit

:create-msvs-files-failed
Expand Down

0 comments on commit abeb1be

Please sign in to comment.