V2

.browserslistrc

@@ -0,0 +1 @@
+last 4 versions

.gitignore

@@ -32,5 +32,8 @@ _tmp
 node_modules
 bower_components
 
+yarn.lock
+package-lock.json
+
 # Production folder
 build/

README.md

@@ -1,3 +1,6 @@
+### ❗️❗️❗️ IMPORTANT
+**This gulp starter based on [generator-man](https://github.com/coderiver/generator-man)**
+
 ## How to use
 
 Clone this repo and then in command line type:

gulp/tasks/build.js

@@ -1,29 +1,55 @@
 var gulp        = require('gulp');
-var runSequence = require('run-sequence');
+var runSequence = require('gulp4-run-sequence');
 var config      = require('../config');
 
+let { clean } = require('./clean');
+let { spriteSvg } = require('./sprite-svg/sprite-svg');
+let { svgo } = require('./svgo');
+let { sassTask } = require('./sass');
+let { pugTask } = require('./pug');
+let { webpackTask } = require('./webpack');
+let { copy } = require('./copy');
+let { listPages } = require('./index/index-page');
+
 function build(cb) {
-    runSequence(
-        'clean',
-        'sprite:svg',
-        'svgo',
-        'sass',
-        'pug',
-        'webpack',
-        'copy',
-        'list-pages',
-        cb
-    );
+  runSequence(
+    clean,
+    spriteSvg,
+    svgo,
+    sassTask,
+    pugTask,
+    webpackTask,
+    copy,
+    listPages,
+    cb
+  );
+}
+
+// gulp.task('build', function(cb) {
+//   config.setEnv('production');
+//   config.logEnv();
+//   build(cb);
+// });
+
+// gulp.task('build:dev', function(cb) {
+//   config.setEnv('development');
+//   config.logEnv();
+//   build(cb);
+// });
+
+function buildTask(cb) {
+  config.setEnv('production');
+  config.logEnv();
+  build(cb);
 }
 
-gulp.task('build', function(cb) {
-    config.setEnv('production');
-    config.logEnv();
-    build(cb);
-});
+function buildDevTask(cb) {
+  config.setEnv('development');
+  config.logEnv();
+  build(cb);
+}
 
-gulp.task('build:dev', function(cb) {
-    config.setEnv('development');
-    config.logEnv();
-    build(cb);
-});
+module.exports = {
+  buildTask,
+  buildDevTask
+}

gulp/tasks/clean.js

@@ -1,12 +1,15 @@
-var gulp   = require('gulp');
 var del    = require('del');
 var util   = require('gulp-util');
 var config = require('../config');
 
-gulp.task('clean', function(cb) {
-    return del([
-        config.dest.root
-    ]).then(function(paths) {
-        util.log('Deleted:', util.colors.magenta(paths.join('\n')));
-    });
-});
+function clean() {
+  return del([
+    config.dest.root
+  ]).then(function(paths) {
+    util.log('Deleted:', util.colors.magenta(paths.join('\n')));
+  });
+}
+
+module.exports = { 
+  clean
+};

gulp/tasks/copy.js

@@ -1,46 +1,86 @@
 var gulp = require('gulp');
 var config = require('../config.js');
 
-gulp.task('copy:fonts', function () {
-    return gulp
-        .src(config.src.fonts + '/*.{ttf,eot,woff,woff2}')
-        .pipe(gulp.dest(config.dest.fonts));
-});
-
-gulp.task('copy:data', function () {
-    return gulp
-        .src(config.src.data + '/**/*.*')
-        .pipe(gulp.dest(config.dest.data));
-});
-
-gulp.task('copy:lib', function () {
-    return gulp
-        .src(config.src.lib + '/**/*.*')
-        .pipe(gulp.dest(config.dest.lib));
-});
-
-gulp.task('copy:rootfiles', function () {
-    return gulp
-        .src(config.src.root + '/*.*')
-        .pipe(gulp.dest(config.dest.root));
-});
-
-gulp.task('copy:img', function () {
-    return gulp
-        .src([
-            config.src.img + '/**/*.{jpg,png,jpeg,svg,gif}',
-            '!' + config.src.img + '/svgo/**/*.*'
-        ])
-        .pipe(gulp.dest(config.dest.img));
-});
-
-gulp.task('copy', [
-    'copy:img',
+// gulp.task('copy:fonts', function () {
+//     return gulp
+//         .src(config.src.fonts + '/*.{ttf,eot,woff,woff2}')
+//         .pipe(gulp.dest(config.dest.fonts));
+// });
+
+// gulp.task('copy:data', function () {
+//     return gulp
+//         .src(config.src.data + '/**/*.*')
+//         .pipe(gulp.dest(config.dest.data));
+// });
+
+// gulp.task('copy:lib', function () {
+//     return gulp
+//         .src(config.src.lib + '/**/*.*')
+//         .pipe(gulp.dest(config.dest.lib));
+// });
+
+// gulp.task('copy:rootfiles', function () {
+//     return gulp
+//         .src(config.src.root + '/*.*')
+//         .pipe(gulp.dest(config.dest.root));
+// });
+
+// gulp.task('copy:img', function () {
+//     return gulp
+//         .src([
+//             config.src.img + '/**/*.{jpg,png,jpeg,svg,gif}',
+//             '!' + config.src.img + '/svgo/**/*.*'
+//         ])
+//         .pipe(gulp.dest(config.dest.img));
+// });
+
+// gulp.task('copy', gulp.series([
+// 		'copy:img',
+// 		// 'copy:rootfiles',
+// 		// 'copy:lib',
+// 		// 'copy:data',
+// 		'copy:fonts'
+//   ]));
+
+// gulp.task('copy:watch', function (cb) {
+//   gulp.watch([config.src.img + '/*',config.src.fonts + '/*'], gulp.series(['copy']));
+//   cb();
+// });
+
+function copyImg(cb) {
+  gulp
+    .src([
+        config.src.img + '/**/*.{jpg,png,jpeg,svg,gif}',
+        '!' + config.src.img + '/svgo/**/*.*'
+    ])
+    .pipe(gulp.dest(config.dest.img));
+  cb();
+}
+
+function copyFonts(cb) {
+  gulp
+    .src(config.src.fonts + '/*.{ttf,eot,woff,woff2}')
+    .pipe(gulp.dest(config.dest.fonts));
+  cb()
+}
+
+function copyWatch(cb) {
+  gulp.watch([config.src.img + '/*',config.src.fonts + '/*'], gulp.series(copy));
+  cb();
+}
+
+function copy(cb) {
+  gulp.series(
+    copyImg,
     // 'copy:rootfiles',
     // 'copy:lib',
     // 'copy:data',
-    'copy:fonts'
-]);
-gulp.task('copy:watch', function () {
-    gulp.watch(config.src.img + '/*', ['copy']);
-});
+    copyFonts
+  )();
+  cb();
+}
+
+module.exports = {
+  copy,
+  copyWatch
+}

gulp/tasks/default.js

@@ -1,12 +1,38 @@
 var gulp        = require('gulp');
-var runSequence = require('run-sequence');
+var runSequence = require('gulp4-run-sequence');
 var config      = require('../config');
 
-gulp.task('default', function(cb) {
-    runSequence(
-        'build:dev',
-        'watch',
-        'server',
-        cb
-    );
-});
+var { buildTask, buildDevTask } = require('./build');
+var { watchTask } = require('./watch');
+var { serverTask } = require('./server');
+
+// gulp.task('default', function(cb) {
+//   runSequence(
+//       'build:dev',
+//       'watch',
+//       'server',
+//       cb
+//   );
+// });
+
+// gulp.task('default', function(cb) {
+//   runSequence(
+//     buildDevTask,
+//     watchTask,
+//     serverTask,
+//     cb
+//   );
+// });
+
+function defaultTask(cb) {
+  runSequence(
+    buildDevTask,
+    watchTask,
+    serverTask,
+    cb
+  );
+}
+
+module.exports = {
+  defaultTask
+}

gulp/tasks/index/index-page.js

@@ -3,18 +3,45 @@ var consolidate = require('gulp-consolidate');
 var config      = require('../../config');
 require('require-yaml');
 
-gulp.task('list-pages', function() {
-	delete require.cache[require.resolve('../../../' + config.src.pagelist)]
-    var pages = require('../../../' + config.src.pagelist);
-    return gulp
-        .src(__dirname + '/index.html')
-        .pipe(consolidate('lodash', {
-            pages: pages
-        }))
-        .pipe(gulp.dest(config.dest.html));
-});
-
-gulp.task('list-pages:watch', function() {
-    gulp.watch([config.src.root+'/*', 'gulp/tasks/index/index.html'], ['list-pages']);
-});
+// gulp.task('list-pages', function() {
+// 	delete require.cache[require.resolve('../../../' + config.src.pagelist)]
+//     var pages = require('../../../' + config.src.pagelist);
+//     return gulp
+//         .src(__dirname + '/index.html')
+//         .pipe(consolidate('lodash', {
+//             pages: pages
+//         }))
+//         .pipe(gulp.dest(config.dest.html));
+// });
+
+// gulp.task('list-pages:watch', function(cb) {
+//     gulp.watch([config.src.root+'/*', 'gulp/tasks/index/index.html'], gulp.series(['list-pages']));
+//     cb();
+// });
+
+
+
+
+
+
+function listPagesWatch(cb) {
+  gulp.watch([config.src.root+'/*', 'gulp/tasks/index/index.html'], gulp.series(listPages));
+  cb();
+}
+
+function listPages() {
+  delete require.cache[require.resolve('../../../' + config.src.pagelist)]
+  var pages = require('../../../' + config.src.pagelist);
+  return gulp
+    .src(__dirname + '/index.html')
+    .pipe(consolidate('lodash', {
+        pages: pages
+    }))
+    .pipe(gulp.dest(config.dest.html));
+}
+
+module.exports = {
+  listPages,
+  listPagesWatch,
+}