Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the Gulp version to 4.0.0 and adapt code to them #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ var postcssProcessors = [
autoprefixer( { browsers: ['last 2 versions', 'ie > 10'] } )
]

gulp.task('sassInline', function(callback) {
gulp.task('sassInline', function() {
return gulp.src('src/sass/inline.scss')
.pipe(
postcss(postcssProcessors, {syntax: scss})
Expand All @@ -35,7 +35,7 @@ gulp.task('sassInline', function(callback) {
.pipe(gulp.dest('build/css/'));
});

gulp.task('sassEmbedded', function(callback) {
gulp.task('sassEmbedded', function() {
return gulp.src('src/sass/embedded.scss')
.pipe(
postcss(postcssProcessors, {syntax: scss})
Expand All @@ -47,11 +47,9 @@ gulp.task('sassEmbedded', function(callback) {
.pipe(gulp.dest('build/css/'));
});



var inlineCss = require('gulp-inline-css');

gulp.task('inlinecss', ['sassInline', 'nunjucks'], function() {
gulp.task('inlinecss', function() {
return gulp.src('build/*.html')
.pipe(
inlineCss({
Expand All @@ -65,17 +63,14 @@ gulp.task('inlinecss', ['sassInline', 'nunjucks'], function() {
});





/* *************
TEMPLATING
************* */

var nunjucksRender = require('gulp-nunjucks-render');
var data = require('gulp-data');

gulp.task('nunjucks', ['sassEmbedded'], function() {
gulp.task('nunjucks', function() {
return gulp.src('src/emails/*.nunjucks')
.pipe(
data(function() {
Expand Down Expand Up @@ -107,20 +102,30 @@ gulp.task('zip', function () {


/* *************
SERVER
SERVER
************* */

var connect = require('gulp-connect');

gulp.task('connect', function() {
gulp.task('connect', function(done) {
connect.server({
port: 8000,
root: 'build', // Serve from build directory instead,
livereload:true
});
done();
});


/* *************
BUILD
************* */

gulp.task('build', gulp.series(
gulp.parallel('sassInline', 'sassEmbedded'), 'nunjucks', 'inlinecss'
)
);


/* *************
WATCH
Expand All @@ -134,14 +139,12 @@ var filesToWatch = [
]

gulp.task('watch', function() {
gulp.watch(filesToWatch,['nunjucks', 'inlinecss']);
return gulp.watch(filesToWatch, gulp.series('build'));
});


/* *************
DEFAULT
************* */

gulp.task('default', ['connect', 'nunjucks', 'inlinecss', 'watch']);


gulp.task('default', gulp.parallel('connect', 'build', 'watch'));
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"main": "gulpfile.js",
"devDependencies": {
"autoprefixer": "^6.3.6",
"gulp": "^3.9.1",
"gulp-connect": "^3.2.2",
"gulp": "^4.0.0",
"gulp-connect": "^5.6.1",
"gulp-data": "^1.2.1",
"gulp-inline-css": "^3.1.0",
"gulp-nunjucks-render": "^2.0.0",
"gulp-postcss": "^6.1.0",
"gulp-sass": "^2.2.0",
"gulp-sass": "^4.0.2",
"gulp-util": "^3.0.7",
"gulp-zip": "^3.2.0",
"postcss-scss": "^0.1.7"
Expand Down