@@ -460,14 +460,12 @@ gulp.task('build:client', ['transpile:client', 'styles', 'html'], () => {
460
460
var appFilter = plugins . filter ( '**/app.js' ) ;
461
461
var jsFilter = plugins . filter ( '**/*.js' ) ;
462
462
var cssFilter = plugins . filter ( '**/*.css' ) ;
463
- var htmlFilter = plugins . filter ( '**/*.html' ) ; < % if ( filters . jade ) { % >
463
+ var htmlBlock = plugins . filter ( [ '**/*.!( html)' ] ) ; < % if ( filters . jade ) { % >
464
464
var assetsFilter = plugins . filter ( '**/*.{js,css}' ) ; < % } % >
465
465
466
- let assets = plugins . useref . assets ( { searchPath : [ clientPath , '.tmp' ] } ) ;
467
-
468
466
return gulp . src ( paths . client . mainView ) < % if ( filters . jade ) { % >
469
467
. pipe ( plugins . jade ( { pretty : true } ) ) < % } % >
470
- . pipe ( assets )
468
+ . pipe ( plugins . useref ( ) )
471
469
. pipe ( appFilter )
472
470
. pipe ( plugins . addSrc . append ( '.tmp/templates.js' ) )
473
471
. pipe ( plugins . concat ( 'app/app.js' ) )
@@ -482,10 +480,10 @@ gulp.task('build:client', ['transpile:client', 'styles', 'html'], () => {
482
480
processImportFrom : [ '!fonts.googleapis.com' ]
483
481
} ) )
484
482
. pipe ( cssFilter . restore ( ) )
485
- . pipe ( plugins . rev ( ) )
486
- . pipe ( assets . restore ( ) )
487
- . pipe ( plugins . revReplace ( ) )
488
- . pipe ( plugins . useref ( ) ) < % if ( filters . jade ) { % >
483
+ . pipe ( htmlBlock )
484
+ . pipe ( plugins . rev ( ) )
485
+ . pipe ( htmlBlock . restore ( ) )
486
+ . pipe ( plugins . revReplace ( ) ) < % if ( filters . jade ) { % >
489
487
. pipe ( assetsFilter ) < % } % >
490
488
. pipe ( gulp . dest ( `${ paths . dist } /${ clientPath } ` ) ) ;
491
489
} ) ;
0 commit comments