Undo conflicting pull request #690

lib/nodefs-handler.js

@@ -4,7 +4,6 @@ var fs = require('fs');
 var sysPath = require('path');
 var readdirp = require('readdirp');
 var isBinaryPath = require('is-binary-path');
-var debounce = require('lodash.debounce');
 
 // fs.watch helpers
 
@@ -342,12 +341,15 @@ function(dir, stats, initialAdd, depth, target, wh, callback) {
   parentDir.add(sysPath.basename(dir));
   this._getWatchedDir(dir);
 
-  var debouncedRead;
-
   var read = function(directory, initialAdd, done) {
     // Normalize the directory name on Windows
     directory = sysPath.join(directory, '');
 
+    if (!wh.hasGlob) {
+      var throttler = this._throttle('readdir', directory, 1000);
+      if (!throttler) return;
+    }
+
     var previous = this._getWatchedDir(wh.path);
     var current = [];
 
@@ -378,11 +380,9 @@ function(dir, stats, initialAdd, depth, target, wh, callback) {
         this._addToNodeFs(path, initialAdd, wh, depth + 1);
       }
     }.bind(this)).on('end', function() {
+      if (throttler) throttler.clear();
       if (done) done();
 
-      // Run any pending reads that may be queued
-      debouncedRead.flush();
-
       // Files that absent in current directory snapshot
       // but present in previous emit `remove` event
       // and are removed from @watched[directory].
@@ -401,35 +401,20 @@ function(dir, stats, initialAdd, depth, target, wh, callback) {
     }.bind(this)).on('error', this._handleError.bind(this));
   }.bind(this);
 
-  // Create a debounced version of read
-  debouncedRead = debounce(read, 1000, {
-    leading: true,
-    trailing: true,
-    maxWait: 1000
-  });
-
   var closer;
 
   if (this.options.depth == null || depth <= this.options.depth) {
     if (!target) read(dir, initialAdd, callback);
     closer = this._watchWithNodeFs(dir, function(dirPath, stats) {
       // if current directory is removed, do nothing
       if (stats && stats.mtime.getTime() === 0) return;
-      debouncedRead(dirPath, false);
+
+      read(dirPath, false);
     });
   } else {
     callback();
   }
-
-  // Close function that calls fs closer and cancels any pending debounced reads
-  return function () {
-    if (closer) {
-      closer();
-    }
-
-    // Cancel any pending reads that may be queued
-    debouncedRead.cancel();
-  };
+  return closer;
 };
 
 // Private method: Handle added file, directory, or glob pattern.