fix(cypress): use depsets for runfiles and data (#3240)

mrmeku · alexeagle · commit 4889a1acc911 · 2022-01-20T11:42:40.000-08:00
diff --git a/internal/node/node.bzl b/internal/node/node.bzl
@@ -156,7 +156,7 @@ def _join(*elements):
 def _nodejs_binary_impl(ctx, data = [], runfiles = [], expanded_args = []):
     node_modules_manifest = write_node_modules_manifest(ctx, link_workspace_root = ctx.attr.link_workspace_root)
     node_modules_depsets = []
-    data = ctx.attr.data + data
+    data = depset(ctx.attr.data + data).to_list()
 
     # Also include files from npm fine grained deps as inputs.
     # These deps are identified by the ExternalNpmPackageInfo provider.
diff --git a/packages/cypress/internal/cypress_web_test.bzl b/packages/cypress/internal/cypress_web_test.bzl
@@ -95,26 +95,25 @@ def _cypress_web_test_impl(ctx):
         cypressinfo.cypress_bin_path,
     ]
 
-    runfiles = (
+    runfiles = depset(
         [plugin_wrapper] +
         ctx.files.config_file +
         ctx.files.cypress_npm_package +
         ctx.files.plugin_file +
         ctx.files.srcs +
-        cypressinfo.cypress_files
+        cypressinfo.cypress_files,
     )
 
-    data = [
+    data = depset([
         ctx.attr.config_file,
         ctx.attr.cypress_npm_package,
         ctx.attr.plugin_file,
-        ctx.attr.srcs,
-    ]
+    ] + ctx.attr.srcs)
 
     return nodejs_test_kwargs["implementation"](
         ctx,
-        data = data,
-        runfiles = runfiles,
+        data = data.to_list(),
+        runfiles = runfiles.to_list(),
         expanded_args = expanded_args,
     )
 
