aspect-build · jbedard · Apr 30, 2025 · Apr 30, 2025
diff --git a/e2e/pnpm_lockfiles/.bazelignore b/e2e/pnpm_lockfiles/.bazelignore
@@ -1,5 +1,10 @@
 node_modules/
-cases/node_modules
+cases/versionless-patch-v9/node_modules
+cases/docusaurus-direct-peer-v9/node_modules
+cases/isaacs-cliui-v90/node_modules
+cases/override-with-alias-url-v9/node_modules
+cases/docusaurus-direct-peer-v6/node_modules
+cases/tarball-no-url-v54/node_modules
 projects/a/node_modules
 projects/a-types/node_modules
 projects/b/node_modules

diff --git a/e2e/pnpm_lockfiles/MODULE.bazel b/e2e/pnpm_lockfiles/MODULE.bazel
@@ -14,12 +14,12 @@ PNPM_LOCK_VERSIONS = [
 
 # Lockfiles with unique test cases
 PNPM_LOCK_TEST_CASES = [
-    "tarball-no-url-v54.yaml",
-    "override-with-alias-url-v9.yaml",
-    "isaacs-cliui-v90.yaml",
-    "docusaurus-direct-peer-v6.yaml",
-    "docusaurus-direct-peer-v9.yaml",
-    "versionless-patch-v9.yaml",
+    "tarball-no-url-v54",
+    "override-with-alias-url-v9",
+    "isaacs-cliui-v90",
+    "docusaurus-direct-peer-v6",
+    "docusaurus-direct-peer-v9",
+    "versionless-patch-v9",
 ]
 
 bazel_dep(name = "aspect_bazel_lib", version = "2.14.0")
@@ -94,7 +94,7 @@ npm = use_extension(
 [
     npm.npm_translate_lock(
         name = lockfile.replace(".yaml", ""),
-        pnpm_lock = "//cases:%s" % lockfile,
+        pnpm_lock = "//cases/%s:pnpm-lock.yaml" % lockfile,
         verify_node_modules_ignored = "//:.bazelignore",
     )
     for lockfile in PNPM_LOCK_TEST_CASES

diff --git a/e2e/pnpm_lockfiles/WORKSPACE b/e2e/pnpm_lockfiles/WORKSPACE
@@ -13,12 +13,12 @@ PNPM_LOCK_VERSIONS = [
 
 # Lockfiles with unique test cases
 PNPM_LOCK_TEST_CASES = [
-    "tarball-no-url-v54.yaml",
-    "override-with-alias-url-v9.yaml",
-    "isaacs-cliui-v90.yaml",
-    "docusaurus-direct-peer-v6.yaml",
-    "docusaurus-direct-peer-v9.yaml",
-    "versionless-patch-v9.yaml",
+    "tarball-no-url-v54",
+    "override-with-alias-url-v9",
+    "isaacs-cliui-v90",
+    "docusaurus-direct-peer-v6",
+    "docusaurus-direct-peer-v9",
+    "versionless-patch-v9",
 ]
 
 load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
@@ -60,7 +60,7 @@ npm_repositories_v90()
 [
     npm_translate_lock(
         name = lockfile.replace(".yaml", ""),
-        pnpm_lock = "//cases:%s" % lockfile,
+        pnpm_lock = "//cases/%s:pnpm-lock.yaml" % lockfile,
         verify_node_modules_ignored = "//:.bazelignore",
     )
     for lockfile in PNPM_LOCK_TEST_CASES

diff --git a/e2e/pnpm_lockfiles/cases/BUILD.bazel b/e2e/pnpm_lockfiles/cases/BUILD.bazel
diff --git a/e2e/pnpm_lockfiles/cases/docusaurus-direct-peer-v6/BUILD.bazel b/e2e/pnpm_lockfiles/cases/docusaurus-direct-peer-v6/BUILD.bazel
@@ -0,0 +1,14 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@docusaurus-direct-peer-v6//:defs.bzl", docusaurus_direct_with_peers_v6_link_all = "npm_link_all_packages")
+
+exports_files(["pnpm-lock.yaml"])
+
+docusaurus_direct_with_peers_v6_link_all()
+
+build_test(
+    name = "docusaurus_direct_with_peers",
+    targets = [
+        ":node_modules",
+        ":node_modules/@docusaurus/module-type-aliases",
+    ],
+)
diff --git a/e2e/pnpm_lockfiles/cases/package.json → ...es/docusaurus-direct-peer-v6/package.json b/e2e/pnpm_lockfiles/cases/package.json → ...es/docusaurus-direct-peer-v6/package.json
diff --git a/...iles/cases/docusaurus-direct-peer-v6.yaml → .../docusaurus-direct-peer-v6/pnpm-lock.yaml b/...iles/cases/docusaurus-direct-peer-v6.yaml → .../docusaurus-direct-peer-v6/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/cases/pnpm-workspace.yaml → ...saurus-direct-peer-v6/pnpm-workspace.yaml b/e2e/pnpm_lockfiles/cases/pnpm-workspace.yaml → ...saurus-direct-peer-v6/pnpm-workspace.yaml
diff --git a/e2e/pnpm_lockfiles/cases/docusaurus-direct-peer-v9/BUILD.bazel b/e2e/pnpm_lockfiles/cases/docusaurus-direct-peer-v9/BUILD.bazel
@@ -0,0 +1,14 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@docusaurus-direct-peer-v9//:defs.bzl", docusaurus_direct_with_peers_v9_link_all = "npm_link_all_packages")
+
+exports_files(["pnpm-lock.yaml"])
+
+docusaurus_direct_with_peers_v9_link_all()
+
+build_test(
+    name = "docusaurus_direct_with_peers",
+    targets = [
+        ":node_modules",
+        ":node_modules/@docusaurus/module-type-aliases",
+    ],
+)
diff --git a/e2e/pnpm_lockfiles/cases/docusaurus-direct-peer-v9/package.json b/e2e/pnpm_lockfiles/cases/docusaurus-direct-peer-v9/package.json
@@ -0,0 +1,5 @@
+{
+    "pnpm": {
+        "onlyBuiltDependencies": []
+    }
+}
diff --git a/...iles/cases/docusaurus-direct-peer-v9.yaml → .../docusaurus-direct-peer-v9/pnpm-lock.yaml b/...iles/cases/docusaurus-direct-peer-v9.yaml → .../docusaurus-direct-peer-v9/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/cases/docusaurus-direct-peer-v9/pnpm-workspace.yaml b/e2e/pnpm_lockfiles/cases/docusaurus-direct-peer-v9/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+packages:
+    - '.'
diff --git a/e2e/pnpm_lockfiles/cases/isaacs-cliui-v90/BUILD.bazel b/e2e/pnpm_lockfiles/cases/isaacs-cliui-v90/BUILD.bazel
@@ -0,0 +1,14 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@isaacs-cliui-v90//:defs.bzl", isaacs_cliui_v90_link_all = "npm_link_all_packages")
+
+exports_files(["pnpm-lock.yaml"])
+
+isaacs_cliui_v90_link_all()
+
+build_test(
+    name = "isaacs_cliui",
+    targets = [
+        ":node_modules",
+        ":node_modules/@isaacs/cliui",
+    ],
+)
diff --git a/e2e/pnpm_lockfiles/cases/isaacs-cliui-v90/package.json b/e2e/pnpm_lockfiles/cases/isaacs-cliui-v90/package.json
@@ -0,0 +1,5 @@
+{
+    "pnpm": {
+        "onlyBuiltDependencies": []
+    }
+}
diff --git a/...npm_lockfiles/cases/isaacs-cliui-v90.yaml → ...les/cases/isaacs-cliui-v90/pnpm-lock.yaml b/...npm_lockfiles/cases/isaacs-cliui-v90.yaml → ...les/cases/isaacs-cliui-v90/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/cases/isaacs-cliui-v90/pnpm-workspace.yaml b/e2e/pnpm_lockfiles/cases/isaacs-cliui-v90/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+packages:
+    - '.'
diff --git a/e2e/pnpm_lockfiles/cases/override-with-alias-url-v9/BUILD.bazel b/e2e/pnpm_lockfiles/cases/override-with-alias-url-v9/BUILD.bazel
@@ -0,0 +1,14 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@override-with-alias-url-v9//:defs.bzl", override_with_alias_link_all = "npm_link_all_packages")
+
+exports_files(["pnpm-lock.yaml"])
+
+override_with_alias_link_all()
+
+build_test(
+    name = "override-with-alias-url-v9",
+    targets = [
+        ":node_modules",
+        "node_modules/lodash.pick",
+    ],
+)
diff --git a/e2e/pnpm_lockfiles/cases/override-with-alias-url-v9/package.json b/e2e/pnpm_lockfiles/cases/override-with-alias-url-v9/package.json
@@ -0,0 +1,5 @@
+{
+    "pnpm": {
+        "onlyBuiltDependencies": []
+    }
+}
diff --git a/...les/cases/override-with-alias-url-v9.yaml → ...override-with-alias-url-v9/pnpm-lock.yaml b/...les/cases/override-with-alias-url-v9.yaml → ...override-with-alias-url-v9/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/cases/override-with-alias-url-v9/pnpm-workspace.yaml b/e2e/pnpm_lockfiles/cases/override-with-alias-url-v9/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+packages:
+    - '.'
diff --git a/e2e/pnpm_lockfiles/cases/tarball-no-url-v54/BUILD.bazel b/e2e/pnpm_lockfiles/cases/tarball-no-url-v54/BUILD.bazel
@@ -0,0 +1,14 @@
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@tarball-no-url-v54//:defs.bzl", tarball_no_url_link_all = "npm_link_all_packages")
+
+exports_files(["pnpm-lock.yaml"])
+
+tarball_no_url_link_all()
+
+build_test(
+    name = "tarball-no-url-v54",
+    targets = [
+        ":node_modules",
+        ":node_modules/@aspect-build/a",
+    ],
+)
diff --git a/e2e/pnpm_lockfiles/cases/tarball-no-url-v54/package.json b/e2e/pnpm_lockfiles/cases/tarball-no-url-v54/package.json
@@ -0,0 +1,5 @@
+{
+    "pnpm": {
+        "onlyBuiltDependencies": []
+    }
+}
diff --git a/...m_lockfiles/cases/tarball-no-url-v54.yaml → ...s/cases/tarball-no-url-v54/pnpm-lock.yaml b/...m_lockfiles/cases/tarball-no-url-v54.yaml → ...s/cases/tarball-no-url-v54/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/cases/tarball-no-url-v54/pnpm-workspace.yaml b/e2e/pnpm_lockfiles/cases/tarball-no-url-v54/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+packages:
+    - '.'
diff --git a/e2e/pnpm_lockfiles/cases/versionless-patch-v9/BUILD.bazel b/e2e/pnpm_lockfiles/cases/versionless-patch-v9/BUILD.bazel
@@ -0,0 +1,23 @@
+load("@aspect_rules_js//js:defs.bzl", "js_test")
+load("@bazel_skylib//rules:build_test.bzl", "build_test")
+load("@versionless-patch-v9//:defs.bzl", versionless_patch_link_all = "npm_link_all_packages")
+
+exports_files(["pnpm-lock.yaml"])
+
+versionless_patch_link_all()
+
+build_test(
+    name = "versionless_patch_targets",
+    targets = [
+        ":node_modules",
+        ":node_modules/@aspect-test/e",
+    ],
+)
+
+js_test(
+    name = "versionless_patch_test",
+    data = [
+        ":node_modules/@aspect-test/e",
+    ],
+    entry_point = "versionless-patch.spec.js",
+)
diff --git a/e2e/pnpm_lockfiles/cases/versionless-patch-v9/package.json b/e2e/pnpm_lockfiles/cases/versionless-patch-v9/package.json
@@ -0,0 +1,5 @@
+{
+    "pnpm": {
+        "onlyBuiltDependencies": []
+    }
+}
diff --git a/...es/cases/patches/aspect-test-e-pnpm.patch → ...patch-v9/patches/aspect-test-e-pnpm.patch b/...es/cases/patches/aspect-test-e-pnpm.patch → ...patch-v9/patches/aspect-test-e-pnpm.patch
diff --git a/...lockfiles/cases/versionless-patch-v9.yaml → ...cases/versionless-patch-v9/pnpm-lock.yaml b/...lockfiles/cases/versionless-patch-v9.yaml → ...cases/versionless-patch-v9/pnpm-lock.yaml
diff --git a/e2e/pnpm_lockfiles/cases/versionless-patch-v9/pnpm-workspace.yaml b/e2e/pnpm_lockfiles/cases/versionless-patch-v9/pnpm-workspace.yaml
@@ -0,0 +1,2 @@
+packages:
+    - '.'
diff --git a/...lockfiles/cases/versionless-patch.spec.js → ...onless-patch-v9/versionless-patch.spec.js b/...lockfiles/cases/versionless-patch.spec.js → ...onless-patch-v9/versionless-patch.spec.js