Skip to content

Commit

Permalink
Default task renamed to "build", assets task added, html minifiy proc…
Browse files Browse the repository at this point in the history
…ess updated.
  • Loading branch information
alenvuletic committed May 21, 2018
1 parent 83a5f40 commit bf615ea
Show file tree
Hide file tree
Showing 7 changed files with 266 additions and 14 deletions.
16 changes: 16 additions & 0 deletions gulp/config.js
Expand Up @@ -8,6 +8,13 @@ module.exports = {
clean: {
src: [ 'dist/**/*.html' ],
dest: [ 'dist' ],
options: {
collapseWhitespace: true,
keepClosingSlash: true,
minifyCSS: true,
removeComments: true,
processConditionalComments: true,
},
},
},
sass: {
Expand All @@ -29,6 +36,15 @@ module.exports = {
'src/templates/**/*.html',
],
},
assets: {
clean: {
src: [ 'dist/assets/**/*' ],
},
copy: {
src: [ 'src/assets/**/*' ],
dest: [ 'dist/assets' ],
},
},
release: {
versionedFiles: [
'README.md',
Expand Down
20 changes: 20 additions & 0 deletions gulp/tasks/assets.js
@@ -0,0 +1,20 @@
var gulp = require( 'gulp' );
var del = require( 'del' );

// Require main configuration file
var config = require( '../config.js' );

// Export functions
exports.clean = clean;
exports.copy = copy;

// Remove old distribution files
function clean() {
return del( config.paths.assets.clean.src );
}

// Copy assets to `dist` directory
function copy() {
return gulp.src( config.paths.assets.copy.src )
.pipe( gulp.dest( config.paths.assets.copy.dest ) );
}
9 changes: 3 additions & 6 deletions gulp/tasks/html.js
@@ -1,6 +1,6 @@
var gulp = require( 'gulp' );
var juice = require( '@akzhan/gulp-juice' );
var stripComments = require( 'gulp-strip-comments' );
var htmlmin = require( 'gulp-htmlmin' );
var connect = require( 'gulp-connect' );

// Require main configuration file
Expand Down Expand Up @@ -28,13 +28,10 @@ function inline() {
.pipe( gulp.dest( config.paths.html.inline.dest ) );
}

// Clean HTML (Removing unwanted comments)
// Clean HTML
function clean() {
return gulp.src( config.paths.html.clean.src )
.pipe( stripComments( {
safe: true,
trim: true,
} ) )
.pipe( htmlmin( config.paths.html.clean.options ) )
.pipe( gulp.dest( config.paths.html.clean.dest ) )
.pipe( connect.reload() );
}
26 changes: 22 additions & 4 deletions gulpfile.js
Expand Up @@ -8,18 +8,21 @@ var dev = require( './gulp/tasks/dev.js' );
var html = require( './gulp/tasks/html.js' );
var release = require( './gulp/tasks/release.js' );
var sass = require( './gulp/tasks/sass.js' );
var assets = require( './gulp/tasks/assets.js' );

// Default task (build)
// Build task
gulp.task(
'default',
'build',
gulp.series( [
sass.lint,
sass.build,
html.inline,
gulp.parallel( [
assets.clean,
sass.clean,
html.clean,
] ),
assets.copy,
] )
);

Expand All @@ -30,7 +33,13 @@ gulp.task(
gulp.watch(
config.paths.watch.src,
gulp.series( [
'default',
sass.lint,
sass.build,
html.inline,
gulp.parallel( [
sass.clean,
html.clean,
] ),
] )
);
}
Expand All @@ -40,14 +49,23 @@ gulp.task(
gulp.task(
'dev',
gulp.series( [
'default',
'build',
gulp.parallel( [
dev.server,
'watch',
] ),
] )
);

// Copy all the assets to `dist` directory
gulp.task(
'assets',
gulp.series( [
assets.clean,
assets.copy,
] )
);

// Prepare everything for new version release
gulp.task(
'release',
Expand Down

0 comments on commit bf615ea

Please sign in to comment.