build: no longer keep track of UMD globals for package output

As of APF v13, we no longer ship UMD files. This means that we can
remove all the logic for keeping track of the UMD global names. Instead
we just keep track of external packages which should not be bundled
into the package output (this includes cross-entry point imports; e.g.
slider should not bundle the core entry-point; so we still need to keep
track of all the entry-points as externals)

Author: devversion

.circleci/config.yml

@@ -338,10 +338,10 @@ jobs:
       - *setup_bazel_binary
 
       - run:
-          name: Checking rollup globals
+          name: Checking package externals
           command: |
-            bazel build //:rollup_globals
-            yarn check-rollup-globals $(bazel info bazel-bin)/rollup_globals.json
+            bazel build //:package_externals
+            yarn check-package-externals $(bazel info bazel-bin)/package_externals.json
 
       - run:
           name: Checking entry-points configuration

BUILD.bazel

@@ -1,4 +1,4 @@
-load("//:rollup-globals.bzl", "ROLLUP_GLOBALS")
+load("//:pkg-externals.bzl", "PKG_EXTERNALS")
 load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS")
 load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_ENTRYPOINTS")
 load("//src/material:config.bzl", "MATERIAL_ENTRYPOINTS", "MATERIAL_TESTING_ENTRYPOINTS")
@@ -11,10 +11,13 @@ exports_files([
     "package.json",
 ])
 
+# Target which writes the list of package externals into a JSON file so that the
+# Starlark-configured externals (for the NPM package bundling) can be passed to
+# the `check-package-externals` Yarn script, which validates our module imports.
 genrule(
-    name = "rollup_globals",
-    outs = ["rollup_globals.json"],
-    cmd = "echo '%s' > $@" % ROLLUP_GLOBALS,
+    name = "package_externals",
+    outs = ["package_externals.json"],
+    cmd = "echo '%s' > $@" % PKG_EXTERNALS,
 )
 
 entryPoints = ["cdk/%s" % e for e in CDK_ENTRYPOINTS] + \

package.json

@@ -28,7 +28,7 @@
     "breaking-changes": "ts-node --project scripts/tsconfig.json scripts/breaking-changes.ts",
     "gulp": "gulp",
     "check-entry-point-setup": "node ./scripts/check-entry-point-setup.js",
-    "check-rollup-globals": "ts-node --project scripts/tsconfig.json scripts/check-rollup-globals.ts",
+    "check-package-externals": "ts-node --project scripts/tsconfig.json scripts/check-package-externals.ts",
     "format": "yarn ng-dev format changed",
     "cherry-pick-patch": "ts-node --project tools/cherry-pick-patch/tsconfig.json tools/cherry-pick-patch/cherry-pick-patch.ts",
     "ownerslint": "ts-node --project scripts/tsconfig.json scripts/ownerslint.ts",

packages.bzl

@@ -22,98 +22,61 @@ VERSION_PLACEHOLDER_REPLACEMENTS = {
     "0.0.0-RXJS": RXJS_PACKAGE_VERSION,
 }
 
