From 0a5ce42b6e4e6683062d763461c8c261ef9ff4e5 Mon Sep 17 00:00:00 2001
From: Brandy Carney <brandyscarney@gmail.com>
Date: Tue, 13 Sep 2016 18:31:23 -0400
Subject: [PATCH] chore(polyfills): include polyfills task in compile and e2e

---
 package.json                    |  1 +
 scripts/e2e/index.html          |  2 +-
 scripts/gulp/tasks/e2e.ts       |  2 +-
 scripts/gulp/tasks/polyfills.ts | 10 +++++-----
 scripts/gulp/tasks/release.ts   |  2 +-
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 6f938c24d6..4145b2c54a 100644
--- a/package.json
+++ b/package.json
@@ -64,6 +64,7 @@
     "gulp": "^3.9.1",
     "gulp-autoprefixer": "^2.3.0",
     "gulp-clean-css": "^2.0.12",
+    "gulp-concat": "^2.6.0",
     "gulp-git": "^1.11.2",
     "gulp-if": "^1.2.5",
     "gulp-remember": "^0.3.0",
diff --git a/scripts/e2e/index.html b/scripts/e2e/index.html
index ce0e764a29..d12089e413 100644
--- a/scripts/e2e/index.html
+++ b/scripts/e2e/index.html
@@ -44,7 +44,7 @@
     }
   </script>
   <script src="/webpack-dev-server.js"></script>
-  <script src="../../../../polyfills.js"></script>
+  <script src="../../../../../../dist/ionic-angular/polyfills/polyfills.js"></script>
   <script src="../../../../vendor.js"></script>
   <script src="./index.js"></script>
 </body>
diff --git a/scripts/gulp/tasks/e2e.ts b/scripts/gulp/tasks/e2e.ts
index 4e5604d9ef..e4d97200fb 100644
--- a/scripts/gulp/tasks/e2e.ts
+++ b/scripts/gulp/tasks/e2e.ts
@@ -11,7 +11,7 @@ task('e2e', e2eBuild);
 
 function e2eBuild(done: Function) {
   const runSequence = require('run-sequence');
-  runSequence('e2e.copySource', 'e2e.compileTests', 'e2e.copyExternalDependencies', 'e2e.sass', 'e2e.fonts', 'e2e.beforeWebpack', 'e2e.runWebpack', done);
+  runSequence('polyfills', 'e2e.copySource', 'e2e.compileTests', 'e2e.copyExternalDependencies', 'e2e.sass', 'e2e.fonts', 'e2e.beforeWebpack', 'e2e.runWebpack', done);
 }
 
 task('e2e.copyAndCompile', (done: Function) => {
diff --git a/scripts/gulp/tasks/polyfills.ts b/scripts/gulp/tasks/polyfills.ts
index 47bd75bfff..d1bf460e74 100644
--- a/scripts/gulp/tasks/polyfills.ts
+++ b/scripts/gulp/tasks/polyfills.ts
@@ -2,9 +2,9 @@ import { task, src, dest } from 'gulp';
 const concat = require('gulp-concat');
 const uglify = require('gulp-uglify');
 
-task('polyfill', ['polyfill.modern', 'polyfill.all', 'polyfill.ng', 'polyfill.copy-readme']);
+task('polyfills', ['polyfills.modern', 'polyfills.all', 'polyfills.ng', 'polyfills.copy-readme']);
 
-task('polyfill.modern', (done) => {
+task('polyfills.modern', (done) => {
     return src([
         'node_modules/zone.js/dist/zone.min.js',
         'node_modules/zone.js/dist/proxy.min.js',
@@ -26,7 +26,7 @@ task('polyfill.modern', (done) => {
     .pipe(dest('dist/ionic-angular/polyfills/'), done);
 });
 
-task('polyfill.all', (done) => {
+task('polyfills.all', (done) => {
     return src([
         'node_modules/zone.js/dist/zone.min.js',
         'node_modules/zone.js/dist/proxy.min.js',
@@ -38,7 +38,7 @@ task('polyfill.all', (done) => {
     .pipe(dest('dist/ionic-angular/polyfills/'), done);
 });
 
-task('polyfill.ng', (done) => {
+task('polyfills.ng', (done) => {
     return src([
         'node_modules/zone.js/dist/zone.min.js',
         'node_modules/zone.js/dist/proxy.min.js',
@@ -49,7 +49,7 @@ task('polyfill.ng', (done) => {
     .pipe(dest('dist/ionic-angular/polyfills/'), done);
 });
 
-task('polyfill.copy-readme', (done) => {
+task('polyfills.copy-readme', (done) => {
     return src('scripts/npm/polyfills.readme.md')
     .pipe(dest('dist/ionic-angular/polyfills/README.md'), done);
 });
diff --git a/scripts/gulp/tasks/release.ts b/scripts/gulp/tasks/release.ts
index 7ac8e7817d..a0bac392aa 100644
--- a/scripts/gulp/tasks/release.ts
+++ b/scripts/gulp/tasks/release.ts
@@ -15,7 +15,7 @@ task('release.prepareNightly', (done: Function) => {
 
 task('release.nightlyPackage', (done: Function) => {
   const runSequence = require('run-sequence');
-  runSequence('clean', /*'release.prepareNightly',*/ 'compile.release', 'release.prepareNightly', 'release.compileSass', 'release.fonts', 'release.scss', done);
+  runSequence('clean', /*'release.prepareNightly',*/ 'polyfills', 'compile.release', 'release.prepareNightly', 'release.compileSass', 'release.fonts', 'release.scss', done);
 });
 
 task('release.publishNightly', (done: Function) => {