honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: should use $(execpath) in npm_package_bin args (#34589) 

This is recommended in the Bazel docs as $(location) is ambiguous and can mean either $(execpath) or $(rootpath) depending on the context.

PR Close #34589
This commit is contained in:
Greg Magolan 2020-01-08 02:08:00 -08:00 committed by atscott
parent c3e8439954
commit 67044ef55d
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/bazel/src/builders/files/src/BUILD.bazel.template
View File

@ -70,14 +70,14 @@ html_insert_assets(
outs = ["_/index.html"], outs = ["_/index.html"],
args = [ args = [
"--html", "--html",
"$(location :index.html)", "$(execpath :index.html)",
"--out", "--out",
"$@", "$@",
"--roots", "--roots",
"$(RULEDIR)", "$(RULEDIR)",
"--assets", "--assets",
"$(location :global_stylesheet.css)", "$(execpath :global_stylesheet.css)",
"$(location @npm//:node_modules/zone.js/dist/zone.min.js)", "$(execpath @npm//:node_modules/zone.js/dist/zone.min.js)",
"bundle.min.js", "bundle.min.js",
], ],
data = [ data = [

8
tools/defaults.bzl
View File

@ -346,7 +346,7 @@ def rollup_bundle(name, testonly = False, **kwargs):
name + ".js", name + ".js",
], ],
args = [ args = [
"$(location :%s.es2015.js)" % name, "$(execpath :%s.es2015.js)" % name,
"--types", "--types",
"--skipLibCheck", "--skipLibCheck",
"--target", "--target",
@ -355,7 +355,7 @@ def rollup_bundle(name, testonly = False, **kwargs):
"es2015,dom", "es2015,dom",
"--allowJS", "--allowJS",
"--outFile", "--outFile",
"$(location :%s.js)" % name, "$(execpath :%s.js)" % name,
], ],
data = [ data = [
name + ".es2015.js", name + ".es2015.js",
@ -377,7 +377,7 @@ def rollup_bundle(name, testonly = False, **kwargs):
name + ".es5umd.js", name + ".es5umd.js",
], ],
args = [ args = [
"$(location :%s.umd.js)" % name, "$(execpath :%s.umd.js)" % name,
"--types", "--types",
"--skipLibCheck", "--skipLibCheck",
"--target", "--target",
@ -386,7 +386,7 @@ def rollup_bundle(name, testonly = False, **kwargs):
"es2015,dom", "es2015,dom",
"--allowJS", "--allowJS",
"--outFile", "--outFile",
"$(location :%s.es5umd.js)" % name, "$(execpath :%s.es5umd.js)" % name,
], ],
data = [ data = [
name + ".umd.js", name + ".umd.js",

8
tools/ng_rollup_bundle/ng_rollup_bundle.bzl
View File

@ -416,8 +416,8 @@ def ng_rollup_bundle(name, **kwargs):
data = [name + ".min.js"], data = [name + ".min.js"],
outs = [name + ".min.js.br"], outs = [name + ".min.js.br"],
args = [ args = [
"--output=$(location %s.min.js.br)" % name, "--output=$(execpath %s.min.js.br)" % name,
"$(location %s.min.js)" % name, "$(execpath %s.min.js)" % name,
], ],
visibility = visibility, visibility = visibility,
) )
@ -439,8 +439,8 @@ def ng_rollup_bundle(name, **kwargs):
data = [name + ".min.es2015.js"], data = [name + ".min.es2015.js"],
outs = [name + ".min.es2015.js.br"], outs = [name + ".min.es2015.js.br"],
args = [ args = [
"--output=$(location %s.min.es2015.js.br)" % name, "--output=$(execpath %s.min.es2015.js.br)" % name,
"$(location %s.min.es2015.js)" % name, "$(execpath %s.min.es2015.js)" % name,
], ],
visibility = visibility, visibility = visibility,
) )