feat(npm): use pnpm publish for npm_package

Author: luciomartinez

npm/private/npm_package.bzl

@@ -140,15 +140,19 @@ def npm_package(
         include_runfiles = False,
         hardlink = "auto",
         publishable = False,
+        pnpm_binary = "@pnpm//:pnpm",
         verbose = False,
         **kwargs):
     """A macro that packages sources into a directory (a tree artifact) and provides an `NpmPackageInfo`.
 
     This target can be used as the `src` attribute to `npm_link_package`.
 
     With `publishable = True` the macro also produces a target `[name].publish`, that can be run to publish to an npm registry.
-    Under the hood, this target runs `npm publish`. You can pass arguments to npm by escaping them from Bazel using a double-hyphen,
-    for example: `bazel run //path/to:my_package.publish -- --tag=next`
+    Under the hood, this target runs `pnpm publish`. You can pass arguments to pnpm by escaping them from Bazel using a double-hyphen,
+    for example: `bazel run //path/to:my_package.publish -- --tag=next`.
+
+    pnpm publishing uses the configured `pnpm_binary` and can resolve pnpm workspace settings such as `catalog` entries from
+    `pnpm-workspace.yaml`. Workspace protocol dependencies follow pnpm's own resolution requirements.
 
     Files and directories can be arranged as needed in the output directory using
     the `root_paths`, `include_srcs_patterns`, `exclude_srcs_patterns` and `replace_prefixes` attributes.
@@ -210,7 +214,7 @@ def npm_package(
 
         srcs: Files and/or directories or targets that provide `DirectoryPathInfo` to copy into the output directory.
 
-        args: Arguments that are passed down to `<name>.publish` target and `npm publish` command.
+        args: Arguments that are passed down to `<name>.publish` target and the publish command.
 
         data: Runtime / linktime npm dependencies of this npm package.
 
@@ -409,6 +413,9 @@ def npm_package(
 
         publishable: When True, enable generation of `{name}.publish` target
 
+        pnpm_binary: Label of the pnpm binary used for publishing. This is typically `@pnpm//:pnpm`
+            from the `pnpm` extension in `@aspect_rules_js//npm:extensions.bzl`.
+
         verbose: If true, prints out verbose logs to stdout
 
         **kwargs: Additional attributes such as `tags` and `visibility`
@@ -437,10 +444,11 @@ def npm_package(
             name = "{}.publish".format(name),
             entry_point = Label("@aspect_rules_js//npm/private:npm_publish_mjs"),
             fixed_args = [
+                "$(rootpath {})".format(pnpm_binary),
                 "./$(rootpath :{})".format(name),
             ],
-            data = [name],
-            # required to make npm to be available in PATH
+            data = [name, pnpm_binary],
+            # pnpm <11 may delegate registry operations to npm. This can be removed when rules_js drops pnpm <=10.
             include_npm = True,
             args = args,
             tags = kwargs.get("tags", []) + ["manual"],

npm/private/npm_publish.mjs

@@ -1,9 +1,38 @@
 import { spawnSync } from 'node:child_process'
+import path from 'node:path'
 
-const restArgs = process.argv.slice(2)
+const [toolPath, packageDir, ...restArgs] = process.argv.slice(2)
 
-const spawn = spawnSync('npm', ['publish', ...restArgs], {
-    stdio: 'inherit',
-})
+if (!toolPath || !packageDir) {
+    console.error(
+        'Expected publish tool path and package directory arguments.',
+    )
+    process.exit(1)
+}
+
+const publishCwd = process.env.BUILD_WORKSPACE_DIRECTORY || process.cwd()
+
+const spawn = spawnSync(
+    path.resolve(toolPath),
+    ['publish', path.resolve(packageDir), '--no-git-checks', ...restArgs],
+    {
+        cwd: publishCwd,
+        env: {
+            ...process.env,
+            BAZEL_BINDIR: process.env.BAZEL_BINDIR || '.',
+        },
+        stdio: 'inherit',
+    },
+)
+
+if (spawn.error) {
+    console.error(spawn.error.message)
+    process.exit(1)
+}
+
+if (spawn.signal) {
+    console.error(`pnpm publish exited with signal ${spawn.signal}`)
+    process.exit(1)
+}
 
 process.exit(spawn.status)

npm/private/test/npm_package_publish/BUILD.bazel

@@ -20,16 +20,28 @@ npm_package(
     publishable = True,
 )
 
+npm_package(
+    name = "pkg_pnpm",
+    srcs = [
+        "pnpm_catalog/index.js",
+        "pnpm_catalog/package.json",
+    ],
+    publishable = True,
+    root_paths = [package_name() + "/pnpm_catalog"],
+)
+
 sh_test(
     name = "test",
     srcs = ["test.sh"],
     args = [
         "$(locations :pkg_a.publish)",
         "$(locations :pkg_b.publish)",
+        "$(locations :pkg_pnpm.publish)",
     ],
     data = [
         ":pkg_a.publish",
         ":pkg_b.publish",
+        ":pkg_pnpm.publish",
     ],
     tags = [
         "no-remote-exec",

npm/private/test/npm_package_publish/pnpm_catalog/index.js

@@ -0,0 +1 @@
+export const value = 1

npm/private/test/npm_package_publish/pnpm_catalog/package.json

@@ -0,0 +1,7 @@
+{
+    "name": "@mycorp/pkg-to-publish-pnpm",
+    "version": "1.0.0",
+    "dependencies": {
+        "typescript": "catalog:"
+    }
+}

npm/private/test/npm_package_publish/test.sh

@@ -2,27 +2,66 @@
 
 readonly PUBLISH_A="$1"
 readonly PUBLISH_B="$2"
+readonly PUBLISH_PNPM="$3"
 
-# assert that it prints package name from package.json to stderr,
-# to ensure package directory is properly passed and npm can read it.
-$PUBLISH_A 2>pub_a.log
+# Assert that pnpm reads package.json from the package directory.
+$PUBLISH_A >pub_a.log 2>&1
 
-cat pub_a.log | grep 'npm notice package: @mycorp/pkg-to-publish@'
+cat pub_a.log | grep 'ERR_PNPM_PACKAGE_VERSION_NOT_FOUND'
 
 # shellcheck disable=SC2181
 if [ $? != 0 ]; then
-    echo "FAIL: expected 'npm notice package: @mycorp/pkg-to-publish@' error, GOT: $(cat pub_a.log)"
+    echo "FAIL: expected 'ERR_PNPM_PACKAGE_VERSION_NOT_FOUND' error, GOT: $(cat pub_a.log)"
     exit 1
 fi
 
 # asserting that npm_package has no package.json in it's srcs and we fail correctly.
-# npm publish requires a package.json in the root of the package directory.
-$PUBLISH_B 2>pub_b.log
+# pnpm publish requires a package.json in the root of the package directory.
+$PUBLISH_B >pub_b.log 2>&1
 
-cat pub_b.log | grep 'npm error enoent Could not read package.json:'
+cat pub_b.log | grep 'ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND'
 
 # shellcheck disable=SC2181
 if [ $? != 0 ]; then
-    echo "FAIL: expected 'npm error enoent Could not read package.json:' error, GOT: $(cat pub_b.log)"
+    echo "FAIL: expected 'ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND' error, GOT: $(cat pub_b.log)"
+    exit 1
+fi
+
+readonly TMP_WORKSPACE="$(mktemp -d)"
+trap 'rm -rf "${TMP_WORKSPACE}"' EXIT
+
+cat >"${TMP_WORKSPACE}/pnpm-workspace.yaml" <<'EOF'
+packages:
+    - packages/*
+catalog:
+    typescript: 5.9.3
+EOF
+
+# Ensure pnpm publish can read workspace-level catalog settings when publishing
+# a generated package directory.
+BUILD_WORKSPACE_DIRECTORY="${TMP_WORKSPACE}" \
+    "$PUBLISH_PNPM" --dry-run --json >pub_pnpm.log 2>pub_pnpm.err
+
+# shellcheck disable=SC2181
+if [ $? != 0 ]; then
+    echo "FAIL: expected pnpm publish dry-run to pass, GOT stdout: $(cat pub_pnpm.log), stderr: $(cat pub_pnpm.err)"
+    exit 1
+fi
+
+cat pub_pnpm.log | grep '"name": "@mycorp/pkg-to-publish-pnpm"'
+
+# shellcheck disable=SC2181
+if [ $? != 0 ]; then
+    echo "FAIL: expected pnpm publish dry-run output to include package name, GOT: $(cat pub_pnpm.log)"
+    exit 1
+fi
+
+# The source package.json is 132 bytes. pnpm rewrites catalog: to the concrete
+# version before packing, producing the smaller manifest below.
+cat pub_pnpm.log | grep '"size": 116'
+
+# shellcheck disable=SC2181
+if [ $? != 0 ]; then
+    echo "FAIL: expected pnpm publish to resolve catalog: in package.json, GOT: $(cat pub_pnpm.log)"
     exit 1
 fi