Skip to content

Commit 72c704d

Browse files
committed
Restrict tool visibility to //tools/internal:__pkg__.
All published tools should be referenced via `//tools/internal:*`, because it provides the aliases and stubs that resolve the tools to different paths between HEAD builds and published builds. Updated the `pkg_npm()` rule to use these internal references and also moved `//packages/renderer:renderer_js` to `//tools/internal/...` which was previously missed.
1 parent 024c696 commit 72c704d

11 files changed

Lines changed: 28 additions & 15 deletions

File tree

BUILD.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ pkg_npm(
5858
# Merge all tools and files to publish all together into the directory.
5959
":publish_files",
6060
"//common:publish_files",
61-
"//packages/annotation_extractor",
62-
"//packages/renderer",
6361
"//packages/renderer:publish_files",
64-
"//packages/resource_injector",
65-
"//packages/resource_packager",
6662
"//packages/rules_prerender",
6763
"//packages/rules_prerender:publish_files",
68-
"//packages/script_entry_generator",
69-
"//packages/style_entry_generator",
64+
"//tools/internal:annotation_extractor",
65+
"//tools/internal:renderer",
66+
"//tools/internal:resource_injector",
67+
"//tools/internal:resource_packager",
68+
"//tools/internal:script_entry_generator",
69+
"//tools/internal:style_entry_generator",
7070
"//tools/internal:publish_files",
7171
],
7272
)

packages/annotation_extractor/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ load("//tools:jasmine.bzl", "jasmine_node_test")
55
nodejs_binary(
66
name = "annotation_extractor",
77
entry_point = "annotation_extractor.ts",
8-
visibility = ["//visibility:public"],
8+
visibility = ["//tools/internal:__pkg__"],
99
templated_args = ["--bazel_patch_module_resolver"],
1010
data = [
1111
":annotation_extractor_lib",

packages/renderer/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ publish_files(
1414
ts_library(
1515
name = "renderer",
1616
srcs = ["renderer.ts"],
17-
visibility = ["//visibility:public"],
17+
visibility = ["//tools/internal:__pkg__"],
1818
deps = [
1919
":entry_point",
2020
"//common:binary",
@@ -28,7 +28,7 @@ ts_library(
2828
filegroup(
2929
name = "renderer_js",
3030
srcs = [":renderer"],
31-
visibility = ["//visibility:public"],
31+
visibility = ["//tools/internal:__pkg__"],
3232
output_group = "es5_sources",
3333
)
3434

packages/renderer/BUILD.publish

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ exports_files(glob(["**/*.bzl"]), visibility = ["//visibility:public"])
33
filegroup(
44
name = "renderer_js",
55
srcs = ["renderer.js"],
6-
visibility = ["//visibility:public"],
6+
visibility = ["//tools/internal:__pkg__"],
77
)

packages/resource_injector/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ load("//tools:jasmine.bzl", "jasmine_node_test")
55
nodejs_binary(
66
name = "resource_injector",
77
entry_point = "resource_injector.ts",
8+
visibility = ["//tools/internal:__pkg__"],
89
templated_args = ["--bazel_patch_module_resolver"],
910
data = [
1011
":resource_injector_lib",
1112
"@npm//yargs",
1213
],
13-
visibility = ["//visibility:public"],
1414
)
1515

1616
ts_library(

packages/resource_packager/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ load("//tools:jasmine.bzl", "jasmine_node_test")
55
nodejs_binary(
66
name = "resource_packager",
77
entry_point = ":resource_packager.ts",
8+
visibility = ["//tools/internal:__pkg__"],
89
templated_args = ["--bazel_patch_module_resolver"],
9-
visibility = ["//visibility:public"],
1010
data = [
1111
":resource_packager_lib",
1212
"@npm//yargs",

packages/rules_prerender/prerender_multi_page.bzl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def prerender_multi_page(
9999
binary = "%s_binary" % name
100100
nodejs_binary(
101101
name = binary,
102-
entry_point = "//packages/renderer:renderer_js",
102+
entry_point = "//tools/internal:renderer_js",
103103
templated_args = ["--bazel_patch_module_resolver"],
104104
testonly = testonly,
105105
data = RENDERER_RUNTIME_DEPS + [

packages/script_entry_generator/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ load("//tools:jasmine.bzl", "jasmine_node_test")
55
nodejs_binary(
66
name = "script_entry_generator",
77
entry_point = ":script_entry_generator.ts",
8+
visibility = ["//tools/internal:__pkg__"],
89
templated_args = ["--bazel_patch_module_resolver"],
910
data = [
1011
":script_entry_generator_lib",
1112
"@npm//yargs",
1213
],
13-
visibility = ["//visibility:public"],
1414
)
1515

1616
ts_library(

packages/style_entry_generator/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ load("//tools:jasmine.bzl", "jasmine_node_test")
55
nodejs_binary(
66
name = "style_entry_generator",
77
entry_point = ":style_entry_generator.ts",
8+
visibility = ["//tools/internal:__pkg__"],
89
templated_args = ["--bazel_patch_module_resolver"],
910
data = [
1011
":style_entry_generator_lib",
1112
"@npm//yargs",
1213
],
13-
visibility = ["//visibility:public"],
1414
)
1515

1616
ts_library(

tools/internal/BUILD.bazel

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ alias(
3636
actual = "//packages/renderer",
3737
)
3838

39+
alias(
40+
name = "renderer_js",
41+
actual = "//packages/renderer:renderer_js",
42+
)
43+
3944
alias(
4045
name = "resource_injector",
4146
actual = "//packages/resource_injector",

0 commit comments

Comments
 (0)