Skip to content

Commit 2651ac1

Browse files
josephperrottthePunderWoman
authored andcommitted
build: use an unstamped version of compiler-cli for running the angular compiler in ng_project (angular#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 angular#61479
1 parent 6f74458 commit 2651ac1

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

packages/compiler-cli/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,14 @@ pkg_npm(
148148
# Long-term, `pkg_npm` will be migrated to `npm_package` in general.
149149
npm_package(
150150
name = "pkg",
151-
srcs = [":npm_package"],
151+
srcs = [":npm_package_nosub"],
152152
data = [
153153
# Needed because compiler is a dev dependency (to satisfy the peer dependency)
154154
# and `rules_js` only makes transitive production dependencies available.
155155
":node_modules/@angular/compiler",
156156
],
157157
replace_prefixes = {
158-
"npm_package/": "",
158+
"npm_package_nosub/": "",
159159
},
160160
)
161161

tools/defaults.bzl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ def ng_package(name, readme_md = None, license_banner = None, license = None, de
214214
def pkg_npm(name, deps = [], validate = True, **kwargs):
215215
"""Default values for pkg_npm"""
216216
visibility = kwargs.pop("visibility", None)
217+
tags = kwargs.pop("tags", [])
217218

218219
common_substitutions = dict(kwargs.pop("substitutions", {}), **PKG_GROUP_REPLACEMENTS)
219220
substitutions = dict(common_substitutions, **{
@@ -247,6 +248,18 @@ def pkg_npm(name, deps = [], validate = True, **kwargs):
247248
}),
248249
deps = [":%s_js_module_output" % name],
249250
visibility = visibility,
251+
tags = tags,
252+
**kwargs
253+
)
254+
255+
_pkg_npm(
256+
name = "%s_nosub" % name,
257+
validate = validate,
258+
substitutions = common_substitutions,
259+
deps = [":%s_js_module_output" % name],
260+
visibility = visibility,
261+
# should not be built unless it is a dependency of another rule
262+
tags = ["manual"],
250263
**kwargs
251264
)
252265

0 commit comments

Comments
 (0)