Skip to content
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

Jump to bottom

What if Watchman CLI is missing... #2643

Closed
wants to merge 8 commits into from
Closed

What if Watchman CLI is missing... #2643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
abe24c0
What if Watchman CLI is missing...
alunyov Feb 10, 2019
e2d5bb6
Happy flow
alunyov Feb 10, 2019
5aeb3b6
Happy flow
alunyov Feb 10, 2019
0e77b81
Merge branch 'relay-compiler-no-watchman' of github.com:facebook/rela…
alunyov Feb 10, 2019
4da3ffc
Merge branch 'master' into relay-compiler-no-watchman
alunyov Feb 22, 2019
e6d7d4c
Change the implementatio for watchman check
alunyov Feb 22, 2019
9cb7999
Change the implementation of watchman client availability
alunyov Feb 22, 2019
60b39a2
Merge branch 'relay-compiler-no-watchman' of github.com:facebook/rela…
alunyov Feb 22, 2019
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
3 changes: 1 addition & 2 deletions packages/relay-compiler/bin/RelayCompilerMain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ Ensure that one such file exists in ${srcDir} or its parents.
verbose: options.verbose,
quiet: options.quiet,
});

const useWatchman = options.watchman && (await WatchmanClient.isAvailable());

const schema = getSchema(schemaPath);
Expand Down Expand Up @@ -270,7 +269,7 @@ Ensure that one such file exists in ${srcDir} or its parents.
// TODO: allow passing in a flag or detect?
sourceControl: null,
});
if (!options.validate && !options.watch && options.watchman) {
if (!options.validate && !options.watch && useWatchman) {
// eslint-disable-next-line no-console
console.log('HINT: pass --watch to keep watching for changes.');
}
Expand Down
21 changes: 20 additions & 1 deletion packages/relay-compiler/core/GraphQLWatchmanClient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,38 @@
'use strict';

const watchman = require('fb-watchman');
const childProcess = require('child_process');

const MAX_ATTEMPT_LIMIT = 5;

function delay(delayMs: number): Promise<void> {
return new Promise(resolve => setTimeout(resolve, delayMs));
}

function hasWatchmanInstalled(): Promise<boolean> {
return new Promise(resolve => {
const proc = childProcess.spawn('watchman', ['--version']);
proc.on('error', () => {
resolve(false);
});
proc.on('close', code => {
if (code === 0) {
resolve(true);
}
});
});
}

class GraphQLWatchmanClient {
_client: any;
_attemptLimit: number;

static isAvailable(): Promise<boolean> {
return new Promise(resolve => {
return new Promise(async resolve => {
const hasWatchman = await hasWatchmanInstalled();
if (!hasWatchman) {
return resolve(false);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

TIL about command ! ✨

How about using the exit status, though? (And made it async too, although it probably matters very little overall.)

const exec = require("util").promisify(require("child_process").exec)
undefined
> exec("command -v does-not-exist").then(() => console.log("Exists!")).catch(() => console.log("Does not exist!"))
Promise { … }
> Does not exist!
> exec("command -v ls").then(() => console.log("Exists!")).catch(() => console.log("Does not exist!"))
Promise { … }
> Exists!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just realized that this won't work on windows. I will add something else.

const client = new GraphQLWatchmanClient(MAX_ATTEMPT_LIMIT);
client.on('error', () => {
resolve(false);
Expand Down