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: do not support mixing pnpm.patchedDependencies and npm_translate_lock(patches) #1694

Merged
merged 1 commit into from
May 9, 2024
Merged

fix: do not support mixing pnpm.patchedDependencies and npm_translate_lock(patches) #1694

merged 1 commit into from
May 9, 2024

Conversation

jbedard
Copy link
Member

@jbedard jbedard commented May 3, 2024 •
edited
Loading

Fix #1427

An alternative to #837 or #1693. This removes the option of mixing pnpm.patchedDependencies + npm_translate_lock(patches, patch_args) on a single package and instead providing simple defaults to patch args when using pnpm.patchedDependencies.

Changes are visible to end-users: yes/no

  • Searched for relevant documentation and updated as needed: yes
  • Breaking change (forces users to change their own code or config): yes
  • Suggested release notes appear below: yes

Patches from both pnpm.patchedDependencies and npm_translate_lock(patches) can no longer be applied to the same npm package.

Test plan

  • Covered by existing test cases
  • Manual testing; please provide instructions so we can reproduce:

@aspect-workflows Aspect Workflows
Copy link

aspect-workflows bot commented May 3, 2024 •
edited
Loading

Test

All tests were cache hits

190 tests (100.0%) were fully cached saving 51s.

Test

e2e/bzlmod

All tests were cache hits

4 tests (100.0%) were fully cached saving 467ms.

Test

e2e/gyp_no_install_script

All tests were cache hits

2 tests (100.0%) were fully cached saving 693ms.

Test

e2e/js_image_oci

All tests were cache hits

1 test (100.0%) was fully cached saving 7s.

Test

e2e/npm_link_package

All tests were cache hits

2 tests (100.0%) were fully cached saving 845ms.

Test

e2e/npm_link_package-esm

All tests were cache hits

2 tests (100.0%) were fully cached saving 773ms.

Test

e2e/npm_translate_lock

All tests were cache hits

1 test (100.0%) was fully cached saving 73ms.

Test

e2e/npm_translate_lock_empty

All tests were cache hits

1 test (100.0%) was fully cached saving 73ms.

Test

e2e/npm_translate_lock_multi

All tests were cache hits

2 tests (100.0%) were fully cached saving 271ms.

Test

e2e/npm_translate_lock_partial_clone

All tests were cache hits

1 test (100.0%) was fully cached saving 117ms.

Test

e2e/npm_translate_lock_subdir_patch

All tests were cache hits

1 test (100.0%) was fully cached saving 248ms.

Test

e2e/npm_translate_package_lock

All tests were cache hits

1 test (100.0%) was fully cached saving 73ms.

Test

e2e/npm_translate_yarn_lock

All tests were cache hits

1 test (100.0%) was fully cached saving 73ms.

Test

e2e/package_json_module

All tests were cache hits

1 test (100.0%) was fully cached saving 511ms.

Test

e2e/pnpm_lockfiles

All tests were cache hits

6 tests (100.0%) were fully cached saving 2s.

Test

e2e/pnpm_workspace

All tests were cache hits

8 tests (100.0%) were fully cached saving 3s.

Test

e2e/pnpm_workspace_rerooted

All tests were cache hits

6 tests (100.0%) were fully cached saving 2s.

Test

e2e/repo_mapping

All tests were cache hits

2 tests (100.0%) were fully cached saving 451ms.

Test

e2e/rules_foo

All tests were cache hits

2 tests (100.0%) were fully cached saving 393ms.

Test

e2e/vendored_node

All tests were cache hits

1 test (100.0%) was fully cached saving 187ms.

Buildifier      Format

@jbedard jbedard mentioned this pull request May 3, 2024
Closed
@jbedard jbedard marked this pull request as ready for review May 3, 2024 18:40
@gregmagolan gregmagolan mentioned this pull request May 6, 2024
Closed
21 tasks
@jbedard jbedard force-pushed the 1427-not-both branch 2 times, most recently from 7f5cf33 to 2d7c130 Compare May 7, 2024 00:59
@jbedard jbedard requested a review from thesayyn May 9, 2024 00:01
thesayyn
thesayyn approved these changes May 9, 2024
View reviewed changes
Copy link
Member

@thesayyn thesayyn left a comment

Choose a reason for hiding this comment

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

SGTM, reasonable

gregmagolan
gregmagolan approved these changes May 9, 2024
View reviewed changes
Copy link
Member

@gregmagolan gregmagolan left a comment

Choose a reason for hiding this comment

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

🌮

@jbedard jbedard enabled auto-merge (squash) May 9, 2024 18:55
@jbedard jbedard merged commit b66dad1 into aspect-build:2.x May 9, 2024
96 of 97 checks passed
@jbedard jbedard deleted the 1427-not-both branch May 9, 2024 18:56
This was referenced May 9, 2024
Closed
Closed
gregmagolan pushed a commit that referenced this pull request May 10, 2024
@jbedard @gregmagolan
fix: do not support mixing pnpm.patchedDependencies and npm_translate…
f045423 
…_lock(patches) (#1694)

Fix #1427
Close #1693
Close #837
gregmagolan pushed a commit that referenced this pull request May 10, 2024
@jbedard @gregmagolan
fix: do not support mixing pnpm.patchedDependencies and npm_translate…
29b9afd 
…_lock(patches) (#1694)

Fix #1427
Close #1693
Close #837
@gregmagolan gregmagolan mentioned this pull request May 10, 2024
Merged
gregmagolan pushed a commit that referenced this pull request May 13, 2024
@jbedard @gregmagolan
fix: do not support mixing pnpm.patchedDependencies and npm_translate…
96902e9 
…_lock(patches) (#1694)

Fix #1427
Close #1693
Close #837
jbedard added a commit to jbedard/rules_js that referenced this pull request May 14, 2024
@jbedard
fix: do not support mixing pnpm.patchedDependencies and npm_translate…
8abac39 
…_lock(patches) (aspect-build#1694)

Fix aspect-build#1427
Close aspect-build#1693
Close aspect-build#837
jbedard added a commit that referenced this pull request May 14, 2024
@jbedard
fix: do not support mixing pnpm.patchedDependencies and npm_translate…
6dd0376 
…_lock(patches) (#1694)

Fix #1427
Close #1693
Close #837
jbedard added a commit to jbedard/rules_js that referenced this pull request May 16, 2024
@jbedard
fix: do not support mixing pnpm.patchedDependencies and npm_translate…
68e1333 
…_lock(patches) (aspect-build#1694)

Fix aspect-build#1427
Close aspect-build#1693
Close aspect-build#837
gregmagolan pushed a commit that referenced this pull request May 20, 2024
@jbedard @gregmagolan
fix: do not support mixing pnpm.patchedDependencies and npm_translate…
f43be0b 
…_lock(patches) (#1694)

Fix #1427
Close #1693
Close #837
gregmagolan pushed a commit that referenced this pull request May 20, 2024
@jbedard @gregmagolan
fix: do not support mixing pnpm.patchedDependencies and npm_translate…
bfb2293 
…_lock(patches) (#1694)

Fix #1427
Close #1693
Close #837
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gregmagolan gregmagolan gregmagolan approved these changes

@thesayyn thesayyn thesayyn approved these changes

@kormide kormide Awaiting requested review from kormide

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jbedard @gregmagolan @thesayyn