From abdfbefe74e96b8a1aaa1142b2b0977e3d56d340 Mon Sep 17 00:00:00 2001
From: Joey Perrott <josephperrott@gmail.com>
Date: Mon, 19 May 2025 18:37:17 +0000
Subject: [PATCH] build: use an unstamped version of compiler-cli for running
 the angular compiler in ng_project (#61479)

Use an unstamped version of the compiler when it runs in `ng_project` as it will get stamped appropriately
whenever the generated code gets stamped after its usage."

PR Close #61479
---
 packages/compiler-cli/BUILD.bazel |  4 ++--
 tools/defaults.bzl                | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-cli/BUILD.bazel b/packages/compiler-cli/BUILD.bazel
index dc0208af858..a3e52356315 100644
--- a/packages/compiler-cli/BUILD.bazel
+++ b/packages/compiler-cli/BUILD.bazel
@@ -148,14 +148,14 @@ pkg_npm(
 # Long-term, `pkg_npm` will be migrated to `npm_package` in general.
 npm_package(
     name = "pkg",
-    srcs = [":npm_package"],
+    srcs = [":npm_package_nosub"],
     data = [
         # Needed because compiler is a dev dependency (to satisfy the peer dependency)
         # and `rules_js` only makes transitive production dependencies available.
         ":node_modules/@angular/compiler",
     ],
     replace_prefixes = {
-        "npm_package/": "",
+        "npm_package_nosub/": "",
     },
 )
 
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
index 99926d5742f..07a2af13669 100644
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@@ -214,6 +214,7 @@ def ng_package(name, readme_md = None, license_banner = None, license = None, de
 def pkg_npm(name, deps = [], validate = True, **kwargs):
     """Default values for pkg_npm"""
     visibility = kwargs.pop("visibility", None)
+    tags = kwargs.pop("tags", [])
 
     common_substitutions = dict(kwargs.pop("substitutions", {}), **PKG_GROUP_REPLACEMENTS)
     substitutions = dict(common_substitutions, **{
@@ -247,6 +248,18 @@ def pkg_npm(name, deps = [], validate = True, **kwargs):
         }),
         deps = [":%s_js_module_output" % name],
         visibility = visibility,
+        tags = tags,
+        **kwargs
+    )
+
+    _pkg_npm(
+        name = "%s_nosub" % name,
+        validate = validate,
+        substitutions = common_substitutions,
+        deps = [":%s_js_module_output" % name],
+        visibility = visibility,
+        # should not be built unless it is a dependency of another rule
+        tags = ["manual"],
         **kwargs
     )