feat(rollup): provide output groupings of js+map for each bundle type

Author: Jason Bedard

internal/e2e/rollup/BUILD.bazel

@@ -35,3 +35,47 @@ jasmine_node_test(
         "@npm//unidiff",
     ],
 )
+
+filegroup(
+    name = "bundle-outputgroups-cjs",
+    srcs = [":bundle"],
+    output_group = "cjs",
+)
+
+filegroup(
+    name = "bundle-outputgroups-umd",
+    srcs = [":bundle"],
+    output_group = "umd",
+)
+
+filegroup(
+    name = "bundle-outputgroups-es5_min_debug",
+    srcs = [":bundle"],
+    output_group = "es5_min_debug",
+)
+
+filegroup(
+    name = "bundle-outputgroups-es5_min",
+    srcs = [":bundle"],
+    output_group = "es5_min",
+)
+
+jasmine_node_test(
+    name = "test-outputgroups",
+    srcs = glob(["*.spec.js"]),
+    configuration_env_vars = ["UPDATE_GOLDEN"],
+    data = glob([
+        "*_golden.js_",
+        "*_golden.js.map",
+    ]) + [
+        ":bundle-outputgroups-cjs",
+        ":bundle-outputgroups-umd",
+        ":bundle-outputgroups-es5_min",
+        ":bundle-outputgroups-es5_min_debug",
+    ],
+    deps = [
+        "//internal/e2e:check_lib",
+        "@npm//jasmine",
+        "@npm//unidiff",
+    ],
+)

internal/e2e/rollup_code_splitting/BUILD.bazel

@@ -26,3 +26,45 @@ jasmine_node_test(
         "@npm//unidiff",
     ],
 )
+
+filegroup(
+    name = "bundle-outputgroups-es2015",
+    srcs = [":bundle"],
+    output_group = "es2015",
+)
+
+filegroup(
+    name = "bundle-outputgroups-es5",
+    srcs = [":bundle"],
+    output_group = "es5",
+)
+
+filegroup(
+    name = "bundle-outputgroups-es5_min",
+    srcs = [":bundle"],
+    output_group = "es5_min",
+)
+
+filegroup(
+    name = "bundle-outputgroups-es5_min_debug",
+    srcs = [":bundle"],
+    output_group = "es5_min_debug",
+)
+
+jasmine_node_test(
+    name = "test-outputgroups",
+    srcs = glob(["*.spec.js"]),
+    data = glob([
+        "*_golden.js_",
+    ]) + [
+        ":bundle-outputgroups-es2015",
+        ":bundle-outputgroups-es5",
+        ":bundle-outputgroups-es5_min",
+        ":bundle-outputgroups-es5_min_debug",
+    ],
+    deps = [
+        "//internal/e2e:check_lib",
+        "@npm//jasmine",
+        "@npm//unidiff",
+    ],
+)

internal/rollup/rollup_bundle.bzl

@@ -408,77 +408,109 @@ def _generate_code_split_entry(ctx, bundles_folder, output):
         },
     )
 
