build: build zone-evergreen.js in es2015, add terser minify support

Author: JiaLiPassion

.travis.yml

@@ -55,5 +55,4 @@ script:
   - node_modules/.bin/gulp test/node
   - node_modules/.bin/gulp test/node -no-patch-clock
   - cp ./test/browser/custom-element.spec.js ./build/test/browser
-  - node_modules/.bin/karma start karma-dist-sauce-jasmine.es6.conf.js --single-run
   - node_modules/.bin/karma start karma-evergreen-dist-sauce-jasmine.conf.js --single-run

gulpfile.js

@@ -10,19 +10,22 @@
 var gulp = require('gulp');
 var rollup = require('gulp-rollup');
 var rename = require('gulp-rename');
-var uglify = require('gulp-uglify');
+var terser = require('gulp-terser');
 var pump = require('pump');
 var path = require('path');
 var spawn = require('child_process').spawn;
 const os = require('os');
 
-function generateScript(inFile, outFile, minify, callback, format) {
+function generateScript(inFile, outFile, minify, callback, format, inDir) {
   if (!format) {
     format = 'umd';
   }
-  inFile = path.join('./build-esm/', inFile).replace(/\.ts$/, '.js');
+  if (!inDir) {
+    inDir = './build-esm/'
+  }
+  inFile = path.join(inDir, inFile).replace(/\.ts$/, '.js');
   var parts = [
-    gulp.src('./build-esm/lib/**/*.js')
+    gulp.src(inDir + 'lib/**/*.js')
         .pipe(rollup({
           input: inFile,
           onwarn: function(warning) {
@@ -62,7 +65,9 @@ function generateScript(inFile, outFile, minify, callback, format) {
         .pipe(rename(outFile)),
   ];
   if (minify) {
-    parts.push(uglify());
+    parts.push(terser({
+      ecma: format === 'es' ? 6 : 5, // specify one of: 5, 6, 7 or 8
+    }));
   }
   parts.push(gulp.dest('./dist'));
   pump(parts, callback);
@@ -101,6 +106,10 @@ gulp.task('compile-esm', function(cb) {
   tsc('tsconfig-esm.json', cb);
 });
 
+gulp.task('compile-esm-2015', function(cb) {
+  tsc('tsconfig-esm-2015.json', cb);
+});
+
 gulp.task('compile-esm-node', function(cb) {
   tsc('tsconfig-esm-node.json', cb);
 });
@@ -126,12 +135,12 @@ gulp.task('build/zone.min.js', ['compile-esm'], function(cb) {
 });
 
 // Zone for the evergreen browser.
-gulp.task('build/zone-evergreen.js', ['compile-esm'], function(cb) {
-  return generateScript('./lib/browser/rollup-main.ts', 'zone-evergreen.js', false, cb);
+gulp.task('build/zone-evergreen.js', ['compile-esm-2015'], function(cb) {
+  return generateScript('./lib/browser/rollup-main.ts', 'zone-evergreen.js', false, cb, 'es', './build-esm-2015/');
 });
 
-gulp.task('build/zone-evergreen.min.js', ['compile-esm'], function(cb) {
-  return generateScript('./lib/browser/rollup-main.ts', 'zone-evergreen.min.js', true, cb);
+gulp.task('build/zone-evergreen.min.js', ['compile-esm-2015'], function(cb) {
+  return generateScript('./lib/browser/rollup-main.ts', 'zone-evergreen.min.js', true, cb, 'es', './build-esm-2015/');
 });
 
 // Zone legacy patch for the legacy browser.

karma-build-jasmine.es2015.conf.js

@@ -0,0 +1,11 @@
+
+module.exports = function (config) {
+  require('./karma-build-jasmine.conf.js')(config);
+  for (let i = 0; i < config.files.length; i ++) {
+    if (config.files[i] === 'node_modules/core-js-bundle/index.js') {
+      config.files.splice(i, 1);
+      break;
+    }
+  }
+  config.client.entrypoint = 'browser_es2015_entry_point';
+};

karma-build-jasmine.es6.conf.js

@@ -8,6 +8,7 @@
 
 module.exports = function(config) {
   require('./karma-base.conf.js')(config);
+  config.files.push('node_modules/core-js-bundle/index.js');
   config.files.push('build/test/wtf_mock.js');
   config.files.push('build/test/test_fake_polyfill.js');
   config.files.push('build/lib/zone.js');

karma-build.conf.js

@@ -0,0 +1,28 @@
+
+module.exports = function (config) {
+  require('./karma-dist-jasmine.conf.js')(config);
+  require('./sauce.es2015.conf')(config);
+  const files = config.files;
+  config.files = [];
+  for (let i = 0; i < files.length; i ++) {
+    if (files[i] !== 'node_modules/core-js-bundle/index.js' || files[i] === 'build/test/main.js') {
+      config.files.push(files[i]);
+    }
+  }
+  config.files.push('build/test/wtf_mock.js');
+  config.files.push('build/test/test_fake_polyfill.js');
+  config.files.push('build/test/custom_error.js');
+  config.files.push({pattern: 'dist/zone-evergreen.js', type: 'module'});
+  config.files.push('dist/zone-patch-canvas.js');
+  config.files.push('dist/zone-patch-fetch.js');
+  config.files.push('dist/webapis-media-query.js');
+  config.files.push('dist/webapis-notification.js');
+  config.files.push('dist/zone-patch-user-media.js');
+  config.files.push('dist/zone-patch-resize-observer.js');
+  config.files.push('dist/task-tracking.js');
+  config.files.push('dist/wtf.js');
+  config.files.push('dist/zone-testing.js');
+  config.files.push('build/test/test-env-setup-jasmine.js');
+  config.files.push('build/lib/common/error-rewrite.js');
+  config.files.push('build/test/browser/custom-element.spec.js');
+};

karma-dist-sauce-jasmine.es2015.conf.js

@@ -8,6 +8,7 @@
 
 module.exports = function(config) {
   require('./karma-base.conf.js')(config);
+  config.files.push('node_modules/core-js-bundle/index.js');
   config.files.push('build/test/wtf_mock.js');
   config.files.push('build/test/test_fake_polyfill.js');
   config.files.push('build/test/custom_error.js');

karma-dist-sauce-jasmine.es6.conf.js

@@ -8,10 +8,18 @@
 
 module.exports = function(config) {
   require('./karma-base.conf.js')(config);
+  const files = config.files;
+  config.files = [];
+  for (let i = 0; i < files.length; i ++) {
+    if (files[i] !== 'node_modules/core-js-bundle/index.js') {
+      config.files.push(files[i]);
+    }
+  }
+
   config.files.push('build/test/wtf_mock.js');
   config.files.push('build/test/test_fake_polyfill.js');
   config.files.push('build/test/custom_error.js');
-  config.files.push('dist/zone-evergreen.js');
+  config.files.push({pattern: 'dist/zone-evergreen.js', type: 'module'});
   config.files.push('dist/zone-patch-canvas.js');
   config.files.push('dist/zone-patch-fetch.js');
   config.files.push('dist/webapis-media-query.js');
@@ -21,5 +29,6 @@ module.exports = function(config) {
   config.files.push('dist/task-tracking.js');
   config.files.push('dist/wtf.js');
   config.files.push('dist/zone-testing.js');
+  config.files.push({pattern: 'build/test/browser/custom-element.spec.js', type: 'module'});
   config.files.push('build/test/main.js');
 };

karma-dist.conf.js

@@ -365,6 +365,10 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
       }
     }
 
+    get[Symbol.toStringTag]() {
+      return 'Promise' as any;
+    }
+
     then<TResult1 = R, TResult2 = never>(
         onFulfilled?: ((value: R) => TResult1 | PromiseLike<TResult1>)|undefined|null,
         onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>)|undefined|