From c95d6fbf4dd5a52ef33c94454bd1657ec835f601 Mon Sep 17 00:00:00 2001 From: Johan Nielsen Date: Mon, 5 Mar 2018 22:43:47 +0100 Subject: [PATCH 1/3] Fix copy-assets Not all assets are copied when `gulp copy-assets` is run --- gulpfile.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 71f6e0a..f4f5c5a 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -225,12 +225,11 @@ gulp.task('copy-assets', function() { // Copy all Bootstrap SCSS files gulp.src(paths.node + 'bootstrap/scss/**/*.scss') .pipe(gulp.dest(paths.dev + '/sass/bootstrap4')); - return stream; ////////////////// End Bootstrap 4 Assets ///////////////////////// // Copy all Font Awesome Fonts - var stream = gulp.src(paths.node + 'font-awesome/fonts/**/*.{ttf,woff,woff2,eof,svg}') + gulp.src(paths.node + 'font-awesome/fonts/**/*.{ttf,woff,woff2,eof,svg}') .pipe(gulp.dest('./fonts')); // Copy all Font Awesome SCSS files From 5e6faf9af10bba8e45da5b1b60817f66de26be28 Mon Sep 17 00:00:00 2001 From: Johan Nielsen Date: Wed, 7 Mar 2018 10:00:32 +0100 Subject: [PATCH 2/3] change eof to eot --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index f4f5c5a..13f5fa7 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -259,7 +259,7 @@ gulp.task('copy-assets', function() { // Deleting the files distributed by the copy-assets task gulp.task('clean-vendor-assets', function () { - return del([paths.dev+'/js/bootstrap4/**', paths.dev+'/sass/bootstrap4/**', './fonts/*wesome*.{ttf,woff,woff2,eof,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+'/**'):'')]); + 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+'/**'):'')]); }); // Run From 15a9de369157b0a34439318c0f33a3cc4a6589e4 Mon Sep 17 00:00:00 2001 From: Johan Nielsen Date: Wed, 7 Mar 2018 10:01:24 +0100 Subject: [PATCH 3/3] Update gulpfile.js --- gulpfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulpfile.js b/gulpfile.js index 13f5fa7..d7a4469 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -229,7 +229,7 @@ gulp.task('copy-assets', function() { ////////////////// End Bootstrap 4 Assets ///////////////////////// // Copy all Font Awesome Fonts - gulp.src(paths.node + 'font-awesome/fonts/**/*.{ttf,woff,woff2,eof,svg}') + gulp.src(paths.node + 'font-awesome/fonts/**/*.{ttf,woff,woff2,eot,svg}') .pipe(gulp.dest('./fonts')); // Copy all Font Awesome SCSS files