Merge be9d0f7 into 1eff0bd

cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-/* eslint-disable import-order/import-order */
+/* eslint-disable import/order */
 'use strict';
 
 var debug = require('debug')('xo');

config/plugins.js

@@ -2,18 +2,35 @@
 module.exports = {
 	plugins: [
 		'no-use-extend-native',
-		'import-order',
 		'ava',
 		'xo',
-		'promise'
+		'promise',
+		'import'
 	],
 	extends: [
 		'plugin:ava/recommended',
 		'plugin:xo/recommended'
 	],
 	rules: {
 		'no-use-extend-native/no-use-extend-native': 2,
-		'import-order/import-order': 2,
-		'promise/param-names': 2
+		'promise/param-names': 2,
+		// disabled because of https://github.com/benmosher/eslint-plugin-import/issues/268
+		// 'import/default': 2,
+		'import/export': 2,
+		'import/extensions': [2, 'never'],
+		'import/imports-first': 2,
+		// disabled because of https://github.com/benmosher/eslint-plugin-import/issues/268
+		// 'import/named': 2,
+		'import/namespace': 2,
+		'import/no-amd': 2,
+		// enable this sometime in the future when Node.js has ES2015 module support
+		// 'import/no-commonjs': 2,
+		// looks useful, but too unstable at the moment
+		// 'import/no-deprecated': 2,
+		'import/no-extraneous-dependencies': 2,
+		'import/no-named-as-default-member': 2,
+		'import/no-named-as-default': 2,
+		'import/no-unresolved': [2, {commonjs: true}],
+		'import/order': 2
 	}
 };

package.json

@@ -70,7 +70,7 @@
     "eslint-formatter-pretty": "^0.2.1",
     "eslint-plugin-ava": "^2.0.0",
     "eslint-plugin-babel": "^3.1.0",
-    "eslint-plugin-import-order": "^2.0.0",
+    "eslint-plugin-import": "^1.6.0",
     "eslint-plugin-no-use-extend-native": "^0.3.2",
     "eslint-plugin-promise": "^1.1.0",
     "eslint-plugin-xo": "^0.3.1",

test/fixtures/overrides/package.json

@@ -12,6 +12,9 @@
         "files": "test/foo.js",
         "space": 4
       }
-    ]
+    ],
+    "rules": {
+      "import/no-extraneous-dependencies": 0
+    }
   }
 }