Bug fixes (angular#622)

hansl · hansl · commit cc989462f5de · 2016-05-03T22:04:54.000-07:00
* chore: if no files in tsconfig, use empty array * chore: cleanup and check for file existence in the build. Fixes angular#620.
diff --git a/lib/broccoli/angular2-app.js b/lib/broccoli/angular2-app.js
@@ -69,12 +69,17 @@ class Angular2App extends BroccoliPlugin {
   }
 
   _buildInputTree() {
-    return new BroccoliMergeTrees([
+    const inputTreeArray = [
       new BroccoliFunnel(this._sourceDir, { destDir: this._sourceDir }),
       new BroccoliFunnel('typings', { destDir: 'typings' }),
-      new BroccoliFunnel('public', { destDir: 'public' }),
       this._getConfigTree()
-    ], { overwrite: true });
+    ];
+
+    if (fs.existsSync('public')) {
+      inputTreeArray.push(new BroccoliFunnel('public', { destDir: 'public' }));
+    }
+
+    return new BroccoliMergeTrees(inputTreeArray, { overwrite: true });
   }
 
   /**
@@ -121,13 +126,8 @@ class Angular2App extends BroccoliPlugin {
 
     // Add the public folder in.
     buildTrees.push(new BroccoliFunnel(this._inputNode, {
-      include: ['public/**/*'],
-      getDestinationPath: (n) => {
-        if (n.startsWith('public')) {
-          return n.substr(6);
-        }
-        return n;
-      },
+      allowEmpty: true,
+      srcDir: 'public',
       name: 'PublicFolderFunnel'
     }));
 
@@ -327,20 +327,14 @@ class Angular2App extends BroccoliPlugin {
    */
   _getAssetsTree() {
     return new BroccoliFunnel(this._inputNode, {
-      include: [path.join(this._sourceDir, '**/*')],
+      srcDir: this._sourceDir,
       exclude: [
         '**/*.ts',
         '**/*.scss',
         '**/*.sass',
         '**/*.less',
         '**/*.styl'
       ],
-      getDestinationPath: (n) => {
-        if (n.startsWith(this._sourceDir)) {
-          return n.substr(this._sourceDir.length);
-        }
-        return n;
-      },
       allowEmpty: true
     });
   }
diff --git a/lib/broccoli/broccoli-typescript.js b/lib/broccoli/broccoli-typescript.js
@@ -122,7 +122,8 @@ class BroccoliTypeScriptCompiler extends Plugin {
     var tsConfigPath = path.join(this.inputPaths[0], this._tsConfigPath);
     var tsconfig = JSON.parse(fs.readFileSync(tsConfigPath, 'utf-8'));
 
-    tsconfig.files = tsconfig.files.map(name => path.join(path.dirname(this._tsConfigPath), name));
+    tsconfig.files = (tsconfig.files || [])
+      .map(name => path.join(path.dirname(this._tsConfigPath), name));
 
     // Add all glob files to files. In some cases we don't want to specify
     let globFiles = this._options.additionalFiles;
