Skip to content

Commit 08eb590

Browse files
authored
refactor: remove not needed empty lists from bazel files generation (#2134)
1 parent 7ebadf5 commit 08eb590

File tree

17 files changed

+20
-60
lines changed

17 files changed

+20
-60
lines changed

e2e/gyp_no_install_script/snapshots/bzlmod/segfault-handler_defs.bzl

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/gyp_no_install_script/snapshots/wksp/segfault-handler_defs.bzl

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/npm_translate_lock/WORKSPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ load("@aspect_rules_js//npm:repositories.bzl", "npm_translate_lock")
1616
npm_translate_lock(
1717
name = "npm",
1818
data = ["//:package.json"],
19+
exclude_package_contents = {
20+
"[email protected]": ["**/README*"],
21+
},
1922
npmrc = "//:.npmrc",
2023
pnpm_lock = "//:pnpm-lock.yaml",
2124
update_pnpm_lock = True,

e2e/npm_translate_lock/snapshots/wksp/repositories.bzl

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/npm_translate_lock_disable_hooks/snapshots/aspect_test_c_links_defs.bzl

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/pnpm_lockfiles/v54/snapshots/rollup_links_defs.bzl

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/pnpm_lockfiles/v60/snapshots/rollup_links_defs.bzl

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/pnpm_lockfiles/v61/snapshots/rollup_links_defs.bzl

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

e2e/pnpm_lockfiles/v90/snapshots/rollup_links_defs.bzl

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

npm/private/npm_import.bzl

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,8 @@ def npm_imported_package_store(name):
7272
name = "{{}}/ref".format(store_target_name),
7373
package = "{package}",
7474
version = "{version}",
75-
exclude_package_contents = {exclude_package_contents},
7675
dev = {dev},
77-
tags = ["manual"],
76+
tags = ["manual"],{maybe_exclude_package_contents}
7877
)
7978
8079
# post-lifecycle target with reference deps for use in terminal target with transitive closure
@@ -83,10 +82,9 @@ def npm_imported_package_store(name):
8382
src = "{{}}/pkg_lc".format(store_target_name) if {has_lifecycle_build_target} else "{npm_package_target}",
8483
package = "{package}",
8584
version = "{version}",
86-
exclude_package_contents = {exclude_package_contents},
8785
dev = {dev},
8886
deps = ref_deps,
89-
tags = ["manual"],
87+
tags = ["manual"],{maybe_exclude_package_contents}
9088
)
9189
9290
# package store target with transitive closure of all npm package dependencies
@@ -95,11 +93,10 @@ def npm_imported_package_store(name):
9593
src = None if {transitive_closure_pattern} else "{npm_package_target}",
9694
package = "{package}",
9795
version = "{version}",
98-
exclude_package_contents = {exclude_package_contents},
9996
dev = {dev},
10097
deps = deps,
10198
visibility = ["//visibility:public"],
102-
tags = ["manual"],
99+
tags = ["manual"],{maybe_exclude_package_contents}
103100
)
104101
105102
# filegroup target that provides a single file which is
@@ -121,21 +118,19 @@ _LINK_JS_PACKAGE_LIFECYCLE_TMPL = """\
121118
name = "{{}}/pkg_pre_lc_lite".format(store_target_name),
122119
package = "{package}",
123120
version = "{version}",
124-
exclude_package_contents = {exclude_package_contents},
125121
dev = {dev},
126122
deps = ref_deps,
127-
tags = ["manual"],
123+
tags = ["manual"],{maybe_exclude_package_contents}
128124
)
129125
130126
# terminal pre-lifecycle target for use in lifecycle build target below
131127
_npm_package_store(
132128
name = "{{}}/pkg_pre_lc".format(store_target_name),
133129
package = "{package}",
134130
version = "{version}",
135-
exclude_package_contents = {exclude_package_contents},
136131
dev = {dev},
137132
deps = lc_deps,
138-
tags = ["manual"],
133+
tags = ["manual"],{maybe_exclude_package_contents}
139134
)
140135
141136
# lifecycle build action
@@ -761,6 +756,12 @@ def _npm_import_links_rule_impl(rctx):
761756

762757
public_visibility = ("//visibility:public" in rctx.attr.package_visibility)
763758

759+
maybe_exclude_package_contents = ""
760+
if rctx.attr.exclude_package_contents == []:
761+
maybe_exclude_package_contents = ""
762+
elif rctx.attr.exclude_package_contents != None:
763+
maybe_exclude_package_contents = "\n exclude_package_contents = " + starlark_codegen_utils.to_list_attr(rctx.attr.exclude_package_contents) + ","
764+
764765
npm_link_pkg_bzl_vars = dict(
765766
deps = starlark_codegen_utils.to_dict_attr(deps, 1, quote_key = False),
766767
link_default = "None" if rctx.attr.link_packages else "True",
@@ -786,7 +787,7 @@ def _npm_import_links_rule_impl(rctx):
786787
maybe_bins = maybe_bins,
787788
dev = rctx.attr.dev,
788789
use_default_shell_env = rctx.attr.lifecycle_hooks_use_default_shell_env,
789-
exclude_package_contents = starlark_codegen_utils.to_list_attr(rctx.attr.exclude_package_contents),
790+
maybe_exclude_package_contents = maybe_exclude_package_contents,
790791
)
791792

792793
npm_link_package_bzl = [
@@ -826,15 +827,15 @@ _ATTRS_LINKS = dicts.add(_COMMON_ATTRS, {
826827
"transitive_closure": attr.string_list_dict(),
827828
"package_visibility": attr.string_list(),
828829
"replace_package": attr.string(),
829-
"exclude_package_contents": attr.string_list(),
830+
"exclude_package_contents": attr.string_list(default = []),
830831
})
831832

832833
_ATTRS = dicts.add(_COMMON_ATTRS, {
833834
"commit": attr.string(),
834835
"custom_postinstall": attr.string(),
835836
"extra_build_content": attr.string(),
836837
"extract_full_archive": attr.bool(),
837-
"exclude_package_contents": attr.string(),
838+
"exclude_package_contents": attr.string_list(default = []),
838839
"generate_bzl_library_targets": attr.bool(),
839840
"integrity": attr.string(),
840841
"lifecycle_hooks": attr.string_list(),
@@ -1224,6 +1225,7 @@ def npm_import(
12241225
),
12251226
generate_bzl_library_targets = generate_bzl_library_targets,
12261227
extract_full_archive = extract_full_archive,
1228+
exclude_package_contents = exclude_package_contents,
12271229
system_tar = system_tar,
12281230
)
12291231

npm/private/npm_package_store.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ _ATTRS = {
112112
113113
The exclude patterns are relative to the package store directory.
114114
""",
115+
default = [],
115116
),
116117
"package": attr.string(
117118
doc = """The package name to link to.

npm/private/test/snapshots/bzlmod/fsevents_links_defs.bzl

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

npm/private/test/snapshots/bzlmod/rollup_links_defs.bzl

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)