Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion lib/BrowserifyCache.js
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ function attachCacheHooksToPipeline(b) {
function invalidateCacheBeforeBundling(b, done) {
var cache = BrowserifyCache.getCache(b);

invalidateCache(cache.mtimes, cache.modules, function(err, invalidated, deleted) {
invalidateCache(b, cache.mtimes, cache.modules, function(err, invalidated, deleted) {
invalidateDependentFiles(cache, [].concat(invalidated, deleted), function(err) {
b.emit('changedDeps', invalidated, deleted);
done(err, invalidated);
Expand Down
38 changes: 36 additions & 2 deletions lib/invalidateCache.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,46 @@
var assertExists = require('./assertExists');
var invalidateModifiedFiles = require('./invalidateModifiedFiles');

function invalidateCache(mtimes, cache, done) {
function invalidateCache(b, mtimes, cache, done) {
assertExists(mtimes);

invalidateModifiedFiles(mtimes, Object.keys(cache), function(file) {
delete cache[file];
}, done);
}, function (file) {
return invalidateModifiedStream(b, cache, file)
}, function(err, invalidated, deleted) {
if (deferedQueue.length > 0) {
b.on('_ready', function () {
invalidated = invalidated.concat(deferedQueue.filter(function (file) {
return invalidateModifiedStream(b, cache, file)
}))
done(err, invalidated, deleted)
})

return
}

done(err, invalidated, deleted)
});
}

var deferedQueue = [];
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If multiple browserify runs are happening simultaneously (it doesn't happen when using browserify from the CLI but can be done when using browserify from node), then it looks like they'll all share the same deferedQueue variable which doesn't seem intended.

function invalidateModifiedStream(b, cache, file) {
if (b._pending > 0) {
deferedQueue.push(file);
return false;
}

var record = b._recorded.find(function (record) {
return record.file == file;
})

if (cache[file].source != record.source) {
delete cache[file];
return true;
}

return false;
}

module.exports = invalidateCache;
2 changes: 1 addition & 1 deletion lib/invalidateDependentFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function invalidateDependentFiles(cache, invalidatedModules, done) {
Object.keys(dependentFiles[dependentFile]).forEach(function(module) {
delete cache.modules[module];
});
}, function(err) { done(err); });
}, null, function(err) { done(err); });
}

module.exports = invalidateDependentFiles;
11 changes: 9 additions & 2 deletions lib/invalidateModifiedFiles.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,20 @@ var async = require('async');

var CONCURRENCY_LIMIT = 40;

function invalidateModifiedFiles(mtimes, files, invalidate, done) {
function invalidateModifiedFiles(mtimes, files, invalidate, defer, done) {
var invalidated = [];
var deleted = [];
async.eachLimit(files, CONCURRENCY_LIMIT, function(file, fileDone) {
fs.stat(file, function(err, stat) {
if (err) {
deleted.push(file);
// If the cache doesn't have any modification times it's a stream
if (!mtimes[file] && defer) {
if (defer(file)) {
invalidated.push(file)
}
} else {
deleted.push(file);
}
return fileDone();
}
var mtimeNew = stat.mtime.getTime();
Expand Down