From 41416d61c2b1c114883151020bcd1d9d606b027c Mon Sep 17 00:00:00 2001 From: Johan Nielsen Date: Mon, 16 Jul 2018 13:57:36 +0200 Subject: [PATCH] Browser-Sync loop minor fix to prevent Browser-Sync loop --- gulpfile.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 03bcaa4..8c86820 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -36,8 +36,8 @@ function scss( ) { exports.scss = scss; // Minify CSS -function minifycss( done ) { - gulp.src( paths.css + '/theme.css' ) +function minifycss( ) { + return gulp.src( paths.css + '/theme.css' ) .pipe( sourcemaps.init( { loadMaps: true } ) ) .pipe( cleanCSS( { compatibility: '*' } ) ) .pipe( rename( { suffix: '.min' } ) ) @@ -50,8 +50,6 @@ function minifycss( done ) { .pipe( rename( { suffix: '.min' } ) ) .pipe( sourcemaps.write( './' ) ) .pipe( gulp.dest( paths.css ) ); - - done(); }; exports.minifycss = minifycss; @@ -65,7 +63,9 @@ function scripts( done ) { paths.dev + '/js/skip-link-focus-fix.js', // Adding currently empty javascript file to add on for your own themesĀ“ customizations // Please add any customizations to this .js file only! - paths.dev + '/js/custom-javascript.js' + paths.dev + '/js/custom-javascript.js', + + paths.dev + '/js/search.js' ]; gulp.src( scripts ) @@ -76,8 +76,8 @@ function scripts( done ) { .pipe( concat( 'theme.min.js' ) ) .pipe( uglify() ) .pipe( gulp.dest( paths.js ) ); + revision(); - done(); } exports.scripts = scripts; @@ -148,11 +148,11 @@ gulp.task( 'clean-dist', function() { function revision( done ) { // by default, gulp would pick `assets/css` as the base, // so we need to set it explicitly: - gulp.src([paths.css + '/theme.min.css', paths.js + '/theme.min.js'], {base: './'}) + return gulp.src([paths.css + '/theme.min.css', paths.js + '/theme.min.js'], {base: './'}) .pipe(rev()) .pipe(gulp.dest('./')) // write rev'd assets to build dir .pipe(rev.manifest()) - .pipe(revDel({dest: './'})) + .pipe(revDel({dest: './', force: true})) .pipe(gulp.dest('./')); // write manifest to build dir done(); }; @@ -181,8 +181,8 @@ function reload( done ){ // BrowserSync main task gulp.task( 'watch-bs', function( done ) { browserSync.init( cfg.browserSyncWatchFiles, cfg.browserSyncOptions ); - gulp.watch( paths.sass + '/**/*.scss', gulp.series(scss, minifycss, revision, reload) ); - gulp.watch( [paths.dev + '/js/**/*.js', 'js/**/*.js', '!js/theme.js', '!js/theme.min.js'], gulp.series( scripts, revision, reload ) ); + gulp.watch( paths.sass + '/**/*.scss', gulp.series( scss, minifycss, revision, reload ) ); + gulp.watch( [paths.dev + '/js/**/*.js', 'js/**/*.js', '!js/theme.js', '!js/theme.min.js'], gulp.series( scripts, reload ) ); //Inside the watch task. gulp.watch( paths.imgsrc + '/**', gulp.series( imagemin, reload ) );