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

feat(core): add support for pnpm v8 #15925

Merged
merged 9 commits into from
Apr 6, 2023
Merged

feat(core): add support for pnpm v8 #15925

merged 9 commits into from
Apr 6, 2023

Conversation

meeroslav
Copy link
Contributor

@meeroslav meeroslav commented Mar 28, 2023 •
edited

This PR adds support for pnpm lockfile v6:

  • Add fallback info when pruning fails
  • Detect v6 as an inline-specifiers version for the pre-formatting function
  • Support the new @ version separator in the keys when detecting package name and version
  • Support the new (...) version extra information
  • Stringify v6 lockfile specifiers
  • Map the new format to the old one during the parsing
  • Add unit tests

Current Behavior

Expected Behavior

Related Issue(s)

Fixes #15960
Fixes #15973

@meeroslav meeroslav added the scope: core core nx functionality label Mar 28, 2023
@meeroslav meeroslav self-assigned this Mar 28, 2023
@vercel
Copy link

vercel bot commented Mar 28, 2023 •
edited

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

Name Status Preview Comments Updated (UTC)
nx-dev ✅ Ready (Inspect) Visit Preview 💬 Add feedback Apr 4, 2023 2:52pm

@nx-cloud
Copy link

nx-cloud bot commented Mar 28, 2023 •
edited

☁️ Nx Cloud Report

CI is running/has finished running commands for commit c39dcf2. As they complete they will appear below. Click to see the status, the terminal output, and the build insights.

📂 See all runs for this branch

✅ Successfully ran 8 targets

Sent with 💌 from NxCloud.

@roderik roderik mentioned this pull request Mar 29, 2023
Closed
@meeroslav meeroslav marked this pull request as ready for review March 30, 2023 12:19
meeroslav
meeroslav commented Mar 30, 2023
View reviewed changes
packages/nx/src/plugins/js/lock-file/__fixtures__/auxiliary-packages/pnpm-lock.yaml.pruned.ts
yargs: 17.6.2
devDependencies:
react: 18.2.0
specifiers:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The newly added format converter from pnp makes those changes

meeroslav
meeroslav commented Mar 30, 2023
View reviewed changes
packages/nx/src/plugins/js/lock-file/__fixtures__/pruning/devkit-yargs/pnpm-lock.yaml.ts
nx: 15.4.5
typescript: 4.8.4
yargs: 17.6.2
specifiers:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The newly added format converter from pnp makes those changes

meeroslav
meeroslav commented Mar 30, 2023
View reviewed changes
packages/nx/src/plugins/js/lock-file/__fixtures__/pruning/typescript/pnpm-lock.yaml.ts
@@ -1,12 +1,10 @@
export default `lockfileVersion: 5.4

importers:
specifiers:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The newly added format converter from pnp makes those changes

@meeroslav meeroslav force-pushed the fix-pnpm-v8-issues branch 2 times, most recently from a6eb965 to 09f45ec Compare March 30, 2023 12:27
@zaunermax zaunermax mentioned this pull request Mar 31, 2023
Closed
AgentEnder
AgentEnder previously requested changes Apr 3, 2023
View reviewed changes
Copy link
Member

@AgentEnder AgentEnder left a comment

Choose a reason for hiding this comment

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

Looking good, few small changes

packages/nx/src/plugins/js/lock-file/pnpm-parser.spec.ts Outdated Show resolved Hide resolved
packages/nx/src/plugins/js/lock-file/pnpm-parser.spec.ts Outdated Show resolved Hide resolved
packages/nx/src/plugins/js/lock-file/pnpm-parser.spec.ts Outdated Show resolved Hide resolved
packages/nx/src/plugins/js/lock-file/pnpm-parser.spec.ts Outdated Show resolved Hide resolved
packages/nx/src/plugins/js/lock-file/pnpm-parser.spec.ts Outdated Show resolved Hide resolved
packages/nx/src/plugins/js/lock-file/pnpm-parser.ts Outdated Show resolved Hide resolved
packages/nx/src/plugins/js/lock-file/utils/pnpm-normalizer.ts Show resolved Hide resolved
packages/nx/src/plugins/js/lock-file/utils/pnpm-normalizer.ts Show resolved Hide resolved
packages/nx/src/plugins/js/lock-file/utils/pnpm-normalizer.ts Show resolved Hide resolved
@meeroslav meeroslav force-pushed the fix-pnpm-v8-issues branch 2 times, most recently from f03b177 to c6af46b Compare April 4, 2023 13:05
@FrozenPandaz FrozenPandaz dismissed AgentEnder’s stale review April 6, 2023 14:41

Feedback was addressed

@FrozenPandaz FrozenPandaz merged commit 443d45d into nrwl:master Apr 6, 2023
3 checks passed
@github-actions
Copy link

This pull request has already been merged/closed. If you experience issues related to these changes, please open a new issue referencing this pull request.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 12, 2023
@meeroslav meeroslav deleted the fix-pnpm-v8-issues branch April 27, 2023 09:55
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@FrozenPandaz FrozenPandaz FrozenPandaz approved these changes

@vsavkin vsavkin Awaiting requested review from vsavkin

@AgentEnder AgentEnder Awaiting requested review from AgentEnder

Assignees

@meeroslav meeroslav

Labels
scope: core core nx functionality
Projects
None yet
Milestone
No milestone
3 participants
@meeroslav @AgentEnder @FrozenPandaz