@@ -147,32 +147,24 @@ function Angular2ConventionsLoader(source, sourcemap){
147147var _hasHtmlFile ;
148148// if selector and filename are the same
149149if ( hasSameFileSelector ) {
150- try {
151- _hasHtmlFile = fs . statSync ( path . join ( self . context , lastFileName + htmlExtension ) ) ;
152- } catch ( e ) { }
150+ _hasHtmlFile = isFileExist ( path . join ( self . context , lastFileName + htmlExtension ) )
153151} else {
154- try {
155- _hasHtmlFile = fs . statSync ( path . join ( self . context , relativePathStart + __selector + htmlExtension ) ) ;
156- } catch ( e ) {
157- metadata = 'template: "",' + metadata ;
158- }
152+ _hasHtmlFile = isFileExist ( path . join ( self . context , relativePathStart + __selector + htmlExtension ) )
159153}
160154// set file in metadata
161155if ( _hasHtmlFile ) {
162156metadata = 'template: require("' + relativePathStart + lastFileName + htmlExtension + '"),\n' + metadata ;
157+ } else {
158+ metadata = 'template: "",' + metadata ;
163159}
164160}
165161// do the same for styles
166162if ( decorator === 'Component' && ! ( / s t y l e s \s * : ( \s * \[ [ \s \S ] * ?\] ) / g. test ( metadata ) ) ) {
167163var _hasCssFile ;
168164if ( hasSameFileSelector ) {
169- try {
170- _hasCssFile = fs . statSync ( path . join ( self . context , lastFileName + cssExtension ) ) ;
171- } catch ( e ) { }
165+ _hasCssFile = isFileExist ( path . join ( self . context , lastFileName + cssExtension ) )
172166} else {
173- try {
174- _hasCssFile = fs . statSync ( path . join ( self . context , relativePathStart + __selector + cssExtension ) ) ;
175- } catch ( e ) { }
167+ _hasCssFile = isFileExist ( path . join ( self . context , relativePathStart + __selector + cssExtension ) ) ;
176168}
177169
178170if ( _hasCssFile ) {
@@ -195,4 +187,12 @@ function Angular2ConventionsLoader(source, sourcemap){
195187} ;
196188Angular2ConventionsLoader . default = Angular2ConventionsLoader ;
197189
190+ function isFileExist ( path ) {
191+ try {
192+ return ! ! fs . statSync ( path ) ;
193+ } catch ( e ) {
194+ return false ;
195+ }
196+ }
197+
198198module . exports = Angular2ConventionsLoader
0 commit comments