From 6b12883d6c16a3a22bb20a9a6539637e407fcd5d Mon Sep 17 00:00:00 2001
From: Nicolas Coden <nicolas@ncoden.fr>
Date: Wed, 15 Aug 2018 22:42:05 +0200
Subject: [PATCH] refactor: move the customizer ZIPing to `customizer:zip` and
 `customizer:clean`

The `finish` gulp event is an stream internal event and is not suitable to chain tasks.

Changes:
- Move the custom ZIP file generation to the `customizer:zip` task
- Move the cleaning of the customizer build directory to `customizer:clean` task
---
 gulp/tasks/customizer.js | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/gulp/tasks/customizer.js b/gulp/tasks/customizer.js
index 070e5abc7..cf327db2f 100644
--- a/gulp/tasks/customizer.js
+++ b/gulp/tasks/customizer.js
@@ -131,13 +131,8 @@ gulp.task('customizer:html', gulp.series('customizer:loadConfig', function() {
     .pipe(gulp.dest(OUTPUT_DIR));
 }));
 
-// Creates a custom build by:
-//   - Generating a CSS file
-//   - Generating a JS file
-//   - Copying the index.html file
-//   - Creating a blank app.css file
-//   - Creating an app.js file with Foundation initialization code
-gulp.task('customizer', gulp.series('customizer:sass', 'customizer:javascript', 'customizer:html', function(done) {
+// Add main CSS and JS files to the build directory and create a ZIP file from it.
+gulp.task('customizer:zip', function (done) {
   var outputFolder = path.dirname(OUTPUT_DIR);
   var outputFileName = path.basename(OUTPUT_DIR);
 
@@ -145,13 +140,23 @@ gulp.task('customizer', gulp.series('customizer:sass', 'customizer:javascript',
   touch(path.join(OUTPUT_DIR, 'js/app.js'));
   fs.writeFileSync(path.join(OUTPUT_DIR, 'js/app.js'), '$(document).foundation()\n');
 
-  gulp.src(path.join(OUTPUT_DIR, '/**/*'))
+  return gulp.src(path.join(OUTPUT_DIR, '/**/*'))
     .pipe(zip(path.basename(outputFileName) + '.zip'))
-    .pipe(gulp.dest(outputFolder))
-    .on('finish', function() {
-      rimraf(OUTPUT_DIR, done);
-    });
-}));
+    .pipe(gulp.dest(outputFolder));
+});
+
+// Clean the build directory
+gulp.task('customizer:clean', function(done) {
+  rimraf(OUTPUT_DIR, done);
+});
+
+// Creates a custom build by:
+//   - Generating a CSS file
+//   - Generating a JS file
+//   - Copying the index.html file
+//   - Creating a blank app.css file
+//   - Creating an app.js file with Foundation initialization code
+gulp.task('customizer', gulp.series('customizer:sass', 'customizer:javascript', 'customizer:html', 'customizer:zip', 'customizer:clean'));
 
 function createStream(name, content) {
   // Create a stream with our entry file
-- 
2.47.2