opdavies/oliverdavies.uk
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Tidy gulpfile

Browse source
This commit is contained in:
Oliver Davies 2016-12-02 19:57:15 +00:00
parent baf2138920
commit 03bb68e2f3
2 changed files with 9 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
gulpfile.js
View file

@ -50,10 +50,6 @@ app.copy = function(source, destination) {
.pipe(gulp.dest(destination)); .pipe(gulp.dest(destination));
}; };
gulp.task('default', function() {
return plugins.taskListing.withFilters(null, 'default')();
});
gulp.task('clean', function() { gulp.task('clean', function() {
del.sync(config.fontsDir); del.sync(config.fontsDir);
del.sync(config.js.outputDir); del.sync(config.js.outputDir);
@ -69,24 +65,14 @@ gulp.task('fonts', function() {
], config.fontsDir); ], config.fontsDir);
}); });
gulp.task('sass', ['sass:compile', 'sass:watch']); gulp.task('styles', function() {
gulp.task('sass:compile', function() {
return app.sass([ return app.sass([
config.bowerDir + '/font-awesome/css/font-awesome.css', config.bowerDir + '/font-awesome/css/font-awesome.css',
config.sass.sourceDir + config.sass.pattern config.sass.sourceDir + config.sass.pattern
], 'site.css'); ], 'site.css');
}); });
gulp.task('sass:watch', ['sass:compile'], function() { gulp.task('scripts', function() {
plugins.refresh.listen();
gulp.watch(config.sass.sourceDir + config.sass.pattern, ['sass:compile']);
});
gulp.task('js', ['js:compile', 'js:watch']);
gulp.task('js:compile', function() {
return app.js([ return app.js([
config.bowerDir + '/jquery2/jquery.js', config.bowerDir + '/jquery2/jquery.js',
config.bowerDir + '/bootstrap-sass/assets/javascripts/bootstrap.js', config.bowerDir + '/bootstrap-sass/assets/javascripts/bootstrap.js',
@ -94,12 +80,13 @@ gulp.task('js:compile', function() {
], 'site.js'); ], 'site.js');
}); });
gulp.task('js:watch', ['js:compile'], function() { gulp.task('build', ['clean', 'fonts', 'styles', 'scripts']);
gulp.task('default', ['build']);
gulp.task('watch', ['build'], function() {
plugins.refresh.listen(); plugins.refresh.listen();
gulp.watch(config.js.sourceDir + config.js.pattern, ['js']); gulp.watch(config.sass.sourceDir + config.sass.pattern, ['sass:compile']);
gulp.watch(config.js.sourceDir + config.js.pattern, ['scripts']);
}); });
gulp.task('build', ['clean', 'fonts', 'sass:compile', 'js:compile']);
gulp.task('watch', ['sass:watch', 'js:watch'])

2
package.json
View file

@ -12,13 +12,11 @@
"gulp-if": "^2.0.0", "gulp-if": "^2.0.0",
"gulp-imagemin": "^2.4.0", "gulp-imagemin": "^2.4.0",
"gulp-load-plugins": "^1.1.0", "gulp-load-plugins": "^1.1.0",
"gulp-notify": "^2.2.0",
"gulp-plumber": "^1.0.1", "gulp-plumber": "^1.0.1",
"gulp-refresh": "^1.1.0", "gulp-refresh": "^1.1.0",
"gulp-sass": "^2.3.2", "gulp-sass": "^2.3.2",
"gulp-sass-glob": "^1.0.5", "gulp-sass-glob": "^1.0.5",
"gulp-sourcemaps": "^1.6.0", "gulp-sourcemaps": "^1.6.0",
"gulp-task-listing": "^1.0.1",
"gulp-uglify": "^1.5.3", "gulp-uglify": "^1.5.3",
"gulp-util": "^3.0.7" "gulp-util": "^3.0.7"
} }