Skip to content

Commit

Permalink
build(zone.js): zone.js should output esm format for fesm2015 bundles
Browse files Browse the repository at this point in the history
Zone.js support `Angular package format` since `0.11`, but the `fesm2015` bundles
are not `esm` format, it still use `umd` bundle which is not correct, in this PR,
a new `esm` bundle output is added in `rollup_bundle` rule under `tools`, so
zone.js can use the new rule to generate `esm` bundles.
  • Loading branch information
JiaLiPassion committed Oct 9, 2020
1 parent a84976f commit 4195415
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
6 changes: 3 additions & 3 deletions packages/zone.js/tools.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def copy_dist(module_name, module_format, output_module_name, suffix, umd):
native.genrule(
name = module_name + "." + suffix_output + "dist",
srcs = [
"//packages/zone.js:" + module_name + "-rollup." + suffix_output + module_format + "umd.js",
"//packages/zone.js:" + module_name + "-rollup." + suffix_output + module_format,
],
outs = [
output_module_name + "." + umd_output + suffix_output + "js",
Expand Down Expand Up @@ -69,9 +69,9 @@ def generate_rollup_bundle(bundles):
)

def generate_dist(bundles, output_format, umd):
module_format = ""
module_format = "esm.js"
if output_format == "es5":
module_format = "es5"
module_format = "es5umd.js"
for b in bundles:
module_name = b[0]
copy_dist(
Expand Down
10 changes: 10 additions & 0 deletions tools/defaults.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,9 @@ def rollup_bundle(name, testonly = False, sourcemap = "true", **kwargs):
es2015 iife : "%{name}.es2015.js"
es2015 iife minified : "%{name}.min.es2015.js"
es2015 iife minified (debug) : "%{name}.min_debug.es2015.js"
esm : "%{name}.esm.js"
esm : "%{name}.min.esm.js"
esm minified (debug) : "%{name}.min_debug.esm.js"
es5 iife : "%{name}.js"
es5 iife minified : "%{name}.min.js"
es5 iife minified (debug) : "%{name}.min_debug.js"
Expand All @@ -422,6 +425,13 @@ def rollup_bundle(name, testonly = False, sourcemap = "true", **kwargs):
"sourcemap": False,
}

# esm
_rollup_bundle(name = name + ".esm", testonly = testonly, format = "esm", sourcemap = sourcemap, **kwargs)
terser_minified(name = name + ".min.esm", testonly = testonly, src = name + ".esm", **common_terser_args)
native.filegroup(name = name + ".min.esm.js", testonly = testonly, srcs = [name + ".min.esm"])
terser_minified(name = name + ".min_debug.esm", testonly = testonly, src = name + ".esm", **common_terser_args)
native.filegroup(name = name + ".min_debug.esm.js", testonly = testonly, srcs = [name + ".min_debug.esm"])

# es2015
_rollup_bundle(name = name + ".es2015", testonly = testonly, format = "iife", sourcemap = sourcemap, **kwargs)
terser_minified(name = name + ".min.es2015", testonly = testonly, src = name + ".es2015", **common_terser_args)
Expand Down

0 comments on commit 4195415

Please sign in to comment.