From d894d3f5e3f4488da89cf32dd226752737dca078 Mon Sep 17 00:00:00 2001
From: Neil Kistner <neil.kistner@gmail.com>
Date: Sat, 5 Mar 2016 09:46:26 -0600
Subject: [PATCH] Update `eslint-plugin-wyze` and use recommended config

---
 base.js      | 11 ++++++-----
 package.json |  2 +-
 rules/es6.js |  5 +----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/base.js b/base.js
index bfd603b..4ae3ba6 100644
--- a/base.js
+++ b/base.js
@@ -1,9 +1,10 @@
 module.exports = {
   extends: [
-    'eslint-config-airbnb/base',
-    './rules/best-practices',
-    './rules/es6',
-    './rules/style'
-  ].map(require.resolve),
+    'airbnb/base',
+    'plugin:wyze/recommended',
+    './rules/best-practices.js',
+    './rules/es6.js',
+    './rules/style.js'
+  ],
   parser: 'babel-eslint'
 };
diff --git a/package.json b/package.json
index c96a3dd..b12cd04 100644
--- a/package.json
+++ b/package.json
@@ -24,7 +24,7 @@
   "dependencies": {
     "babel-eslint": "^5.0.0",
     "eslint-config-airbnb": "^6.0.0",
-    "eslint-plugin-wyze": "^1.0.0"
+    "eslint-plugin-wyze": "^1.2.0"
   },
   "peerDependencies": {
     "eslint": "^2.0.0",
diff --git a/rules/es6.js b/rules/es6.js
index 8609bb2..1bd0dcf 100644
--- a/rules/es6.js
+++ b/rules/es6.js
@@ -21,9 +21,6 @@ module.exports = {
     // import sorting
     // http://eslint.org/docs/rules/sort-imports
     // disabled in favor of `wyze/sort-imports`
-    'sort-imports': 0,
-    // import sorting by default vs named
-    // https://github.com/wyze/eslint-plugin-wyze/docs/rules/sort-imports.md
-    'wyze/sort-imports': 2
+    'sort-imports': 0
   }
 };