fix: update typescript rules

GetResponse · Feb 28, 2020 · 52fae3d · 52fae3d
1 parent c5c0be6
commit 52fae3d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/rules/errors.js b/rules/errors.js
@@ -28,7 +28,7 @@ module.exports = {
         'no-import-assign': ['error'],
         'no-inner-declarations': ['error'],
         'no-invalid-regexp': ['warn'],
-        'no-irregular-whitespace': ['error'],
+        'no-irregular-whitespace': ['warn', {skipStrings: true}],
         'no-misleading-character-class': ['error'],
         'no-obj-calls': ['error'],
         'no-prototype-builtins': ['off'],

diff --git a/rules/style.js b/rules/style.js
@@ -31,9 +31,9 @@ module.exports = {
         'line-comment-position': ['off'],
         'linebreak-style': ['off'],
         'lines-around-comment': ['off'],
-        'lines-between-class-members': ['warn'],
+        'lines-between-class-members': ['warn', 'always', {exceptAfterSingleLine: true}],
         'max-depth': ['off'],
-        'max-len': ['warn', 140, 4],
+        'max-len': ['warn', 120, 4],
         'max-lines': ['off'],
         'max-nested-callbacks': ['off'],
         'max-params': ['off'],

diff --git a/rules/typescript.js b/rules/typescript.js
@@ -17,9 +17,7 @@ module.exports = {
         '@typescript-eslint/consistent-type-definitions': ['warn'],
         'default-param-last': ['off'],
         '@typescript-eslint/default-param-last': ['error'],
-        '@typescript-eslint/explicit-function-return-type': ['warn', {
-            allowExpressions: true,
-        }],
+        '@typescript-eslint/explicit-function-return-type': ['off'],
         '@typescript-eslint/explicit-member-accessibility': ['off'],
         '@typescript-eslint/explicit-module-boundary-types': ['off'],
         'func-call-spacing': ['off'],
@@ -89,15 +87,26 @@ module.exports = {
         '@typescript-eslint/switch-exhaustiveness-check': ['off'],
         '@typescript-eslint/triple-slash-reference': ['error'],
         '@typescript-eslint/type-annotation-spacing': ['warn'],
-        '@typescript-eslint/typedef': ['warn', {
-            arrayDestructuring: false,
-            arrowParameter: true,
-            memberVariableDeclaration: true,
-            objectDestructuring: false,
-            parameter: true,
-            propertyDeclaration: true,
-            variableDeclaration: true,
-        }],
+        '@typescript-eslint/typedef': ['off'],
         '@typescript-eslint/unified-signatures': ['warn'],
     },
+    overrides: [
+        {
+            files: ['**/*.ts?(x)'],
+            rules: {
+                '@typescript-eslint/explicit-function-return-type': ['warn', {
+                    allowExpressions: true,
+                }],
+                '@typescript-eslint/typedef': ['warn', {
+                    arrayDestructuring: false,
+                    arrowParameter: false,
+                    memberVariableDeclaration: true,
+                    objectDestructuring: false,
+                    parameter: true,
+                    propertyDeclaration: true,
+                    variableDeclaration: false,
+                }],
+            },
+        },
+    ],
 };