Skip to content

Commit b20ea69

Browse files
targosMyles Borins
authored and
Myles Borins
committed
tools: update eslint config
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: #2286 Reviewed-By: Roman Reiss <[email protected]>
1 parent 2e0352d commit b20ea69

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

.eslintrc

+1-5
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ rules:
2727
no-duplicate-case: 2
2828
## disallow assignment of exceptional params
2929
no-ex-assign: 2
30-
## disallow use of reserved words as keys like enum, class
31-
no-reserved-keys: 2
3230
## disallow unreachable code
3331
no-unreachable: 2
3432
## require valid typeof compared string like typeof foo === 'strnig'
@@ -44,7 +42,7 @@ rules:
4442
## use single quote, we can use double quote when escape chars
4543
quotes: [2, "single", "avoid-escape"]
4644
## 2 space indentation
47-
indent: [2, 2]
45+
indent: [2, 2, {SwitchCase: 1}]
4846
## add space after comma
4947
comma-spacing: 2
5048
## put semi-colon
@@ -112,5 +110,3 @@ globals:
112110
DTRACE_NET_SERVER_CONNECTION : false
113111
LTTNG_NET_SERVER_CONNECTION : false
114112
COUNTER_NET_SERVER_CONNECTION : false
115-
escape : false
116-
unescape : false

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ bench-idle:
510510

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

515515
CPPLINT_EXCLUDE ?=
516516
CPPLINT_EXCLUDE += src/node_lttng.cc

vcbuild.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ goto jslint
251251
:jslint
252252
if not defined jslint goto exit
253253
echo running jslint
254-
%config%\node tools\eslint\bin\eslint.js src lib test tools\eslint-rules --rulesdir tools\eslint-rules --reset --quiet
254+
%config%\node tools\eslint\bin\eslint.js src lib test tools\eslint-rules --rulesdir tools\eslint-rules --quiet
255255
goto exit
256256

257257
:create-msvs-files-failed

0 commit comments

Comments
 (0)