refactor: align pnpm package store with lockfile

Signed-off-by: Jason Bedard <[email protected]>

Author: jbedard

MODULE.bazel

@@ -222,7 +222,7 @@ use_repo(
     "npm__rollup__2.70.2",
     "npm__rollup__2.70.2__links",
     "npm__unused__0.2.2__links",
-    "npm__webpack-bundle-analyzer__4.5.0_bufferutil_4.0.8",
+    "npm__webpack-bundle-analyzer_4.5.0_bufferutil_4.0.8",
 )
 
 # As an example, manually import a package using explicit coordinates.

e2e/pnpm_lockfiles/MODULE.bazel

@@ -72,21 +72,21 @@ npm = use_extension(
         "lock-%s__rollup__3.29.4__links" % version,
 
         # Dep only referenced via npm: should have the real package name in the repo name
-        "lock-%s__at_types_sizzle__2.3.9" % version,
-        "lock-%s__at_types_sizzle__2.3.9__links" % version,
+        # "lock-%s__at_types_sizzle_2.3.9" % version,
+        # "lock-%s__at_types_sizzle_2.3.9__links" % version,
 
         # Dep with peers
-        "lock-%s__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2" % version,
-        "lock-%s__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2__links" % version,
+        # "lock-%s__at_aspect-test_d_2.0.0_aspect-test_c_2.0.2" % version,
+        # "lock-%s__at_aspect-test_d_2.0.0_aspect-test_c_2.0.2__links" % version,
 
         # Deep with many peers
-        "lock-%s__at_rollup_plugin-typescript__8.2.1_%s" % (
-            version,
-            "3vgsug3mjv7wvue74swjdxifxy" if version == "v54" else "626159424" if version == "v90" else "1813138439",
-        ),
+        # "lock-%s__at_rollup_plugin-typescript_8.2.1_%s" % (
+        #     version,
+        #     "3vgsug3mjv7wvue74swjdxifxy" if version == "v54" else "626159424" if version == "v90" else "1813138439",
+        # ),
 
         # Dep with patch
-        "lock-%s__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq" % version,
+        # "lock-%s__meaning-of-life_1.0.0_o3deharooos255qt5xdujc3cuq" % version,
     )
     for version in PNPM_LOCK_VERSIONS
 ]

e2e/pnpm_lockfiles/lockfile-test.bzl

@@ -110,7 +110,7 @@ def lockfile_test(npm_link_all_packages, name = None):
             # npm: alias to a package that has many peers
             ":node_modules/rollup-plugin-with-peers",
             # underlying repo for the many-peers package
-            "@%s__at_rollup_plugin-typescript__8.2.1_%s//:pkg" % (lock_repo, "3vgsug3mjv7wvue74swjdxifxy" if lock_version == "v54" else "626159424" if lock_version == "v90" else "1813138439"),
+            # "@%s__at_rollup_plugin-typescript_8.2.1_%s//:pkg" % (lock_repo, "3vgsug3mjv7wvue74swjdxifxy" if lock_version == "v54" else "626159424" if lock_version == "v90" else "1813138439"),
 
             # uuv 'hasBin'
             ":node_modules/uvu",
@@ -164,7 +164,7 @@ def lockfile_test(npm_link_all_packages, name = None):
             # npm: alias to package not listed elsewhere
             ":node_modules/alias-only-sizzle",
             ":.aspect_rules_js/node_modules/@[email protected]",
-            "@%s__at_types_sizzle__2.3.9//:pkg" % lock_repo,
+            # "@%s__at_types_sizzle__2.3.9//:pkg" % lock_repo if lock_version == "v90" else "[email protected]",
 
             # Targets within the virtual store...
             # Direct dep targets
@@ -189,14 +189,14 @@ def lockfile_test(npm_link_all_packages, name = None):
 
             # Patched dependencies
             ":.aspect_rules_js/node_modules/[email protected]_o3deharooos255qt5xdujc3cuq",
-            "@%s__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq//:pkg" % lock_repo,
+            # "@%s__meaning-of-life__1.0.0_o3deharooos255qt5xdujc3cuq//:pkg" % lock_repo,
 
             # Direct deps from custom registry
             ":.aspect_rules_js/node_modules/@[email protected]",
 
             # Direct deps with peers
             ":.aspect_rules_js/node_modules/@[email protected]_at_aspect-test_c_2.0.2",
-            "@%s__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2//:pkg" % lock_repo,
+            # "@%s__at_aspect-test_d__2.0.0_at_aspect-test_c_2.0.2//:pkg" % lock_repo,
         ],
     )