Skip to content

Commit ea6119f

Browse files
committed
fixup! fix(bazel/rules_angular): ensure correct typescript version is utilized in persistent worker runfiles
1 parent 6cd21db commit ea6119f

6 files changed

Lines changed: 20 additions & 18 deletions

File tree

MODULE.bazel.lock

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

bazel/rules/rules_angular/MODULE.bazel.lock

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

bazel/rules/rules_angular/setup/extensions.bzl

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,22 @@ def _extension(ctx):
1010
root_setup = mod.tags.setup[0]
1111

1212
for attr in mod.tags.setup:
13-
if attr.name not in generated:
14-
generated[attr.name] = True
15-
configurable_deps_repo(
16-
name = attr.name,
17-
angular_compiler_cli = attr.angular_compiler_cli,
18-
typescript = attr.typescript,
19-
)
13+
if attr.name in generated:
14+
fail("The repository '{}' is already registered by another module. Please use a different name.".format(attr.name))
15+
generated[attr.name] = True
16+
configurable_deps_repo(
17+
name = attr.name,
18+
angular_compiler_cli = attr.angular_compiler_cli,
19+
typescript = attr.typescript,
20+
)
2021

21-
if "rules_angular_configurable_deps" not in generated and root_setup:
22-
configurable_deps_repo(
23-
name = "rules_angular_configurable_deps",
24-
angular_compiler_cli = root_setup.angular_compiler_cli,
25-
typescript = root_setup.typescript,
26-
)
22+
if "rules_angular_configurable_deps" not in generated:
23+
if root_setup:
24+
configurable_deps_repo(
25+
name = "rules_angular_configurable_deps",
26+
angular_compiler_cli = root_setup.angular_compiler_cli,
27+
typescript = root_setup.typescript,
28+
)
2729

2830
rules_angular = module_extension(
2931
implementation = _extension,

bazel/rules/rules_browsers/MODULE.bazel.lock

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

bazel/rules/rules_browsers/test/MODULE.bazel.lock

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

bazel/rules/rules_sass/MODULE.bazel.lock

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

0 commit comments

Comments
 (0)