Fix js & img tasks from logging being finished before actually being …

…finished (#38)

lib/gulp/image.js

@@ -4,6 +4,7 @@ const newer = require('gulp-newer');
 const gulpSvgSprite = require('gulp-svg-sprite');
 const gulp = require('gulp');
 const plumber = require('gulp-plumber');
+const merge = require('merge-stream');
 const config = require('./config.js');
 
 // CSS task
@@ -16,7 +17,7 @@ function img() {
     return svgSprite({src: config.src_base_path + svg.src, dest: config.dest_base_path + svg.dest, name: svg.name});
   });
 
-  return Promise.all(imgTasks.concat(spriteTasks));
+  return merge(imgTasks.concat(spriteTasks));
 }
 
 // Optimize Images

lib/gulp/js.js

@@ -4,6 +4,7 @@ const presetEnv = require('@babel/preset-env');
 const concat = require('gulp-concat');
 const gulp = require('gulp');
 const plumber = require('gulp-plumber');
+const merge = require('merge-stream');
 const config = require('./config.js');
 
 function js() {
@@ -15,7 +16,7 @@ function js() {
     return jsConcat({src: config.src_base_path + js.src, dest: config.dest_base_path + js.dest, name: js.name});
   });
 
-  return Promise.all(jsTasks.concat(jsConcatTasks));
+  return merge(jsTasks.concat(jsConcatTasks));
 }
 
 function jsCompile({src, dest, browserSync = false}) {

package.json

@@ -27,6 +27,7 @@
     "gulp-svg-sprite": "^1.5.0",
     "gulp-terser": "^1.2.0",
     "js-yaml": "^3.13.1",
+    "merge-stream": "^2.0.0",
     "postcss-load-config": "^2.1.0",
     "rfs": "^9.0.0",
     "rimraf": "^3.0.0",