File tree 1 file changed +12
-2
lines changed
1 file changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -57,13 +57,23 @@ Angular2App.prototype.toTree = function() {
57
57
} ) ;
58
58
59
59
// TODO(i): kill rootFilePaths in broccoli-typescript and use tsconfig.json#files instead
60
- tsConfigCompilerOptions . rootFilePaths = tsConfigCompilerOptions . rootFilePaths . concat ( tsconfig . files ) ;
60
+ tsConfigCompilerOptions . rootFilePaths = tsConfigCompilerOptions . rootFilePaths .
61
+ concat ( tsconfig . files . map ( function ( p ) {
62
+ // TODO(i): this is a hack - for some reason we need to prefix all paths with srcDir because
63
+ // tsc's "rootDir" doesn't take effect when resolving "files" paths
64
+ return path . join ( sourceDir , p ) ;
65
+ } ) ) ;
61
66
62
67
63
- var srcAndTypingsTree = mergeTrees ( [ sourceDir , typingsTree ] ) ;
68
+ var srcAndTypingsTree = mergeTrees ( [ sourceTree , typingsTree ] ) ;
64
69
65
70
var tsTree = compileWithTypescript ( srcAndTypingsTree , tsConfigCompilerOptions ) ;
66
71
72
+ tsTree = new Funnel ( tsTree , {
73
+ srcDir : 'src' ,
74
+ exclude : [ '*.d.ts' , 'tsconfig.json' ]
75
+ } ) ;
76
+
67
77
var tsSrcTree = new Funnel ( sourceDir , {
68
78
include : [ '**/*.ts' ] ,
69
79
allowEmpty : true
You can’t perform that action at this time.
0 commit comments