1 files changed, 30 insertions, 25 deletions

diff --git a/gulpfile.js b/gulpfile.js
index bd1d37f..98ffb38 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,4 +1,4 @@
-var gulp = require('gulp');
+const gulp = require('gulp');
 var sass = require('gulp-sass');
 var cleancss = require('gulp-clean-css');
 var csscomb = require('gulp-csscomb');
@@ -11,29 +11,21 @@ var paths = {
   doc: './docs/src/scss/*.scss'
 };
 
-gulp.task('watch', function() {
-  gulp.watch('./**/*.scss', ['build']);
-  gulp.watch('./**/*.scss', ['docs']);
-  gulp.watch('./**/*.pug', ['docs']);
-});
+function docs () {
 
-gulp.task('build', function() {
-  gulp.src(paths.source)
+  return gulp.src(paths.doc)
     .pipe(sass({outputStyle: 'compact', precision: 10})
       .on('error', sass.logError)
     )
     .pipe(autoprefixer())
     .pipe(csscomb())
-    .pipe(gulp.dest('./dist'))
+    .pipe(gulp.dest('./docs/dist'))
     .pipe(cleancss())
     .pipe(rename({
       suffix: '.min'
     }))
-    .pipe(gulp.dest('./dist'));
-});
-
-gulp.task('docs', function() {
-  gulp.src(paths.doc)
+    .pipe(gulp.dest('./docs/dist'))
+    .pipe(gulp.src(paths.source))
     .pipe(sass({outputStyle: 'compact', precision: 10})
       .on('error', sass.logError)
     )
@@ -44,24 +36,37 @@ gulp.task('docs', function() {
     .pipe(rename({
       suffix: '.min'
     }))
-    .pipe(gulp.dest('./docs/dist'));
-  gulp.src(paths.source)
+    .pipe(gulp.dest('./docs/dist'))
+    .pipe(gulp.src('docs/src/**/!(_)*.pug'))
+    .pipe(pug({
+      pretty: true
+    }))
+    .pipe(gulp.dest('./docs/'));
+}
+
+function build() {
+
+  return gulp.src(paths.source)
     .pipe(sass({outputStyle: 'compact', precision: 10})
       .on('error', sass.logError)
     )
     .pipe(autoprefixer())
     .pipe(csscomb())
-    .pipe(gulp.dest('./docs/dist'))
+    .pipe(gulp.dest('./dist'))
     .pipe(cleancss())
     .pipe(rename({
       suffix: '.min'
     }))
-    .pipe(gulp.dest('./docs/dist'));
-  gulp.src('docs/src/**/!(_)*.pug')
-    .pipe(pug({
-      pretty: true
-    }))
-    .pipe(gulp.dest('./docs/'));
-});
+    .pipe(gulp.dest('./dist'));
+
+}
+
+function watch ()
+{
+  return gulp.watch(["./**/*.scss", "./**/*.pug"], gulp.parallel(build, docs));
+}
 
-gulp.task('default', ['build']);
+exports.watch = watch;
+exports.docs = docs;
+exports.build = build;
+exports.default = build;