add files generated by yarn install to .gitignore #1692
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
.pnp.cjs is redundant with yarn.lock, and as a file format it's a disaster magnet for git merge conflicts.
|
Merge conflict on the PR to prevent future merge conflicts. Ironic. |
|
Thank you for bringing this up. Turns our that this depends on Zero-Installs vs. non-Zero-Installs. See https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored and https://yarnpkg.com/features/caching#zero-installs. I'm not necessarily convinced we need Zero-Installs but for now we use it. This is also why the whole cache is checked-in. If we give up Zero-Installs this should be discussed in a separate issue. So I did #1696 instead. Hope it helps. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix on #788
https://yarnpkg.com/features/pnp
.pnp.loader.mjsnever changes, and.pnp.cjs(pnp's replacement for anode_modules/directory) is just a22k+23k line file derived from from the 8k lineyarn.lock, except it's much more prone to git merge conflicts.The best way to solve merge conflicts is to delete it and regenerate it (in cases where there were no conflicts in yarn.lock), so best practice is to just delete it ahead of time.