@@ -508,8 +508,11 @@ gulp.task('wiredep:test', () => {
508508//FIXME: looks like font-awesome isn't getting loaded
509509gulp.task('build', cb => {
510510 runSequence (
511- 'clean:dist' ,
512- 'clean:tmp' ,
511+ [
512+ 'clean:dist' ,
513+ 'clean:tmp'
514+ ] , < % if ( filters . jade ) { % >
515+ 'jade' , < % } % >
513516 'inject',
514517 'wiredep:client',< % if ( filters . ts ) { % >
515518 'tsd',< % } % >
@@ -532,11 +535,9 @@ gulp.task('build:client', ['transpile:client', 'styles', 'html', 'constant'], ()
532535 var appFilter = plugins . filter ( '**/app.js' ) ;
533536 var jsFilter = plugins . filter ( '**/*.js' ) ;
534537 var cssFilter = plugins . filter ( '**/*.css' ) ;
535- var htmlBlock = plugins . filter ( [ '**/*.!(html)' ] ) ; < % if ( filters . jade ) { % >
536- var assetsFilter = plugins . filter ( '**/*.{js,css}' ) ; < % } % >
538+ var htmlBlock = plugins . filter ( [ '**/*.!(html)' ] ) ;
537539
538- return gulp . src ( paths . client . mainView ) < % if ( filters . jade ) { % >
539- . pipe ( plugins . jade ( { pretty : true } ) ) < % } % >
540+ return gulp . src ( paths . client . mainView )
540541 . pipe ( plugins . useref ( ) )
541542 . pipe ( appFilter )
542543 . pipe ( plugins . addSrc . append ( '.tmp/templates.js' ) )
@@ -555,13 +556,13 @@ gulp.task('build:client', ['transpile:client', 'styles', 'html', 'constant'], ()
555556 . pipe ( htmlBlock )
556557 . pipe ( plugins . rev ( ) )
557558 . pipe ( htmlBlock . restore ( ) )
558- . pipe ( plugins . revReplace ( { manifest} ) ) < % if ( filters . jade ) { % >
559- . pipe ( assetsFilter ) < % } % >
559+ . pipe ( plugins . revReplace ( { manifest} ) )
560560 . pipe ( gulp . dest ( `${ paths . dist } /${ clientPath } ` ) ) ;
561561} ) ;
562562
563- gulp . task ( 'html' , function ( ) {
564- return gulp . src ( `${ clientPath } /{app,components}/**/*.html` )
563+ gulp . task ( 'html' , function ( ) { < % if ( filters . jade ) { % >
564+ return gulp . src ( `.tmp/{app,components}/**/*.html` ) < % } else { % >
565+ return gulp . src ( `${ clientPath } /{app,components}/**/*.html` ) < % } % >
565566 . pipe ( plugins . angularTemplatecache ( {
566567 module : '<%= scriptAppName %>'
567568 } ) )
0 commit comments