Skip to content

Commit 17eac47

Browse files
committed
fix: properly find ng_cli_tool in runfiles both locally and as a dependency
1 parent a957283 commit 17eac47

5 files changed

Lines changed: 10 additions & 4 deletions

File tree

MODULE.bazel.lock

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

src/optimization/boilerplate/BUILD.bazel

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ run_binary(
1111
env = {
1212
"BAZEL_BINDIR": "$(BINDIR)",
1313
"OUT_DIR": "$(@)",
14+
"NG_CLI_TOOL_RUNFILES_PATH": "$(rlocationpath //src/optimization:ng_cli_tool)",
1415
},
16+
srcs = [
17+
"//src/optimization:ng_cli_tool",
18+
],
1519
mnemonic = "GenerateCLIBoilerplate",
1620
out_dirs = ["boilerplate"],
1721
progress_message = "Generating Angular CLI boilerplate: %{label}",

src/optimization/boilerplate/generate.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function suppress_on_success {
1414

1515
# find path to the Angular CLI executable.
1616
RUNFILES="$(realpath $0.runfiles)"
17-
NG_CLI_TOOL="$RUNFILES/_main/src/optimization/ng_cli_tool_/ng_cli_tool"
17+
NG_CLI_TOOL="$RUNFILES/$NG_CLI_TOOL_RUNFILES_PATH"
1818

1919
# cd into the bazel bin dir
2020
cd ${OUT_DIR}/..

src/optimization/index.bzl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,14 @@ def optimize_angular_app(
2727
":_%s_package" % name,
2828
"@yq_toolchains//:resolved_toolchain",
2929
"@rules_angular//src/optimization/boilerplate",
30+
"@rules_angular//src/optimization:ng_cli_tool"
3031
] + deps,
3132
out_dirs = ["%s_cli_execution" % name],
3233
use_default_shell_env = True,
3334
progress_message = "Optimizing Angular app: %{label}",
3435
mnemonic = "OptimizeAngular",
3536
env = dict({
37+
"NG_CLI_TOOL_RUNFILES_PATH": "$(rlocationpath @rules_angular//src/optimization:ng_cli_tool)",
3638
"BAZEL_BINDIR": ".",
3739
"OUT_DIR": "$(@)",
3840
"CURRENT_PACKAGE": native.package_name(),

src/optimization/optimize.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ function suppress_on_success {
1515

1616
# find path to the Angular CLI executable.
1717
RUNFILES="$(realpath $0.runfiles)"
18-
NG_CLI_TOOL="$RUNFILES/_main/src/optimization/ng_cli_tool_/ng_cli_tool"
18+
NG_CLI_TOOL="$RUNFILES/$NG_CLI_TOOL_RUNFILES_PATH"
1919

2020
# Copy Angular CLI boilerplate.
2121
cp -Rf -L $BOILERPLATE_DIR/* $OUT_DIR

0 commit comments

Comments
 (0)