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

chore: update fsevents #11028

Merged
merged 2 commits into from
Jan 26, 2021
Merged

chore: update fsevents #11028

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
edd66d9
build: update fsevents to include stability fixes
cmdcarini Jan 25, 2021
1f22eac
Merge branch 'master' into patch/fsevents-2.2.1
SimenB Jan 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/jest-haste-map/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"slash": "^3.0.0"
},
"optionalDependencies": {
"fsevents": "^2.1.2"
"fsevents": "^2.2.1"
Copy link
Contributor

Choose a reason for hiding this comment

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

Need to run yarn to update the lockfile

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should (hopefully) be done!

Copy link
Contributor

Choose a reason for hiding this comment

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

Seems like you used Yarn 1 to do that instead of the checked in version, how old is your Yarn 1 version since it didn't pick up on the yarn-path setting?

Copy link
Member

@SimenB SimenB Jan 26, 2021 •
edited

Choose a reason for hiding this comment

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

@merceyz I tried to fix it, but the patch in yarn v2 seems broken.

➤ YN0066: │ fsevents@patch:fsevents@npm%3A2.3.1#builtin<compat/fsevents>::version=2.3.1&hash=127e8e: Cannot apply hunk #1
➤ YN0000: │     }
➤ YN0000: │
➤ YN0028: │ -   let instance = Native.start(path, handler);
➤ YN0028: │ +   let VFS = require('./vfs');
➤ YN0028: │ +   let vfs = new VFS(path);
➤ YN0028: │ +   let instance = Native.start(vfs.resolvedPath, vfs.wrap(handler));
➤ YN0000: │     if (!instance) throw new Error(`could not watch: ${path}`);
➤ YN0000: │     return () => {

(same for 2.2.1, fwiw)

Copy link
Contributor

@merceyz merceyz Jan 26, 2021 •
edited

Choose a reason for hiding this comment

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

That was fixed in yarnpkg/berry#2078 (yarn set version latest)

Copy link
Member

@SimenB SimenB Jan 26, 2021 •
edited

Choose a reason for hiding this comment

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

Oh, the fork was super outdated (over 120 commits behind) and had an old version of yarn. Merging in master fixed the issue 👍

},
"engines": {
"node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0"
Expand Down
30 changes: 24 additions & 6 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9401,12 +9401,12 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"fsevents@^2.1.2, fsevents@~2.1.2":
version: 2.1.3
resolution: "fsevents@npm:2.1.3"
fsevents@^2.2.1:
version: 2.3.1
resolution: "fsevents@npm:2.3.1"
dependencies:
node-gyp: latest
checksum: 8977781884d06c5bcb97b5f909efdce9683c925f2a0ce7e098d2cdffe2e0a0a50b1868547bb94dca75428c06535a4a70517a7bb3bb5a974d93bf9ffc067291eb
checksum: 32619a121e7f9ac8a5ce4954f5fdf06be68b7b1c16e4ac8fa6e5e13cbf97d83c86cdcdf872ab7b188ebb07b34d2271b7818aebfc305b4a7d5b35f4bc2117f8be
languageName: node
linkType: hard

Expand All @@ -9420,7 +9420,16 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

"fsevents@patch:fsevents@^2.1.2#builtin<compat/fsevents>, fsevents@patch:fsevents@~2.1.2#builtin<compat/fsevents>":
"fsevents@patch:fsevents@^2.2.1#builtin<compat/fsevents>":
version: 2.3.1
resolution: "fsevents@patch:fsevents@npm%3A2.3.1#builtin<compat/fsevents>::version=2.3.1&hash=11e9ea"
dependencies:
node-gyp: latest
checksum: 66b24358e15cdd0f705b456346e58b4613f2bf54206b47874decda4152614fb0632d2d662c92b0ea54810109f646e5233e4cdd64dbb2a1949070ee5dc14dab87
languageName: node
linkType: hard

"fsevents@patch:fsevents@~2.1.2#builtin<compat/fsevents>":
version: 2.1.3
resolution: "fsevents@patch:fsevents@npm%3A2.1.3#builtin<compat/fsevents>::version=2.1.3&hash=11e9ea"
dependencies:
Expand All @@ -9429,6 +9438,15 @@ fsevents@^1.2.7:
languageName: node
linkType: hard

fsevents@~2.1.2:
version: 2.1.3
resolution: "fsevents@npm:2.1.3"
dependencies:
node-gyp: latest
checksum: 8977781884d06c5bcb97b5f909efdce9683c925f2a0ce7e098d2cdffe2e0a0a50b1868547bb94dca75428c06535a4a70517a7bb3bb5a974d93bf9ffc067291eb
languageName: node
linkType: hard

"function-bind@npm:^1.1.1":
version: 1.1.1
resolution: "function-bind@npm:1.1.1"
Expand Down Expand Up @@ -11765,7 +11783,7 @@ fsevents@^1.2.7:
"@types/node": "*"
anymatch: ^3.0.3
fb-watchman: ^2.0.0
fsevents: ^2.1.2
fsevents: ^2.2.1
graceful-fs: ^4.2.4
jest-regex-util: ^27.0.0-next.0
jest-serializer: ^27.0.0-next.0
Expand Down