diff --git a/packages/build/gulpfile.js b/packages/build/gulpfile.js
index 71ecbc819..02d738673 100644
--- a/packages/build/gulpfile.js
+++ b/packages/build/gulpfile.js
@@ -101,47 +101,112 @@ gulp.task('depcheck', function() {
* There doesn't seem to be documentation on what helpers are available, or
* which helpers are required for which transforms. The
* source is here:
- * https://github.com/babel/babel/blob/6.x/packages/babel-helpers/src/helpers.js
+ * https://github.com/babel/babel/tree/master/packages/babel-helpers
*
- * This list is an educated guess at the helpers needed for our transform set
- * of ES2015 - modules. When we switch to loose mode we should update the list.
+ * You can usually tell what the helpers are used for by searching the babel
+ * source to find out which plugin packages make an `addHelper` call for it.
*
* All helpers are listed here, with some commented out, so it's clear what
* we've excluded.
*/
const babelHelperWhitelist = [
- 'typeof', // Symbol support, for IE11
- // 'jsx', // we don't support JSX
- // 'asyncIterator', // async-iterators are not in ES2015
- // 'asyncGenerator', // async-iterators are not in ES2015
- // 'asyncGeneratorDelegate', // async-iterators are not in ES2015
- // 'asyncToGenerator', // async functions are not in ES2015
+
+ // __proto__ assignment
+ 'defaults',
+ 'extends',
+
+ // es2015 classes
+ 'assertThisInitialized',
'classCallCheck',
+ 'construct',
'createClass',
+ 'get',
+ 'getPrototypeOf',
+ 'inherits',
+ //'inheritsLoose',
+ 'possibleConstructorReturn',
+ 'set',
+ 'setPrototypeOf',
+ 'superPropBase',
+ 'wrapNativeSuper',
+
+ // es2015 array-spread
+ 'slicedToArray',
+ //'slicedToArrayLoose',
+ 'toArray',
+ 'toConsumableArray',
+ 'arrayWithoutHoles',
+ 'arrayWithHoles',
+ 'iterableToArray',
+ 'iterableToArrayLimit',
+ //'iterableToArrayLimitLoose',
+ 'nonIterableSpread',
+ 'nonIterableRest',
+
+ // es2015 instanceof
+ 'instanceof',
+
+ // es2015 arrow-functions
+ 'newArrowCheck',
+
+ // es2015 typeof-symbol
+ 'typeof',
+
+ // es2015 computed-properties
'defineEnumerableProperties',
- 'defaults', // used to make `obj.__proto__ = bar` work
'defineProperty',
- 'extends', // used when setting __proto__
- 'get', // needed for class compilation
- 'inherits', // used for es6 class inheritance
- 'instanceof',
- // 'interopRequireDefault', // for modules support
- // 'interopRequireWildcard', // for modules support
- 'newArrowCheck', // confirms that `this` is correct inside arrow function
- // body
+
+ // es2015 block-scoping
+ 'readOnlyError',
+ 'temporalRef',
+ 'temporalUndefined',
+
+ // es2015 destructuring
'objectDestructuringEmpty',
'objectWithoutProperties',
- 'possibleConstructorReturn', // can we exclude with loose?
- // 'selfGlobal', // not needed. `global` is not ES2015
- 'set', // difficult to tell if needed
- 'slicedToArray',
- // 'slicedToArrayLoose',
+
+ // es2015 template-literals
'taggedTemplateLiteral',
- // 'taggedTemplateLiteralLoose',
- 'temporalRef', // not needed in loose?
- 'temporalUndefined',
- 'toArray',
- 'toConsumableArray',
+ //'taggedTemplateLiteralLoose',
+
+ // es2017 async-to-generator
+ 'asyncToGenerator',
+
+ // es2018 proposal-async-generator-functions
+ 'AsyncGenerator',
+ 'AwaitValue',
+ 'asyncGeneratorDelegate',
+ 'asyncIterator',
+ 'awaitAsyncGenerator',
+ 'wrapAsyncGenerator',
+
+ // es2018 proposal-object-rest-spread
+ 'objectSpread',
+ 'toPropertyKey',
+
+ // proposal-function-sent
+ //'skipFirstGeneratorNext',
+
+ // proposal-class-properties
+ //'classNameTDZError',
+
+ // proposal-decorators
+ //'applyDecoratedDescriptor',
+ //'initializerDefineProperty',
+ //'initializerWarningHelper',
+
+ // react-inline-elements
+ //'jsx',
+];
+
+/**
+ * Babel helpers needed only for ES module transformation. We bundle these with
+ * the require.js AMD module loader instead so that the AMD transform does not
+ * depend on loading all Babel helpers.
+ */
+const moduleHelpers = [
+ 'interopRequireDefault',
+ 'interopRequireWildcard',
];
gulp.task('gen-babel-helpers', () => {
@@ -156,8 +221,10 @@ gulp.task('minify-requirejs', () => {
const requireJsPath =
path.join(path.dirname(require.resolve('requirejs')), '..', 'require.js');
const requireJsCode = fs.readFileSync(requireJsPath, 'utf-8');
+ const moduleBabelHelpers = babelCore.buildExternalHelpers(moduleHelpers);
+ const combined = requireJsCode + moduleBabelHelpers;
const minified =
- babelCore.transform(requireJsCode, {presets: [babelPresetMinify]}).code;
+ babelCore.transform(combined, {presets: [babelPresetMinify]}).code;
fs.mkdirpSync('./lib/');
fs.writeFileSync('./lib/requirejs.min.js', minified, {encoding: 'utf-8'});
});
diff --git a/packages/cli/src/test/integration/fixtures/build-modules/expected/bundled-amd/index.html b/packages/cli/src/test/integration/fixtures/build-modules/expected/bundled-amd/index.html
index 6bbc1b744..18a7ffe19 100644
--- a/packages/cli/src/test/integration/fixtures/build-modules/expected/bundled-amd/index.html
+++ b/packages/cli/src/test/integration/fixtures/build-modules/expected/bundled-amd/index.html
@@ -1,5 +1,5 @@
-
+
diff --git a/packages/cli/src/test/integration/fixtures/build-modules/expected/unbundled-amd/index.html b/packages/cli/src/test/integration/fixtures/build-modules/expected/unbundled-amd/index.html
index 6bb5259cd..3a6dfef53 100644
--- a/packages/cli/src/test/integration/fixtures/build-modules/expected/unbundled-amd/index.html
+++ b/packages/cli/src/test/integration/fixtures/build-modules/expected/unbundled-amd/index.html
@@ -1,5 +1,5 @@
-
+
diff --git a/packages/cli/src/test/integration/fixtures/build-simple/expected/bundled-compiled/index.html b/packages/cli/src/test/integration/fixtures/build-simple/expected/bundled-compiled/index.html
index 7b7521bed..55a20205d 100644
--- a/packages/cli/src/test/integration/fixtures/build-simple/expected/bundled-compiled/index.html
+++ b/packages/cli/src/test/integration/fixtures/build-simple/expected/bundled-compiled/index.html
@@ -1 +1 @@
-
I'm foo.html!
hello world
\ No newline at end of file
+
I'm foo.html!
hello world
\ No newline at end of file
diff --git a/packages/cli/src/test/integration/fixtures/build-with-preset/expected/es5-bundled/index.html b/packages/cli/src/test/integration/fixtures/build-with-preset/expected/es5-bundled/index.html
index 69e95a312..0513ddbcf 100644
--- a/packages/cli/src/test/integration/fixtures/build-with-preset/expected/es5-bundled/index.html
+++ b/packages/cli/src/test/integration/fixtures/build-with-preset/expected/es5-bundled/index.html
@@ -1 +1 @@
-