From c0de2a652bdbb1f3fb2baec360213305454ccc73 Mon Sep 17 00:00:00 2001 From: Matt Stratton Date: Fri, 31 Aug 2018 15:52:08 -0700 Subject: [PATCH 1/5] Update dev gulp tasks Signed-off-by: Matt Stratton --- gulp/tasks/development/build-dev.js | 9 ++------- gulp/tasks/development/local-imagemin.js | 9 +++------ 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/gulp/tasks/development/build-dev.js b/gulp/tasks/development/build-dev.js index a8d1e1a87..5fdfb5e86 100644 --- a/gulp/tasks/development/build-dev.js +++ b/gulp/tasks/development/build-dev.js @@ -1,8 +1,3 @@ -var gulp = require('gulp'), - runSequence = require('run-sequence'); +var gulp = require('gulp'); -gulp.task('dev', function (callback) { - runSequence('bower', 'sass', 'js-concat', 'watch', - callback - ) -}) +gulp.task('dev', gulp.series('bower', 'sass', 'js-concat', 'watch')); diff --git a/gulp/tasks/development/local-imagemin.js b/gulp/tasks/development/local-imagemin.js index 43cb03443..c1918031a 100644 --- a/gulp/tasks/development/local-imagemin.js +++ b/gulp/tasks/development/local-imagemin.js @@ -1,7 +1,6 @@ var gulp = require('gulp'), imagemin = require('gulp-imagemin'), cache = require('gulp-cache'); -runSequence = require('run-sequence'); @@ -18,8 +17,6 @@ gulp.task('optimize-local-theme-images', function() { }); -gulp.task('optimize-local-images', function(callback) { - runSequence('optimize-local-content-images', 'optimize-local-theme-images', - callback - ) -}) +gulp.task('optimize-local-images', gulp.parallel('optimize-local-content-images', 'optimize-local-theme-images')); + + From 4ea8e80a8c0f5ae3bfe06fcec255084197b14cbc Mon Sep 17 00:00:00 2001 From: Matt Stratton Date: Fri, 31 Aug 2018 16:10:23 -0700 Subject: [PATCH 2/5] Lock node version Signed-off-by: Matt Stratton --- .nvmrc | 1 + 1 file changed, 1 insertion(+) create mode 100644 .nvmrc diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 000000000..cf8b7743a --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +v9.4.0 \ No newline at end of file From 9575257d50f284b350266460c8ad7a68943281ac Mon Sep 17 00:00:00 2001 From: Matt Stratton Date: Fri, 31 Aug 2018 16:23:08 -0700 Subject: [PATCH 3/5] Remove extra node version from travis file Signed-off-by: Matt Stratton --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4770b8fd8..429d4795b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ sudo: false language: node_js -node_js: - - "6" + env: - CXX=g++-4.8 addons: From e22614bea44c5e769fcf67097c5980a0001be53c Mon Sep 17 00:00:00 2001 From: Matt Stratton Date: Fri, 31 Aug 2018 16:27:42 -0700 Subject: [PATCH 4/5] Fix process html gulp task Signed-off-by: Matt Stratton --- gulp/tasks/process-html.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gulp/tasks/process-html.js b/gulp/tasks/process-html.js index e47f083e2..12c36facc 100644 --- a/gulp/tasks/process-html.js +++ b/gulp/tasks/process-html.js @@ -3,11 +3,8 @@ var gulp = require('gulp'), imgRetina = require('gulp-img-retina'); // runSequence = require('run-sequence'); -gulp.task('process-html', function(callback) { - runSequence('min-html', 'retina-html', - callback - ) -}) + + gulp.task('copy-html', function(){ return gulp.src('public/**/*.html') @@ -35,3 +32,5 @@ gulp.task('retina-html', function() { }) .pipe(gulp.dest('dist')); }) + +gulp.task('process-html', gulp.series('min-html', 'retina-html')); From c4975ae253f80dcabdc862e937be37966478b7c3 Mon Sep 17 00:00:00 2001 From: Matt Stratton Date: Fri, 31 Aug 2018 16:33:03 -0700 Subject: [PATCH 5/5] Add gulp-cli Signed-off-by: Matt Stratton --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 429d4795b..b5866d521 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ addons: - g++-4.8 before_script: - npm install -g gulp +- npm i -g gulp-cli - npm install - cd exampleSite