build: refactor the typescript compiler broccoli plugin

Author: hansl

addon/ng2/commands/version.ts

@@ -1,6 +1,6 @@
 import * as Command from 'ember-cli/lib/models/command';
 import * as path from 'path';
-
+import * as child_process from 'child_process';
 
 const VersionCommand = Command.extend({
   name: 'version',
@@ -21,7 +21,19 @@ const VersionCommand = Command.extend({
 
     var alwaysPrint = ['node', 'os'];
 
-    this.printVersion('angular-cli', pkg.version);
+    var ngCliVersion = pkg.version;
+    if (!__dirname.match(/node_modules/)) {
+      var gitBranch = '??';
+      try {
+        var gitRefName = '' + child_process.execSync('git symbolic-ref HEAD', {cwd: __dirname});
+        gitBranch = path.basename(gitRefName.replace('\n', ''));
+      } catch (e) {
+      }
+
+      ngCliVersion = `local (v${pkg.version}, branch: ${gitBranch})`;
+    }
+
+    this.printVersion('angular-cli', ngCliVersion);
 
     for (var module in versions) {
       if (options.verbose || alwaysPrint.indexOf(module) > -1) {

lib/broccoli/angular2-app.js

@@ -1,6 +1,6 @@
 var path = require('path');
 var configReplace = require('./broccoli-config-replace');
-var compileWithTypescript = require('./broccoli-typescript').default;
+var compileWithTypescript = require('./broccoli-typescript');
 var SwManifest = require('./service-worker-manifest').default;
 var fs = require('fs');
 var Funnel = require('broccoli-funnel');
@@ -71,11 +71,6 @@ Angular2App.prototype.toTree = function () {
     exclude: ['*.d.ts', 'tsconfig.json']
   });
 
-  var tsSrcTree = new Funnel(sourceDir, {
-    include: ['**/*.ts'],
-    allowEmpty: true
-  });
-
   var jsTree = new Funnel(sourceDir, {
     include: ['**/*.js'],
     allowEmpty: true
@@ -94,7 +89,6 @@ Angular2App.prototype.toTree = function () {
 
   var merged = mergeTrees([
     assetTree,
-    tsSrcTree,
     tsTree,
     jsTree,
     this.index(),