build: update to rules_nodejs 0.38

WORKSPACE

@@ -18,9 +18,6 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    patch_args = ["-p1"],
-    # Patch https://github.com/bazelbuild/rules_nodejs/pull/903
-    patches = ["//tools:rollup_bundle_commonjs_ignoreGlobal.patch"],
     sha256 = "ad4be2c6f40f5af70c7edf294955f9d9a0222c8e2756109731b25f79ea2ccea0",
     urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.38.3/rules_nodejs-0.38.3.tar.gz"],
 )

integration/bazel/src/BUILD.bazel

@@ -1,8 +1,8 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@npm_angular_bazel//:index.bzl", "ng_module")
-load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle")
 load("@npm//http-server:index.bzl", "http_server")
+load("@npm_bazel_rollup//:index.bzl", "rollup_bundle")
 load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
 load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
 

package.json

@@ -39,10 +39,14 @@
     "@angular-devkit/core": "^8.0.0-beta.15",
     "@angular-devkit/schematics": "^8.0.0-beta.15",
     "@angular/bazel": "file:./tools/npm/@angular_bazel",
+    "@babel/cli": "^7.6.4",
     "@babel/core": "^7.6.4",
+    "@babel/preset-env": "^7.6.3",
     "@bazel/jasmine": "0.38.3",
     "@bazel/karma": "0.38.3",
     "@bazel/protractor": "0.38.3",
+    "@bazel/rollup": "0.38.3",
+    "@bazel/terser": "0.38.3",
     "@bazel/typescript": "0.38.3",
     "@microsoft/api-extractor": "^7.3.9",
     "@schematics/angular": "^8.0.0-beta.15",
@@ -101,11 +105,11 @@
     "nodejs-websocket": "^1.7.2",
     "protractor": "^5.4.2",
     "reflect-metadata": "^0.1.3",
-    "rollup": "^1.1.0",
-    "rollup-plugin-amd": "^3.0.0",
-    "rollup-plugin-commonjs": "^9.2.1",
+    "rollup": "1.21.4",
+    "rollup-plugin-amd": "^4.0.0",
+    "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-node-resolve": "^4.0.0",
+    "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-sourcemaps": "^0.4.2",
     "rxjs": "^6.5.3",
     "selenium-webdriver": "3.5.0",

packages/bazel/src/BUILD.bazel

@@ -22,7 +22,7 @@ nodejs_binary(
         "@npm//rollup-plugin-node-resolve",
         "@npm//rollup-plugin-sourcemaps",
     ],
-    entry_point = "@npm//:node_modules/rollup/bin/rollup",
+    entry_point = "@npm//:node_modules/rollup/dist/bin/rollup",
     install_source_map_support = False,
     visibility = ["//visibility:public"],
 )

packages/bazel/src/builders/BUILD.bazel