-# Map of MDC packages and their UMD bundles. These are used for unit tests and the dev-app.
-MDC_PACKAGE_UMD_BUNDLES = {
-    "@material/animation": "@npm//:node_modules/@material/animation/dist/mdc.animation.js",
-    "@material/auto-init": "@npm//:node_modules/@material/auto-init/dist/mdc.autoInit.js",
-    "@material/base": "@npm//:node_modules/@material/base/dist/mdc.base.js",
-    "@material/checkbox": "@npm//:node_modules/@material/checkbox/dist/mdc.checkbox.js",
-    "@material/chips": "@npm//:node_modules/@material/chips/dist/mdc.chips.js",
-    "@material/circular-progress": "@npm//:node_modules/@material/circular-progress/dist/mdc.circularProgress.js",
-    "@material/data-table": "@npm//:node_modules/@material/data-table/dist/mdc.dataTable.js",
-    "@material/dialog": "@npm//:node_modules/@material/dialog/dist/mdc.dialog.js",
-    "@material/dom": "@npm//:node_modules/@material/dom/dist/mdc.dom.js",
-    "@material/drawer": "@npm//:node_modules/@material/drawer/dist/mdc.drawer.js",
-    "@material/floating-label": "@npm//:node_modules/@material/floating-label/dist/mdc.floatingLabel.js",
-    "@material/form-field": "@npm//:node_modules/@material/form-field/dist/mdc.formField.js",
-    "@material/icon-button": "@npm//:node_modules/@material/icon-button/dist/mdc.iconButton.js",
-    "@material/line-ripple": "@npm//:node_modules/@material/line-ripple/dist/mdc.lineRipple.js",
-    "@material/linear-progress": "@npm//:node_modules/@material/linear-progress/dist/mdc.linearProgress.js",
-    "@material/list": "@npm//:node_modules/@material/list/dist/mdc.list.js",
-    "@material/menu-surface": "@npm//:node_modules/@material/menu-surface/dist/mdc.menuSurface.js",
-    "@material/menu": "@npm//:node_modules/@material/menu/dist/mdc.menu.js",
-    "@material/notched-outline": "@npm//:node_modules/@material/notched-outline/dist/mdc.notchedOutline.js",
-    "@material/radio": "@npm//:node_modules/@material/radio/dist/mdc.radio.js",
-    "@material/ripple": "@npm//:node_modules/@material/ripple/dist/mdc.ripple.js",
-    "@material/select": "@npm//:node_modules/@material/select/dist/mdc.select.js",
-    "@material/slider": "@npm//:node_modules/@material/slider/dist/mdc.slider.js",
-    "@material/snackbar": "@npm//:node_modules/@material/snackbar/dist/mdc.snackbar.js",
-    "@material/switch": "@npm//:node_modules/@material/switch/dist/mdc.switch.js",
-    "@material/tab-bar": "@npm//:node_modules/@material/tab-bar/dist/mdc.tabBar.js",
-    "@material/tab-indicator": "@npm//:node_modules/@material/tab-indicator/dist/mdc.tabIndicator.js",
-    "@material/tab-scroller": "@npm//:node_modules/@material/tab-scroller/dist/mdc.tabScroller.js",
-    "@material/tab": "@npm//:node_modules/@material/tab/dist/mdc.tab.js",
-    "@material/textfield": "@npm//:node_modules/@material/textfield/dist/mdc.textfield.js",
-    "@material/tooltip": "@npm//:node_modules/@material/tooltip/dist/mdc.tooltip.js",
-    "@material/top-app-bar": "@npm//:node_modules/@material/top-app-bar/dist/mdc.topAppBar.js",
-}
-
-# List of default Angular library UMD bundles which are not processed by ngcc.
-ANGULAR_NO_NGCC_BUNDLES = [
-    ("@angular/compiler", ["compiler.umd.js"]),
-    ("@angular/localize", ["localize.umd.js", "localize-init.umd.js"]),
+# List of MDC packages.
+MDC_PACKAGES = [
+    "@material/animation",
+    "@material/auto-init",
+    "@material/base",
+    "@material/checkbox",
+    "@material/chips",
+    "@material/circular-progress",
+    "@material/data-table",
+    "@material/dialog",
+    "@material/dom",
+    "@material/drawer",
+    "@material/floating-label",
+    "@material/form-field",
+    "@material/icon-button",
+    "@material/line-ripple",
+    "@material/linear-progress",
+    "@material/list",
+    "@material/menu-surface",
+    "@material/menu",
+    "@material/notched-outline",
+    "@material/radio",
+    "@material/ripple",
+    "@material/select",
+    "@material/slider",
+    "@material/snackbar",
+    "@material/switch",
+    "@material/tab-bar",
+    "@material/tab-indicator",
+    "@material/tab-scroller",
+    "@material/tab",
+    "@material/textfield",
+    "@material/tooltip",
+    "@material/top-app-bar",
 ]
 
-# List of Angular library UMD bundles which will are processed by ngcc.
-ANGULAR_NGCC_BUNDLES = [
-    ("@angular/animations", ["animations-browser.umd.js", "animations.umd.js"]),
-    ("@angular/common", ["common-http-testing.umd.js", "common-http.umd.js", "common-testing.umd.js", "common.umd.js"]),
-    ("@angular/compiler", ["compiler-testing.umd.js"]),
-    ("@angular/core", ["core-testing.umd.js", "core.umd.js"]),
-    ("@angular/forms", ["forms.umd.js"]),
-    ("@angular/platform-browser-dynamic", ["platform-browser-dynamic-testing.umd.js", "platform-browser-dynamic.umd.js"]),
-    ("@angular/platform-browser", ["platform-browser.umd.js", "platform-browser-testing.umd.js", "platform-browser-animations.umd.js"]),
-    ("@angular/router", ["router.umd.js"]),
+ANGULAR_PACKAGES_CONFIG = [
+    ("@angular/animations", struct(entry_points = ["browser"])),
+    ("@angular/common", struct(entry_points = ["http/testing", "http", "testing"])),
+    ("@angular/compiler", struct(entry_points = ["testing"])),
+    ("@angular/core", struct(entry_points = ["testing"])),
+    ("@angular/forms", struct(entry_points = [])),
+    ("@angular/platform-browser", struct(entry_points = ["testing", "animations"])),
+    ("@angular/platform-server", struct(entry_points = [], platform = "node")),
+    ("@angular/platform-browser-dynamic", struct(entry_points = ["testing"])),
+    ("@angular/router", struct(entry_points = [])),
+    ("@angular/localize", struct(entry_points = ["init"])),
 ]
 
-"""
-  Gets a dictionary of all packages and their bundle names.
-"""
-
-def getFrameworkPackageBundles():
-    res = {}
-    for pkgName, bundleNames in ANGULAR_NGCC_BUNDLES + ANGULAR_NO_NGCC_BUNDLES:
-        res[pkgName] = res.get(pkgName, []) + bundleNames
-    return res
-
-"""
-  Gets a list of labels which resolve to the UMD bundles of the given packages.
-"""
-
-def getUmdFilePaths(packages, ngcc_artifacts):
-    tmpl = "@npm//:node_modules/%s" + ("/__ivy_ngcc__" if ngcc_artifacts else "") + "/bundles/%s"
-    return [
-        tmpl % (pkgName, bundleName)
-        for pkgName, bundleNames in packages
-        for bundleName in bundleNames
-    ]
-
-ANGULAR_PACKAGE_BUNDLES = getFrameworkPackageBundles()
-
-ANGULAR_LIBRARY_VIEW_ENGINE_UMDS = getUmdFilePaths(ANGULAR_NO_NGCC_BUNDLES, False) + \
-                                   getUmdFilePaths(ANGULAR_NGCC_BUNDLES, False)
-
-ANGULAR_LIBRARY_IVY_UMDS = getUmdFilePaths(ANGULAR_NO_NGCC_BUNDLES, False) + \
-                           getUmdFilePaths(ANGULAR_NGCC_BUNDLES, True)
-
-"""
-  Gets the list of targets for the Angular library UMD bundles. Conditionally
-  switches between View Engine or Ivy UMD bundles based on the
-  "--config={ivy,view-engine}" flag.
-"""
-
-def getAngularUmdTargets():
-    return select({
-        "//tools:view_engine_mode": ANGULAR_LIBRARY_VIEW_ENGINE_UMDS,
-        "//conditions:default": ANGULAR_LIBRARY_IVY_UMDS,
-    })
+ANGULAR_PACKAGES = [
+    struct(
+        name = name[len("@angular/"):],
+        entry_points = config.entry_points,
+        platform = config.platform if hasattr(config, "platform") else "browser",
+        module_name = name,
+    )
+    for name, config in ANGULAR_PACKAGES_CONFIG
+]

pkg-externals.bzl

@@ -0,0 +1,85 @@
+load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS")
+load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_ENTRYPOINTS")
+load("//src/material:config.bzl", "MATERIAL_ENTRYPOINTS", "MATERIAL_TESTING_ENTRYPOINTS")
+load(
+    "//src/material-experimental:config.bzl",
+    "MATERIAL_EXPERIMENTAL_ENTRYPOINTS",
+    "MATERIAL_EXPERIMENTAL_TESTING_ENTRYPOINTS",
+)
+load("//:packages.bzl", "MDC_PACKAGES")
+
+# Base list of externals which should not be bundled into the APF package output.
+# Note that we want to disable sorting of the externals as we manually group entries.
+# buildifier: disable=unsorted-list-items
+PKG_EXTERNALS = [
+    # Framework packages.
+    "@angular/animations",
+    "@angular/common",
+    "@angular/common/http",
+    "@angular/common/http/testing",
+    "@angular/common/testing",
+    "@angular/core",
+    "@angular/core/testing",
+    "@angular/forms",
+    "@angular/platform-browser",
+    "@angular/platform-browser-dynamic",
+    "@angular/platform-browser-dynamic/testing",
+    "@angular/platform-browser/animations",
+    "@angular/platform-server",
+    "@angular/router",
+
+    # Primary entry-points in the project.
+    "@angular/cdk",
+    "@angular/cdk-experimental",
+    "@angular/google-maps",
+    "@angular/material",
+    "@angular/material-experimental",
+    "@angular/material-moment-adapter",
+    "@angular/material-luxon-adapter",
+    "@angular/material-date-fns-adapter",
+    "@angular/youtube-player",
+
+    # Third-party libraries.
+    "kagekiri",
+    "moment",
+    "moment/locale/fr",
+    "moment/locale/ja",
+    "luxon",
+    "date-fns",
+    "protractor",
+    "rxjs",
+    "rxjs/operators",
+    "selenium-webdriver",
+]
+
+# Configures the externals for all MDC packages.
+def setup_mdc_externals():
+    for pkg_name in MDC_PACKAGES:
+        PKG_EXTERNALS.append(pkg_name)
+
+# Creates externals for a given package and its entry-points.
+def setup_entry_point_externals(packageName, entryPoints):
+    PKG_EXTERNALS.extend(["@angular/%s/%s" % (packageName, ep) for ep in entryPoints])
+
+setup_mdc_externals()
+
+setup_entry_point_externals("cdk", CDK_ENTRYPOINTS)
+setup_entry_point_externals("cdk-experimental", CDK_EXPERIMENTAL_ENTRYPOINTS)
+setup_entry_point_externals("material", MATERIAL_ENTRYPOINTS + MATERIAL_TESTING_ENTRYPOINTS)
+setup_entry_point_externals(
+    "material-experimental",
+    MATERIAL_EXPERIMENTAL_ENTRYPOINTS + MATERIAL_EXPERIMENTAL_TESTING_ENTRYPOINTS,
+)
+
+# External module names in the examples package. Individual examples are grouped
+# by package and component, so we add configure such entry-points as external.
+setup_entry_point_externals("components-examples/cdk", CDK_ENTRYPOINTS)
+setup_entry_point_externals("components-examples/cdk-experimental", CDK_EXPERIMENTAL_ENTRYPOINTS)
+setup_entry_point_externals(
+    "components-examples/material",
+    MATERIAL_ENTRYPOINTS + MATERIAL_TESTING_ENTRYPOINTS,
+)
+setup_entry_point_externals(
+    "components-examples/material-experimental",
+    MATERIAL_EXPERIMENTAL_ENTRYPOINTS + MATERIAL_EXPERIMENTAL_TESTING_ENTRYPOINTS,
+)