Merge pull request #29 from amzrk2/dev

Release v2.0.1

1 files changed, 24 insertions, 12 deletions

diff --git a/gulpfile.js b/gulpfile.js
index e6eebff..7caec20 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -10,45 +10,57 @@ var autoprefixer = require('autoprefixer');
 var cssnano = require('cssnano');
 var rename = require('gulp-rename');
 
-function js() {
+function devJs() {
     return pipeline(
         gulp.src('assets/js/fuji.js'),
         sourcemaps.init(),
         babel({
             presets: ['@babel/env'],
         }),
-        uglify(),
         rename({ suffix: '.min' }),
         sourcemaps.write('.'),
         gulp.dest('static/assets/js/')
     );
 }
 
-function css() {
+function devCss() {
     return pipeline(
         gulp.src('assets/scss/fuji.scss'),
         sourcemaps.init(),
         sass(),
-        postcss([autoprefixer(), cssnano()]),
+        postcss([autoprefixer()]),
         rename({ suffix: '.min' }),
         sourcemaps.write('.'),
         gulp.dest('static/assets/css/')
     );
 }
 
-function dist() {
+function js() {
+    return pipeline(
+        gulp.src('assets/js/fuji.js'),
+        babel({
+            presets: ['@babel/env'],
+        }),
+        uglify(),
+        rename({ suffix: '.min' }),
+        gulp.dest('static/assets/js/')
+    );
+}
+
+function css() {
     return pipeline(
-        gulp.src('static/assets/css/*.*'),
-        gulp.dest('dist/'),
-        gulp.src('static/assets/js/*.*'),
-        gulp.dest('dist/')
+        gulp.src('assets/scss/fuji.scss'),
+        sass(),
+        postcss([autoprefixer(), cssnano()]),
+        rename({ suffix: '.min' }),
+        gulp.dest('static/assets/css/')
     );
 }
 
-exports.build = gulp.series(gulp.parallel(js, css), dist);
+exports.build = gulp.parallel(js, css);
 exports.devJs = function () {
-    return gulp.watch('assets/js/fuji.js', { delay: 500 }, gulp.parallel(js));
+    return gulp.watch('assets/js/fuji.js', { delay: 500 }, devJs);
 };
 exports.devCss = function () {
-    return gulp.watch(['assets/scss/*.scss', 'assets/scss/*/*.scss'], { delay: 500 }, gulp.parallel(css));
+    return gulp.watch('assets/**/*.scss', { delay: 500 }, devCss);
 };