From 1eff0bd3e5111527f82b595229fcb5b8fd6c5c17 Mon Sep 17 00:00:00 2001
From: Sindre Sorhus <sindresorhus@gmail.com>
Date: Sat, 30 Apr 2016 01:04:05 +0700
Subject: [PATCH] bump dependencies and other tweaks

---
 cli.js       |  1 +
 package.json | 19 +++++++------------
 test/api.js  |  7 +++++--
 test/cli.js  |  4 ++--
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/cli.js b/cli.js
index 435c77a8..7d076a90 100755
--- a/cli.js
+++ b/cli.js
@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+/* eslint-disable import-order/import-order */
 'use strict';
 
 var debug = require('debug')('xo');
diff --git a/package.json b/package.json
index 64e00be2..162c4d08 100644
--- a/package.json
+++ b/package.json
@@ -65,18 +65,18 @@
     "babel-eslint": "^6.0.0",
     "debug": "^2.2.0",
     "deep-assign": "^1.0.0",
-    "eslint": "^2.7.0",
-    "eslint-config-xo": "^0.13.0",
-    "eslint-formatter-pretty": "^0.1.0",
+    "eslint": "^2.9.0",
+    "eslint-config-xo": "^0.14.0",
+    "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-no-use-extend-native": "^0.3.2",
     "eslint-plugin-promise": "^1.1.0",
-    "eslint-plugin-xo": "^0.1.0",
+    "eslint-plugin-xo": "^0.3.1",
     "get-stdin": "^5.0.0",
     "globby": "^4.0.0",
-    "has-flag": "^1.0.0",
+    "has-flag": "^2.0.0",
     "home-or-tmp": "^2.0.0",
     "meow": "^3.4.2",
     "multimatch": "^2.1.0",
@@ -93,15 +93,10 @@
     "coveralls": "^2.11.9",
     "eslint-config-xo-react": "^0.7.0",
     "eslint-plugin-react": "^5.0.1",
-    "execa": "^0.2.2",
+    "execa": "^0.4.0",
     "nyc": "^6.1.1",
     "proxyquire": "^1.7.3",
     "temp-write": "^2.0.1",
-    "xo": "sindresorhus/xo#v0.13.0"
-  },
-  "xo": {
-    "ignores": [
-      "cli.js"
-    ]
+    "xo": "file:."
   }
 }
diff --git a/test/api.js b/test/api.js
index cf96349a..fdf1ae62 100644
--- a/test/api.js
+++ b/test/api.js
@@ -50,13 +50,16 @@ test('.lintText() - extends support with `esnext` option', t => {
 });
 
 test('always use the Babel parser so esnext syntax won\'t throw in normal mode', t => {
-	const results = fn.lintText('async function foo() {}\n\nfoo();\n').results;
+	// TODO: remove the `filename` option when https://github.com/sindresorhus/eslint-plugin-xo/issues/19 is fixed
+	const results = fn.lintText('async function foo() {}\n\nfoo();\n', {filename: 'x'}).results;
 	t.is(results[0].errorCount, 0);
 });
 
 test('.lintText() - regression test for #71', t => {
+	// TODO: remove the `filename` option when https://github.com/sindresorhus/eslint-plugin-xo/issues/19 is fixed
 	const results = fn.lintText(`var foo = { key: 'value' };\nconsole.log(foo);\n`, {
-		extends: path.join(__dirname, 'fixtures/extends.js')
+		extends: path.join(__dirname, 'fixtures/extends.js'),
+		filename: 'x'
 	}).results;
 	t.is(results[0].errorCount, 0, results[0]);
 });
diff --git a/test/cli.js b/test/cli.js
index 9b59acb1..db050007 100644
--- a/test/cli.js
+++ b/test/cli.js
@@ -1,8 +1,8 @@
 import fs from 'fs';
+import path from 'path';
 import test from 'ava';
 import tempWrite from 'temp-write';
 import execa from 'execa';
-import path from 'path';
 
 global.Promise = Promise;
 
@@ -27,7 +27,7 @@ test('overrides fixture', async () => {
 	await execa('../../../cli.js', ['--no-local'], {cwd});
 });
 
-test.skip('ignores fixture', async t => {
+test.skip('ignores fixture', async t => { // eslint-disable-line
 	const cwd = path.join(__dirname, 'fixtures/ignores');
 	t.throws(execa('../../../cli.js', ['--no-local'], {cwd}));
 });