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.
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
feat: add git-branch-lockfile config to generate lockfile in each branch #4475
Merged
Merged
Changes from all commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
771978d
feat: add git-branch-lockfile config to generate lockfile in each branch
chengcyber 781addd
feat: add --clean-git-branch-lockfiles arg to pnpm install
chengcyber 3713348
chore: test lockfile name
chengcyber 5ea34d3
chore: add more tests for git branch lockfile
chengcyber bb014fa
chore: syntax tweak accoding to code review
chengcyber bfb8a67
refactor: extract git checks to a package @pnpm/git-utils
chengcyber 01bc5f9
test: git-utils
chengcyber ad8091d
test: @pnpm/core test
chengcyber 7363a2d
refactor: clean-git-branch-lockfiles -> merge-git-branch-lockfiles
chengcyber e19b2e9
fix: cleanGitBranchLockfiles when install --merge-git-branch-lockfiles
chengcyber 5f39748
refactor: reuse readwantedlockfile logic
chengcyber 3708de4
feat: merge git branch lockfiles unsupported in headless
chengcyber 545ed3b
chore: turn on sourcemap accidently
chengcyber b2b6151
chore: test file
chengcyber 36878d5
feat: merge-git-branch-lockfiles-branch-pattern
chengcyber 4d6c772
feat: reuse merge lockfile changes logic
chengcyber 124156e
Merge branch 'main' into feat-lockfile-assembly
zkochan 2a6aca5
Merge remote-tracking branch 'origin/main' into feat-lockfile-assembly
zkochan f132ebf
Update packages/lockfile-file/src/gitBranchLockfile.ts
chengcyber 1942722
Merge remote-tracking branch 'origin/main' into feat-lockfile-assembly
zkochan acccbb2
fix: add missing dependency to @pnpm/config
zkochan e598218
test: fix
zkochan eeec313
Merge remote-tracking branch 'origin/main' into feat-lockfile-assembly
zkochan f53e407
test: fix
zkochan 19b457c
Merge remote-tracking branch 'origin/main' into feat-lockfile-assembly
zkochan 847db0b
fix: engines in git-utils
zkochan ebb052b
test: fix
zkochan 4df4553
test: fix
zkochan 04361ce
test: fix
zkochan 958df6a
docs: add changeset
zkochan File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
--- | ||
"@pnpm/config": minor | ||
"@pnpm/core": minor | ||
"@pnpm/get-context": minor | ||
"@pnpm/git-utils": minor | ||
"@pnpm/headless": minor | ||
"@pnpm/lockfile-file": minor | ||
"@pnpm/plugin-commands-installation": minor | ||
"@pnpm/plugin-commands-publishing": minor | ||
"pnpm": minor | ||
"@pnpm/assert-project": minor | ||
--- | ||
|
||
New settings added: use-git-branch-lockfile, merge-git-branch-lockfiles, merge-git-branch-lockfiles-branch-pattern. |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
This file contains 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this needed? The default value of
use-git-branch-lockfile
is set tofalse
at line 184There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The idea is to keep the same code style with
useLockfile