From 59b11531c9e5cd26afae3d12b77abeca386d1f3e Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 27 Jul 2016 15:06:40 +0100 Subject: [PATCH 1/2] Enable generators --- config/babel.dev.js | 9 +++++++-- config/babel.prod.js | 11 ++++++++--- package.json | 2 ++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/config/babel.dev.js b/config/babel.dev.js index 6ee2fd2db5..7482d1f0e8 100644 --- a/config/babel.dev.js +++ b/config/babel.dev.js @@ -8,6 +8,7 @@ */ module.exports = { + babelrc: false, cacheDirectory: true, presets: [ 'babel-preset-es2015', @@ -18,6 +19,10 @@ module.exports = { 'babel-plugin-syntax-trailing-function-commas', 'babel-plugin-transform-class-properties', 'babel-plugin-transform-object-rest-spread' - ].map(require.resolve), - babelrc: false + ].map(require.resolve).concat([ + [require.resolve('babel-plugin-transform-runtime'), { + regenerator: true, + polyfill: false + }] + ]) }; diff --git a/config/babel.prod.js b/config/babel.prod.js index c47f515c0e..86f85c1e80 100644 --- a/config/babel.prod.js +++ b/config/babel.prod.js @@ -8,6 +8,7 @@ */ module.exports = { + babelrc: false, presets: [ 'babel-preset-es2015', 'babel-preset-es2016', @@ -17,7 +18,11 @@ module.exports = { 'babel-plugin-syntax-trailing-function-commas', 'babel-plugin-transform-class-properties', 'babel-plugin-transform-object-rest-spread', - 'babel-plugin-transform-react-constant-elements' - ].map(require.resolve), - babelrc: false + 'babel-plugin-transform-react-constant-elements', + ].map(require.resolve).concat([ + [require.resolve('babel-plugin-transform-runtime'), { + regenerator: true, + polyfill: false + }] + ]) }; diff --git a/package.json b/package.json index ec53436295..c405ab88eb 100644 --- a/package.json +++ b/package.json @@ -35,9 +35,11 @@ "babel-plugin-transform-class-properties": "6.10.2", "babel-plugin-transform-object-rest-spread": "6.8.0", "babel-plugin-transform-react-constant-elements": "6.9.1", + "babel-plugin-transform-runtime": "6.9.0", "babel-preset-es2015": "6.9.0", "babel-preset-es2016": "6.11.3", "babel-preset-react": "6.11.1", + "babel-runtime": "6.11.6", "chalk": "1.1.3", "cross-spawn": "4.0.0", "css-loader": "0.23.1", From 7008de78dc769a0b0d0e3e7df98e6964a06d75cb Mon Sep 17 00:00:00 2001 From: Dan Abramov Date: Wed, 27 Jul 2016 21:33:16 +0100 Subject: [PATCH 2/2] Opt out of using helpers --- config/babel.dev.js | 5 +++-- config/babel.prod.js | 5 +++-- package.json | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/config/babel.dev.js b/config/babel.dev.js index 7482d1f0e8..64545127d0 100644 --- a/config/babel.dev.js +++ b/config/babel.dev.js @@ -21,8 +21,9 @@ module.exports = { 'babel-plugin-transform-object-rest-spread' ].map(require.resolve).concat([ [require.resolve('babel-plugin-transform-runtime'), { - regenerator: true, - polyfill: false + helpers: false, + polyfill: false, + regenerator: true }] ]) }; diff --git a/config/babel.prod.js b/config/babel.prod.js index 86f85c1e80..f5446012c5 100644 --- a/config/babel.prod.js +++ b/config/babel.prod.js @@ -21,8 +21,9 @@ module.exports = { 'babel-plugin-transform-react-constant-elements', ].map(require.resolve).concat([ [require.resolve('babel-plugin-transform-runtime'), { - regenerator: true, - polyfill: false + helpers: false, + polyfill: false, + regenerator: true }] ]) }; diff --git a/package.json b/package.json index c405ab88eb..15a99e5933 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "babel-plugin-transform-class-properties": "6.10.2", "babel-plugin-transform-object-rest-spread": "6.8.0", "babel-plugin-transform-react-constant-elements": "6.9.1", - "babel-plugin-transform-runtime": "6.9.0", + "babel-plugin-transform-runtime": "6.12.0", "babel-preset-es2015": "6.9.0", "babel-preset-es2016": "6.11.3", "babel-preset-react": "6.11.1",