From 63b7b7152c1b2b51f384d171d72e05f9337d1e15 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Mon, 13 Jun 2016 16:10:14 -0400
Subject: [PATCH] Port .eslintrc.json to .js to support comments.
---
.eslintrc.json => .eslintrc.js | 13 ++++++++-----
build.xml | 6 +++---
2 files changed, 11 insertions(+), 8 deletions(-)
rename .eslintrc.json => .eslintrc.js (87%)
diff --git a/.eslintrc.json b/.eslintrc.js
similarity index 87%
rename from .eslintrc.json
rename to .eslintrc.js
index fc5c94a7180..72d76420fe6 100644
--- a/.eslintrc.json
+++ b/.eslintrc.js
@@ -1,11 +1,12 @@
-{
- "extends": "eslint:recommended",
- "globals": {
+module.export = {
+ extends: "eslint:recommended",
+ globals: {
"$": false,
"document": false,
"window": false
},
- "rules": {
+ rules: {
+ // errors
"block-scoped-var": "error",
"func-names": "error",
"no-loop-func": "error",
@@ -13,6 +14,7 @@
"no-shadow": "error",
"no-unused-expressions": "error",
+ // warnings
"dot-notation": "warn",
"eqeqeq": ["warn", "smart"],
"guard-for-in": "warn",
@@ -21,6 +23,7 @@
"no-console": ["warn", { "allow": ["warn", "error"] }],
"no-unneeded-ternary": "warn",
+ // fixed automatically
"block-spacing": ["warn", "always"],
"comma-spacing": ["warn", { "before": false, "after": true }],
"indent": ["error", 2],
@@ -30,4 +33,4 @@
"semi-spacing": ["warn", { "before": false, "after": true }],
"space-infix-ops": "warn"
}
-}
+};
diff --git a/build.xml b/build.xml
index c75a0e9f0ae..385f89d40b3 100644
--- a/build.xml
+++ b/build.xml
@@ -107,13 +107,13 @@
<!-- ESLint -->
<target name="eslint">
- <exec command="eslint -c ${srcdir}/.eslintrc.json ${srcdir}/themes/bootstrap3/js/*.js" escape="false" checkreturn="true" passthru="true" />
+ <exec command="eslint -c ${srcdir}/.eslintrc.js ${srcdir}/themes/bootstrap3/js/*.js" escape="false" checkreturn="true" passthru="true" />
</target>
<target name="eslint-fix">
- <exec command="eslint --fix -c ${srcdir}/.eslintrc.json ${srcdir}/themes/bootstrap3/js/*.js" escape="false" passthru="true" />
+ <exec command="eslint -c ${srcdir}/.eslintrc.js ${srcdir}/themes/bootstrap3/js/*.js --fix" escape="false" passthru="true" />
</target>
<target name="eslint-report">
- <exec command="eslint -c ${srcdir}/.eslintrc.json ${srcdir}/themes/bootstrap3/js/*.js -f checkstyle -o ${builddir}/reports/eslint.xml" escape="false" />
+ <exec command="eslint -c ${srcdir}/.eslintrc.js ${srcdir}/themes/bootstrap3/js/*.js --format checkstyle -o ${builddir}/reports/eslint.xml" escape="false" />
</target>
<!-- PHP API Documentation -->
--
GitLab