more love

gulpfile.js

@@ -1,8 +1,9 @@
 var gulp = require('gulp');
+const { series } = require('gulp');
 var help = require('gulp-task-listing');
 var clean = require('gulp-clean');
 var toml = require('gulp-toml');
-var sass = require('gulp-sass');
+var gulpSass = require('gulp-sass');
 var rename = require("gulp-rename");
 var yaml = require('gulp-yaml');
 var template = require('gulp-template');
@@ -14,26 +15,26 @@ var modify = require('gulp-modify');
 var _ = require('lodash');
 var fs = require('fs');
 
-gulp.task('help', help);
+exports.help = help;
 
 
-gulp.task('sass', [], function(){
+exports.sass = function sass(){
     var extraSassPath = ['./node_modules/'];
     return gulp.src('./scss/*.scss')
-        .pipe(sass({includePaths: extraSassPath}).on('error', console.log))
+        .pipe(gulpSass({includePaths: extraSassPath}).on('error', gulpSass.logError))
         .pipe(gulp.dest('./css'));
-});
+}
 
-gulp.task('clean', function(){
+exports.clean = function clean(){
     return gulp.src(["lib/", "css/"], {read: false})
         .pipe(clean());
-});
+}
 
-gulp.task('compile-results', function(){
+exports.compileResults = function compileResults(){
     return gulp.src('data/*.yaml')
-    .pipe(yaml({safe: true}))
+    .pipe(yaml({safe: true}).on('error', console.log))
     .pipe(gulp.dest('./api'));
-});
+};
 
 var encryptFile = function(message){
     var keyLengthInBytes = 128;
@@ -49,7 +50,7 @@ var wrapEncryptedData = function(encryptedData){
     return 'window.encryptedPlayerList = ' + encryptedData + ';';
 };
 
-gulp.task('encrypt-results', ['compile-results'], function(){
+exports.encryptResults = function encryptResults(){
     return gulp.src('api/*.clear.json')
     .pipe(modify({
             fileModifier: function(file, content) {
@@ -62,7 +63,7 @@ gulp.task('encrypt-results', ['compile-results'], function(){
         return path;
     }))
     .pipe(gulp.dest('./api'));
-});
+};
 
 function getAvailableYears(files) {
   var rgx = /^resultats(\d*).yaml/;
@@ -74,7 +75,7 @@ function getAvailableYears(files) {
     .sort();
 }
 
-gulp.task('template-prod', function () {
+exports.templateProd = function templateProd() {
     var dataFiles = fs.readdirSync('./data');
 
     var data = {
@@ -86,22 +87,23 @@ gulp.task('template-prod', function () {
         .pipe(rename("index.html"))
         .pipe(template(data))
         .pipe(gulp.dest('.'));
-});
+};
 
-gulp.task('template-dev', function () {
+exports.templateDev = function templateDev() {
     var dataFiles = fs.readdirSync('./data');
     var data = {
       availableYears: JSON.stringify(getAvailableYears(dataFiles)),
       production: false,
       salt: 'salt',
       playerListLocation: 'api/players.spritz.js'}
+    console.log(data);
     return gulp.src('index.tmpl.html')
         .pipe(rename("index.html"))
         .pipe(template(data))
         .pipe(gulp.dest('.'));
-});
+};
 
-gulp.task('compile-articles', function(){
+exports.compileArticles = function compileArticles(){
 
     var transformArticle = function(article){
         var isMarkdownKey = /markdown/i;
@@ -115,7 +117,7 @@ gulp.task('compile-articles', function(){
         return JSON.stringify(article, null, 4);
     };
 
-    gulp.src('data/articles/**/*.toml.md')
+    return gulp.src('data/articles/**/*.toml.md')
         .pipe(toml({to: transformArticle}))
         .pipe(wrapper({
             header: "define(['m', '_'], function (m, _ ) {\nreturn ",
@@ -127,26 +129,44 @@ gulp.task('compile-articles', function(){
             return path;
         }))
         .pipe(gulp.dest('./script/articles/'));
+};
 
-});
 
-gulp.task('default', ['sass', 'encrypt-results', 'compile-results', 'compile-articles']);
+exports.base = series(
+    exports.sass,
+    exports.compileResults,
+    exports.compileArticles,
+    exports.encryptResults
 
-gulp.task('prod', ['default', 'template-prod']);
+);
 
-gulp.task('webserver', function(){
-    return gulp.src('.')
-    .pipe(webserver({
-        host: '0.0.0.0',
-        port: 4321,
-        livereload: false,
-        directoryListing: false,
-    }));
-});
+exports.prod = series(
+    exports.base,
+    exports.templateProd
+);
 
-gulp.task('dev', ['default', 'webserver', 'template-dev'], function(){
-    gulp.watch('./scss/*.scss', ['sass']);
-    gulp.watch('*.tmpl.html', ['template-dev']);
-    gulp.watch('./data/articles/**/*', ['compile-articles']);
-    return gulp.watch('./data/*.yaml', ['encrypt-results', 'compile-results']);
-});
+exports.dev = series(
+    exports.base,
+    exports.templateDev
+);
+
+// gulp.task('default', ['sass', 'encrypt-results', 'compile-results', 'compile-articles']);
+
+// gulp.task('prod', ['default', 'template-prod']);
+
+// gulp.task('webserver', function(){
+//     return gulp.src('.')
+//     .pipe(webserver({
+//         host: '0.0.0.0',
+//         port: 4321,
+//         livereload: false,
+//         directoryListing: false,
+//     }));
+// });
+
+// gulp.task('dev', ['default', 'webserver', 'template-dev'], function(){
+//     gulp.watch('./scss/*.scss', ['sass']);
+//     gulp.watch('*.tmpl.html', ['template-dev']);
+//     gulp.watch('./data/articles/**/*', ['compile-articles']);
+//     return gulp.watch('./data/*.yaml', ['encrypt-results', 'compile-results']);
+// });