[pull] main from vercel:main #207
Merged
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
### Description CLOSES #11301 ### Testing Instructions Verified the fix in the browser and added a test.
Co-authored-by: Turbobot <[email protected]>
## Summary Fixes multiple issues with `turbo prune` producing corrupted bun.lock files that fail `bun install --frozen-lockfile`. While investigating #11266 (git repository package corruption), I discovered additional issues affecting the pruned lockfile format. ## Issues Fixed ### 1. GitHub/git package format corruption (fixes #11266) The deserializer was type-blind when processing package entries - it stored `registry: Some("")` for any package with an empty string at position 1, including GitHub/git packages that should never have a registry field. Per bun.lock.zig, the format is: - npm packages: 4 elements `[ident, registry, info, checksum]` - github/git packages: 3 elements `[ident, info, .bun-tag]` — no registry The serializer then output 4-element arrays for GitHub packages, which bun rejects. ### 2. Missing metadata sections Pruned lockfiles were missing: `configVersion`, `trustedDependencies`, `overrides`, `catalog`, `catalogs`, and `patchedDependencies`. ### 3. JSON formatting issues - Missing trailing commas in nested structures (bun's parser requires them) - `optionalPeers` arrays formatted as `[ "a", "b", ]` instead of `["a", "b"]` ## Test Plan - Red/green tests for all fixes (tests fail without fix, pass with fix) - Comprehensive coverage for all 9 package types and 6 metadata sections - Tested with real monorepo using `bun install --frozen-lockfile` - Verified both `turbo prune` and `turbo prune --docker` work (same encode path) ## Related Issues - Fixes #11266 - Related: #11007, #10782, #10783 --------- Co-authored-by: Anthony Shew <[email protected]>
Co-authored-by: Turbobot <[email protected]>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )