From 24f70387d29c1665454f94b76e26223dac65b24b Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Thu, 6 Jul 2017 18:52:37 +0100
Subject: [PATCH] Make it possible to use async/await

Enables the babel plugin that transpiles async/await to generator functions,
and load the regenerator runtime so that generator functions work.
---
 .babelrc      | 5 ++++-
 package.json  | 2 ++
 src/matrix.js | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.babelrc b/.babelrc
index c13c5f627fd..e0b2e393d9b 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1,3 +1,6 @@
 {
-  "presets": ["es2015"]
+    "presets": ["es2015"],
+    "plugins": [
+        "transform-async-to-generator",
+    ],
 }
diff --git a/package.json b/package.json
index 2b3d5e04eb5..822209c6cb6 100644
--- a/package.json
+++ b/package.json
@@ -51,11 +51,13 @@
     "browser-request": "^0.3.3",
     "content-type": "^1.0.2",
     "q": "^1.4.1",
+    "regenerator-runtime": "^0.10.5",
     "request": "^2.53.0"
   },
   "devDependencies": {
     "babel-cli": "^6.18.0",
     "babel-eslint": "^7.1.1",
+    "babel-plugin-transform-async-to-generator": "^6.24.1",
     "babel-preset-es2015": "^6.18.0",
     "browserify": "^14.0.0",
     "browserify-shim": "^3.8.13",
diff --git a/src/matrix.js b/src/matrix.js
index e75b3dc49b3..5e3fef81e07 100644
--- a/src/matrix.js
+++ b/src/matrix.js
@@ -16,6 +16,9 @@ limitations under the License.
 */
 "use strict";
 
+// make sure that the regenerator-runtime has been loaded
+import 'regenerator-runtime/runtime';
+
 /** The {@link module:models/event.MatrixEvent|MatrixEvent} class. */
 module.exports.MatrixEvent = require("./models/event").MatrixEvent;
 /** The {@link module:models/event.EventStatus|EventStatus} enum. */