make gulp working with Browserify

erykpiast · May 13, 2015 · f148d70 · f148d70
1 parent ab8ee6a
commit f148d70
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 26 deletions.
diff --git a/demo/index.js b/demo/index.js
@@ -1,3 +1,3 @@
-import fileManager from '../src/js/file-manager';
+import fileManager from '../src/file-manager/js';
 
 fileManager(document.body);
diff --git a/gulp/build/js.js b/gulp/build/js.js
@@ -33,16 +33,18 @@ module.exports = function buildJsTask(before) {
         }
 
         return before(changedFiles)
-            .pipe(bundler.bundle())
-            .on('error', function(err) {
-                gutil.log('Browserify error:', err.message);
-            })
-            .pipe(source(config.dist.js.bundleName))
-            .pipe(gulp.dest(config.dist.js.dir))
-            .on('finish', function() {
-                gutil.log('building finished!');
-            })
-            .pipe(connect.reload());
+            .then(function() {
+                return bundler.bundle()
+                .on('error', function(err) {
+                    gutil.log('Browserify error:', err.message);
+                })
+                .pipe(source(config.dist.js.bundleName))
+                .pipe(gulp.dest(config.dist.js.dir))
+                .on('finish', function() {
+                    gutil.log('building finished!');
+                })
+                .pipe(connect.reload());
+            });
     };
 
 

diff --git a/gulp/lint.js b/gulp/lint.js
@@ -6,19 +6,29 @@ var gutil = require('gulp-util');
 var jshint = require('gulp-jshint');
 var stylish = require('jshint-stylish');
 
+var q = require('q');
+
 var config = require('./config');
 
 module.exports = function lintTask(cb, files) {
+    var deferred = q.defer();
+
     gutil.log('linting is starting...');
 
-    return gulp.src(files || config.src.js.files)
+    gulp.src(files || config.src.js.files)
         .pipe(jshint())
         .pipe(jshint.reporter(stylish))
         .pipe(jshint.reporter('fail'))
         .on('error', function(err) {
             gutil.log('linter error:', err.message);
+
+            deferred.reject(err);
         })
-        .on('finish', function() {
+        .on('finish', function(e) {
             gutil.log('linting finished!');
+
+            deferred.resolve(e);
         });
+
+    return deferred.promise;
 };
diff --git a/gulp/test/build-watch.js b/gulp/test/build-watch.js
@@ -45,19 +45,21 @@ module.exports = function buildTestsTask(before, after) {
             building = true;
 
             return before(changedFiles)
-                .pipe(bundler.bundle())
-                .pipe(source(config.test.bundle.name))
-                .pipe(gulp.dest(config.test.bundle.dir))
-                .pipe(after(changedFiles))
-                .on('error', function(err) {
-                    building = false;
-
-                    gutil.log('Building error', err.message);
-                })
-                .on('end', function() {
-                    building = false;
-
-                    gutil.log('Building finished!');
+                .then(function() {
+                    return bundler.bundle()
+                    .pipe(source(config.test.bundle.name))
+                    .pipe(gulp.dest(config.test.bundle.dir))
+                    .pipe(after(changedFiles))
+                    .on('error', function(err) {
+                        building = false;
+
+                        gutil.log('Building error', err.message);
+                    })
+                    .on('end', function() {
+                        building = false;
+
+                        gutil.log('Building finished!');
+                    });
                 });
         } else {
             return null;

diff --git a/package.json b/package.json
@@ -48,6 +48,7 @@
     "karma-phantomjs-launcher": "~0.1",
     "mocha": "~2.2",
     "proxyquireify": "~2.0",
+    "q": "~1.4",
     "run-sequence": "~1.0",
     "vinyl-source-stream": "~1.1",
     "watchify": "~3.2"