@@ -20,7 +20,6 @@ ts_library(
     data = [
         "schema.json",
     ] + glob(["files/**/*"]),
-    module_name = "@angular/bazel/src/builders",
     deps = [
         "@npm//@angular-devkit/architect",
         "@npm//@angular-devkit/core",

packages/bazel/src/ng_module.bzl

@@ -617,6 +617,8 @@ def _ng_module_impl(ctx):
     ts_providers = ng_module_impl(ctx, compile_ts)
 
     # Add in new JS providers
+    # See design doc https://docs.google.com/document/d/1ggkY5RqUkVL4aQLYm7esRW978LgX3GUCnQirrk5E1C0/edit#
+    # and issue https://github.com/bazelbuild/rules_nodejs/issues/57 for more details.
     ts_providers["providers"].extend([
         js_named_module_info(
             sources = ts_providers["typescript"]["es5_sources"],
@@ -626,6 +628,9 @@ def _ng_module_impl(ctx):
             sources = ts_providers["typescript"]["es6_sources"],
             deps = ctx.attr.deps,
         ),
+        # TODO: Add remaining shared JS providers from design doc
+        # (JSModuleInfo) and remove legacy "typescript" provider
+        # once it is no longer needed.
     ])
 
     return ts_providers_dict_to_struct(ts_providers)

packages/common/BUILD.bazel

@@ -10,6 +10,7 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
+    module_name = "@angular/common",
     deps = [
         "//packages/core",
         "@npm//rxjs",

packages/core/BUILD.bazel

@@ -10,6 +10,7 @@ ng_module(
             "src/**/*.ts",
         ],
     ),
+    module_name = "@angular/core",
     deps = [
         "//packages:types",
         "//packages/core/src/compiler",

packages/service-worker/BUILD.bazel

@@ -26,7 +26,7 @@ genrule(
 
 genrule(
     name = "ngsw_worker_renamed",
-    srcs = ["//packages/service-worker/worker:ngsw_worker.es2015.js"],
+    srcs = ["//packages/service-worker/worker:ngsw_worker.js"],
     outs = ["ngsw-worker.js"],
     # Remove sourcemap since this file will be served in production site
     # See https://github.com/angular/angular/issues/23596

packages/zone.js/BUILD.bazel

@@ -3,6 +3,8 @@ load("//packages/zone.js:bundles.bzl", "ES2015_BUNDLES", "ES5_BUNDLES", "ES5_GLO
 
 exports_files([
     "tsconfig.json",
+    "rollup-es5.config.js",
+    "rollup-es5_global-es2015.config.js",
 ])
 
 genrule(

packages/zone.js/dist/BUILD.bazel

@@ -21,11 +21,8 @@ genrule(
 [
     rollup_bundle(
         name = b[0].replace("-", "_") + "_rollup",
+        config_file = "//packages/zone.js:rollup-es5.config.js",
         entry_point = b[1] + ".ts",
-        globals = {
-            "electron": "electron",
-        },
-        license_banner = "//packages:license-banner.txt",
         deps = [
             "//packages/zone.js/lib",
         ],
@@ -36,63 +33,22 @@ genrule(
 [
     rollup_bundle(
         name = b[0].replace("-", "_") + "_rollup",
+        config_file = "//packages/zone.js:rollup-es5_global-es2015.config.js",
         entry_point = b[1] + ".ts",
-        global_name = "Zone",
-        license_banner = "//packages:license-banner.txt",
         deps = [
             "//packages/zone.js/lib",
         ],
     )
     for b in ES5_GLOBAL_BUNDLES.items() + ES2015_BUNDLES.items()
 ]
 
-# the es5 filegroups
-[
-    filegroup(
-        name = b[0] + ".es5",
-        srcs = [":" + b[0].replace("-", "_") + "_rollup"],
-        output_group = "es5_umd",
-    )
-    for b in ES5_BUNDLES.items() + ES5_GLOBAL_BUNDLES.items()
-]
-
-# the es5.min filegroups
-[
-    filegroup(
-        name = b[0] + ".es5.min",
-        srcs = [":" + b[0].replace("-", "_") + "_rollup"],
-        output_group = "es5_umd_min",
-    )
-    for b in ES5_BUNDLES.items() + ES5_GLOBAL_BUNDLES.items()
-]
-
-# the es2015 filegroups
-[
-    filegroup(
-        name = b[0] + ".umd",
-        srcs = [":" + b[0].replace("-", "_") + "_rollup"],
-        output_group = "umd",
-    )
-    for b in ES2015_BUNDLES.items()
-]
-
-# the es2015.min filegroups
-[
-    filegroup(
-        name = b[0] + ".umd.min",
-        srcs = [":" + b[0].replace("-", "_") + "_rollup"],
-        output_group = "umd_min",
-    )
-    for b in ES2015_BUNDLES.items()
-]
-
 # Extract and rename each es5 bundle to a .js and .min.js in the dist/ dir
 [
     genrule(
         name = b[0] + "-dist",
         srcs = [
-            b[0] + ".es5",
-            b[0] + ".es5.min",
+            b[0].replace("-", "_") + "_rollup.es5umd.js",
+            b[0].replace("-", "_") + "_rollup.min.es5umd.js",
         ],
         outs = [
             b[0] + ".js",
@@ -114,7 +70,7 @@ genrule(
     genrule(
         name = b[0] + "-dist-dev-test",
         srcs = [
-            b[0] + ".es5",
+            b[0].replace("-", "_") + "_rollup.es5umd.js",
         ],
         outs = [
             b[0] + ".dev.test.js",
@@ -131,7 +87,7 @@ genrule(
     genrule(
         name = b + "-dist-dev-test",
         srcs = [
-            b + ".umd",
+            b.replace("-", "_") + "_rollup.umd.js",
         ],
         outs = [
             b + ".dev.test.js",
@@ -149,7 +105,7 @@ genrule(
     genrule(
         name = b[0] + "-dist-test",
         srcs = [
-            b[0] + ".es5.min",
+            b[0].replace("-", "_") + "_rollup.min.es5umd.js",
         ],
         outs = [
             b[0] + ".test.min.js",
@@ -167,8 +123,8 @@ genrule(
     genrule(
         name = b + "-dist",
         srcs = [
-            b + ".umd",
-            b + ".umd.min",
+            b.replace("-", "_") + "_rollup.umd.js",
+            b.replace("-", "_") + "_rollup.min.umd.js",
         ],
         outs = [
             b + ".js",
@@ -190,7 +146,7 @@ genrule(
     genrule(
         name = b + "-dist-test",
         srcs = [
-            b + ".umd.min",
+            b.replace("-", "_") + "_rollup.min.umd.js",
         ],
         outs = [
             b + ".test.min.js",

packages/zone.js/rollup-es5.config.js

@@ -0,0 +1,10 @@
+const banner = `/**
+* @license Angular v0.0.0-PLACEHOLDER
+* (c) 2010-2019 Google LLC. https://angular.io/
+* License: MIT
+*/`;
+
+module.exports = {
+  external: ['electron'],
+  output: {globals: {electron: 'electron'}, banner},
+}

packages/zone.js/rollup-es5_global-es2015.config.js

@@ -0,0 +1,10 @@
+const banner = `/**
+* @license Angular v0.0.0-PLACEHOLDER
+* (c) 2010-2019 Google LLC. https://angular.io/
+* License: MIT
+*/`;
+
+module.exports = {
+  external: ['rxjs'],
+  output: {globals: {rxjs: 'rxjs'}, name: 'Zone', banner},
+}

packages/zone.js/test/karma_test.bzl

@@ -16,17 +16,11 @@ def karma_test_prepare(name, env_srcs, env_deps, env_entry_point, test_srcs, tes
             ":" + name + "_env",
         ],
     )
-    native.filegroup(
-        name = name + "_env_rollup.es5",
-        testonly = True,
-        srcs = [":" + name + "_env_rollup"],
-        output_group = "umd",
-    )
     native.genrule(
         name = name + "_env_trim_map",
         testonly = True,
         srcs = [
-            ":" + name + "_env_rollup.es5",
+            ":" + name + "_env_rollup.umd",
         ],
         outs = [
             name + "_env_rollup_trim_map.js",
@@ -45,24 +39,16 @@ def karma_test_prepare(name, env_srcs, env_deps, env_entry_point, test_srcs, tes
         name = name + "_rollup",
         testonly = True,
         entry_point = test_entry_point,
-        globals = {
-            "electron": "electron",
-        },
+        config_file = "//packages/zone.js:rollup-es5.config.js",
         deps = [
             ":" + name + "_test",
         ],
     )
-    native.filegroup(
-        name = name + "_rollup.es5",
-        testonly = True,
-        srcs = [":" + name + "_rollup"],
-        output_group = "umd",
-    )
     native.genrule(
         name = name + "_trim_map",
         testonly = True,
         srcs = [
-            ":" + name + "_rollup.es5",
+            ":" + name + "_rollup.umd",
         ],
         outs = [
             name + "_rollup_trim_map.js",

tools/BUILD.bazel

@@ -5,6 +5,7 @@ load("@npm_bazel_typescript//:index.bzl", "ts_config")
 exports_files([
     "tsconfig.json",
     "jasmine-seed-generator.js",
+    "ng_rollup_bundle.config.js",
 ])
 
 ts_config(