Use "indent", disabling "indent-legacy"

eslint/eslint#8847 eslint/eslint#8594 eslint/eslint#9105
futagoza · Aug 24, 2017 · 59f4e5f · 59f4e5f
1 parent 1c86866
commit 59f4e5f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Unreleased
 
 * Confirmed compatibility with ESLint v4.5
+* Use `indent`, disabling `indent-legacy` ([eslint/eslint#8847](https://github.com/eslint/eslint/issues/8847), [eslint/eslint#8594](https://github.com/eslint/eslint/issues/8594), [eslint/eslint#9105](https://github.com/eslint/eslint/issues/9105))
 
 <a name="3.3.1"></a>
 ## [v3.3.1](https://github.com/futagoza/eslint-config-futagozaryuu/compare/v3.3.0...v3.3.1) (2017-08-05)

diff --git a/deprecated.js b/deprecated.js
@@ -13,7 +13,7 @@ module.exports = {
          * @deprecated ESLint 4.0.0-alpha.0
          * @see http://eslint.org/docs/rules/indent-legacy
          */
-        "indent-legacy": [ "error", 4, { "SwitchCase": 1 } ],
+        "indent-legacy": 0,
 
         /**
          * 📝 require or disallow newlines around directives

diff --git a/stylistic-issues.js b/stylistic-issues.js
@@ -149,7 +149,14 @@ module.exports = {
          *
          * @see http://eslint.org/docs/rules/indent
          */
-        "indent": 0,
+        "indent": [ "error", 4, {
+
+            "SwitchCase": 1,
+            "ignoredNodes": [
+                "ConditionalExpression"
+            ]
+
+        } ],
 
         /**
          * 📝 enforce the consistent use of either double or single quotes in JSX attributes