Skip to content

Commit 5bb1161

Browse files
authored
fix: support for pnpm 11.0.0-rc.5 (#2812)
When we initially added support for 11.0.0-rc.0, we had to put in a workaround in lockfile-test.bzl due to the way peer suffixes changed unexpectedly: pnpm/pnpm#11272 This has now been fixed in more recent release candidates, so we can drop that workaround. --- ### Changes are visible to end-users: yes - Searched for relevant documentation and updated as needed: yes/no - Breaking change (forces users to change their own code or config): no - Suggested release notes appear below: no ### Test plan - Covered by existing test cases
1 parent 40ad11c commit 5bb1161

8 files changed

Lines changed: 20 additions & 18 deletions

File tree

.aspect/workflows/config.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,9 @@ tasks:
170170
bazel:
171171
flags: ['--test_tag_filters=-skip-on-bazel9']
172172
env:
173-
USE_BAZEL_VERSION: '9.x'
173+
# TODO: change this back to 9.x once this bug is fixed:
174+
# https://github.com/bazelbuild/bazel/issues/29393
175+
USE_BAZEL_VERSION: '9.0.2'
174176
- format:
175177
queue: aspect-medium
176178
- buildifier:

e2e/pnpm_lockfiles/lockfile-test.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ def lockfile_test(npm_link_all_packages, name = None):
148148
# Workaround for peer suffixes changing in pnpm 11. We may want to
149149
# revisit this depending on the outcome of:
150150
# https://github.com/pnpm/pnpm/issues/11272
151-
":.aspect_rules_js/node_modules/@scoped+c@file+..+projects+c_@scoped+b@%sprojects+b" % ("+" if lock_version == "v110" else ""),
151+
":.aspect_rules_js/node_modules/@scoped+c@file+..+projects+c_@scoped+b@projects+b",
152152
":.aspect_rules_js/node_modules/@[email protected]",
153153

154154
# file: 4.17.21.tgz tarbal

e2e/pnpm_lockfiles/v101/pnpm-lock.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/pnpm_lockfiles/v101/snapshots/defs.bzl

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/pnpm_lockfiles/v110/pnpm-lock.yaml

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/pnpm_lockfiles/v110/snapshots/defs.bzl

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/pnpm_lockfiles/v90/pnpm-lock.yaml

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/pnpm_lockfiles/v90/snapshots/defs.bzl

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)