Skip to content

Add option for watchers to allow you to share watchers between watchify instances #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jballant wants to merge 3 commits into from
Closed

Add option for watchers to allow you to share watchers between watchify instances #32

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4391247
Added watchers option, allowing you to share watchers between watchif…
Mar 25, 2014
fb1c395
Fixed invalidate issue where a shared watcher can be closed by a sing…
Mar 26, 2014
ca88297
Cleaner listeners object
Mar 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 31 additions & 9 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ var copy = require('shallow-copy');
var browserify = require('browserify');
var fs = require('fs');
var chokidar = require('chokidar');
var listenerCount = require('events').EventEmitter.listenerCount;

module.exports = watchify;
watchify.browserify = browserify;
Expand All @@ -18,6 +19,8 @@ function watchify (opts) {
var queuedDeps = {};
var changingDeps = {};
var first = true;
var watchers = {};
var listeners = {};

if (opts.cache) {
cache = opts.cache;
Expand All @@ -29,6 +32,11 @@ function watchify (opts) {
pkgcache = opts.pkgcache;
delete opts.pkgcache;
}

if (opts.watchers) {
watchers = opts.watchers;
delete opts.watchers;
}

b.on('package', function (file, pkg) {
pkgcache[file] = pkg;
Expand Down Expand Up @@ -60,18 +68,26 @@ function watchify (opts) {
});
});

var watchers = {};
function addDep (dep) {
if (watching[dep.id]) return;
watching[dep.id] = true;
cache[dep.id] = dep;

var watcher = chokidar.watch(dep.id, {persistent: true});
watchers[dep.id] = watcher;
watcher.on('error', b.emit.bind(b, 'error'));
watcher.on('change', function () {
invalidate(dep.id);
});
var watcher = watchers[dep.id];
if (!watcher) {
watcher = watchers[dep.id] = chokidar.watch(dep.id, {persistent: true});
b.emit('watch', watcher, dep);
}

listeners[dep.id] = {
err: b.emit.bind(b, 'error'),
change: function () {
invalidate(dep.id);
}
};

watcher.on('error', listeners[dep.id].err);
watcher.on('change', listeners[dep.id].change);
}

function invalidate (id) {
Expand Down Expand Up @@ -129,9 +145,15 @@ function watchify (opts) {
outStream.on('close', close);
function close () {
first = false;
var depId;
var depId, watcher;
for (depId in queuedCloses) {
queuedCloses[depId].close();
watcher = watchers[depId];
watcher.removeListener('change', listeners[depId].change);
watcher.removeListener('error', listeners[depId].err);
if (!listenerCount(watcher, 'change') && !listenerCount(watcher, 'error')) {
watcher.close();
watchers[depId] = null;
}
watching[depId] = false;
}
queuedCloses = {};
Expand Down