chore: migrate more gulp tasks to new run-sequence API

diff --git a/gulp/tasks/customizer.js b/gulp/tasks/customizer.js
index d1e72c85d5a906dad7c0b0a40d9552153bd6e3c1..710d9dfbfa4360ab338672468064f8634f5c36a4 100644 (file)
--- a/gulp/tasks/customizer.js
+++ b/gulp/tasks/customizer.js
@@ -6,6 +6,7 @@ var customizer = require('../../customizer/lib');
 var Vinyl = require('vinyl');
 var fs = require('fs');
 var gulp = require('gulp');
+var sequence = require('run-sequence');
 var If = require('gulp-if');
 var path = require('path');
 var Readable = require('stream').Readable;
@@ -88,7 +89,8 @@ gulp.task('customizer:prepareSassDeps', function() {
 });
 
 // Creates a Sass file from the module/variable list and creates foundation.css and foundation.min.css
-gulp.task('customizer:sass', ['customizer:loadConfig', 'customizer:prepareSassDeps'], function() {
+gulp.task('customizer:sass', function() {
+  sequence('customizer:loadConfig', 'customizer:prepareSassDeps', function() {
   var sassFile = customizer.sass(CUSTOMIZER_CONFIG, MODULE_LIST, VARIABLE_LIST);
 
   var stream = createStream('foundation.scss', sassFile);
@@ -107,6 +109,7 @@ gulp.task('customizer:sass', ['customizer:loadConfig', 'customizer:prepareSassDe
     .pipe(cleancss({ compatibility: 'ie9' }))
     .pipe(rename('foundation.min.css'))
     .pipe(gulp.dest(path.join(OUTPUT_DIR, 'css')));
+  });
 });
 
 // Creates a Foundation JavaScript file from the module list, and also copies dependencies (jQuery, what-input)
@@ -148,7 +151,8 @@ gulp.task('customizer:html', ['customizer:loadConfig'], function() {
 //   - Copying the index.html file
 //   - Creating a blank app.css file
 //   - Creating an app.js file with Foundation initialization code
-gulp.task('customizer', ['customizer:sass', 'customizer:javascript', 'customizer:html'], function(done) {
+gulp.task('customizer', function() {
+  sequence('customizer:sass', 'customizer:javascript', 'customizer:html', function(done) {
   var outputFolder = path.dirname(OUTPUT_DIR);
   var outputFileName = path.basename(OUTPUT_DIR);
 
@@ -163,6 +167,7 @@ gulp.task('customizer', ['customizer:sass', 'customizer:javascript', 'customizer
       rimraf(OUTPUT_DIR, done);
     });
   });
+});
 
 function createStream(name, content) {
   // Create a stream with our entry file

diff --git a/gulp/tasks/deploy.js b/gulp/tasks/deploy.js
index afa1c8057b3823d116865cf8c8b58b39449238d2..3bc86653fea8318c5804899afe306ae2d44f0644 100644 (file)
--- a/gulp/tasks/deploy.js
+++ b/gulp/tasks/deploy.js
@@ -46,7 +46,8 @@ gulp.task('deploy:version', function() {
 });
 
 // Generates compiled CSS and JS files and sourcemaps and puts them in the dist/ folder
-gulp.task('deploy:dist', ['sass:foundation', 'javascript:foundation'], function() {
+gulp.task('deploy:dist', function() {
+  sequence('sass:foundation', 'javascript:foundation', function() {
   var cssFilter = filter(['**/*.css'], { restore: true });
   var jsFilter  = filter(['**/*.js'], { restore: true });
   var cssSourcemapFilter = filter(['**/*.css.map'], { restore: true });
@@ -87,6 +88,7 @@ gulp.task('deploy:dist', ['sass:foundation', 'javascript:foundation'], function(
       .pipe(uglify())
       .pipe(sourcemaps.write('.'))
       .pipe(gulp.dest('./dist/js'));
+  });
 });
 
 // Copies standalone JavaScript plugins to dist/ folder
@@ -175,7 +177,8 @@ gulp.task('deploy:templates', function(done) {
 });
 
 // The Customizer runs this function to generate files it needs
-gulp.task('deploy:custom', ['sass:foundation', 'javascript:foundation'], function() {
+gulp.task('deploy:custom', function() {
+  sequence('sass:foundation', 'javascript:foundation', function() {
   gulp.src('./_build/assets/css/foundation.css')
       .pipe(cleancss({ compatibility: 'ie9' }))
       .pipe(rename('foundation.min.css'))
@@ -185,4 +188,5 @@ gulp.task('deploy:custom', ['sass:foundation', 'javascript:foundation'], functio
       .pipe(uglify())
       .pipe(rename('foundation.min.js'))
       .pipe(gulp.dest('./_build/assets/js'));
+  });
 });

diff --git a/gulp/tasks/docs.js b/gulp/tasks/docs.js
index 5c53b851c91401c509a08a3e50c66f4345949f5d..7fffa75496cbc206f741ea3b3e52061b7d7675be 100644 (file)
--- a/gulp/tasks/docs.js
+++ b/gulp/tasks/docs.js
@@ -3,7 +3,6 @@ var foundationDocs = require('foundation-docs');
 var gulp = require('gulp');
 var newer = require('gulp-newer');
 var panini = require('panini');
-var sequence = require('run-sequence');
 var supercollider = require('supercollider');
 
 var PANINI_CONFIG = {

diff --git a/gulp/tasks/lint.js b/gulp/tasks/lint.js
index 7caa075e6d4dcc53d945f5fc159174e0885b3198..eefbecda1b7a9b3f5c2bb0b448f933db7005efa5 100644 (file)
--- a/gulp/tasks/lint.js
+++ b/gulp/tasks/lint.js
@@ -21,11 +21,11 @@ gulp.task('lint:sass', function() {
 });
 
 gulp.task('lint:javascript', function () {
-    return gulp.src(CONFIG.JS_FILES)
-        .pipe(eslint({
-               useEslintrc: true,
-               configFile: '.eslintrc'
-        }))
-        .pipe(eslint.format())
-        .pipe(eslint.failAfterError());
+  return gulp.src(CONFIG.JS_FILES)
+    .pipe(eslint({
+      useEslintrc: true,
+      configFile: '.eslintrc'
+    }))
+    .pipe(eslint.format())
+    .pipe(eslint.failAfterError());
 });