From 8ad59113c593d0ad67d56b857687404a09f5fb2a Mon Sep 17 00:00:00 2001
From: curbengh <43627182+curbengh@users.noreply.github.com>
Date: Tue, 3 Sep 2019 10:35:16 +0100
Subject: [PATCH 1/3] feat: prefer ES6 syntax

---
 eslint.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/eslint.js b/eslint.js
index 689f1a7..1df07c0 100644
--- a/eslint.js
+++ b/eslint.js
@@ -85,15 +85,13 @@ module.exports = {
     'no-array-constructor': 'error',
     'no-extra-label': 'error',
     'no-multiple-empty-lines': 'error',
+    'no-multi-assign': 'error',
     'no-nested-ternary': 'error',
     'no-new-object': 'error',
     'no-trailing-spaces': 'error',
     'no-unneeded-ternary': 'error',
     'no-whitespace-before-property': 'error',
-    'one-var': ['error', {
-      uninitialized: 'always',
-      initialized: 'never'
-    }],
+    'one-var': 'error',
     'operator-linebreak': ['error', 'before'],
     'quotes': ['error', 'single'],
     'semi': 'error',
@@ -113,13 +111,24 @@ module.exports = {
     'template-tag-spacing': 'error',
     'unicode-bom': 'error',
     // ECMAScript 6
-    'arrow-spacing': 'error',
+    'arrow-parens': ['error', 'as-needed'],
+    'arrow-spacing': ['error', { before: true, after: true }],
     'generator-star-spacing': ['error', 'after'],
     'no-confusing-arrow': ['error', { allowParens: true }],
+    'no-const-assign': 'error',
     'no-duplicate-imports': 'error',
     'no-useless-computed-key': 'error',
     'no-useless-constructor': 'error',
     'no-useless-rename': 'error',
+    'no-var': 'error',
+    'prefer-arrow-callback': ['error', {
+      allowNamedFunctions: false,
+      allowUnboundThis: true
+    }],
+    'prefer-const': ['error', {
+      destructuring: 'any',
+      ignoreReadBeforeAssign: true
+    }],
     'rest-spread-spacing': 'error',
     'template-curly-spacing': 'error',
     'yield-star-spacing': 'error',

From 982a6b4aff24791e5adbce97980150460f0d15d7 Mon Sep 17 00:00:00 2001
From: curbengh <43627182+curbengh@users.noreply.github.com>
Date: Wed, 11 Sep 2019 08:54:08 +0100
Subject: [PATCH 2/3] fix: revert one-var rule

---
 eslint.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/eslint.js b/eslint.js
index 1df07c0..73bef3b 100644
--- a/eslint.js
+++ b/eslint.js
@@ -91,7 +91,10 @@ module.exports = {
     'no-trailing-spaces': 'error',
     'no-unneeded-ternary': 'error',
     'no-whitespace-before-property': 'error',
-    'one-var': 'error',
+    'one-var': ['error', {
+      uninitialized: 'always',
+      initialized: 'never'
+    }],
     'operator-linebreak': ['error', 'before'],
     'quotes': ['error', 'single'],
     'semi': 'error',

From 2c92a9724d34725d10a8530c3ed7eab17188cdf7 Mon Sep 17 00:00:00 2001
From: curbengh <43627182+curbengh@users.noreply.github.com>
Date: Wed, 11 Sep 2019 09:03:55 +0100
Subject: [PATCH 3/3] fix: de-duplicate defaults

---
 eslint.js | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/eslint.js b/eslint.js
index 73bef3b..c613485 100644
--- a/eslint.js
+++ b/eslint.js
@@ -115,7 +115,7 @@ module.exports = {
     'unicode-bom': 'error',
     // ECMAScript 6
     'arrow-parens': ['error', 'as-needed'],
-    'arrow-spacing': ['error', { before: true, after: true }],
+    'arrow-spacing': 'error',
     'generator-star-spacing': ['error', 'after'],
     'no-confusing-arrow': ['error', { allowParens: true }],
     'no-const-assign': 'error',
@@ -124,14 +124,8 @@ module.exports = {
     'no-useless-constructor': 'error',
     'no-useless-rename': 'error',
     'no-var': 'error',
-    'prefer-arrow-callback': ['error', {
-      allowNamedFunctions: false,
-      allowUnboundThis: true
-    }],
-    'prefer-const': ['error', {
-      destructuring: 'any',
-      ignoreReadBeforeAssign: true
-    }],
+    'prefer-arrow-callback': 'error',
+    'prefer-const': ['error', { ignoreReadBeforeAssign: true }],
     'rest-spread-spacing': 'error',
     'template-curly-spacing': 'error',
     'yield-star-spacing': 'error',