+# Generate code split bundles if additional entry points have been specified.
+# See doc for additional_entry_points for more information.
+# Note: "_chunks" is needed on the output folders since ctx.label.name + ".es2015" is already
+# a folder that contains the re-rooted es2015 sources
+def _rollup_bundle_addition_entry_points(ctx):
+    rollup_config = write_rollup_config(ctx, output_format = "es", additional_entry_points = ctx.attr.additional_entry_points)
+    code_split_es2015_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks_es2015")
+    _run_rollup(ctx, _collect_es2015_sources(ctx), rollup_config, code_split_es2015_output_dir)
+    code_split_es2015_min_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks_min_es2015")
+    _run_terser(ctx, code_split_es2015_output_dir, code_split_es2015_min_output_dir, None)
+    code_split_es2015_min_debug_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks_min_debug_es2015")
+    _run_terser(ctx, code_split_es2015_output_dir, code_split_es2015_min_debug_output_dir, None, debug = True)
+
+    code_split_es5_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks")
+    _run_tsc_on_directory(ctx, code_split_es2015_output_dir, code_split_es5_output_dir)
+    code_split_es5_min_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks_min")
+    _run_terser(ctx, code_split_es5_output_dir, code_split_es5_min_output_dir, None)
+    code_split_es5_min_debug_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks_min_debug")
+    _run_terser(ctx, code_split_es5_output_dir, code_split_es5_min_debug_output_dir, None, debug = True)
+
+    # Generate the SystemJS boilerplate/entry point files
+    _generate_toplevel_entry(ctx, ctx.label.name + "_chunks_es2015", ctx.outputs.build_es2015)
+    _generate_toplevel_entry(ctx, ctx.label.name + "_chunks_min_es2015", ctx.outputs.build_es2015_min)
+    _generate_toplevel_entry(ctx, ctx.label.name + "_chunks_min_debug_es2015", ctx.outputs.build_es2015_min_debug)
+    _generate_code_split_entry(ctx, ctx.label.name + "_chunks", ctx.outputs.build_es5)
+    _generate_code_split_entry(ctx, ctx.label.name + "_chunks_min", ctx.outputs.build_es5_min)
+    _generate_code_split_entry(ctx, ctx.label.name + "_chunks_min_debug", ctx.outputs.build_es5_min_debug)
+
+    # There is no UMD/CJS bundle when code-splitting but we still need to satisfy the output
+    _generate_code_split_entry(ctx, ctx.label.name + "_chunks", ctx.outputs.build_umd)
+    _generate_code_split_entry(ctx, ctx.label.name + "_chunks", ctx.outputs.build_cjs)
+
+    # There is no source map explorer output when code-splitting but we still need to satisfy the output
+    ctx.actions.expand_template(
+        output = ctx.outputs.explore_html,
+        template = ctx.file._no_explore_html,
+        substitutions = {},
+    )
+    files = [
+        ctx.outputs.build_es2015,
+        ctx.outputs.build_es2015_min,
+        ctx.outputs.build_es2015_min_debug,
+        ctx.outputs.build_es5,
+        ctx.outputs.build_es5_min,
+        ctx.outputs.build_es5_min_debug,
+        code_split_es2015_output_dir,
+        code_split_es2015_min_output_dir,
+        code_split_es2015_min_debug_output_dir,
+        code_split_es5_output_dir,
+        code_split_es5_min_output_dir,
+        code_split_es5_min_debug_output_dir,
+    ]
+
+    return [
+        DefaultInfo(files = depset(files), runfiles = ctx.runfiles(files)),
+        OutputGroupInfo(
+            es2015 = depset([ctx.outputs.build_es2015, code_split_es2015_output_dir]),
+            es2015_min = depset([ctx.outputs.build_es2015_min, code_split_es2015_min_output_dir]),
+            es2015_min_debug = depset([ctx.outputs.build_es2015_min_debug, code_split_es2015_min_debug_output_dir]),
+            es5 = depset([ctx.outputs.build_es5, code_split_es5_output_dir]),
+            es5_min = depset([ctx.outputs.build_es5_min, code_split_es5_min_output_dir]),
+            es5_min_debug = depset([ctx.outputs.build_es5_min_debug, code_split_es5_min_debug_output_dir]),
+        ),
+    ]
+
+def _rollup_bundle_single_entry(ctx):
+    # Generate the bundles
+    rollup_config = write_rollup_config(ctx)
+
+    es2015_map = run_rollup(ctx, _collect_es2015_sources(ctx), rollup_config, ctx.outputs.build_es2015)
+    es2015_min_map = run_terser(ctx, ctx.outputs.build_es2015, ctx.outputs.build_es2015_min, config_name = ctx.label.name + "es2015_min")
+    es2015_min_debug_map = run_terser(ctx, ctx.outputs.build_es2015, ctx.outputs.build_es2015_min_debug, debug = True, config_name = ctx.label.name + "es2015_min_debug")
+    _run_tsc(ctx, ctx.outputs.build_es2015, ctx.outputs.build_es5)
+    es5_min_map = run_terser(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min)
+    es5_min_debug_map = run_terser(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min_debug, debug = True)
+    cjs_rollup_config = write_rollup_config(ctx, filename = "_%s_cjs.rollup.conf.js", output_format = "cjs")
+    cjs_map = run_rollup(ctx, _collect_es2015_sources(ctx), cjs_rollup_config, ctx.outputs.build_cjs)
+    umd_rollup_config = write_rollup_config(ctx, filename = "_%s_umd.rollup.conf.js", output_format = "umd")
+    umd_map = run_rollup(ctx, _collect_es2015_sources(ctx), umd_rollup_config, ctx.outputs.build_umd)
+
+    run_sourcemapexplorer(ctx, ctx.outputs.build_es5_min, es5_min_map, ctx.outputs.explore_html)
+
+    files = [ctx.outputs.build_es5_min, es5_min_map]
+
+    return [
+        DefaultInfo(files = depset(files), runfiles = ctx.runfiles(files)),
+        OutputGroupInfo(
+            cjs = depset([ctx.outputs.build_cjs, cjs_map]),
+            es2015 = depset([ctx.outputs.build_es2015, es2015_map]),
+            es2015_min = depset([ctx.outputs.build_es2015_min, es2015_min_map]),
+            es2015_min_debug = depset([ctx.outputs.build_es2015_min_debug, es2015_min_debug_map]),
+            es5 = depset([ctx.outputs.build_es5]),
+            es5_min = depset([ctx.outputs.build_es5_min, es5_min_map]),
+            es5_min_debug = depset([ctx.outputs.build_es5_min_debug, es5_min_debug_map]),
+            umd = depset([ctx.outputs.build_umd, umd_map]),
+        ),
+    ]
+
 def _rollup_bundle(ctx):
     if ctx.attr.additional_entry_points:
