From 0ab904e2d96dc3157b0e32727951b658a569b323 Mon Sep 17 00:00:00 2001
From: Henry Zhu <hi@henryzoo.com>
Date: Thu, 29 Sep 2016 15:24:58 -0400
Subject: [PATCH 1/2] Add transform-async-generator-functions to stage-2

---
 packages/babel-preset-stage-2/src/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/babel-preset-stage-2/src/index.js b/packages/babel-preset-stage-2/src/index.js
index 9806a625cb..4ffe2253c0 100644
--- a/packages/babel-preset-stage-2/src/index.js
+++ b/packages/babel-preset-stage-2/src/index.js
@@ -3,12 +3,14 @@ import presetStage3 from "babel-preset-stage-3";
 import transformClassProperties from "babel-plugin-transform-class-properties";
 import transformObjectRestSpread from "babel-plugin-transform-object-rest-spread";
 import transformDecorators from "babel-plugin-transform-decorators";
+import transformAsyncGeneratorFunctions from "babel-plugin-transform-async-generator-functions";
 
 export default {
   presets: [
     presetStage3
   ],
   plugins: [
+    transformAsyncGeneratorFunctions,
     transformClassProperties,
     transformObjectRestSpread,
     transformDecorators

From efa0affea193a6ad4d9035a4292cff0d78b97376 Mon Sep 17 00:00:00 2001
From: Henry Zhu <hi@henryzoo.com>
Date: Thu, 29 Sep 2016 15:26:47 -0400
Subject: [PATCH 2/2] move object-rest-spread to stage-3

---
 packages/babel-preset-stage-2/package.json | 1 -
 packages/babel-preset-stage-2/src/index.js | 2 --
 packages/babel-preset-stage-3/package.json | 3 ++-
 packages/babel-preset-stage-3/src/index.js | 8 +++++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/babel-preset-stage-2/package.json b/packages/babel-preset-stage-2/package.json
index b3544abb91..0c9c61975d 100644
--- a/packages/babel-preset-stage-2/package.json
+++ b/packages/babel-preset-stage-2/package.json
@@ -11,7 +11,6 @@
     "babel-plugin-transform-async-generator-functions": "^6.16.0",
     "babel-plugin-transform-class-properties": "^6.16.0",
     "babel-plugin-transform-decorators": "^6.13.0",
-    "babel-plugin-transform-object-rest-spread": "^6.16.0",
     "babel-preset-stage-3": "^6.16.0"
   }
 }
diff --git a/packages/babel-preset-stage-2/src/index.js b/packages/babel-preset-stage-2/src/index.js
index 4ffe2253c0..88f02d6218 100644
--- a/packages/babel-preset-stage-2/src/index.js
+++ b/packages/babel-preset-stage-2/src/index.js
@@ -1,7 +1,6 @@
 import presetStage3 from "babel-preset-stage-3";
 
 import transformClassProperties from "babel-plugin-transform-class-properties";
-import transformObjectRestSpread from "babel-plugin-transform-object-rest-spread";
 import transformDecorators from "babel-plugin-transform-decorators";
 import transformAsyncGeneratorFunctions from "babel-plugin-transform-async-generator-functions";
 
@@ -12,7 +11,6 @@ export default {
   plugins: [
     transformAsyncGeneratorFunctions,
     transformClassProperties,
-    transformObjectRestSpread,
     transformDecorators
   ]
 };
diff --git a/packages/babel-preset-stage-3/package.json b/packages/babel-preset-stage-3/package.json
index 5ab358d981..bc47127fbc 100644
--- a/packages/babel-preset-stage-3/package.json
+++ b/packages/babel-preset-stage-3/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "babel-plugin-syntax-trailing-function-commas": "^6.3.13",
     "babel-plugin-transform-async-to-generator": "^6.16.0",
-    "babel-plugin-transform-exponentiation-operator": "^6.3.13"
+    "babel-plugin-transform-exponentiation-operator": "^6.3.13",
+    "babel-plugin-transform-object-rest-spread": "^6.16.0"
   }
 }
diff --git a/packages/babel-preset-stage-3/src/index.js b/packages/babel-preset-stage-3/src/index.js
index 3eaa913ebd..780a83fba4 100644
--- a/packages/babel-preset-stage-3/src/index.js
+++ b/packages/babel-preset-stage-3/src/index.js
@@ -1,11 +1,13 @@
 import syntaxTrailingFunctionCommas from "babel-plugin-syntax-trailing-function-commas";
 import transformAsyncToGenerator from "babel-plugin-transform-async-to-generator";
 import transformExponentiationOperator from "babel-plugin-transform-exponentiation-operator";
+import transformObjectRestSpread from "babel-plugin-transform-object-rest-spread";
 
 export default {
   plugins: [
-    syntaxTrailingFunctionCommas,
-    transformAsyncToGenerator,
-    transformExponentiationOperator
+    syntaxTrailingFunctionCommas, // in ES2017 (remove as a breaking change)
+    transformAsyncToGenerator, // in ES2017 (remove as a breaking change)
+    transformExponentiationOperator,  // in ES2016 (remove as a breaking change)
+    transformObjectRestSpread
   ]
 };