test: enable all e2e tests on bzlmod

Author: jbedard

.aspect/workflows/config.yaml

@@ -105,7 +105,7 @@ workspaces:
     e2e/repo_mapping:
         icon: js
         tasks: *e2e_tasks
-    e2e/rules_foo:
+    e2e/npm_translate_lock_link_workspace:
         icon: js
         tasks: *e2e_tasks
     e2e/runfiles:

.gitattributes

@@ -1,6 +1,6 @@
 docs/*_*.md linguist-generated=true
 pnpm-lock.yaml linguist-generated=true
-e2e/rules_foo/npm_repositories.bzl linguist-generated=true
+e2e/npm_translate_lock_link_workspace/npm_repositories.bzl linguist-generated=true
 **/snapshots/** linguist-generated=true
 js/private/coverage/coverage.js linguist-generated=true
 js/private/devserver/js_run_devserver.mjs linguist-generated=true

.github/workflows/ci.yaml

@@ -47,6 +47,7 @@ jobs:
                     e2e/js_run_devserver
                     e2e/npm_link_package
                     e2e/npm_link_package-esm
+                    e2e/npm_link_package-rerooted
                     e2e/npm_translate_lock
                     e2e/npm_translate_lock_disable_hooks
                     e2e/npm_translate_lock_empty
@@ -66,7 +67,7 @@ jobs:
                     e2e/pnpm_workspace_rerooted
                     e2e/pnpm_version
                     e2e/runfiles
-                    e2e/rules_foo
+                    e2e/npm_translate_lock_link_workspace
                     e2e/stamped_package_json
                     e2e/update_pnpm_lock
                     e2e/update_pnpm_lock_with_import
@@ -164,12 +165,20 @@ jobs:
                           major: 7
                       bzlmod: 0
                       folder: e2e/js_image_oci
+                    - bzlmod: 1
+                      folder: e2e/npm_link_package
+                      bazel-version:
+                          major: 6
                     - bzlmod: 1
                       folder: e2e/npm_link_package-esm
+                      bazel-version:
+                          major: 6
                     - bzlmod: 1
-                      folder: e2e/npm_link_package
+                      folder: e2e/npm_link_package-rerooted
+                      bazel-version:
+                          major: 6
                     - bzlmod: 1
-                      folder: e2e/rules_foo
+                      folder: e2e/npm_translate_lock_link_workspace
                       bazel-version:
                           major: 6
                     # gyp_no_install_script+patch_from_repo+js_run_devserver are broken in an usual way on 6.5.0

e2e/npm_link_package-esm/BUILD.bazel

@@ -1,7 +1,6 @@
 load("@aspect_bazel_lib//lib:output_files.bzl", "output_files")
 load("@aspect_rules_js//npm:defs.bzl", "npm_link_package")
 load("@bazel_skylib//rules:build_test.bzl", "build_test")
-load("@foo//:@aspect-test/a/package_json.bzl", aspect_test_a_bin = "bin")
 load("@npm//:defs.bzl", "npm_link_all_packages")
 
 npm_link_all_packages(name = "node_modules")
@@ -22,10 +21,6 @@ npm_link_package(
     src = "//wrapper-lib:wrapper-lib_pkg",
 )
 
-aspect_test_a_bin.bin_a_test(
-    name = "aspect_test_a_bin_test",
-)
-
 output_files(
     name = "e2e/lib-package_store_entry",
     paths = [

e2e/npm_link_package-esm/MODULE.bazel

@@ -1,6 +1,22 @@
-###############################################################################
-# Bazel now uses Bzlmod by default to manage external dependencies.
-# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
-#
-# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
-###############################################################################
+bazel_dep(name = "aspect_rules_js", version = "0.0.0", dev_dependency = True)
+local_path_override(
+    module_name = "aspect_rules_js",
+    path = "../..",
+)
+
+bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
+
+npm = use_extension(
+    "@aspect_rules_js//npm:extensions.bzl",
+    "npm",
+    dev_dependency = True,
+)
+npm.npm_translate_lock(
+    name = "npm",
+    data = ["//:package.json"],
+    npmrc = "//:.npmrc",
+    pnpm_lock = "//:pnpm-lock.yaml",
+    verify_node_modules_ignored = "//:.bazelignore",
+)
+use_repo(npm, "npm")

e2e/npm_link_package-esm/WORKSPACE

@@ -36,16 +36,3 @@ npm_translate_lock(
 load("@npm//:repositories.bzl", "npm_repositories")
 
 npm_repositories()
-
-local_repository(
-    name = "rules_foo",
-    path = "../rules_foo",
-)
-
-load("@rules_foo//foo:repositories.bzl", "foo_repositories")
-
-foo_repositories()
-
-load("@foo//:npm_repositories.bzl", foo_npm_repositories = "npm_repositories")
-
-foo_npm_repositories()

e2e/npm_link_package-esm/WORKSPACE.bzlmod

@@ -0,0 +1,2 @@
+# The presence of this file causes WORKSPACE to be ignored when bzlmod is enabled.
+# See https://docs.google.com/document/d/1JtXIVnXyFZ4bmbiBCr5gsTH4-opZAFf5DMMb-54kES0/edit#heading=h.y054fjub9max

e2e/npm_link_package-esm/src/BUILD.bazel

@@ -11,7 +11,6 @@ js_binary(
         "//:node_modules/@e2e/pkg",
         "//:node_modules/@e2e/wrapper-lib",
         "//:node_modules/sharp",
-        "@foo//:node_modules/@aspect-test/a",
     ],
     entry_point = "main.mjs",
     node_options = [
@@ -30,7 +29,6 @@ js_test(
         "//:node_modules/@e2e/pkg",
         "//:node_modules/@e2e/wrapper-lib",
         "//:node_modules/sharp",
-        "@foo//:node_modules/@aspect-test/a",
     ],
     entry_point = "main.mjs",
     log_level = "info",

e2e/npm_link_package-esm/src/main.mjs

@@ -24,11 +24,6 @@ console.log(wrapper.id())
 console.log(wrapper.libId())
 console.log(wrapper.subdirId())
 console.log(wrapper.pkgId())
-import rulesFooA from '../../foo/node_modules/@aspect-test/a/index.js'
-console.log('--rulesFooA--')
-console.log(rulesFooA.id())
-console.log(rulesFooA.idB())
-console.log(rulesFooA.idC())
 import sharp from 'sharp'
 const roundedCorners = Buffer.from(
     '<svg><rect x="0" y="0" width="200" height="200" rx="50" ry="50"/></svg>'

e2e/npm_link_package-rerooted/MODULE.bazel

@@ -0,0 +1,22 @@
+bazel_dep(name = "aspect_rules_js", version = "0.0.0", dev_dependency = True)
+local_path_override(
+    module_name = "aspect_rules_js",
+    path = "../..",
+)
+
+bazel_dep(name = "aspect_bazel_lib", version = "2.7.7", dev_dependency = True)
+bazel_dep(name = "bazel_skylib", version = "1.5.0", dev_dependency = True)
+
+npm = use_extension(
+    "@aspect_rules_js//npm:extensions.bzl",
+    "npm",
+    dev_dependency = True,
+)
+npm.npm_translate_lock(
+    name = "npm",
+    data = ["//root:package.json"],
+    npmrc = "//:.npmrc",
+    pnpm_lock = "//root:pnpm-lock.yaml",
+    verify_node_modules_ignored = "//:.bazelignore",
+)
+use_repo(npm, "npm")