feat(esbuild): support transitive runfiles when importing css

bazel-contrib#2545 (comment)
ankitects · Mar 28, 2021 · 41708b5 · 41708b5
1 parent e735d60
commit 41708b5
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/packages/esbuild/esbuild.bzl b/packages/esbuild/esbuild.bzl
@@ -28,6 +28,9 @@ def _esbuild_impl(ctx):
         elif hasattr(dep, "files"):
             deps_depsets.append(dep.files)
 
+        if DefaultInfo in dep:
+            deps_depsets.append(dep[DefaultInfo].data_runfiles.files)
+
         if NpmPackageInfo in dep:
             deps_depsets.append(dep[NpmPackageInfo].sources)
             npm_workspaces.append(dep[NpmPackageInfo].workspace)

diff --git a/packages/esbuild/test/css/BUILD.bazel b/packages/esbuild/test/css/BUILD.bazel
@@ -8,12 +8,26 @@ copy_to_bin(
     srcs = ["external.css"],
 )
 
+ts_library(
+    name = "dep",
+    srcs = [
+        "dep.ts",
+    ],
+    data = [
+        ":external_copied",
+    ],
+    deps = [
+        "@npm//@types/node",
+    ],
+)
+
 ts_library(
     name = "main",
     srcs = [
         "main.ts",
     ],
     deps = [
+        ":dep",
         "@npm//@types/node",
     ],
 )
@@ -22,7 +36,6 @@ esbuild(
     name = "default",
     entry_point = "main.ts",
     deps = [
-        "external_copied",
         ":main",
     ],
 )
@@ -32,7 +45,6 @@ esbuild(
     entry_point = "main.ts",
     output_css = True,
     deps = [
-        "external_copied",
         ":main",
     ],
 )

diff --git a/packages/esbuild/test/css/dep.ts b/packages/esbuild/test/css/dep.ts
@@ -0,0 +1,3 @@
+import "./external.css";
+
+export function dep() {}
diff --git a/packages/esbuild/test/css/main.ts b/packages/esbuild/test/css/main.ts
@@ -1 +1,3 @@
-import "./external.css";
+import { dep } from "./dep";
+
+dep();