Skip to content
This repository has been archived by the owner on Jul 21, 2019. It is now read-only.

Commit

Permalink
Merge pull request #648 from devopsdays/update-packages
Browse files Browse the repository at this point in the history
Update dev gulp tasks
  • Loading branch information
mattstratton committed Aug 31, 2018
2 parents 7053db6 + c4975ae commit 35d8644
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 20 deletions.
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v9.4.0
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
sudo: false
language: node_js
node_js:
- "6"

env:
- CXX=g++-4.8
addons:
Expand All @@ -12,6 +11,7 @@ addons:
- g++-4.8
before_script:
- npm install -g gulp
- npm i -g gulp-cli
- npm install
- cd exampleSite

Expand Down
9 changes: 2 additions & 7 deletions gulp/tasks/development/build-dev.js
Original file line number Diff line number Diff line change
@@ -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'));
9 changes: 3 additions & 6 deletions gulp/tasks/development/local-imagemin.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
var gulp = require('gulp'),
imagemin = require('gulp-imagemin'),
cache = require('gulp-cache');
runSequence = require('run-sequence');



Expand All @@ -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'));


9 changes: 4 additions & 5 deletions gulp/tasks/process-html.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -35,3 +32,5 @@ gulp.task('retina-html', function() {
})
.pipe(gulp.dest('dist'));
})

gulp.task('process-html', gulp.series('min-html', 'retina-html'));

0 comments on commit 35d8644

Please sign in to comment.