fix: set basePath for gulp-cache-bust and apply run-sequence

diff --git a/gulp/tasks/check.js b/gulp/tasks/check.js
index ca3314933b66cb501f7d9973099d95bedc97068e..2ae9b419dd9e141513741d506f6a3b8de90e1249 100644 (file)
--- a/gulp/tasks/check.js
+++ b/gulp/tasks/check.js
@@ -4,10 +4,12 @@ var gulp = require('gulp');
 var checkDeps = require('gulp-check-deps');
 var postcss = require('gulp-postcss');
 var doiuse = require('doiuse');
-
+var sequence = require('run-sequence');
 var CONFIG = require('../config.js');
 
-gulp.task('check', ['check:deps', 'check:browserSupport']);
+gulp.task('check', function(cb) {
+  sequence('check:deps', 'check:browserSupport', cb)
+});
 
 // Check npm dependencies
 gulp.task('check:deps', function() {

diff --git a/gulp/tasks/docs.js b/gulp/tasks/docs.js
index e1bdef9fdca0b090ce5eacadac6547b52c3daaa0..59b42cc1d95b0001eb0b3df5cb4f94acab8478f1 100644 (file)
--- a/gulp/tasks/docs.js
+++ b/gulp/tasks/docs.js
@@ -3,6 +3,7 @@ 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 = {
@@ -50,7 +51,9 @@ gulp.task('docs', function() {
     }))
     .pipe(supercollider.init())
     .pipe(panini(PANINI_CONFIG))
-    .pipe(cacheBust())
+    .pipe(cacheBust({
+               basePath: '_build/'
+       }))
     .pipe(gulp.dest('_build'))
     .on('finish', buildSearch);
 });
@@ -61,7 +64,9 @@ gulp.task('docs:all', function() {
   return gulp.src('docs/pages/**/*')
     .pipe(supercollider.init())
     .pipe(panini(PANINI_CONFIG))
-    .pipe(cacheBust())
+    .pipe(cacheBust({
+               basePath: '_build/'
+       }))
     .pipe(gulp.dest('_build'))
     .on('finish', buildSearch);
 });

diff --git a/gulp/tasks/javascript.js b/gulp/tasks/javascript.js
index a2070869d8403d4a76cace28635e825d9847ed57..63f8f76369cae3d80c2887c94c3c0351d7406107 100644 (file)
--- a/gulp/tasks/javascript.js
+++ b/gulp/tasks/javascript.js
@@ -6,6 +6,7 @@ var rename = require('gulp-rename');
 var webpackStream = require('webpack-stream');
 var webpack2 = require('webpack');
 var named = require('vinyl-named');
+var sequence = require('run-sequence');
 var sourcemaps = require('gulp-sourcemaps');
 
 var utils = require('../utils.js');