-        # Generate code split bundles if additional entry points have been specified.
-        # See doc for additional_entry_points for more information.
-        # Note: "_chunks" is needed on the output folders since ctx.label.name + ".es2015" is already
-        # a folder that contains the re-rooted es2015 sources
-        rollup_config = write_rollup_config(ctx, output_format = "es", additional_entry_points = ctx.attr.additional_entry_points)
-        code_split_es2015_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks_es2015")
-        _run_rollup(ctx, _collect_es2015_sources(ctx), rollup_config, code_split_es2015_output_dir)
-        code_split_es2015_min_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks_min_es2015")
-        _run_terser(ctx, code_split_es2015_output_dir, code_split_es2015_min_output_dir, None)
-        code_split_es2015_min_debug_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks_min_debug_es2015")
-        _run_terser(ctx, code_split_es2015_output_dir, code_split_es2015_min_debug_output_dir, None, debug = True)
-
-        code_split_es5_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks")
-        _run_tsc_on_directory(ctx, code_split_es2015_output_dir, code_split_es5_output_dir)
-        code_split_es5_min_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks_min")
-        _run_terser(ctx, code_split_es5_output_dir, code_split_es5_min_output_dir, None)
-        code_split_es5_min_debug_output_dir = ctx.actions.declare_directory(ctx.label.name + "_chunks_min_debug")
-        _run_terser(ctx, code_split_es5_output_dir, code_split_es5_min_debug_output_dir, None, debug = True)
-
-        # Generate the SystemJS boilerplate/entry point files
-        _generate_toplevel_entry(ctx, ctx.label.name + "_chunks_es2015", ctx.outputs.build_es2015)
-        _generate_toplevel_entry(ctx, ctx.label.name + "_chunks_min_es2015", ctx.outputs.build_es2015_min)
-        _generate_toplevel_entry(ctx, ctx.label.name + "_chunks_min_debug_es2015", ctx.outputs.build_es2015_min_debug)
-        _generate_code_split_entry(ctx, ctx.label.name + "_chunks", ctx.outputs.build_es5)
-        _generate_code_split_entry(ctx, ctx.label.name + "_chunks_min", ctx.outputs.build_es5_min)
-        _generate_code_split_entry(ctx, ctx.label.name + "_chunks_min_debug", ctx.outputs.build_es5_min_debug)
-
-        # There is no UMD/CJS bundle when code-splitting but we still need to satisfy the output
-        _generate_code_split_entry(ctx, ctx.label.name + "_chunks", ctx.outputs.build_umd)
-        _generate_code_split_entry(ctx, ctx.label.name + "_chunks", ctx.outputs.build_cjs)
-
-        # There is no source map explorer output when code-splitting but we still need to satisfy the output
-        ctx.actions.expand_template(
-            output = ctx.outputs.explore_html,
-            template = ctx.file._no_explore_html,
-            substitutions = {},
-        )
-        files = [
-            ctx.outputs.build_es2015,
-            ctx.outputs.build_es2015_min,
-            ctx.outputs.build_es2015_min_debug,
-            ctx.outputs.build_es5,
-            ctx.outputs.build_es5_min,
-            ctx.outputs.build_es5_min_debug,
-            code_split_es2015_output_dir,
-            code_split_es2015_min_output_dir,
-            code_split_es2015_min_debug_output_dir,
-            code_split_es5_output_dir,
-            code_split_es5_min_output_dir,
-            code_split_es5_min_debug_output_dir,
-        ]
-
+        return _rollup_bundle_addition_entry_points(ctx)
     else:
-        # Generate the bundles
-        rollup_config = write_rollup_config(ctx)
-        run_rollup(ctx, _collect_es2015_sources(ctx), rollup_config, ctx.outputs.build_es2015)
-        run_terser(ctx, ctx.outputs.build_es2015, ctx.outputs.build_es2015_min, config_name = ctx.label.name + "es2015_min")
-        run_terser(ctx, ctx.outputs.build_es2015, ctx.outputs.build_es2015_min_debug, debug = True, config_name = ctx.label.name + "es2015_min_debug")
-        _run_tsc(ctx, ctx.outputs.build_es2015, ctx.outputs.build_es5)
-        source_map = run_terser(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min)
-        run_terser(ctx, ctx.outputs.build_es5, ctx.outputs.build_es5_min_debug, debug = True)
-        cjs_rollup_config = write_rollup_config(ctx, filename = "_%s_cjs.rollup.conf.js", output_format = "cjs")
-        run_rollup(ctx, _collect_es2015_sources(ctx), cjs_rollup_config, ctx.outputs.build_cjs)
-        umd_rollup_config = write_rollup_config(ctx, filename = "_%s_umd.rollup.conf.js", output_format = "umd")
-        run_rollup(ctx, _collect_es2015_sources(ctx), umd_rollup_config, ctx.outputs.build_umd)
-        run_sourcemapexplorer(ctx, ctx.outputs.build_es5_min, source_map, ctx.outputs.explore_html)
-        files = [ctx.outputs.build_es5_min, source_map]
-
-    return DefaultInfo(files = depset(files), runfiles = ctx.runfiles(files))
+        return _rollup_bundle_single_entry(ctx)
 
 # Expose our list of aspects so derivative rules can override the deps attribute and
 # add their own additional aspects.