From 03bb68e2f3c1f9fc461946a197575cb9f7a0cd8f Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.uk>
Date: Fri, 2 Dec 2016 19:57:15 +0000
Subject: [PATCH] Tidy gulpfile

---
 gulpfile.js  | 31 +++++++++----------------------
 package.json |  2 --
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index c32ea92d..6f165ad4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -50,10 +50,6 @@ app.copy = function(source, destination) {
         .pipe(gulp.dest(destination));
 };
 
-gulp.task('default', function() {
-    return plugins.taskListing.withFilters(null, 'default')();
-});
-
 gulp.task('clean', function() {
     del.sync(config.fontsDir);
     del.sync(config.js.outputDir);
@@ -69,24 +65,14 @@ gulp.task('fonts', function() {
     ], config.fontsDir);
 });
 
-gulp.task('sass', ['sass:compile', 'sass:watch']);
-
-gulp.task('sass:compile', function() {
+gulp.task('styles', function() {
     return app.sass([
         config.bowerDir + '/font-awesome/css/font-awesome.css',
         config.sass.sourceDir + config.sass.pattern
     ], 'site.css');
 });
 
-gulp.task('sass:watch', ['sass:compile'], 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() {
+gulp.task('scripts', function() {
     return app.js([
         config.bowerDir + '/jquery2/jquery.js',
         config.bowerDir + '/bootstrap-sass/assets/javascripts/bootstrap.js',
@@ -94,12 +80,13 @@ gulp.task('js:compile', function() {
     ], '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();
 
-    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'])
diff --git a/package.json b/package.json
index 309d71b6..bbff124e 100644
--- a/package.json
+++ b/package.json
@@ -12,13 +12,11 @@
     "gulp-if": "^2.0.0",
     "gulp-imagemin": "^2.4.0",
     "gulp-load-plugins": "^1.1.0",
-    "gulp-notify": "^2.2.0",
     "gulp-plumber": "^1.0.1",
     "gulp-refresh": "^1.1.0",
     "gulp-sass": "^2.3.2",
     "gulp-sass-glob": "^1.0.5",
     "gulp-sourcemaps": "^1.6.0",
-    "gulp-task-listing": "^1.0.1",
     "gulp-uglify": "^1.5.3",
     "gulp-util": "^3.0.7"
   }