diff --git a/Gulpfile.js b/Gulpfile.js index 25b14db3..d6be7c9d 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -45,23 +45,26 @@ var paths = { // CSS task gulp.task('css', function() { - // Convert scss first - gulp.src('app/assets/sass/**/*.scss') +// Cleanup old assets + del(['public/assets/css/styles-*.css'], function (err) {}); + +// Convert scss first +// Prefix, compress and concat the CSS assets +// Afterwards add the MD5 hash to the filename + + return gulp.src('app/assets/sass/**/*.scss') .pipe(sass()) .pipe(autoprefixer('last 10 version')) - .pipe(gulp.dest('app/assets/css/dist')); - - // Cleanup old assets - del(['public/assets/css/styles-*.css'], function (err) {}); + .pipe(gulp.dest('app/assets/css/dist')) + .on('end',function() { + gulp.src(paths.frontend.styles) + .pipe(concat('styles.css')) + .pipe(rev()) + .pipe(filename({ bundleName: 'frontend.styles' })) // This will create/update the assets.json file + .pipe(minifycss()) + .pipe(gulp.dest('public/assets/css')); + }); - // Prefix, compress and concat the CSS assets - // Afterwards add the MD5 hash to the filename - return gulp.src(paths.frontend.styles) - .pipe(concat('styles.css')) - .pipe(rev()) - .pipe(filename({ bundleName: 'frontend.styles' })) // This will create/update the assets.json file - .pipe(minifycss()) - .pipe(gulp.dest('public/assets/css')); }); // JavaScript task