Merge pull request #5 from valentineus/release/2020-06-17

release/2020-06-17

5 files changed, 48 insertions, 51 deletions

diff --git a/src/rules/javascript/default.json b/src/rules/javascript/default.json
index 3014de5..34e1d8f 100644
--- a/src/rules/javascript/default.json
+++ b/src/rules/javascript/default.json
@@ -2,7 +2,8 @@
   "array-callback-return": [
     "error",
     {
-      "allowImplicit": false
+      "allowImplicit": false,
+      "checkForEach": true
     }
   ],
   "arrow-parens": [
@@ -23,9 +24,6 @@
       "allowSingleLine": false
     }
   ],
-  "callback-return": [
-    "warn"
-  ],
   "camelcase": [
     "error",
     {
@@ -53,10 +51,7 @@
   ],
   "comma-style": [
     "error",
-    "last",
-    {
-      "exceptions": {}
-    }
+    "last"
   ],
   "curly": [
     "error",
@@ -80,9 +75,6 @@
     "error",
     "consistent"
   ],
-  "handle-callback-err": [
-    "error"
-  ],
   "id-length": [
     "warn",
     {
@@ -114,7 +106,7 @@
       "VariableDeclarator": 1,
       "flatTernaryExpressions": true,
       "ignoreComments": false,
-      "ignoredNodes": [],
+      "offsetTernaryExpressions": true,
       "outerIIFEBody": 1
     }
   ],
@@ -330,9 +322,6 @@
   "no-new-func": [
     "error"
   ],
-  "no-new-require": [
-    "error"
-  ],
   "no-new-wrappers": [
     "error"
   ],
@@ -345,12 +334,6 @@
       "props": true
     }
   ],
-  "no-path-concat": [
-    "error"
-  ],
-  "no-process-env": [
-    "off"
-  ],
   "no-proto": [
     "error"
   ],
@@ -469,9 +452,22 @@
   "object-curly-newline": [
     "error",
     {
-      "consistent": true,
-      "minProperties": 5,
-      "multiline": true
+      "ExportDeclaration": {
+        "consistent": true,
+        "minProperties": 1,
+        "multiline": true
+      },
+      "ImportDeclaration": "never",
+      "ObjectExpression": {
+        "consistent": true,
+        "minProperties": 1,
+        "multiline": true
+      },
+      "ObjectPattern": {
+        "consistent": true,
+        "minProperties": 1,
+        "multiline": true
+      }
     }
   ],
   "object-curly-spacing": [
@@ -642,4 +638,4 @@
       "onlyEquality": false
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/src/rules/typescript/default.json b/src/rules/typescript/default.json
index 2b45050..f65f761 100644
--- a/src/rules/typescript/default.json
+++ b/src/rules/typescript/default.json
@@ -16,6 +16,7 @@
   "@typescript-eslint/explicit-function-return-type": [
     "error",
     {
+      "allowConciseArrowFunctionExpressionsStartingWithVoid": false,
       "allowExpressions": false,
       "allowHigherOrderFunctions": false,
       "allowTypedFunctionExpressions": false
@@ -61,12 +62,9 @@
       "outerIIFEBody": 1
     }
   ],
-  "@typescript-eslint/interface-name-prefix": [
+  "@typescript-eslint/method-signature-style": [
     "error",
-    {
-      "allowUnderscorePrefix": false,
-      "prefixWithI": "always"
-    }
+    "property"
   ],
   "@typescript-eslint/no-base-to-string": [
     "error"
@@ -125,9 +123,7 @@
   "@typescript-eslint/no-unnecessary-condition": [
     "error",
     {
-      "allowConstantLoopConditions": false,
-      "checkArrayPredicates": true,
-      "ignoreRhs": true
+      "allowConstantLoopConditions": false
     }
   ],
   "@typescript-eslint/no-unnecessary-type-assertion": [
@@ -142,14 +138,6 @@
   "@typescript-eslint/no-unsafe-return": [
     "error"
   ],
-  "@typescript-eslint/no-untyped-public-signature": [
-    "warn",
-    {
-      "ignoredMethods": [
-        "constructor"
-      ]
-    }
-  ],
   "@typescript-eslint/no-unused-vars": [
     "error",
     {
@@ -213,9 +201,13 @@
   "@typescript-eslint/strict-boolean-expressions": [
     "error",
     {
-      "allowNullable": false,
-      "allowSafe": false,
-      "ignoreRhs": false
+      "allowAny": false,
+      "allowNullableBoolean": false,
+      "allowNullableNumber": false,
+      "allowNullableObject": false,
+      "allowNullableString": false,
+      "allowNumber": false,
+      "allowString": false
     }
   ],
   "@typescript-eslint/type-annotation-spacing": [
@@ -297,4 +289,4 @@
   "space-before-function-paren": [
     "off"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/typescript.ts b/src/typescript.ts
index 6295159..33fb125 100644
--- a/src/typescript.ts
+++ b/src/typescript.ts
@@ -3,7 +3,6 @@ import rDefault from "./rules/typescript/default.json";
 module.exports = {
 	"extends": [
 		"./javascript",
-		"plugin:@typescript-eslint/eslint-recommended",
 		"plugin:@typescript-eslint/recommended",
 		"plugin:@typescript-eslint/recommended-requiring-type-checking",
 		"plugin:import/typescript",
@@ -15,5 +14,7 @@ module.exports = {
 	"plugins": [
 		"@typescript-eslint",
 	],
-	"rules": { ...rDefault },
+	"rules": {
+		...rDefault,
+	},
 };
diff --git a/src/vue-javascript.ts b/src/vue-javascript.ts
index 39fba7d..5f08b65 100644
--- a/src/vue-javascript.ts
+++ b/src/vue-javascript.ts
@@ -14,7 +14,9 @@ module.exports = {
 			files: [
 				"*.vue",
 			],
-			rules: { ...rOverrides },
+			rules: {
+				...rOverrides,
+			},
 		},
 	],
 	"parser": "vue-eslint-parser",
@@ -24,5 +26,7 @@ module.exports = {
 		],
 	},
 	"plugins": ["vue"],
-	"rules": { ...rDefault },
+	"rules": {
+		...rDefault,
+	},
 };
diff --git a/src/vue-typescript.ts b/src/vue-typescript.ts
index 11d4d61..3d96792 100644
--- a/src/vue-typescript.ts
+++ b/src/vue-typescript.ts
@@ -14,7 +14,9 @@ module.exports = {
 			files: [
 				"*.vue",
 			],
-			rules: { ...rOverrides },
+			rules: {
+				...rOverrides,
+			},
 		},
 	],
 	"parser": "vue-eslint-parser",
@@ -26,5 +28,7 @@ module.exports = {
 		parser: "@typescript-eslint/parser",
 	},
 	"plugins": ["vue"],
-	"rules": { ...rDefault },
+	"rules": {
+		...rDefault,
+	},
 };