feat: upgrade to rules_js 2.0

aspect-build · Apr 21, 2024 · 77a9fd5 · 77a9fd5
1 parent 3c1ccc0
commit 77a9fd5
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 22 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -6,27 +6,28 @@ module(
     compatibility_level = 1,
 )
 
+# Lower-bounds (minimum) versions for direct runtime dependencies
+bazel_dep(name = "aspect_bazel_lib", version = "2.7.1")
+bazel_dep(name = "aspect_rules_js", version = "2.0.0-alpha.2")
+bazel_dep(name = "bazel_skylib", version = "1.5.0")
+bazel_dep(name = "platforms", version = "0.0.5")
+bazel_dep(name = "rules_nodejs", version = "6.1.0")
+
 cypress = use_extension("//cypress:extensions.bzl", "cypress")
 cypress.toolchain(cypress_version = "12.3.0")
 use_repo(cypress, "cypress_toolchains")
 
 register_toolchains("@cypress_toolchains//:all")
 
-bazel_dep(name = "platforms", version = "0.0.5")
-bazel_dep(name = "aspect_rules_js", version = "1.38.0")
-bazel_dep(name = "rules_nodejs", version = "5.8.2")
-
 node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
 node.toolchain(node_version = "16.14.2")
-#################################
+
+####### Dev dependencies ########
 
 bazel_dep(name = "rules_go", version = "0.39.1", dev_dependency = True, repo_name = "io_bazel_rules_go")
 bazel_dep(name = "gazelle", version = "0.31.0", dev_dependency = True, repo_name = "bazel_gazelle")
 bazel_dep(name = "stardoc", version = "0.6.2", dev_dependency = True, repo_name = "io_bazel_stardoc")
 
-bazel_dep(name = "aspect_bazel_lib", version = "2.5.3")
-bazel_dep(name = "bazel_skylib", version = "1.5.0")
-
 bazel_dep(
     name = "buildifier_prebuilt",
     version = "6.4.0",

diff --git a/cypress/defs.bzl b/cypress/defs.bzl
@@ -42,11 +42,7 @@ def cypress_test(name, cypress = "//:node_modules/cypress", **kwargs):
         ],
         chdir = native.package_name(),
         enable_runfiles = select({
-            "@aspect_rules_js//js/private:enable_runfiles": True,
-            "//conditions:default": False,
-        }),
-        unresolved_symlinks_enabled = select({
-            "@aspect_rules_js//js/private:experimental_allow_unresolved_symlinks": True,
+            "@aspect_bazel_lib//lib:enable_runfiles": True,
             "//conditions:default": False,
         }),
         **kwargs
@@ -87,11 +83,7 @@ def cypress_module_test(name, runner, cypress = "//:node_modules/cypress", **kwa
     _cypress_test(
         name = name,
         enable_runfiles = select({
-            "@aspect_rules_js//js/private:enable_runfiles": True,
-            "//conditions:default": False,
-        }),
-        unresolved_symlinks_enabled = select({
-            "@aspect_rules_js//js/private:experimental_allow_unresolved_symlinks": True,
+            "@aspect_bazel_lib//lib:enable_runfiles": True,
             "//conditions:default": False,
         }),
         entry_point = runner,

diff --git a/cypress/private/cypress_test.bzl b/cypress/private/cypress_test.bzl
@@ -52,11 +52,13 @@ def _impl(ctx):
 
     runfiles = ctx.runfiles(
         files = files,
-        transitive_files = js_lib_helpers.gather_files_from_js_providers(
+        transitive_files = js_lib_helpers.gather_files_from_js_infos(
             targets = ctx.attr.data,
+            include_sources = ctx.attr.include_sources,
+            include_types = ctx.attr.include_types,
             include_transitive_sources = ctx.attr.include_transitive_sources,
-            include_declarations = ctx.attr.include_declarations,
-            include_npm_linked_packages = ctx.attr.include_npm_linked_packages,
+            include_transitive_types = ctx.attr.include_transitive_types,
+            include_npm_sources = ctx.attr.include_npm_sources,
         ),
     ).merge(launcher.runfiles).merge_all([
         target[DefaultInfo].default_runfiles

diff --git a/e2e/workspace/MODULE.bazel b/e2e/workspace/MODULE.bazel
@@ -4,7 +4,8 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_rules_js", version = "1.38.0")
+bazel_dep(name = "aspect_bazel_lib", version = "2.7.1")
+bazel_dep(name = "aspect_rules_js", version = "2.0.0-alpha.2")
 
 npm = use_extension("@aspect_rules_js//npm:extensions.bzl", "npm", dev_dependency = True)
 npm.npm_translate_lock(