Skip to content

Commit 22d81a7

Browse files
authored
fix: return full label paths from npm_link_targets (#2655)
Fix #2417 ### Changes are visible to end-users: no ### Test plan - Covered by existing test cases
1 parent eeb3745 commit 22d81a7

12 files changed

Lines changed: 13 additions & 13 deletions

File tree

e2e/npm_translate_lock_disable_hooks/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/npm_translate_lock_empty/snapshots/npm_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/npm_translate_lock_replace_packages/snapshots/npm_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/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/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.

e2e/pnpm_workspace/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_workspace_rerooted/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.

npm/private/npm_translate_lock_generate.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -552,7 +552,7 @@ def npm_link_targets(name = "node_modules", package = None, prod = True, dev = T
552552
targets = starlark_codegen_utils.to_list_attr(lists["dev"], 3, 4, quote_value = False),
553553
))
554554
first_link = False
555-
npm_link_targets_bzl.append(""" return link_targets""")
555+
npm_link_targets_bzl.append(""" return ["//%s%s" % (bazel_package, target) for target in link_targets]""")
556556
return npm_link_targets_bzl
557557

558558
def _generate_npm_visibility_config(package_visibility_attr):

npm/private/npm_translate_lock_generate.docs.bzl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ load("@npm//:defs.bzl", "npm_link_targets", "npm_link_all_packages")
1818

1919
# buildifier: disable=unused-variable
2020
def npm_link_targets(name = "node_modules", package = None, prod = True, dev = True):
21-
"""Generated list of target names that are linked by npm_link_all_packages()
21+
"""Generated list of target labels that are linked by npm_link_all_packages()
2222
2323
Args:
2424
name: name of catch all target to generate for all packages linked
@@ -35,7 +35,7 @@ def npm_link_targets(name = "node_modules", package = None, prod = True, dev = T
3535
Default True includes development dependencies.
3636
3737
Returns:
38-
A list of target names that are linked by npm_link_all_packages()
38+
A list of target labels (full package labels) that are linked by npm_link_all_packages()
3939
"""
4040
pass
4141

npm/private/test/snapshots/npm_defs-no_dev.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)