From 297c62ef9ef0ebe42801611c13931a697210a1a6 Mon Sep 17 00:00:00 2001
From: James Talmage <james@talmage.io>
Date: Mon, 16 Nov 2015 07:40:33 -0500
Subject: [PATCH] use babel 6

---
 lib/babel.js | 10 +++-------
 package.json | 10 +++++++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/babel.js b/lib/babel.js
index a6b8890ea..c26935335 100644
--- a/lib/babel.js
+++ b/lib/babel.js
@@ -3,8 +3,8 @@ var createEspowerPlugin = require('babel-plugin-espower/create');
 var requireFromString = require('require-from-string');
 var loudRejection = require('loud-rejection/api')(process);
 var resolveFrom = require('resolve-from');
-var hasGenerator = require('has-generator');
 var serializeValue = require('./serialize-value');
+require('babel-polyfill');
 var send = require('./send');
 
 var testPath = process.argv[2];
@@ -24,10 +24,8 @@ var powerAssert = createEspowerPlugin(babel, {
 	patterns: require('./enhance-assert').PATTERNS
 });
 
-// if generators are not supported, use regenerator
 var options = {
-	blacklist: hasGenerator ? ['regenerator'] : [],
-	optional: hasGenerator ? ['asyncToGenerator', 'runtime'] : ['runtime'],
+	presets: ['stage-3', 'es2015'],
 	plugins: [powerAssert]
 };
 
@@ -40,9 +38,7 @@ process.on('uncaughtException', function (exception) {
 
 // include test file
 var transpiled = babel.transformFileSync(testPath, options);
-requireFromString(transpiled.code, testPath, {
-	appendPaths: module.paths
-});
+requireFromString(transpiled.code, testPath);
 
 // if ava was not required, show an error
 if (!exports.avaRequired) {
diff --git a/package.json b/package.json
index e5851dbda..248f81c9b 100644
--- a/package.json
+++ b/package.json
@@ -73,9 +73,12 @@
   "dependencies": {
     "arr-flatten": "^1.0.1",
     "ava-init": "^0.1.0",
-    "babel-core": "^5.8.23",
-    "babel-plugin-espower": "^1.1.0",
-    "babel-runtime": "^5.8.29",
+    "babel-core": "^6.1.21",
+    "babel-plugin-espower": "^2.0.0",
+    "babel-plugin-transform-runtime": "^6.1.18",
+    "babel-preset-es2015": "^6.1.18",
+    "babel-preset-stage-3": "^6.1.18",
+    "babel-runtime": "^6.1.18",
     "bluebird": "^3.0.0",
     "chalk": "^1.0.0",
     "co-with-promise": "^4.6.0",
@@ -105,6 +108,7 @@
     "update-notifier": "^0.5.0"
   },
   "devDependencies": {
+    "babel-polyfill": "^6.1.19",
     "coveralls": "^2.11.4",
     "nyc": "^3.2.2",
     "signal-exit": "^2.1.2",