From 0954bb4641bdbc9baa5d66a870386ae01e01b7b0 Mon Sep 17 00:00:00 2001
From: Tim Lancina <tim@ionic.io>
Date: Fri, 7 Aug 2015 15:46:41 -0500
Subject: [PATCH] temporary npm angular2 bundle work around

---
 gulpfile.js                | 20 ++------------------
 package.json               |  2 +-
 scripts/build/config.js    | 13 ++++++-------
 scripts/test/karma.conf.js |  3 ---
 4 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index a67cd81fe3..b6f4a68d7b 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -150,14 +150,7 @@ gulp.task('bundle.ionic', ['transpile'], function() {
 
 gulp.task('bundle', ['bundle.ionic'], function() {
   var nm = "node_modules";
-  return gulp.src([
-      'node_modules/traceur/bin/traceur-runtime.js',
-      'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js',
-      'node_modules/systemjs/dist/system.js',
-      'node_modules/angular2-build/angular2.dev.js',
-      'dist/js/ionic.js',
-      'node_modules/web-animations-js/web-animations.min.js'
-    ])
+  return gulp.src(buildConfig.scripts)
     .pipe(concat('ionic.bundle.dev.js'))
     .pipe(gulp.dest('dist/js'));;
 })
@@ -172,16 +165,7 @@ gulp.task('tests', function() {
     .pipe(gulp.dest('dist/tests'))
 })
 
-gulp.task('copy-scripts', function(){
-  gulp.src([
-    'scripts/resources/*.js',
-    'scripts/vendor/web-animations-js/web-animations.min.js',
-    'config.js',
-    'dist/js/ionic.bundle.js'
-  ]).pipe(gulp.dest('dist/lib'));
-})
-
-gulp.task('e2e', ['copy-scripts'], function() {
+gulp.task('e2e', function() {
   var buildTest = lazypipe()
              //.pipe(traceur, traceurOptions)
              .pipe(tsc, tscOptions, null, tscReporter)
diff --git a/package.json b/package.json
index b5f47bebe6..92760c41c4 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "yargs": "^3.6.0"
   },
   "dependencies": {
-    "angular2-build": "2.0.0-alpha.33",
+    "angular2-bundle": "tlancina/angular2-bundle",
     "systemjs": "^0.16.11",
     "traceur": "0.0.91",
     "traceur-runtime": "0.0.59",
diff --git a/scripts/build/config.js b/scripts/build/config.js
index 838a61f8ba..d749f3e139 100644
--- a/scripts/build/config.js
+++ b/scripts/build/config.js
@@ -12,13 +12,12 @@ module.exports = {
   },
 
   scripts: [
-    'scripts/resources/traceur-runtime.js',
-    { pattern: 'jspm_packages/es6-module-loader.js', included: false },
-    'jspm_packages/system.src.js',
-    'config.js',
-    'scripts/resources/angular2.dev.js',
-    'dist/js/ionic.bundle.js',
-    'dist/vendor/web-animations-js/web-animations.min.js'
+    'node_modules/traceur/bin/traceur-runtime.js',
+    'node_modules/systemjs/node_modules/es6-module-loader/dist/es6-module-loader.js',
+    'node_modules/systemjs/dist/system.js',
+    'node_modules/angular2-bundle/angular2.dev.js',
+    'dist/js/ionic.js',
+    'node_modules/web-animations-js/web-animations.min.js'
   ],
 
   protractorPort: 8876,
diff --git a/scripts/test/karma.conf.js b/scripts/test/karma.conf.js
index 52f1c9c510..7f71e4114c 100644
--- a/scripts/test/karma.conf.js
+++ b/scripts/test/karma.conf.js
@@ -8,7 +8,6 @@ module.exports = function(config) {
     frameworks: ['jasmine'],
 
     files: buildConfig.scripts.concat([
-      'dist/js/es5/ionic/**/*.js',
       'dist/tests/**/*.spec.js',
       'scripts/test/test-main.js'
     ]),
@@ -24,5 +23,3 @@ module.exports = function(config) {
     port: 9876
   });
 };
-
-