@@ -78,7 +79,9 @@ var webpackConfig = {
 //
 
 // Compiles JavaScript into a single file
-gulp.task('javascript', ['javascript:foundation', 'javascript:deps', 'javascript:docs']);
+gulp.task('javascript', function(cb) {
+  sequence('javascript:foundation', 'javascript:deps', 'javascript:docs', cb)
+});
 
 // Core has to be dealt with slightly differently due to bootstrapping externals
 // and the dependency on foundation.core.utils

diff --git a/gulp/tasks/lint.js b/gulp/tasks/lint.js
index a16f0efb34a5344605f33c33188d1b286a84f064..7caa075e6d4dcc53d945f5fc159174e0885b3198 100644 (file)
--- a/gulp/tasks/lint.js
+++ b/gulp/tasks/lint.js
@@ -2,11 +2,13 @@ var gulp = require('gulp');
 var plumber = require('gulp-plumber');
 var sassLint = require('gulp-sass-lint');
 var eslint = require('gulp-eslint');
-
+var sequence = require('run-sequence');
 var CONFIG = require('../config.js');
 
 // Lints Sass and JavaScript files for formatting issues
-gulp.task('lint', ['lint:sass', 'lint:javascript']);
+gulp.task('lint', function(cb) {
+  sequence('lint:sass', 'lint:javascript', cb)
+});
 
 gulp.task('lint:sass', function() {
   return gulp.src(CONFIG.SASS_LINT_FILES)

diff --git a/gulp/tasks/sass.js b/gulp/tasks/sass.js
index acc215932c165fa09a6ffba213c5383a8ff267f1..fcb2c37530f0dfcadcefa69dc5ccc080d1a0d756 100644 (file)
--- a/gulp/tasks/sass.js
+++ b/gulp/tasks/sass.js
@@ -9,12 +9,15 @@ var plumber = require('gulp-plumber');
 var sourcemaps = require('gulp-sourcemaps');
 var sassLint = require('gulp-sass-lint');
 var postcss = require('gulp-postcss');
+var sequence = require('run-sequence');
 var autoprefixer = require('autoprefixer');
 
 var CONFIG = require('../config.js');
 
 // Compiles Sass files into CSS
-gulp.task('sass', ['sass:foundation', 'sass:docs']);
+gulp.task('sass', function(cb) {
+  sequence('sass:foundation', 'sass:docs', cb)
+});
 
 // Prepare dependencies
 gulp.task('sass:deps', function() {

diff --git a/gulp/tasks/test.js b/gulp/tasks/test.js
index c35194ee4fb54c991545355da1d79b4067974fec..3ed2ef6588a4307f9f26fcf0ba42408b2564d4a8 100644 (file)
--- a/gulp/tasks/test.js
+++ b/gulp/tasks/test.js
@@ -3,13 +3,15 @@ var opener = require('opener');
 var browser = require('browser-sync');
 var concat = require('gulp-concat');
 var babel = require('gulp-babel');
+var sequence = require('run-sequence');
 var onBabelError = require('./babel-error.js');
 var rimraf = require('rimraf').sync;
 
 var CONFIG = require('../config.js');
 
 // Runs unit tests
-gulp.task('test', ['sass:foundation', 'test:transpile-js', 'watch'], function() {
+gulp.task('test', function(cb) {
+  sequence('sass:foundation', 'test:transpile-js', 'watch', function() {
   browser.init({
     server: { 
       baseDir: 'test/visual',
@@ -21,6 +23,7 @@ gulp.task('test', ['sass:foundation', 'test:transpile-js', 'watch'], function()
     }
   });
   gulp.watch(['test/visual/**/*'], ['test:reload']);
+}, cb)
 });
 
 gulp.task('test:reload', function(done) {
@@ -28,7 +31,8 @@ gulp.task('test:reload', function(done) {
   done();
 });
 
-gulp.task('test:transpile-js', ['javascript:foundation', 'javascript:deps'], function() {
+gulp.task('test:transpile-js', function(cb) {
+  sequence('javascript:foundation', 'javascript:deps', function() {
   rimraf('test/javascript/js-tests.js');
   
   return gulp.src(CONFIG.TEST_JS_FILES)
@@ -36,4 +40,5 @@ gulp.task('test:transpile-js', ['javascript:foundation', 'javascript:deps'], fun
                .on('error', onBabelError))
        .pipe(concat('js-tests.js'))
        .pipe(gulp.dest('test/javascript'));
-});
+}, cb)
+});
\ No newline at end of file

diff --git a/gulpfile.js b/gulpfile.js
index 71751e30267e0f0e1a5f3c67d2df16c593a6f34c..269e78826399ad6192bb8953a550783614cdecfa 100644 (file)
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,12 +1,15 @@
 var gulp = require('gulp');
 var browser = require('browser-sync');
 var requireDir = require('require-dir');
+var sequence = require('run-sequence');
 var port = process.env.SERVER_PORT || 3000;
 
 requireDir('./gulp/tasks');
 
 // Builds the documentation and framework files
-gulp.task('build', ['clean', 'copy', 'docs:all', 'sass', 'javascript']);
+gulp.task('build', function(cb) {
+  sequence('clean', 'copy', 'sass', 'javascript', 'docs:all', cb)
+});
 
 // Starts a BrowerSync instance
 gulp.task('serve', ['build'], function(){
@@ -24,4 +27,6 @@ gulp.task('watch', function() {
 });
 
 // Runs all of the above tasks and then waits for files to change
-gulp.task('default', ['serve', 'watch']);
+gulp.task('default', function(cb) {
+  sequence('serve', 'watch', cb)
+});