From 19dc22483c6b430c9a6dde6da4c5d7ea85e7840d Mon Sep 17 00:00:00 2001
From: Dmitry Menov <18627661+mdmen@users.noreply.github.com>
Date: Fri, 30 Mar 2018 23:56:24 +0300
Subject: [PATCH] :hammer: change final task

---
 gulpfile.js | 152 ++++++++++++++++++++++++++++++----------------------
 1 file changed, 89 insertions(+), 63 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index ad1d84d..e491690 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,95 +1,121 @@
-
-const gulp = require('gulp');
-const watch = require('gulp-watch');
-const uglify = require('gulp-uglify');
-const imagemin = require('gulp-imagemin');
-const plumber = require('gulp-plumber');
-const rename = require('gulp-rename');
-const autoprefixer = require('gulp-autoprefixer');
-const csso = require('gulp-csso');
-const babel = require('gulp-babel');
-const zip = require('gulp-zip');
+const gulp = require("gulp");
+const watch = require("gulp-watch");
+const uglify = require("gulp-uglify");
+const imagemin = require("gulp-imagemin");
+const plumber = require("gulp-plumber");
+const rename = require("gulp-rename");
+const autoprefixer = require("gulp-autoprefixer");
+const csso = require("gulp-csso");
+const babel = require("gulp-babel");
+const zip = require("gulp-zip");
 
 const path = {
   dist: {
-    js: 'dist/js/',
-    css: 'dist/css/',
-    img: 'dist/img/',
+    js: "dist/js/",
+    css: "dist/css/",
+    img: "dist/img/",
+    final: "final"
   },
   src: {
-    js: 'src/js/*.js',
-    css: 'src/css/*.css',
-    img: 'src/img/**/*.*'
+    js: "src/js/*.js",
+    css: "src/css/*.css",
+    img: "src/img/**/*.*"
   },
   watch: {
-    js: 'src/js/**/*.*',
-    css: 'src/css/**/*.*',
-    img: 'src/img/**/*.*'
-  },
-  final: 'final'
+    js: "src/js/**/*.*",
+    css: "src/css/**/*.*",
+    img: "src/img/**/*.*"
+  }
 };
 
 gulp
-  .task('js:build', () => {
-    return gulp.src(path.src.js)
+  .task("js:build", () => {
+    return gulp
+      .src(path.src.js)
       .pipe(plumber())
-      .pipe(babel({
-        presets: ['env']
-      }))
+      .pipe(
+        babel({
+          presets: ["env"]
+        })
+      )
       .pipe(uglify())
-      .pipe(rename({
-        suffix: '.min'
-      }))
+      .pipe(
+        rename({
+          suffix: ".min"
+        })
+      )
       .pipe(plumber.stop())
       .pipe(gulp.dest(path.dist.js));
   })
-  .task('css:build', () => {
-    return gulp.src(path.src.css)
+
+  .task("css:build", () => {
+    return gulp
+      .src(path.src.css)
       .pipe(plumber())
-      .pipe(autoprefixer({
-        browsers: ['last 3 versions'],
-        cascade: false
-      }))
+      .pipe(
+        autoprefixer({
+          browsers: ["last 3 versions"],
+          cascade: false
+        })
+      )
       .pipe(csso())
-      .pipe(rename({
-        suffix: '.min'
-      }))
+      .pipe(
+        rename({
+          suffix: ".min"
+        })
+      )
       .pipe(plumber.stop())
       .pipe(gulp.dest(path.dist.css));
   })
-  .task('img:build', () => {
-    return gulp.src(path.src.img)
+
+  .task("img:build", () => {
+    return gulp
+      .src(path.src.img)
       .pipe(plumber())
-      .pipe(imagemin({
-        progressive: true
-      }))
+      .pipe(
+        imagemin({
+          progressive: true
+        })
+      )
       .pipe(plumber.stop())
       .pipe(gulp.dest(path.dist.img));
   })
-  .task('build', [
-    'js:build',
-    'css:build',
-    'img:build',
-  ])
-  .task('watch', () => {
+
+  .task("build", ["js:build", "css:build", "img:build"])
+
+  .task("watch", () => {
     watch([path.watch.img], () => {
-      gulp.start('img:build');
+      gulp.start("img:build");
     });
     watch([path.watch.css], () => {
-      gulp.start('css:build');
+      gulp.start("css:build");
     });
     watch([path.watch.js], () => {
-      gulp.start('js:build');
+      gulp.start("js:build");
     });
   })
-  .task('final', () => {
-    gulp.src(['./popup.html', './manifest.json'])
-      .pipe(gulp.dest(path.final));
-
-    gulp.src(['./dist/**/*.*', '!**/screenshot.png'])
-      .pipe(gulp.dest(path.final + '/dist'));
-
-    gulp.src('./final/**/*.*')
-      .pipe(zip('final.zip'))
-      .pipe(gulp.dest('./'));
+  // group needed files in one folder
+  // and then create zip
+  .task("final", () => {
+    return Promise.all([
+      new Promise(function(resolve, reject) {
+        gulp
+          .src(["./popup.html", "./manifest.json"])
+          .pipe(gulp.dest(path.dist.final))
+          .on("error", reject)
+          .on("end", resolve);
+      }),
+      new Promise(function(resolve, reject) {
+        gulp
+          .src(["./dist/**/*.*", "!**/screenshot.png"])
+          .pipe(gulp.dest(path.dist.final + "/dist"))
+          .on("error", reject)
+          .on("end", resolve);
+      })
+    ]).then(() => {
+      gulp
+        .src("./final/**/*.*")
+        .pipe(zip("final.zip"))
+        .pipe(gulp.dest("./"));
+    });
   });