From b67b03069ba60d3d528bf2bbf75daa535e01d75f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Holger=20Ko=CC=88nemann?= Date: Wed, 7 Mar 2018 12:04:51 +0100 Subject: [PATCH] and again --- .travis.yml | 5 ----- gulpfile.js | 26 ++++++++++++-------------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59bd1ce..a385117 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,11 +12,6 @@ language: php php: - "7.0" - "5.6" - - "5.5" - - "5.4" - - "5.3" - # Current $required_php_version for WordPress: 5.2.4 - - "5.2" # Ditch sudo and use containers. # @link http://docs.travis-ci.com/user/migrating-from-legacy/#Why-migrate-to-container-based-infrastructure%3F diff --git a/gulpfile.js b/gulpfile.js index aacfe24..b3b2747 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -126,7 +126,7 @@ gulp.task( 'imagemin', function() { gulp.task( 'cssnano', function() { return gulp.src( paths.css + '/theme.css' ) .pipe( sourcemaps.init( { loadMaps: true } ) ) - .pipe( plumber ( { + .pipe( plumber( { errorHandler: function( err ) { console.log( err ); this.emit( 'end' ); @@ -144,7 +144,7 @@ gulp.task( 'minifycss', function() { .pipe( cleanCSS( { compatibility: '*' } ) ) .pipe( plumber( { errorHandler: function( err ) { - console.log( err) ; + console.log( err ) ; this.emit( 'end' ); } } ) ) @@ -154,12 +154,14 @@ gulp.task( 'minifycss', function() { }); gulp.task( 'cleancss', function() { - return gulp.src( paths.css + '/*.min.css', { read: false } ) // much faster - .pipe(ignore( 'theme.css') ) + return gulp.src( paths.css + '/*.min.css', { read: false } ) // Much faster + .pipe( ignore( 'theme.css' ) ) .pipe( rimraf() ); }); -gulp.task( 'styles', function( callback ){ gulpSequence( 'sass', 'minifycss' )( callback ); }); +gulp.task( 'styles', function( callback ) { + gulpSequence( 'sass', 'minifycss' )( callback ); +} ); // Run: @@ -169,12 +171,10 @@ gulp.task( 'browser-sync', function() { browserSync.init( cfg.browserSyncWatchFiles, cfg.browserSyncOptions ); } ); - // Run: // gulp watch-bs // Starts watcher with browser-sync. Browser-sync reloads page automatically on your browser -gulp.task( 'watch-bs', ['browser-sync', 'watch', 'scripts'], function () { } ); - +gulp.task( 'watch-bs', ['browser-sync', 'watch', 'scripts'], function() { } ); // Run: // gulp scripts. @@ -192,7 +192,7 @@ gulp.task( 'scripts', function() { gulp.src( scripts ) .pipe( concat( 'theme.min.js' ) ) .pipe( uglify() ) - .pipe( gulp.dest(paths.js) ); + .pipe( gulp.dest( paths.js) ); gulp.src( scripts ) .pipe( concat( 'theme.js' ) ) @@ -213,10 +213,9 @@ gulp.task( 'copy-assets', function() { ////////////////// All Bootstrap 4 Assets ///////////////////////// // Copy all JS files - - var stream = gulp.src( paths.node + 'bootstrap/dist/js/**/*.js' ) .pipe( gulp.dest( paths.dev + '/js/bootstrap4' ) ); + // Copy all Bootstrap SCSS files gulp.src( paths.node + 'bootstrap/scss/**/*.scss' ) .pipe( gulp.dest( paths.dev + '/sass/bootstrap4' ) ); @@ -225,7 +224,7 @@ gulp.task( 'copy-assets', function() { // Copy all Font Awesome Fonts gulp.src( paths.node + 'font-awesome/fonts/**/*.{ttf,woff,woff2,eot,svg}' ) - .pipe( gulp.dest( './fonts') ); + .pipe( gulp.dest( './fonts' ) ); // Copy all Font Awesome SCSS files gulp.src( paths.node + 'font-awesome/scss/*.scss' ) @@ -244,7 +243,6 @@ gulp.task( 'copy-assets', function() { .pipe( gulp.dest( paths.js + paths.vendor ) ); // Copy Popper JS files - gulp.src( paths.node + 'popper.js/dist/umd/popper.min.js' ) .pipe( gulp.dest( paths.js + paths.vendor ) ); gulp.src( paths.node + 'popper.js/dist/umd/popper.js' ) @@ -253,7 +251,7 @@ gulp.task( 'copy-assets', function() { }); // Deleting the files distributed by the copy-assets task -gulp.task( 'clean-vendor-assets', function () { +gulp.task( 'clean-vendor-assets', function() { return del( [paths.dev+'/js/bootstrap4/**', paths.dev+'/sass/bootstrap4/**', './fonts/*wesome*.{ttf,woff,woff2,eot,svg}', paths.dev+'/sass/fontawesome/**', paths.dev+'/sass/underscores/**', paths.dev+'/js/skip-link-focus-fix.js', paths.js+'/**/skip-link-focus-fix.js', paths.js+'/**/popper.min.js', paths.js+'/**/popper.js', ( paths.vendor!==''?( paths.js+paths.vendor+'/**' ):'' )]); });