build: make it compile angular2 from source

gulpfile.js

@@ -2,7 +2,8 @@
 // Mostly stolen from https://github.com/pkozlowski-opensource/ng2-play
 /////
 
-var Builder = require('systemjs-builder');
+var SystemJsBuilder = require('systemjs-builder');
+var exec = require('child_process').exec;
 var gulp = require('gulp');
 var karma = require('karma').server;
 var path = require('path');
@@ -12,7 +13,6 @@ var through2 = require('through2');
 var concat = require('gulp-concat');
 var debug = require('gulp-debug');
 var del = require('del');
-var exec = require('gulp-exec');
 var gulpif = require('gulp-if');
 var karma = require('karma').server;
 var plumber = require('gulp-plumber');
@@ -23,36 +23,11 @@ var traceur = require('gulp-traceur');
 var wrap = require('gulp-wrap');
 var argv = require('yargs').argv;
 
-gulp.task('default', ['js', 'html', 'sass', 'libs', 'playgroundJs', 'playgroundFiles']);
-
-var NG2_PATH = 'jspm_packages/github/angular/angular@master';
-gulp.task('ng2-compile', shell.task([
-  'npm install',
-  'gulp build/transpile.js.dev.es6'
-], {
-  cwd: NG2_PATH
-}));
-gulp.task('ng2-copy', ['ng2-compile'], function() {
-  return gulp.src(NG2_PATH + '/dist/js/dev/es6/{angular2,rtts_assert}/**/*')
-    .pipe(gulpif(/es6$/, rename({ extname: '.js' })))
-    .pipe(gulp.dest('dist/lib'));
-});
+gulp.task('default', ['sass', 'examples', 'ng2']);
 
 gulp.task('watch', ['default'], function() {
-  var http = require('http');
-  var connect = require('connect');
-  var serveStatic = require('serve-static');
-  var port = 9000;
-
-  gulp.watch(buildConfig.src.html, ['html']);
-  gulp.watch(buildConfig.src.js, ['js']);
   gulp.watch(buildConfig.src.scss, ['sass']);
-  gulp.watch(buildConfig.src.playgroundJs, ['playgroundJs']);
-  gulp.watch(buildConfig.src.playgroundFiles, ['playgroundFiles']);
-
-  var app = connect().use(serveStatic(__dirname + '/' + buildConfig.dist));  // serve everything that is static
-  http.createServer(app).listen(port);
-  console.log('Serving `dist` on http://localhost:' + port);
+  return gulp.watch(buildConfig.src.examples.concat('scripts/examples/index.template.html'), ['examples']);
 });
 
 gulp.task('karma', function() {
@@ -77,92 +52,54 @@ gulp.task('clean', function(done) {
   del([buildConfig.dist], done);
 });
 
-gulp.task('playgroundFiles', function() {
-  return gulp.src(buildConfig.src.playgroundFiles)
-    .pipe(gulp.dest(buildConfig.dist));
-});
-
-gulp.task('playgroundJs', function() {
-  return gulp.src(buildConfig.src.playgroundJs)
-    .pipe(rename({extname: ''})) //hack, see: https://github.com/sindresorhus/gulp-traceur/issues/54
-    .pipe(plumber())
-    .pipe(traceur({
-        modules: 'instantiate',
-        moduleName: true,
-        annotations: true,
-        types: true
-    }))
-    .pipe(rename({extname: '.js'})) //hack, see: https://github.com/sindresorhus/gulp-traceur/issues/54
-    .pipe(gulp.dest(buildConfig.dist));
-});
-
-gulp.task('js', function () {
-  return gulp.src(buildConfig.src.js)
-    .pipe(rename(function(file) {
-      // Forces the files to register themselves with 'ionic' prefix
-      file.dirname = 'ionic/' + file.dirname;
-    }))
-    .pipe(rename({extname: ''})) //hack, see: https://github.com/sindresorhus/gulp-traceur/issues/54
-    .pipe(plumber())
-    .pipe(traceur({
-        modules: 'instantiate',
-        moduleName: true,
-        annotations: true,
-        types: true
-    }))
-    .pipe(rename({extname: '.js'})) //hack, see: https://github.com/sindresorhus/gulp-traceur/issues/54
-    // compiled js files in playground go to the playground root, everything else goes in /ionic
-    .pipe(gulp.dest('dist'));
-});
-
-gulp.task('html', function () {
-  // Don't do anything with html for now
-  // return gulp.src(buildConfig.src.html)
-  //   .pipe(gulp.dest(buildConfig.dist));
-});
-
-gulp.task('libs', ['angular2'], function () {
-  return gulp.src(buildConfig.lib)
-    .pipe(gulp.dest('dist/lib'));
-});
-
-gulp.task('angular2', function () {
-  //transpile & concat
-  return gulp.src([
-    'node_modules/angular2/es6/prod/*.es6',
-    'node_modules/angular2/es6/prod/src/**/*.es6'
-  ], {
-    base: 'node_modules/angular2/es6/prod'
-  })
-    .pipe(rename(function(path){
-        path.dirname = 'angular2/' + path.dirname; //this is not ideal... but not sure how to change angular's file structure
-        path.extname = ''; //hack, see: https://github.com/sindresorhus/gulp-traceur/issues/54
-    }))
-    .pipe(traceur({ modules: 'instantiate', moduleName: true}))
-    .pipe(concat('angular2.js'))
-    .pipe(gulp.dest('dist/lib'));
-});
-
 gulp.task('examples', ['sass'], function() {
-  var examplesSrc = path.join(__dirname, 'src/components/**/examples/**/*');
+  var exampleSrc = path.join(__dirname, 'src/components/**/examples/**/*');
   var templateSrc = path.join(__dirname, 'scripts/examples/index.template.html');
-  var examplesDest = path.join(__dirname, 'dist/examples/');
+  var exampleDest = path.join(__dirname, 'dist/examples/');
 
-  return gulp.src(examplesSrc)
+  return gulp.src(exampleSrc)
     .pipe(gulpif(/index.html/, wrap({
       src: templateSrc
     })))
     .pipe(rename(function(file) {
       file.dirname = file.dirname.replace('/examples/', '/');
     }))
-    .pipe(gulp.dest(examplesDest));
+    .pipe(gulp.dest(exampleDest));
 });
 
 require('./scripts/snapshot/snapshot.task')(gulp, argv, buildConfig);
 
-gulp.task('watch-examples', ['examples'], function() {
-  return gulp.watch([
-    'src/**/*',
-    'scripts/examples/index.template.html'
-  ], ['examples']);
+// Take es6 files from angular2's output, rename to js, and move to dist/lib/
+gulp.task('ng2-rename', function(done) {
+  exec('ls dist/angular-master', function(err) {
+    if (err) {
+      console.log('You have not installed angular master.\n' +
+                  'Please run ./scripts/build/update-angular.sh.\n' +
+                  'Aborting.');
+      return process.exit(1);
+    }
+    gulp.src([
+      'dist/angular-master/dist/js/dev/es6/{angular2,rtts_assert}/**/*.es6'
+    ])
+      .pipe(rename({ extname: '.js' }))
+      .pipe(gulp.dest('dist/lib'))
+      .on('end', done);
+  });
 });
+gulp.task('ng2', ['ng2-rename'], function() {
+  var builder = new SystemJsBuilder();
+  return builder.loadConfig('jspm-config.js')
+  .then(function() {
+    builder.config({
+      map: {
+        'angular2': 'dist/lib/angular2',
+        'rtts_assert': 'dist/lib/rtts_assert'
+      },
+      paths: {
+        dist: undefined,
+      }
+    });
+    return builder.build('angular2/angular2', 'dist/lib/angular2.js');
+  });
+});
+