Merge pull request #933 from cherrytech/refactor-useref

Update gulp-useref to latest version

Author: Swiip

generators/app/templates/_package.json

@@ -23,7 +23,7 @@
     "gulp-load-plugins": "~0.10.0",
     "gulp-size": "~2.0.0",
     "gulp-uglify": "~1.4.1",
-    "gulp-useref": "~1.3.0",
+    "gulp-useref": "~3.0.3",
     "gulp-util": "~3.0.6",
 <% if (props.jsPreprocessor.srcExtension !== 'es6' && props.jsPreprocessor.key !== 'typescript') { -%>
     "gulp-ng-annotate": "~1.1.0",

generators/app/templates/gulp/_build.js

@@ -40,18 +40,17 @@ gulp.task('html', ['inject', 'partials'], function () {
   var htmlFilter = $.filter('*.html', { restore: true });
   var jsFilter = $.filter('**/*.js', { restore: true });
   var cssFilter = $.filter('**/*.css', { restore: true });
-  var assets;
 
   return gulp.src(path.join(conf.paths.tmp, '/serve/*.html'))
     .pipe($.inject(partialsInjectFile, partialsInjectOptions))
-    .pipe(assets = $.useref.assets())
-    .pipe($.rev())
+    .pipe($.useref())
     .pipe(jsFilter)
     .pipe($.sourcemaps.init())
 <% if (props.jsPreprocessor.srcExtension !== 'es6' && props.jsPreprocessor.key !== 'typescript') { -%>
     .pipe($.ngAnnotate())
 <% } -%>
     .pipe($.uglify({ preserveComments: $.uglifySaveLicense })).on('error', conf.errorHandler('Uglify'))
+    .pipe($.rev())
     .pipe($.sourcemaps.write('maps'))
     .pipe(jsFilter.restore)
     .pipe(cssFilter)
@@ -66,10 +65,9 @@ gulp.task('html', ['inject', 'partials'], function () {
     .pipe($.replace('../<%- computedPaths.appToBower %>/bower_components/material-design-iconfont/iconfont/', '../fonts/'))
 <% } -%>
     .pipe($.minifyCss({ processImport: false }))
+    .pipe($.rev())
     .pipe($.sourcemaps.write('maps'))
     .pipe(cssFilter.restore)
-    .pipe(assets.restore())
-    .pipe($.useref())
     .pipe($.revReplace())
     .pipe(htmlFilter)
     .pipe($.minifyHtml({