Merge pull request #139 from typed-ember/in-repo-addons

chriskrycho · web-flow · commit fe14eadca589 · 2018-02-20T15:51:34.000-07:00
Fix in-repo addons' app trees
diff --git a/lib/incremental-typescript-compiler.js b/lib/incremental-typescript-compiler.js
@@ -64,7 +64,8 @@ module.exports = class IncrementalTypescriptCompiler {
       });
     });
 
-    return new MergeTrees(addonAppTrees, { overwrite: true });
+    let tree = new MergeTrees(addonAppTrees, { overwrite: true });
+    return new Funnel(tree, { srcDir: 'app', allowEmpty: true });
   }
 
   treeForAddons() {

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,8 @@ module.exports = class IncrementalTypescriptCompiler {`
`64`	`64`	`});`
`65`	`65`	`});`
`66`	`66`
`67`		`- return new MergeTrees(addonAppTrees, { overwrite: true });`
	`67`	`+ let tree = new MergeTrees(addonAppTrees, { overwrite: true });`
	`68`	`+ return new Funnel(tree, { srcDir: 'app', allowEmpty: true });`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`treeForAddons() {`