fix: watch does not work for glob pattern '<dir>/**' if '<dir>' does …

…not exist on fs
paulmillr · Jul 16, 2018 · c1ec6c1 · c1ec6c1
1 parent 8cd5f7a
commit c1ec6c1
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -390,7 +390,8 @@ FSWatcher.prototype._isIgnored = function(path, stats) {
 var replacerRe = /^\.[\/\\]/;
 FSWatcher.prototype._getWatchHelpers = function(path, depth) {
   path = path.replace(replacerRe, '');
-  var watchPath = depth || this.options.disableGlobbing || !isGlob(path) ? path : globParent(path);
+  var getExistingPath = function(path) { return fs.existsSync(path) ? path : getExistingPath(sysPath.dirname(path)); };
+  var watchPath = depth || this.options.disableGlobbing || !isGlob(path) ? path : getExistingPath(globParent(path));
   var fullWatchPath = sysPath.resolve(watchPath);
   var hasGlob = watchPath !== path;
   var globFilter = hasGlob ? anymatch(path) : false;

diff --git a/test.js b/test.js
@@ -1151,6 +1151,24 @@ function runTests(baseopts) {
           });
         });
     });
+
+    it('should correctly watch glob pattern which initially does not match any files on fs', (done) => {
+      var spy = sinon.spy();
+      var watchPath = upath.normalizeSafe(getGlobPath('subdir/**'));
+      var dir = getFixturePath('subdir');
+      var file = getFixturePath('subdir/a.txt');
+      watcher = chokidar.watch(watchPath, options)
+        .on('all', spy)
+        .on('ready', function() {
+          fs.mkdirSync(getFixturePath('subdir'), 0x1ed);
+          fs.writeFileSync(file, Date.now());
+          waitFor([spy.withArgs('add')], function() {
+            spy.should.have.been.calledWith('addDir', dir);
+            spy.should.have.been.calledWith('add', file);
+          });
+          done();
+        });
+    });
   });
   describe('watch symlinks', function() {
     if (os === 'win32') return;