From 435464a8a6434539e90ea9369b285068c18a148e Mon Sep 17 00:00:00 2001 From: Christian Scott Date: Fri, 22 Dec 2023 18:08:16 +1100 Subject: [PATCH 1/2] remove dep on :node_bin --- internal/node/node.bzl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/internal/node/node.bzl b/internal/node/node.bzl index 3706b537..d55e79bd 100755 --- a/internal/node/node.bzl +++ b/internal/node/node.bzl @@ -253,14 +253,11 @@ fi node_tool_files.append(ctx.file._lcov_merger_script) node_tool_files.append(node_modules_manifest) - is_builtin = ctx.attr._node.label.workspace_name in ["nodejs_%s" % p for p in BUILT_IN_NODE_PLATFORMS] - runfiles = [] runfiles.extend(node_tool_files) runfiles.extend(ctx.files._bash_runfile_helper) runfiles.append(ctx.outputs.loader_script) runfiles.append(ctx.outputs.require_patch_script) - #runfiles.append(ctx.file._repository_args) # First replace any instances of "$(rlocation " with "$$(rlocation " to preserve # legacy uses of "$(rlocation" @@ -579,10 +576,6 @@ Predefined genrule variables are not supported in this context. default = Label("//internal/node:loader.js"), allow_single_file = True, ), - "_node": attr.label( - default = Label("@nodejs//:node_bin"), - allow_single_file = True, - ), "_node_patches_script": attr.label( default = Label("//internal/node:node_patches.js"), allow_single_file = True, From 8bf9dc5515760b37da84d3444d6ffb92f21fd62d Mon Sep 17 00:00:00 2001 From: Christian Scott Date: Fri, 22 Dec 2023 18:27:38 +1100 Subject: [PATCH 2/2] remove dep on @nodejs//:bin/node_repo_args.sh --- internal/node/node.bzl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/internal/node/node.bzl b/internal/node/node.bzl index d55e79bd..46f28400 100755 --- a/internal/node/node.bzl +++ b/internal/node/node.bzl @@ -306,7 +306,6 @@ fi "TEMPLATED_loader_script": _to_manifest_path(ctx, ctx.outputs.loader_script), "TEMPLATED_modules_manifest": _to_manifest_path(ctx, node_modules_manifest), "TEMPLATED_node_patches_script": _to_manifest_path(ctx, ctx.file._node_patches_script), - #"TEMPLATED_repository_args": _to_manifest_path(ctx, ctx.file._repository_args), "TEMPLATED_require_patch_script": _to_manifest_path(ctx, ctx.outputs.require_patch_script), "TEMPLATED_runfiles_helper_script": _to_manifest_path(ctx, ctx.file._runfile_helpers_main), "TEMPLATED_vendored_node": ctx.toolchains["@build_bazel_rules_nodejs//toolchains/node:toolchain_type"].nodeinfo.target_tool_path, @@ -580,10 +579,6 @@ Predefined genrule variables are not supported in this context. default = Label("//internal/node:node_patches.js"), allow_single_file = True, ), - "_repository_args": attr.label( - default = Label("@nodejs//:bin/node_repo_args.sh"), - allow_single_file = True, - ), "_require_patch_template": attr.label( default = Label("//internal/node:require_patch.js"), allow_single_file = True,