[react-packager] Enable watchman fs crawl

Summary:
@public
Now that watchman perf issue was fixed we can enable watchman-based fs crawling which is faster than node.
This showed an existing issue with some files missing from the blacklist which I addressed.

Test Plan:
./fbrnios.sh run
click around and scroll all the apps
This commit is contained in:
Amjad Masad 2015-06-26 16:17:16 -07:00
parent d70ff04746
commit 15a0f07c5f
5 changed files with 14 additions and 19 deletions

View File

@ -24,7 +24,7 @@ var platformBlacklists = {
ios: [
'node_modules/react-tools/src/browser/ui/React.js',
'node_modules/react-tools/src/browser/eventPlugins/ResponderEventPlugin.js',
// 'node_modules/react-tools/src/vendor/core/ExecutionEnvironment.js',
'node_modules/react-tools/src/vendor/core/ExecutionEnvironment.js',
'.web.js',
'.android.js',
],
@ -32,7 +32,7 @@ var platformBlacklists = {
'node_modules/react-tools/src/browser/ui/React.js',
'node_modules/react-tools/src/browser/eventPlugins/ResponderEventPlugin.js',
'node_modules/react-tools/src/browser/ReactTextComponent.js',
// 'node_modules/react-tools/src/vendor/core/ExecutionEnvironment.js',
'node_modules/react-tools/src/vendor/core/ExecutionEnvironment.js',
'.web.js',
'.ios.js',
],

View File

@ -2353,7 +2353,8 @@ describe('DependencyGraph', function() {
}
callbacks.push(callback);
return this;
}
},
isWatchman: () => Promise.resolve(false),
};
});

View File

@ -1,21 +1,11 @@
'use strict';
const nodeCrawl = require('./node');
//const watchmanCrawl = require('./watchman');
const watchmanCrawl = require('./watchman');
function crawl(roots, options) {
return nodeCrawl(roots, options);
// Although, in theory, watchman should be much faster;
// there is currently a bottleneck somewhere in the
// encoding/decoding that is causing it to be slower
// than node crawling. However, this should be fixed soon.
// https://github.com/facebook/watchman/issues/113
/*
const {fileWatcher} = options;
return fileWatcher.isWatchman().then(isWatchman => {
console.log(isWatchman);
if (!isWatchman) {
return false;
}
@ -30,7 +20,7 @@ function crawl(roots, options) {
}
return nodeCrawl(roots, options);
});*/
});
}
module.exports = crawl;

View File

@ -36,7 +36,7 @@ function watchmanRecReadDir(roots, {ignore, fileWatcher, exts}) {
}
}
const cmd = Promise.promisify(watcher.client.command.bind(watcher.client));
const cmd = Promise.denodeify(watcher.client.command.bind(watcher.client));
return cmd(['query', watchedRoot, {
'suffix': exts,
'expression': ['allof', ['type', 'f'], 'exists', dirExpr],

View File

@ -12,9 +12,11 @@ const EventEmitter = require('events').EventEmitter;
const sane = require('sane');
const Promise = require('promise');
const exec = require('child_process').exec;
const _ = require('underscore');
const MAX_WAIT_TIME = 25000;
// TODO(amasad): can we use watchman version command instead?r
const detectingWatcherClass = new Promise(function(resolve) {
exec('which watchman', function(err, out) {
if (err || out.length === 0) {
@ -79,9 +81,11 @@ class FileWatcher extends EventEmitter {
static createDummyWatcher() {
const ev = new EventEmitter();
ev.end = function() {
return Promise.resolve();
};
_.extend(ev, {
isWatchman: () => Promise.resolve(false),
end: () => Promise.resolve(),
});
return ev;
}
}