refactor: inline utils.package_directory_output_group in npm_import repo rules (#1526)
diff --git a/npm/private/npm_import.bzl b/npm/private/npm_import.bzl index 10a41ab..96ec6bb 100644 --- a/npm/private/npm_import.bzl +++ b/npm/private/npm_import.bzl
@@ -35,8 +35,7 @@ _LINK_JS_PACKAGE_LOADS_TMPL = """\ load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") -load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_package_store = "npm_link_package_store") -load("@aspect_rules_js//npm/private:utils.bzl", _utils = "utils")\ +load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_package_store = "npm_link_package_store")\ """ _LINK_JS_PACKAGE_LIFECYCLE_LOADS_TMPL = """\ @@ -112,7 +111,7 @@ native.filegroup( name = "{{}}/dir".format(store_target_name), srcs = [":{{}}".format(store_target_name)], - output_group = _utils.package_directory_output_group, + output_group = "{package_directory_output_group}", visibility = ["//visibility:public"], tags = ["manual"], ) @@ -239,7 +238,7 @@ native.filegroup( name = "{{}}/dir".format(name), srcs = [":{{}}".format(name)], - output_group = _utils.package_directory_output_group, + output_group = "{package_directory_output_group}", visibility = {link_visibility}, tags = ["manual"], ) @@ -778,6 +777,7 @@ link_visibility = rctx.attr.package_visibility, public_visibility = str(public_visibility), package = rctx.attr.package, + package_directory_output_group = utils.package_directory_output_group, rctx_name = rctx.name, ref_deps = starlark_codegen_utils.to_dict_attr(ref_deps, 1, quote_key = False), root_package = rctx.attr.root_package,
diff --git a/npm/private/test/chalk_links_defs_checked.bzl b/npm/private/test/chalk_links_defs_checked.bzl index aa228d5..35c17ca 100644 --- a/npm/private/test/chalk_links_defs_checked.bzl +++ b/npm/private/test/chalk_links_defs_checked.bzl
@@ -2,7 +2,6 @@ load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_package_store = "npm_link_package_store") -load("@aspect_rules_js//npm/private:utils.bzl", _utils = "utils") # Generated npm_package_store targets for npm package chalk@5.0.1 # buildifier: disable=function-docstring @@ -73,7 +72,7 @@ native.filegroup( name = "{}/dir".format(store_target_name), srcs = [":{}".format(store_target_name)], - output_group = _utils.package_directory_output_group, + output_group = "package_directory", visibility = ["//visibility:public"], tags = ["manual"], ) @@ -121,7 +120,7 @@ native.filegroup( name = "{}/dir".format(name), srcs = [":{}".format(name)], - output_group = _utils.package_directory_output_group, + output_group = "package_directory", visibility = ["//visibility:public"], tags = ["manual"], )
diff --git a/npm/private/test/fsevents_links_defs_checked.bzl b/npm/private/test/fsevents_links_defs_checked.bzl index b0e1e40..e72bc02 100644 --- a/npm/private/test/fsevents_links_defs_checked.bzl +++ b/npm/private/test/fsevents_links_defs_checked.bzl
@@ -2,7 +2,6 @@ load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_package_store = "npm_link_package_store") -load("@aspect_rules_js//npm/private:utils.bzl", _utils = "utils") load("@aspect_rules_js//js:defs.bzl", _js_run_binary = "js_run_binary") load("@aspect_rules_js//npm/private:npm_package_internal.bzl", _npm_package_internal = "npm_package_internal") @@ -75,7 +74,7 @@ native.filegroup( name = "{}/dir".format(store_target_name), srcs = [":{}".format(store_target_name)], - output_group = _utils.package_directory_output_group, + output_group = "package_directory", visibility = ["//visibility:public"], tags = ["manual"], ) @@ -202,7 +201,7 @@ native.filegroup( name = "{}/dir".format(name), srcs = [":{}".format(name)], - output_group = _utils.package_directory_output_group, + output_group = "package_directory", visibility = ["//visibility:public"], tags = ["manual"], )
diff --git a/npm/private/test/rollup_links_defs_checked.bzl b/npm/private/test/rollup_links_defs_checked.bzl index 0e4fb3d..5a6897d 100644 --- a/npm/private/test/rollup_links_defs_checked.bzl +++ b/npm/private/test/rollup_links_defs_checked.bzl
@@ -2,7 +2,6 @@ load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_package_store = "npm_link_package_store") -load("@aspect_rules_js//npm/private:utils.bzl", _utils = "utils") # Generated npm_package_store targets for npm package rollup@2.70.2 # buildifier: disable=function-docstring @@ -76,7 +75,7 @@ native.filegroup( name = "{}/dir".format(store_target_name), srcs = [":{}".format(store_target_name)], - output_group = _utils.package_directory_output_group, + output_group = "package_directory", visibility = ["//visibility:public"], tags = ["manual"], ) @@ -123,7 +122,7 @@ native.filegroup( name = "{}/dir".format(name), srcs = [":{}".format(name)], - output_group = _utils.package_directory_output_group, + output_group = "package_directory", visibility = ["//visibility:public"], tags = ["manual"], )
diff --git a/npm/private/test/unused_links_defs_checked.bzl b/npm/private/test/unused_links_defs_checked.bzl index 6965d34..a2e7eb0 100644 --- a/npm/private/test/unused_links_defs_checked.bzl +++ b/npm/private/test/unused_links_defs_checked.bzl
@@ -2,7 +2,6 @@ load("@aspect_rules_js//npm/private:npm_package_store_internal.bzl", _npm_package_store = "npm_package_store_internal") load("@aspect_rules_js//npm/private:npm_link_package_store.bzl", _npm_link_package_store = "npm_link_package_store") -load("@aspect_rules_js//npm/private:utils.bzl", _utils = "utils") # Generated npm_package_store targets for npm package unused@0.2.2 # buildifier: disable=function-docstring @@ -80,7 +79,7 @@ native.filegroup( name = "{}/dir".format(store_target_name), srcs = [":{}".format(store_target_name)], - output_group = _utils.package_directory_output_group, + output_group = "package_directory", visibility = ["//visibility:public"], tags = ["manual"], ) @@ -127,7 +126,7 @@ native.filegroup( name = "{}/dir".format(name), srcs = [":{}".format(name)], - output_group = _utils.package_directory_output_group, + output_group = "package_directory", visibility = ["//visibility:private"], tags = ["manual"], )