Fix script watch task

Author: davidchin

tasks/config.js

@@ -1,6 +1,7 @@
 import path from 'path';
 import fs from 'fs';
 
+const cwd = process.cwd();
 const pkgPath = path.resolve('package.json');
 const pkg = JSON.parse(fs.readFileSync(pkgPath));
 
@@ -53,7 +54,7 @@ config.script = {
       config.example.js + '/example.js',
     ],
     noParse: [
-      path.join(process.cwd(), config.build, config.name + '.js'),
+      path.join(cwd, config.build, config.name + '.js'),
     ],
     output: 'example.js',
     dest: config.example.build,
@@ -208,10 +209,13 @@ config.lint = {
 // Test config
 config.test = {
   unit: {
-    configFile: process.cwd() + '/karma.conf.js',
+    configFile: cwd + '/karma.conf.js',
     autoWatch: false,
     singleRun: true,
   },
+  watch: {
+    configFile: cwd + '/karma.conf.js',
+  },
 };
 
 // Release config

tasks/helpers/script-helper.js

@@ -7,19 +7,26 @@ import source from 'vinyl-source-stream';
 import buffer from 'vinyl-buffer';
 import _ from 'lodash';
 
-function bundleScript(bundler, output, dest) {
+function bundleScript(bundler, output, dest, cb) {
   function onError(error) {
     gutil.log(gutil.colors.red('Browserify Error' + error));
   }
 
+  function onEnd() {
+    if (cb) {
+      cb();
+    }
+  }
+
   return bundler.bundle()
     .on('error', onError)
+    .on('end', onEnd)
     .pipe(source(output))
     .pipe(buffer())
     .pipe(gulp.dest(dest));
 }
 
-function compileScript(watch, opts) {
+function compileScript(watch, opts, cb) {
   const acceptedOpts = _.pick(opts, 'paths', 'entries', 'noParse', 'debug', 'standalone');
   const browserifyOpts = _.defaults({}, acceptedOpts, watchify.args);
   const babelifyOpts = { comments: false };
@@ -44,11 +51,11 @@ function compileScript(watch, opts) {
     bundler.on('update', () => {
       gutil.log('Bundling ' + gutil.colors.green(opts.output));
 
-      bundleScript(bundler, opts.output, opts.dest);
+      return bundleScript(bundler, opts.output, opts.dest, cb);
     });
   }
 
-  return bundleScript(bundler, opts.output, opts.dest);
+  return bundleScript(bundler, opts.output, opts.dest, cb);
 }
 
 const scriptHelper = {

tasks/run.js

@@ -2,6 +2,6 @@ import gulp from 'gulp';
 
 gulp.task('run', [
   'build',
-  'connect',
   'watch',
+  'connect',
 ]);

tasks/test.js

@@ -2,14 +2,20 @@ import gulp from 'gulp';
 import config from './config';
 import { Server } from 'karma';
 
+function startServer(options, done) {
+  const server = new Server(options, done);
+
+  server.start();
+}
+
 gulp.task('test', [
   'test:script',
 ]);
 
-gulp.task('test:script', ['test:unit']);
-
-gulp.task('test:unit', (done) => {
-  const server = new Server(config.test.unit, done);
+gulp.task('test:script', (done) => {
+  startServer(config.test.unit, done);
+});
 
-  server.start();
+gulp.task('test:script:watch', (done) => {
+  startServer(config.test.watch, done);
 });

tasks/watch.js

@@ -2,11 +2,24 @@ import gulp from 'gulp';
 import config from './config';
 import { compileScript } from './helpers/script-helper';
 
-gulp.task('watch', ['build'], () => {
-  gulp.watch(config.watch.style.src, ['style']);
-  gulp.watch(config.watch.script.src, ['lint:script', 'test:script']);
-  gulp.watch(config.watch.task.src, ['lint:task']);
+gulp.task('watch', [
+  'watch:script',
+  'watch:style',
+  'watch:task',
+  'test:script:watch',
+]);
 
-  compileScript(true, config.watch.script.build);
+gulp.task('watch:script', () => {
   compileScript(true, config.watch.script.example);
+  compileScript(true, config.watch.script.build, () => {
+    gulp.start('lint:script');
+  });
+});
+
+gulp.task('watch:style', () => {
+  gulp.watch(config.watch.style.src, ['style']);
+});
+
+gulp.task('watch:task', () => {
+  gulp.watch(config.watch.task.src, ['lint:task']);
 });