aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-05-13 03:24:43 +0800
committerGitHub <noreply@github.com>2017-05-13 03:24:43 +0800
commit154eac4a3aed91bf63146601d0850e2ac2d4cfc5 (patch)
tree55ff2b3f8e54927752a182c0864bdbc129a8aa16
parent08b5148b801cb45864dba0bb2f488c7207087b55 (diff)
parent61f5c42a4508aa13f41f5ac85bd13bc53dfa7b2e (diff)
downloadtangerine-wallet-browser-154eac4a3aed91bf63146601d0850e2ac2d4cfc5.tar
tangerine-wallet-browser-154eac4a3aed91bf63146601d0850e2ac2d4cfc5.tar.gz
tangerine-wallet-browser-154eac4a3aed91bf63146601d0850e2ac2d4cfc5.tar.bz2
tangerine-wallet-browser-154eac4a3aed91bf63146601d0850e2ac2d4cfc5.tar.lz
tangerine-wallet-browser-154eac4a3aed91bf63146601d0850e2ac2d4cfc5.tar.xz
tangerine-wallet-browser-154eac4a3aed91bf63146601d0850e2ac2d4cfc5.tar.zst
tangerine-wallet-browser-154eac4a3aed91bf63146601d0850e2ac2d4cfc5.zip
Merge pull request #1421 from MetaMask/es7
Add support for async/await
-rw-r--r--.babelrc5
-rw-r--r--.eslintrc2
-rw-r--r--package.json6
3 files changed, 10 insertions, 3 deletions
diff --git a/.babelrc b/.babelrc
index 9d8d51656..3ca197980 100644
--- a/.babelrc
+++ b/.babelrc
@@ -1 +1,4 @@
-{ "presets": ["es2015"] }
+{
+ "presets": ["es2015"],
+ "plugins": ["transform-runtime"]
+}
diff --git a/.eslintrc b/.eslintrc
index 91c95874e..a57a93cdc 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -1,7 +1,7 @@
{
"parserOptions": {
"sourceType": "module",
- "ecmaVersion": 6,
+ "ecmaVersion": 2017,
"ecmaFeatures": {
"experimentalObjectRestSpread": true,
"impliedStrict": true,
diff --git a/package.json b/package.json
index e2268d20a..f4bdbd998 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,8 @@
"babelify",
{
"presets": [
- "es2015"
+ "es2015",
+ "stage-3"
]
}
],
@@ -45,6 +46,7 @@
"dependencies": {
"async": "^1.5.2",
"async-q": "^0.3.1",
+ "babel-runtime": "^6.23.0",
"bip39": "^2.2.0",
"bluebird": "^3.5.0",
"browser-passworder": "^2.0.3",
@@ -125,6 +127,8 @@
},
"devDependencies": {
"babel-eslint": "^6.0.5",
+ "babel-plugin-transform-runtime": "^6.23.0",
+ "babel-preset-stage-3": "^6.24.1",
"babel-register": "^6.7.2",
"babelify": "^7.2.0",
"beefy": "^2.1.5",