From a770113e6b1d7589674ab8cbacf95ccb8ceea279 Mon Sep 17 00:00:00 2001
From: Awilum <awilum@msn.com>
Date: Tue, 6 Aug 2019 01:41:44 +0300
Subject: [PATCH] Flextype Core: Default theme - update assets building process
 and GULP to 4.X.X #206 #186 - updating gulpfile.js

---
 site/themes/default/gulpfile.js | 86 +++++++++++++++++----------------
 1 file changed, 44 insertions(+), 42 deletions(-)

diff --git a/site/themes/default/gulpfile.js b/site/themes/default/gulpfile.js
index a011a7fb..5cbdab1e 100755
--- a/site/themes/default/gulpfile.js
+++ b/site/themes/default/gulpfile.js
@@ -3,52 +3,54 @@
 // (c) Sergey Romanenko <http://romanenko.digital>
 //
 
-var Promise = require("es6-promise").Promise,
-    gulp = require('gulp'),
-    csso = require('gulp-csso'),
-    concat = require('gulp-concat'),
-    sourcemaps = require('gulp-sourcemaps'),
-    autoprefixer = require('gulp-autoprefixer'),
-    sass = require('gulp-sass');
+const { series, src, dest } = require('gulp');
+const del = require('del');
+const csso = require('gulp-csso');
+const concat = require('gulp-concat');
+const sourcemaps = require('gulp-sourcemaps');
+const autoprefixer = require('gulp-autoprefixer');
+const sass = require('gulp-sass');
 
-gulp.task('default-css', function() {
-    return gulp.src('assets/scss/default.scss')
-        .pipe(sass().on('error', sass.logError))
+function moveBootstrapCss() {
+    return src('node_modules/bootstrap/dist/css/bootstrap.min.css')
+        .pipe(concat('1.min.css'))
+        .pipe(dest('assets/dist/css/tmp'));
+}
+
+function moveAnimateCss() {
+    return src('node_modules/animate.css/animate.min.css')
+        .pipe(concat('2.min.css'))
+        .pipe(dest('assets/dist/css/tmp'));
+}
+
+function moveSimpleLightbox() {
+    return src('node_modules/simplelightbox/dist/simplelightbox.min.css')
+        .pipe(concat('3.min.css'))
+        .pipe(dest('assets/dist/css/tmp'));
+}
+
+function buldDefaultCss() {
+      return src('assets/scss/default.scss')
+          .pipe(sass().on('error', sass.logError))
+          .pipe(concat('4.min.css'))
+          .pipe(dest('assets/dist/css/tmp'));
+}
+
+function mergeCss() {
+    return src('assets/dist/css/tmp/**')
         .pipe(autoprefixer({
-            browsers: ['last 2 versions'],
+            overrideBrowserslist: [
+                "last 1 version"
+            ],
             cascade: false
         }))
         .pipe(csso())
-        .pipe(concat('default.min.css'))
-        .pipe(gulp.dest('assets/dist/css/'));
-});
+        .pipe(concat('build.min.css'))
+        .pipe(dest('assets/dist/css/'));
+}
 
-gulp.task('js', function(){
-  return gulp.src(['node_modules/jquery/dist/jquery.min.js', 'node_modules/bootstrap/dist/js/bootstrap.min.js'])
-    .pipe(sourcemaps.init())
-    .pipe(concat('default.min.js'))
-    .pipe(sourcemaps.write())
-    .pipe(gulp.dest('assets/dist/js/'));
-});
+function cleanTmp() {
+    return del('assets/dist/css/tmp/');
+}
 
-gulp.task('bootstrap-css', function() {
-    return gulp.src('node_modules/bootstrap/dist/css/bootstrap.min.css')
-        .pipe(gulp.dest('assets/dist/css/'));
-});
-
-gulp.task('animate-css', function() {
-    return gulp.src('node_modules/animate.css/animate.min.css')
-        .pipe(gulp.dest('assets/dist/css/'));
-});
-
-gulp.task('simplelightbox-css', function() {
-    return gulp.src('node_modules/simplelightbox/dist/simplelightbox.min.css')
-        .pipe(gulp.dest('assets/dist/css/'));
-});
-
-gulp.task('simplelightbox-js', function() {
-    return gulp.src('node_modules/simplelightbox/dist/simple-lightbox.min.js')
-        .pipe(gulp.dest('assets/dist/js/'));
-});
-
-gulp.task('default', ['default-css', 'js', 'bootstrap-css', 'animate-css', 'simplelightbox-css', 'simplelightbox-js']);
+exports.default = series(moveBootstrapCss, moveAnimateCss, moveSimpleLightbox, buldDefaultCss, mergeCss, cleanTmp);