fix: consumption of @npm//:node_modules/{pkg}/package_json.bzl targets across workspaces

Author: jbedard

e2e/bzlmod/BUILD.bazel

@@ -3,8 +3,8 @@ load("@bazel_lib//lib:testing.bzl", "assert_contains")
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 load("@npm//:jasmine/package_json.bzl", jasmine_bin = "bin")
-load("@npm//:less/package_json.bzl", less_bin = "bin")
 load("@npm_meaning-of-life__links//:defs.bzl", npm_link_meaning_of_life = "npm_link_imported_package")
+load("@other_module//:less.bzl", "lessc")
 
 not_windows = select({
     "@platforms//os:windows": ["@platforms//:incompatible"],
@@ -26,14 +26,9 @@ js_test(
     entry_point = "main.mjs",
 )
 
-less_bin.lessc(
+lessc(
     name = "styles",
-    srcs = ["my.less"],
-    outs = ["my.css"],
-    args = [
-        "my.less",
-        "my.css",
-    ],
+    css = "my.less",
 )
 
 assert_contains(
@@ -83,9 +78,13 @@ build_test(
 build_test(
     name = "other_module_run_binary_test",
     targets = [
-        # TODO: https://github.com/aspect-build/rules_js/issues/2725
         # js_run_binary() in @other_repo
-        # "@other_module//:my.css",
+        "@other_module//:my.css",
+        "@other_module//:styles",
+
+        # js_run_binary() with chdir in a subdir of @other_repo
+        "@other_module//subdir:my.css",
+        "@other_module//subdir:styles",
 
         # js_run_binary() running a binary in @other_repo
         ":run_other_module_binary_test",

e2e/bzlmod/MODULE.bazel

@@ -27,7 +27,6 @@ npm.npm_translate_lock(
     # See https://github.com/aspect-build/rules_js/pull/1142 for more info.
     custom_postinstalls = {
         "chalk": "node --version",
-        "less": "npm --version",
         "jasmine": "tsc --version",
     },
     npmrc = "//:.npmrc",

e2e/bzlmod/other_module/BUILD.bazel

@@ -1,6 +1,6 @@
 load("@npm_other_module//:defs.bzl", "npm_link_all_packages")
-load("@npm_other_module//:less/package_json.bzl", less_bin = "bin")
 load("@npm_other_module//:pyright/package_json.bzl", pyright = "bin")
+load(":less.bzl", "lessc", "lessc_binary")
 
 npm_link_all_packages()
 
@@ -16,18 +16,13 @@ genrule(
     cmd = """ echo ".foo { color: red }" > $@""",
 )
 
-less_bin.lessc(
+lessc(
     name = "styles",
-    srcs = ["my.less"],
-    outs = ["my.css"],
-    args = [
-        "my.less",
-        "my.css",
-    ],
+    css = "my.less",
     visibility = ["//visibility:public"],
 )
 
-less_bin.lessc_binary(
+lessc_binary(
     name = "lessc",
     visibility = ["//visibility:public"],
 )

e2e/bzlmod/other_module/less.bzl

@@ -0,0 +1,24 @@
+"""Macros wrapping the less compiler from the other_module npm packages."""
+
+load("@npm_other_module//:less/package_json.bzl", less_bin = "bin")
+
+def lessc(name, css, **kwargs):
+    """Compile a .less file to .css using the less compiler from other_module."""
+    less_bin.lessc(
+        name = name,
+        srcs = [css],
+        outs = [css.replace(".less", ".css")],
+        args = [
+            css,
+            css.replace(".less", ".css"),
+        ],
+        chdir = kwargs.pop("chdir", "."),
+        **kwargs
+    )
+
+def lessc_binary(name, **kwargs):
+    """Create a standalone lessc binary from the less compiler in other_module."""
+    less_bin.lessc_binary(
+        name = name,
+        **kwargs
+    )

e2e/bzlmod/other_module/subdir/BUILD.bazel

@@ -0,0 +1,14 @@
+load("@npm_other_module//:less/package_json.bzl", less_bin = "bin")
+
+# Verifies that js_run_binary() works in a subdirectory of an external module with chdir.
+less_bin.lessc(
+    name = "styles",
+    srcs = ["my.less"],
+    outs = ["my.css"],
+    args = [
+        "my.less",
+        "my.css",
+    ],
+    chdir = package_name(),
+    visibility = ["//visibility:public"],
+)

e2e/bzlmod/other_module/subdir/my.less

@@ -0,0 +1,3 @@
+.box {
+    width: 100px;
+}

e2e/bzlmod/package.json

@@ -4,7 +4,6 @@
     "packageManager": "[email protected]",
     "dependencies": {
         "chalk": "5.3.0",
-        "less": "4.1.3",
         "jasmine": "5.0.2"
     },
     "pnpm": {