@@ -147,32 +147,24 @@ function Angular2ConventionsLoader(source, sourcemap) {
147
147
var _hasHtmlFile ;
148
148
// if selector and filename are the same
149
149
if ( 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 ) )
153
151
} 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 ) )
159
153
}
160
154
// set file in metadata
161
155
if ( _hasHtmlFile ) {
162
156
metadata = 'template: require("' + relativePathStart + lastFileName + htmlExtension + '"),\n' + metadata ;
157
+ } else {
158
+ metadata = 'template: "",' + metadata ;
163
159
}
164
160
}
165
161
// do the same for styles
166
162
if ( decorator === 'Component' && ! ( / s t y l e s \s * : ( \s * \[ [ \s \S ] * ?\] ) / g. test ( metadata ) ) ) {
167
163
var _hasCssFile ;
168
164
if ( 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 ) )
172
166
} 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 ) ) ;
176
168
}
177
169
178
170
if ( _hasCssFile ) {
@@ -195,4 +187,12 @@ function Angular2ConventionsLoader(source, sourcemap) {
195
187
} ;
196
188
Angular2ConventionsLoader . default = Angular2ConventionsLoader ;
197
189
190
+ function isFileExist ( path ) {
191
+ try {
192
+ return ! ! fs . statSync ( path ) ;
193
+ } catch ( e ) {
194
+ return false ;
195
+ }
196
+ }
197
+
198
198
module . exports = Angular2ConventionsLoader
0 commit comments