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

fix(bazel): correct expected outs for external sources in ng_module (#22755) 

PR Close #22755
This commit is contained in:
Greg Magolan 2018-03-14 01:10:41 -07:00 committed by Miško Hevery
parent 1a0cb21538
commit bfe077ad64
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/bazel/src/ng_module.bzl
View File

@ -37,8 +37,12 @@ def _expected_outs(ctx):
for src in ctx.files.srcs + ctx.files.assets: for src in ctx.files.srcs + ctx.files.assets:
package_prefix = ctx.label.package + "/" if ctx.label.package else "" package_prefix = ctx.label.package + "/" if ctx.label.package else ""
if src.short_path.endswith(".ts") and not src.short_path.endswith(".d.ts"): # Strip external repository name from path if src is from external repository
basename = src.short_path[len(package_prefix):-len(".ts")] # If src is from external repository, it's short_path will be ../<external_repo_name>/...
short_path = src.short_path if src.short_path[0:2] != ".." else "/".join(src.short_path.split("/")[2:])
if short_path.endswith(".ts") and not short_path.endswith(".d.ts"):
basename = short_path[len(package_prefix):-len(".ts")]
if len(factory_basename_set) == 0 or basename in factory_basename_set: if len(factory_basename_set) == 0 or basename in factory_basename_set:
devmode_js = [ devmode_js = [
".ngfactory.js", ".ngfactory.js",
@ -49,8 +53,8 @@ def _expected_outs(ctx):
else: else:
devmode_js = [".js"] devmode_js = [".js"]
summaries = [] summaries = []
elif src.short_path.endswith(".css"): elif short_path.endswith(".css"):
basename = src.short_path[len(package_prefix):-len(".css")] basename = short_path[len(package_prefix):-len(".css")]
devmode_js = [ devmode_js = [
".css.shim.ngstyle.js", ".css.shim.ngstyle.js",
".css.ngstyle.js", ".css.ngstyle.js",