compile both browser and node with downlevelIteration option

gulpfile.js

@@ -78,24 +78,16 @@ gulp.task('compile', function(cb) {
   tsc('tsconfig.json', cb);
 });
 
-gulp.task('compile-node', function(cb) {
-  tsc('tsconfig-node.json', cb);
-});
-
 gulp.task('compile-esm', function(cb) {
   tsc('tsconfig-esm.json', cb);
 });
 
-gulp.task('compile-esm-node', function(cb) {
-  tsc('tsconfig-esm-node.json', cb);
-});
-
 gulp.task('build/zone.js.d.ts', ['compile-esm'], function() {
   return gulp.src('./build-esm/lib/zone.d.ts').pipe(rename('zone.js.d.ts')).pipe(gulp.dest('./dist'));
 });
 
 // Zone for Node.js environment.
-gulp.task('build/zone-node.js', ['compile-esm-node'], function(cb) {
+gulp.task('build/zone-node.js', ['compile-esm'], function(cb) {
   return generateScript('./lib/node/rollup-main.ts', 'zone-node.js', false, cb);
 });
 
@@ -105,7 +97,7 @@ gulp.task('build/zone.js', ['compile-esm'], function(cb) {
 });
 
 // Zone for electron/nw environment.
-gulp.task('build/zone-mix.js', ['compile-esm-node'], function(cb) {
+gulp.task('build/zone-mix.js', ['compile-esm'], function(cb) {
     return generateScript('./lib/mix/rollup-mix.ts', 'zone-mix.js', false, cb);
 });
 
@@ -272,7 +264,7 @@ gulp.task('build', [
   'build/closure.js'
 ]);
 
-gulp.task('test/node', ['compile-node'], function(cb) {
+gulp.task('test/node', ['compile'], function(cb) {
   var JasmineRunner = require('jasmine');
   var jrunner = new JasmineRunner();
 

test/common/Promise.spec.ts

@@ -370,7 +370,8 @@ describe(
 
           it('should resolve generators', ifEnvSupports(
                                               () => {
-                                                return isNode;
+                                                return navigator &&
+                                                    navigator.userAgent.indexOf('PhantomJS') === -1;
                                               },
                                               () => {
                                                 const generators: any = function*() {

tsconfig-esm.json

@@ -12,6 +12,7 @@
     "noEmitOnError": false,
     "stripInternal": true,
     "sourceMap": true,
+    "downlevelIteration": true,
     "moduleResolution": "node",
     "lib": ["es5", "dom", "es2015.promise"]
   },

tsconfig.json

@@ -11,6 +11,7 @@
     "declaration": false,
     "noEmitOnError": false,
     "stripInternal": false,
+    "downlevelIteration": true,
     "lib": ["es5", "dom", "es2015.promise"]
   },
   "exclude": [
@@ -20,4 +21,4 @@
     "dist",
     "lib/closure"
   ]
-}
+}