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

Author: Jason Bedard

internal/e2e/rollup/BUILD.bazel

@@ -18,7 +18,7 @@ rollup_bundle(
 
 jasmine_node_test(
     name = "test",
-    srcs = glob(["*.spec.js"]),
+    srcs = ["rollup.spec.js"],
     configuration_env_vars = ["UPDATE_GOLDEN"],
     data = glob([
         "*_golden.js_",
@@ -35,3 +35,48 @@ 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-es2015",
+    srcs = [":bundle"],
+    output_group = "es2015",
+)
+
+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 = ["outputgroups.spec.js"],
+    data = [
+        ":bundle-outputgroups-cjs",
+        ":bundle-outputgroups-es2015",
+        ":bundle-outputgroups-es5_min",
+        ":bundle-outputgroups-es5_min_debug",
+        ":bundle-outputgroups-umd",
+    ],
+    deps = [
+        "@npm//jasmine",
+    ],
+)

internal/e2e/rollup/outputgroups.spec.js

@@ -0,0 +1,34 @@
+const fs = require('fs');
+const path = require('path');
+
+function checkExists(name) {
+  if (!fs.existsSync(require.resolve(path.join(__dirname, name)))) {
+    fail(`Output ${name} does not exist.`);
+  }
+}
+
+// TODO: the right assertions are to load up the source-map library
+// and assert that the sourcemap actually maps back to the sources
+
+describe('outputgroups', () => {
+  it('should produce a es2015 sourcemap', () => {
+    checkExists('bundle.es2015.js');
+    checkExists('bundle.es2015.js.map');
+  });
+  it('should produce a es5_min sourcemap', () => {
+    checkExists('bundle.min.js');
+    checkExists('bundle.min.js.map');
+  });
+  it('should produce a es5_min_debug sourcemap', () => {
+    checkExists('bundle.min_debug.js');
+    checkExists('bundle.min_debug.js.map');
+  });
+  it('should produce a cjs sourcemap', () => {
+    checkExists('bundle.cjs.js');
+    checkExists('bundle.cjs.js.map');
+  });
+  it('should produce a umd sourcemap', () => {
+    checkExists('bundle.umd.js');
+    checkExists('bundle.umd.js.map');
+  });
+});

internal/e2e/rollup_code_splitting/BUILD.bazel

@@ -13,7 +13,10 @@ rollup_bundle(
 
 jasmine_node_test(
     name = "test",
-    srcs = glob(["*.spec.js"]),
+    srcs = [
+        "additional_entry.spec.js",
+        "main1.spec.js",
+    ],
     data = glob([
         "*_golden.js_",
     ]) + [
@@ -26,3 +29,34 @@ jasmine_node_test(
         "@npm//unidiff",
     ],
 )
+
+filegroup(
+    name = "bundle-outputgroups-es2015",
+    srcs = [":bundle"],
+    output_group = "es2015",
+)
+
+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 = ["outputgroups.spec.js"],
+    data = [
+        ":bundle-outputgroups-es2015",
+        ":bundle-outputgroups-es5_min",
+        ":bundle-outputgroups-es5_min_debug",
+    ],
+    deps = [
+        "@npm//jasmine",
+    ],
+)

internal/e2e/rollup_code_splitting/outputgroups.spec.js

@@ -0,0 +1,35 @@
+const fs = require('fs');
+const path = require('path');
+
+function checkExists(name) {
+  if (!fs.existsSync(require.resolve(path.join(__dirname, name)))) {
+    fail(`Output ${name} does not exist.`);
+  }
+}
+
+// TODO: the right assertions are to load up the source-map library
+// and assert that the sourcemap actually maps back to the sources
+
+describe('outputgroups', () => {
+  it('should produce a es2015 sourcemap', () => {
+    checkExists('bundle.es2015.js');
+    checkExists('bundle_chunks_es2015/additional_entry.js');
+    checkExists('bundle_chunks_es2015/additional_entry.js.map');
+    checkExists('bundle_chunks_es2015/main1.js');
+    checkExists('bundle_chunks_es2015/main1.js.map');
+  });
+  it('should produce a es5_min sourcemap', () => {
+    checkExists('bundle.min.js');
+    checkExists('bundle_chunks_min/additional_entry.js');
+    checkExists('bundle_chunks_min/additional_entry.js.map');
+    checkExists('bundle_chunks_min/main1.js');
+    checkExists('bundle_chunks_min/main1.js.map');
+  });
+  it('should produce a es5_min_debug sourcemap', () => {
+    checkExists('bundle.min_debug.js');
+    checkExists('bundle_chunks_min_debug/additional_entry.js');
+    checkExists('bundle_chunks_min_debug/additional_entry.js.map');
+    checkExists('bundle_chunks_min_debug/main1.js');
+    checkExists('bundle_chunks_min_debug/main1.js.map');
+  });
+});

internal/rollup/rollup_bundle.bzl

@@ -474,24 +474,46 @@ def _rollup_bundle(ctx):
             code_split_es5_min_output_dir,
             code_split_es5_min_debug_output_dir,
         ]
+        output_group = 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]),
+        )
 
     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")
+        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", in_source_map = es2015_map)
+        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", in_source_map = es2015_map)
         _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)
+        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")
-        run_rollup(ctx, _collect_es2015_sources(ctx), cjs_rollup_config, ctx.outputs.build_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")
-        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]
+        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]
+        output_group = 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]),
+        )
 
-    return DefaultInfo(files = depset(files), runfiles = ctx.runfiles(files))
+    return [
+        DefaultInfo(files = depset(files), runfiles = ctx.runfiles(files)),
+        output_group,
+    ]
 
 # Expose our list of aspects so derivative rules can override the deps attribute and
 # add their own additional aspects.