From 798abd34bb9c9c1f79bc77ae1109bae2c9f7b68a Mon Sep 17 00:00:00 2001
From: Jason Bedard <jason+github@jbedard.ca>
Date: Thu, 15 Aug 2024 12:13:06 -0700
Subject: [PATCH] build: upgrade to rules_js v2

---
 MODULE.bazel                | 2 +-
 e2e/npm-links/MODULE.bazel  | 2 +-
 esbuild/dependencies.bzl    | 6 +++---
 esbuild/private/esbuild.bzl | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index ce1ed8d..854eee0 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -8,7 +8,7 @@ module(
 
 # Lower-bounds (minimum) versions for direct runtime dependencies
 bazel_dep(name = "aspect_bazel_lib", version = "2.7.7")
-bazel_dep(name = "aspect_rules_js", version = "2.0.0-rc1")
+bazel_dep(name = "aspect_rules_js", version = "2.0.0")
 bazel_dep(name = "bazel_skylib", version = "1.5.0")
 bazel_dep(name = "platforms", version = "0.0.8")
 bazel_dep(name = "rules_nodejs", version = "6.2.0")
diff --git a/e2e/npm-links/MODULE.bazel b/e2e/npm-links/MODULE.bazel
index 2e98118..44d51dc 100644
--- a/e2e/npm-links/MODULE.bazel
+++ b/e2e/npm-links/MODULE.bazel
@@ -4,7 +4,7 @@ local_path_override(
     path = "../..",
 )
 
-bazel_dep(name = "aspect_rules_js", version = "2.0.0-rc1", dev_dependency = True)
+bazel_dep(name = "aspect_rules_js", version = "2.0.0", 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)
diff --git a/esbuild/dependencies.bzl b/esbuild/dependencies.bzl
index 6a7860f..7155614 100644
--- a/esbuild/dependencies.bzl
+++ b/esbuild/dependencies.bzl
@@ -21,9 +21,9 @@ def rules_esbuild_dependencies():
 
     http_archive(
         name = "aspect_rules_js",
-        sha256 = "7085e915cdba6f2dc0ce93bef59f5d040a539b510b840456b6ac7ccc2bee7886",
-        strip_prefix = "rules_js-2.0.0-rc1",
-        url = "https://github.com/aspect-build/rules_js/releases/download/v2.0.0-rc1/rules_js-v2.0.0-rc1.tar.gz",
+        sha256 = "6b7e73c35b97615a09281090da3645d9f03b2a09e8caa791377ad9022c88e2e6",
+        strip_prefix = "rules_js-2.0.0",
+        url = "https://github.com/aspect-build/rules_js/releases/download/v2.0.0/rules_js-v2.0.0.tar.gz",
     )
 
     http_archive(
diff --git a/esbuild/private/esbuild.bzl b/esbuild/private/esbuild.bzl
index 88c2c70..eb9f5e5 100644
--- a/esbuild/private/esbuild.bzl
+++ b/esbuild/private/esbuild.bzl
@@ -421,7 +421,7 @@ def _esbuild_impl(ctx):
     else:
         # If we're not bundling then include all transitive files
         transitive_sources = js_lib_helpers.gather_transitive_sources(
-            sources = output_sources_depset,
+            sources = output_sources,
             targets = ctx.attr.srcs + ctx.attr.deps,
         )
         transitive_types = js_lib_helpers.gather_transitive_types(