From: Nicolas Coden <nicolas@ncoden.fr>
Date: Fri, 6 Jul 2018 20:31:56 +0000 (+0200)
Subject: Use pull request #11346 from ncoden/fix/gulp-deploy-task-multiple-completion-callback... 
X-Git-Tag: v6.5.0-rc.2^2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f89438009b79f086b6d79dc882d42a2d80efb42;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Use pull request #11346 from ncoden/fix/gulp-deploy-task-multiple-completion-callback for v6.5.0

6cb873365 fix: fix completion callback called too many time in deploy task
9a9f0c197 style: remove unused "done" in "dist:deploy" gulp task
dcd3ab813 fix: remove run-sequence from gulp `deploy:dist` task to detect its end

Signed-off-by: Nicolas Coden <nicolas@ncoden.fr>
---

diff --git a/gulp/tasks/deploy.js b/gulp/tasks/deploy.js
index b0e0d1875..5e60b4838 100644
--- a/gulp/tasks/deploy.js
+++ b/gulp/tasks/deploy.js
@@ -25,6 +25,9 @@ gulp.task('deploy:prep', function(cb) {
   sequence('deploy:prompt', 'deploy:version', 'deploy:dist', 'deploy:plugins', 'deploy:settings', cb);
 });
 
+gulp.task('deploy:dist', function (cb) {
+  sequence('sass:foundation', 'javascript:foundation', 'deploy:dist:files', cb);
+});
 
 gulp.task('deploy:prompt', function(cb) {
   inquirer.prompt([{
@@ -41,64 +44,60 @@ gulp.task('deploy:prompt', function(cb) {
 // Bumps the version number in any file that has one
 gulp.task('deploy:version', function() {
   return gulp.src(CONFIG.VERSIONED_FILES, { base: process.cwd() })
-    .pipe(replace(CURRENT_VERSION, NEXT_VERSION))
-    .pipe(gulp.dest('.'));
+  .pipe(replace(CURRENT_VERSION, NEXT_VERSION))
+  .pipe(gulp.dest('.'));
 });
 
 // Generates compiled CSS and JS files and sourcemaps and puts them in the dist/ folder
-gulp.task('deploy:dist', function(done) {
-  sequence('sass:foundation', 'javascript:foundation', function() {
-    var cssFilter = filter(['**/*.css'], { restore: true });
-    var jsFilter  = filter(['**/*.js'], { restore: true });
-    var cssSourcemapFilter = filter(['**/*.css.map'], { restore: true });
-    var jsSourcemapFilter = filter(['**/*.js.map'], { restore: true });
-    var tsFilter  = filter(['**/*.ts'], { restore: true });
-
-    return gulp.src(CONFIG.DIST_FILES)
-      .pipe(plumber())
-
-      // --- Source maps ---
-      // * Copy sourcemaps to the dist folder
-      // This is done first to avoid collision with minified-sourcemaps.
-      .pipe(cssSourcemapFilter)
-        .pipe(gulp.dest('./dist/css'))
-        .pipe(cssSourcemapFilter.restore)
-      .pipe(jsSourcemapFilter)
-        .pipe(gulp.dest('./dist/js'))
-        .pipe(jsSourcemapFilter.restore)
-
-      // --- Source files ---
-      // * Copy source files to dist folder
-      // * Create minified files
-      // * Create minified-sourcemaps based on standard sourcemaps.
-      //   Sourcemaps are initialized before the ".min" renaming to be able retrieve
-      //   original sourcemaps from source names.
-      .pipe(cssFilter)
-        .pipe(gulp.dest('./dist/css'))
-        .pipe(sourcemaps.init({ loadMaps: true }))
-        .pipe(rename({ suffix: '.min' }))
-        .pipe(cleancss({ compatibility: 'ie9' }))
-        .pipe(sourcemaps.write('.'))
-        .pipe(gulp.dest('./dist/css'))
-        .pipe(cssFilter.restore)
-
-      .pipe(jsFilter)
-        .pipe(gulp.dest('./dist/js'))
-        .pipe(sourcemaps.init({ loadMaps: true }))
-        .pipe(rename({ suffix: '.min' }))
-        .pipe(uglify())
-        .pipe(sourcemaps.write('.'))
-        .pipe(gulp.dest('./dist/js'))
-        .pipe(jsFilter.restore)
-
-      // --- TypeScript files ---
-      // * Copy typescript files to the dist folder
-      .pipe(tsFilter)
-        .pipe(gulp.dest('./dist/js'))
-        .pipe(tsFilter.restore)
-
-      .on('finish', done);
-  });
+gulp.task('deploy:dist:files', function() {
+  var cssFilter = filter(['**/*.css'], { restore: true });
+  var jsFilter  = filter(['**/*.js'], { restore: true });
+  var cssSourcemapFilter = filter(['**/*.css.map'], { restore: true });
+  var jsSourcemapFilter = filter(['**/*.js.map'], { restore: true });
+  var tsFilter  = filter(['**/*.ts'], { restore: true });
+
+  return gulp.src(CONFIG.DIST_FILES)
+    .pipe(plumber())
+
+    // --- Source maps ---
+    // * Copy sourcemaps to the dist folder
+    // This is done first to avoid collision with minified-sourcemaps.
+    .pipe(cssSourcemapFilter)
+      .pipe(gulp.dest('./dist/css'))
+      .pipe(cssSourcemapFilter.restore)
+    .pipe(jsSourcemapFilter)
+      .pipe(gulp.dest('./dist/js'))
+      .pipe(jsSourcemapFilter.restore)
+
+    // --- Source files ---
+    // * Copy source files to dist folder
+    // * Create minified files
+    // * Create minified-sourcemaps based on standard sourcemaps.
+    //   Sourcemaps are initialized before the ".min" renaming to be able retrieve
+    //   original sourcemaps from source names.
+    .pipe(cssFilter)
+      .pipe(gulp.dest('./dist/css'))
+      .pipe(sourcemaps.init({ loadMaps: true }))
+      .pipe(rename({ suffix: '.min' }))
+      .pipe(cleancss({ compatibility: 'ie9' }))
+      .pipe(sourcemaps.write('.'))
+      .pipe(gulp.dest('./dist/css'))
+      .pipe(cssFilter.restore)
+
+    .pipe(jsFilter)
+      .pipe(gulp.dest('./dist/js'))
+      .pipe(sourcemaps.init({ loadMaps: true }))
+      .pipe(rename({ suffix: '.min' }))
+      .pipe(uglify())
+      .pipe(sourcemaps.write('.'))
+      .pipe(gulp.dest('./dist/js'))
+      .pipe(jsFilter.restore)
+
+    // --- TypeScript files ---
+    // * Copy typescript files to the dist folder
+    .pipe(tsFilter)
+      .pipe(gulp.dest('./dist/js'))
+      .pipe(tsFilter.restore);
 });
 
 // Copies standalone JavaScript plugins to dist/ folder