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

fix(pnpm): support pnpm lockfile v9 #7994

Merged
merged 1 commit into from Apr 17, 2024
Merged

fix(pnpm): support pnpm lockfile v9 #7994

merged 1 commit into from Apr 17, 2024
+147 −6

Conversation

chris-olszewski
Copy link
Contributor

@chris-olszewski chris-olszewski commented Apr 16, 2024 •
edited by padmaia

Description

Closes #7993

Only thing that required updating is that as of 9.0.0-rc.0 the lockfile version was updated to 9.0 instead of 7.0 that was used from 9.0.0-alpha.0-9.0.0-beta.3. I believe this was the only change made since I added support for lockfile v7 in #7853.

Testing Instructions

Added roundtrip test along with unit test for package resolution.

Manual test with repro provided in #7993

[0 olszewski@chriss-mbp] /tmp/pnpm-prune-repro $ turbo_dev --skip-infer prune app-a 
Generating pruned monorepo for app-a in /private/tmp/pnpm-prune-repro/out
 - Added app-a
 - Added pkg-a
 - Added tooling-config
[0 olszewski@chriss-mbp] /tmp/pnpm-prune-repro $ cd out 
[0 olszewski@chriss-mbp] /tmp/pnpm-prune-repro/out $ pnpm i --frozen-lockfile
Scope: all 4 workspace projects
Lockfile is up to date, resolution step is skipped
Packages: +2
++
Progress: resolved 2, reused 2, downloaded 0, added 2, done

devDependencies:
+ turbo 1.13.3-canary.1

Done in 245ms

Closes TURBO-2826

@chris-olszewski chris-olszewski marked this pull request as ready for review April 16, 2024 23:36
@chris-olszewski chris-olszewski requested a review from a team as a code owner April 16, 2024 23:36
@vercel Vercel
Copy link

vercel bot commented Apr 16, 2024 •
edited

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
examples-nonmonorepo ✅ Ready (Inspect) Visit Preview Apr 16, 2024 11:42pm
rust-docs ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 16, 2024 11:42pm
8 Ignored Deployments
Name Status Preview Comments Updated (UTC)
examples-basic-web ⬜️ Ignored (Inspect) Apr 16, 2024 11:42pm
examples-designsystem-docs ⬜️ Ignored (Inspect) Apr 16, 2024 11:42pm
examples-gatsby-web ⬜️ Ignored (Inspect) Apr 16, 2024 11:42pm
examples-kitchensink-blog ⬜️ Ignored (Inspect) Apr 16, 2024 11:42pm
examples-native-web ⬜️ Ignored (Inspect) Apr 16, 2024 11:42pm
examples-svelte-web ⬜️ Ignored (Inspect) Apr 16, 2024 11:42pm
examples-tailwind-web ⬜️ Ignored (Inspect) Apr 16, 2024 11:42pm
examples-vite-web ⬜️ Ignored (Inspect) Apr 16, 2024 11:42pm

@github-actions GitHub Actions
Copy link
Contributor

🟢 Turbopack Benchmark CI successful 🟢

Thanks

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Apr 17, 2024 •
edited

🟢 CI successful 🟢

Thanks

mehulkar
mehulkar approved these changes Apr 17, 2024
View reviewed changes
Copy link
Contributor

@mehulkar mehulkar left a comment

Choose a reason for hiding this comment

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

Looks good. I would kind of like to see prysk tests with fixtures in addition to unit test, just to see a full e2e validation, but it's not blocking by any means

crates/turborepo-lockfiles/fixtures/pnpm-v9.yaml
Comment on lines +62 to +64
{
integrity: sha512-D/RRtqHch0I5q/Pod7mgLPGrvjcDpvBe95yp5hNy59+ZSyKHlkDrm/pQaA/+6mdjHEQB8eIL/18nrKx/B5qduA==,
}
Copy link
Contributor

Choose a reason for hiding this comment

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

umm.. what is this?? json inside yaml?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They did in fact add JSON to YAML: https://www.yaml.info/learn/flowstyle.html

Copy link
Contributor

Choose a reason for hiding this comment

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

look-how-theyve-massacred-my-boy.jpg

@chris-olszewski chris-olszewski merged commit 6a34946 into main Apr 17, 2024
56 checks passed
@chris-olszewski chris-olszewski deleted the olszewski/feat_support_pnpm_9_lockfile branch April 17, 2024 15:52
@kdy1 kdy1 mentioned this pull request Apr 19, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anthonyshew anthonyshew anthonyshew left review comments

@mehulkar mehulkar mehulkar approved these changes

@NicholasLYang NicholasLYang Awaiting requested review from NicholasLYang NicholasLYang is a code owner automatically assigned from vercel/turbo-oss

Assignees
No one assigned
Labels
created-by: turborepo owned-by: turborepo
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

pnpm 9 lockfile support
3 participants
@chris-olszewski @mehulkar @anthonyshew