feat(haste-map): watchman crawler now includes dotfiles #10075

grosto · 2020-05-23T11:22:37Z

Summary

Fixes #10063.
Fixes #9829.
Closes #9887.

Watchman will now crawl dotfiles. This now matches the behaviour of Node crawler.

Test plan

I added test to verify that watchman gets dotfiles and that behaviour is same as node crawler.

jeysal

Awesome!

thymikee · 2020-05-24T21:00:24Z

I thought we want to go the other way around and stop crawling dotfiles (or .git) for Node watcher: #9829 (comment)

jeysal · 2020-05-24T21:08:11Z

Hmm, interesting. But .*rc.js files are quite common, also things like .storybook/*, maybe ignoring dotfiles is not the solution, but rather something like ignoring gitignored dotfiles, VCS directories, ...

SimenB · 2020-05-25T10:19:02Z

Ideally we'd crawl dotfiles, but make sure to ignore vcs directories. Stopping to crawl dotfiles for node was to match watchman, not the ideal solution (at least in my mind).

Respecting .gitignore etc is a different discussion imo

grosto · 2020-06-06T17:51:54Z

I agree with crawling the dotfiles and ignoring VCS directories by default. I don't think there is a need for an option to enable crawling of VCS directories.

I can update the PR if that sounds good

jeysal · 2020-06-06T17:54:28Z

SGTM :)

lencioni

Thanks for working on this!

packages/jest-haste-map/src/index.ts

grosto · 2020-06-12T09:32:49Z

Updated PR

cpojer

👍

cpojer · 2020-06-23T11:05:14Z

packages/jest-haste-map/src/index.ts

@@ -113,6 +113,9 @@ const CHANGE_INTERVAL = 30;
 const MAX_WAIT_TIME = 240000;
 const NODE_MODULES = path.sep + 'node_modules' + path.sep;
 const PACKAGE_JSON = path.sep + 'package.json';
+const VCS_DIRECTORIES = ['.git', '.svn', '.hg']
+  .map(vcs => '/' + vcs + '/')


This should use ^ and $, right?

should probably use path.sep like above as well?

Good catch, changed to path.sep.

I don't think I understand why would this need ^ and $? it matches with all the strings that include path.sep + '.git' + path.sep and would not match with path.sep +'.github' + path.sep.

packages/jest-haste-map/src/index.ts

grosto · 2020-07-14T15:34:41Z

Updated PR.

also missed it last time but the watcher was ignoring the dotfiles too. Now it should emit events on dotfiles too.

majames · 2020-07-22T18:07:12Z

Looks great! Thanks for doing this! 🙌

SimenB

Thanks!

SimenB · 2020-07-23T07:04:36Z

packages/jest-haste-map/src/index.ts

@@ -113,6 +114,9 @@ const CHANGE_INTERVAL = 30;
 const MAX_WAIT_TIME = 240000;
 const NODE_MODULES = path.sep + 'node_modules' + path.sep;
 const PACKAGE_JSON = path.sep + 'package.json';
+const VCS_DIRECTORIES = ['.git', '.hg']


meh, I have no idea how it works, and people can open a PR if needed. Should be a simple fix for anyone knowing how subversion works. And we only ship mercurial and git support anyways

SimenB · 2020-07-23T07:23:29Z

@grosto seems the new tests are failing on Travis - mind taking a look?

grosto · 2020-07-27T09:22:40Z

@SimenB looking into it

SimenB · 2020-07-28T07:36:22Z

@grosto any idea why that trailing slash only matters on Travis and not the 3 other CIs? I'd suspect one env is with watchman and the others are not or some such - is there some inconsistency?

EDIT: Ah, it still failed - never mind then 😅 I still suspect some watchman/no watchman mismatch, but I might be wrong

grosto · 2020-07-28T07:49:35Z

@SimenB I could not replicate the issue but I noticed this mismatch with other testIgnorePaths so made a blind shot. I will try to run it without watchman

SimenB · 2020-07-29T11:50:24Z

I don't trust travis, so let's try a fresh push. nodejs/docker-node#1298 (comment). While that's for the config and not code, who knows.

EDIT: Didn't help 😢 No idea what's going on, I'm unable to reproduce it

packages/jest-haste-map/src/crawlers/watchman.ts

grosto · 2020-07-29T12:24:14Z

Yeah I am trying to reproduce it too, but cannot. I was thinking to rollback some changes to see if passes. It was passing(I think) before I pushed path.sep changes.

grosto · 2020-07-29T18:07:36Z

I reverted the changes and even removed /__tests__/test_dotfiles_root/ and still failed with same error 🤷‍♂️ I guess it's some cache which makes this file

SimenB · 2020-07-29T21:25:46Z

I deleted the cache:

Let's see if re-running makes a difference

packages/jest-haste-map/src/index.ts

SimenB · 2020-07-29T21:51:26Z

Travis says it's building this: 7449c30. Which is not HEAD of this PR...

SimenB · 2020-07-30T09:14:08Z

Meh, screw it. If it fails on master I'll delete the integration - we already build on CircleCI, GH Actions and Azure Pipelines regardless, should be covered

SimenB · 2020-07-30T09:37:16Z

23dbcc1

github-actions · 2021-05-11T05:07:59Z

This pull request has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs.
Please note this issue tracker is not a help forum. We recommend using StackOverflow or our discord channel for questions.

facebook-github-bot added the cla signed label May 23, 2020

grosto force-pushed the fix_dotfiles_missing_from_hastemap branch 2 times, most recently from 4ac6954 to 56755b6 Compare May 24, 2020 15:15

jeysal approved these changes May 24, 2020

View reviewed changes

jeysal requested review from SimenB and thymikee May 24, 2020 19:48

grosto force-pushed the fix_dotfiles_missing_from_hastemap branch from 56755b6 to 7af063f Compare June 11, 2020 09:13

lencioni approved these changes Jun 11, 2020

View reviewed changes

packages/jest-haste-map/src/index.ts Outdated Show resolved Hide resolved

vjpr mentioned this pull request Jun 11, 2020

expo@37 support pnpm/pnpm#2622

Open

grosto force-pushed the fix_dotfiles_missing_from_hastemap branch from 7af063f to f9083aa Compare June 12, 2020 08:58

cpojer approved these changes Jun 23, 2020

View reviewed changes

cpojer reviewed Jun 23, 2020

View reviewed changes

SimenB reviewed Jun 23, 2020

View reviewed changes

packages/jest-haste-map/src/index.ts Show resolved Hide resolved

watchman crawler now includes dotfiles

1856fb2

grosto force-pushed the fix_dotfiles_missing_from_hastemap branch 2 times, most recently from 4340280 to 5582a2d Compare July 14, 2020 15:05

haste-map now ignores vcs directories

ec92955

grosto force-pushed the fix_dotfiles_missing_from_hastemap branch from 5582a2d to ec92955 Compare July 14, 2020 15:48

SimenB added 2 commits July 23, 2020 08:54

Merge branch 'master' into fix_dotfiles_missing_from_hastemap

7ebceed

move changelog entry

11d88c4

SimenB approved these changes Jul 23, 2020

View reviewed changes

SimenB reviewed Jul 23, 2020

View reviewed changes

fix testPathIgnorePattern for test_dotfiles_root

a2c348a

Merge branch 'master' into fix_dotfiles_missing_from_hastemap

4253ef9

SimenB reviewed Jul 29, 2020

View reviewed changes

packages/jest-haste-map/src/crawlers/watchman.ts Show resolved Hide resolved

grosto force-pushed the fix_dotfiles_missing_from_hastemap branch 2 times, most recently from e1db615 to a817726 Compare July 29, 2020 17:39

SimenB reviewed Jul 29, 2020

View reviewed changes

packages/jest-haste-map/src/index.ts Outdated Show resolved Hide resolved

grosto force-pushed the fix_dotfiles_missing_from_hastemap branch 2 times, most recently from 9c98d53 to 4253ef9 Compare July 29, 2020 21:47

merge to master

c373ca1

Merge branch 'master' into fix_dotfiles_missing_from_hastemap

c7980cd

SimenB changed the title ~~Watchman crawler now includes dotfiles~~ feat(haste-map): watchman crawler now includes dotfiles Jul 30, 2020

SimenB merged commit e270997 into jestjs:master Jul 30, 2020

SimenB mentioned this pull request Jul 31, 2020

Support dynamically detecting changes when .gitignore is updated #6962

Closed

vjpr mentioned this pull request Dec 8, 2020

expo@39 support pnpm/pnpm#3010

Closed

github-actions bot locked as resolved and limited conversation to collaborators May 11, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(haste-map): watchman crawler now includes dotfiles #10075

feat(haste-map): watchman crawler now includes dotfiles #10075

grosto commented May 23, 2020 •

edited by SimenB

Loading

jeysal left a comment

thymikee commented May 24, 2020

jeysal commented May 24, 2020

SimenB commented May 25, 2020 •

edited

Loading

grosto commented Jun 6, 2020

jeysal commented Jun 6, 2020

lencioni left a comment

grosto commented Jun 12, 2020

cpojer left a comment

cpojer Jun 23, 2020

SimenB Jun 23, 2020

grosto Jul 14, 2020

grosto commented Jul 14, 2020 •

edited

Loading

majames commented Jul 22, 2020

SimenB left a comment

SimenB Jul 23, 2020

SimenB Jul 23, 2020

SimenB commented Jul 23, 2020 •

edited

Loading

grosto commented Jul 27, 2020

SimenB commented Jul 28, 2020 •

edited

Loading

grosto commented Jul 28, 2020 •

edited

Loading

SimenB commented Jul 29, 2020 •

edited

Loading

grosto commented Jul 29, 2020 •

edited

Loading

grosto commented Jul 29, 2020 •

edited

Loading

SimenB commented Jul 29, 2020

SimenB commented Jul 29, 2020

SimenB commented Jul 30, 2020

SimenB commented Jul 30, 2020

github-actions bot commented May 11, 2021

feat(haste-map): watchman crawler now includes dotfiles #10075

feat(haste-map): watchman crawler now includes dotfiles #10075

Conversation

grosto commented May 23, 2020 • edited by SimenB Loading

Summary

Test plan

jeysal left a comment

Choose a reason for hiding this comment

thymikee commented May 24, 2020

jeysal commented May 24, 2020

SimenB commented May 25, 2020 • edited Loading

grosto commented Jun 6, 2020

jeysal commented Jun 6, 2020

lencioni left a comment

Choose a reason for hiding this comment

grosto commented Jun 12, 2020

cpojer left a comment

Choose a reason for hiding this comment

cpojer Jun 23, 2020

Choose a reason for hiding this comment

SimenB Jun 23, 2020

Choose a reason for hiding this comment

grosto Jul 14, 2020

Choose a reason for hiding this comment

grosto commented Jul 14, 2020 • edited Loading

majames commented Jul 22, 2020

SimenB left a comment

Choose a reason for hiding this comment

SimenB Jul 23, 2020

Choose a reason for hiding this comment

SimenB Jul 23, 2020

Choose a reason for hiding this comment

SimenB commented Jul 23, 2020 • edited Loading

grosto commented Jul 27, 2020

SimenB commented Jul 28, 2020 • edited Loading

grosto commented Jul 28, 2020 • edited Loading

SimenB commented Jul 29, 2020 • edited Loading

grosto commented Jul 29, 2020 • edited Loading

grosto commented Jul 29, 2020 • edited Loading

SimenB commented Jul 29, 2020

SimenB commented Jul 29, 2020

SimenB commented Jul 30, 2020

SimenB commented Jul 30, 2020

github-actions bot commented May 11, 2021

grosto commented May 23, 2020 •

edited by SimenB

Loading

SimenB commented May 25, 2020 •

edited

Loading

grosto commented Jul 14, 2020 •

edited

Loading

SimenB commented Jul 23, 2020 •

edited

Loading

SimenB commented Jul 28, 2020 •

edited

Loading

grosto commented Jul 28, 2020 •

edited

Loading

SimenB commented Jul 29, 2020 •

edited

Loading

grosto commented Jul 29, 2020 •

edited

Loading

grosto commented Jul 29, 2020 •

edited

Loading