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.

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

fix: do not use npm_translate_lock patch_args without patches #1693

Closed
wants to merge 1 commit into from

Conversation

jbedard
Copy link
Member

@jbedard jbedard commented May 3, 2024

Fix #1427
An alternative to #837 from @kormide

This makes pure pnpm.patchedDependencies nicer like #837, normally having the same effect, I think?

I think the main difference is that #837 removes -p0 if there are no npm_translate_lock(patches) but still applies the rest of npm_translate_lock(patch_args). While this PR does not apply npm_translate_lock(patch_args) when there are no npm_translate_lock(patches).

Maybe this PR is actually more confusing? 🤦
Maybe we should just drop support for mixing these 2 types of patches in 2.x? See #1694


Test plan

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

Copy link

aspect-workflows bot commented May 3, 2024

Test

All tests were cache hits

211 tests (100.0%) were fully cached saving 42s.


Test

e2e/bzlmod

All tests were cache hits

4 tests (100.0%) were fully cached saving 1s.


Test

e2e/gyp_no_install_script

All tests were cache hits

3 tests (100.0%) were fully cached saving 995ms.


Test

e2e/js_image_oci

All tests were cache hits

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


Test

e2e/npm_link_package

All tests were cache hits

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


Test

e2e/npm_link_package-esm

All tests were cache hits

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


Test

e2e/npm_translate_lock

All tests were cache hits

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


Test

e2e/npm_translate_lock_empty

All tests were cache hits

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


Test

e2e/npm_translate_lock_multi

All tests were cache hits

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


Test

e2e/npm_translate_lock_partial_clone

All tests were cache hits

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


Test

e2e/npm_translate_lock_subdir_patch

All tests were cache hits

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


Test

e2e/npm_translate_package_lock

All tests were cache hits

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


Test

e2e/npm_translate_yarn_lock

All tests were cache hits

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


Test

e2e/package_json_module

All tests were cache hits

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


Test

e2e/pnpm_lockfiles

All tests were cache hits

7 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 6s.


Test

e2e/pnpm_workspace_rerooted

All tests were cache hits

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


Test

e2e/repo_mapping

All tests were cache hits

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


Test

e2e/rules_foo

All tests were cache hits

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


Test

e2e/vendored_node

All tests were cache hits

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


Buildifier      Format

@jbedard
Copy link
Member Author

jbedard commented May 3, 2024

I think we should just do #1694 instead of this or #837

WDYT?

jbedard added a commit that referenced this pull request May 9, 2024
@jbedard
Copy link
Member Author

jbedard commented May 9, 2024

Done with #1694

@jbedard jbedard closed this May 9, 2024
@jbedard jbedard deleted the 1427-pnpm-patch-args branch May 9, 2024 18:58
gregmagolan pushed a commit that referenced this pull request May 10, 2024
gregmagolan pushed a commit that referenced this pull request May 10, 2024
gregmagolan pushed a commit that referenced this pull request May 13, 2024
jbedard added a commit to jbedard/rules_js that referenced this pull request May 14, 2024
jbedard added a commit that referenced this pull request May 14, 2024
jbedard added a commit to jbedard/rules_js that referenced this pull request May 16, 2024
gregmagolan pushed a commit that referenced this pull request May 20, 2024
gregmagolan pushed a commit that referenced this pull request May 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Error from npm_translate_lock when using pnpm.patchedDependencies
1 participant