angular · andrewseguin · Sep 27, 2019 · Sep 24, 2019 · Sep 25, 2019 · Sep 25, 2019
diff --git a/packages.bzl b/packages.bzl
@@ -1,127 +1,3 @@
-# List of all components / subpackages.
-
-CDK_PACKAGES = [
-    "a11y",
-    "accordion",
-    "bidi",
-    "coercion",
-    "collections",
-    "drag-drop",
-    "keycodes",
-    "layout",
-    "observers",
-    "overlay",
-    "platform",
-    "portal",
-    "scrolling",
-    "stepper",
-    "table",
-    "text-field",
-    "tree",
-
-    # NOTE: "testing" should not be listed here as it will be treated as its own
-    # package. This is because we don't want to include "testing the testing utilities
-    # in the release output.
-]
-
-# Within the CDK, only a few targets have sass libraries which need to be
-# part of the release package. This list declares all CDK targets with sass
-# libraries that need to be included and re-exported at the package root.
-CDK_TARGETS_WITH_STYLES = [
-    "a11y",
-    "overlay",
-    "text-field",
-]
-
-CDK_SCSS_LIBS = [
-    "//src/cdk/%s:%s_scss_lib" % (p, p.replace("-", "_"))
-    for p in CDK_TARGETS_WITH_STYLES
-]
-
-CDK_TARGETS = ["//src/cdk"] + ["//src/cdk/%s" % p for p in CDK_PACKAGES]
-
-CDK_EXPERIMENTAL_PACKAGES = [
-    "dialog",
-    "popover-edit",
-    "scrolling",
-]
-
-CDK_EXPERIMENTAL_TARGETS = ["//src/cdk-experimental"] + [
-    "//src/cdk-experimental/%s" % p
-    for p in CDK_EXPERIMENTAL_PACKAGES
-]
-
-MATERIAL_PACKAGES = [
-    "autocomplete",
-    "badge",
-    "bottom-sheet",
-    "button",
-    "button-toggle",
-    "card",
-    "checkbox",
-    "chips",
-    "core",
-    "datepicker",
-    "dialog",
-    "divider",
-    "expansion",
-    "form-field",
-    "grid-list",
-    "icon",
-    "input",
-    "list",
-    "menu",
-    "paginator",
-    "progress-bar",
-    "progress-spinner",
-    "radio",
-    "select",
-    "sidenav",
-    "slide-toggle",
-    "slider",
-    "snack-bar",
-    "sort",
-    "stepper",
-    "table",
-    "tabs",
-    "toolbar",
-    "tooltip",
-    "tree",
-]
-
-MATERIAL_TARGETS = ["//src/material"] + ["//src/material/%s" % p for p in MATERIAL_PACKAGES]
-
-# List that references the sass libraries for each Material package. This can be used to create
-# the theming scss-bundle or to specify dependencies for the all-theme.scss file.
-MATERIAL_SCSS_LIBS = [
-    "//src/material/%s:%s_scss_lib" % (p, p.replace("-", "_"))
-    for p in MATERIAL_PACKAGES
-]
-
-MATERIAL_EXPERIMENTAL_PACKAGES = [
-    "mdc-button",
-    "mdc-card",
-    "mdc-checkbox",
-    "mdc-chips",
-    "mdc-tabs",
-    "mdc-helpers",
-    "mdc-menu",
-    "mdc-radio",
-    "mdc-slide-toggle",
-    "mdc-slider",
-    "popover-edit",
-]
-
-MATERIAL_EXPERIMENTAL_TARGETS = ["//src/material-experimental"] + [
-    "//src/material-experimental/%s" % p
-    for p in MATERIAL_EXPERIMENTAL_PACKAGES
-]
-
-MATERIAL_EXPERIMENTAL_SCSS_LIBS = [
-    "//src/material-experimental/%s:%s_scss_lib" % (p, p.replace("-", "_"))
-    for p in MATERIAL_EXPERIMENTAL_PACKAGES
-]
-
 # Each individual package uses a placeholder for the version of Angular to ensure they're
 # all in-sync. This map is passed to each ng_package rule to stamp out the appropriate
 # version for the placeholders.
@@ -132,96 +8,6 @@ VERSION_PLACEHOLDER_REPLACEMENTS = {
     "0.0.0-NG": ANGULAR_PACKAGE_VERSION,
 }
 
-# Base rollup globals for everything in the repo.
-ROLLUP_GLOBALS = {
-    "@angular/cdk": "ng.cdk",
-    "@angular/cdk-experimental": "ng.cdkExperimental",
-    "@angular/google-maps": "ng.googleMaps",
-    "@angular/material": "ng.material",
-    "@angular/material-experimental": "ng.materialExperimental",
-    "@angular/youtube-player": "ng.youtubePlayer",
-
-    # MDC Web
-    "@material/animation": "mdc.animation",
-    "@material/auto-init": "mdc.autoInit",
-    "@material/base": "mdc.base",
-    "@material/checkbox": "mdc.checkbox",
-    "@material/chips": "mdc.chips",
-    "@material/dialog": "mdc.dialog",
-    "@material/dom": "mdc.dom",
-    "@material/drawer": "mdc.drawer",
-    "@material/floating-label": "mdc.floatingLabel",
-    "@material/form-field": "mdc.formField",
-    "@material/grid-list": "mdc.gridList",
-    "@material/icon-button": "mdc.iconButton",
-    "@material/line-ripple": "mdc.lineRipple",
-    "@material/linear-progress": "mdc.linearProgress",
-    "@material/list": "mdc.list",
-    "@material/menu": "mdc.menu",
-    "@material/menu-surface": "mdc.menuSurface",
-    "@material/notched-outline": "mdc.notchedOutline",
-    "@material/radio": "mdc.radio",
-    "@material/ripple": "mdc.ripple",
-    "@material/select": "mdc.select",
-    "@material/slider": "mdc.slider",
-    "@material/snackbar": "mdc.snackbar",
-    "@material/switch": "mdc.switch",
-    "@material/tab": "mdc.tab",
-    "@material/tab-bar": "mdc.tabBar",
-    "@material/tab-indicator": "mdc.tabIndicator",
-    "@material/tab-scroller": "mdc.tabScroller",
-    "@material/text-field": "mdc.textField",
-    "@material/top-app-bar": "mdc.topAppBar",
-    "moment": "moment",
-    "tslib": "tslib",
-}
-
-# Rollup globals for cdk subpackages in the form of, e.g., {"@angular/cdk/table": "ng.cdk.table"}
-ROLLUP_GLOBALS.update({
-    "@angular/cdk/%s" % p: "ng.cdk.%s" % p
-    for p in CDK_PACKAGES
-})
-
-# Rollup globals for cdk subpackages in the form of, e.g.,
-# {"@angular/cdk-experimental/scrolling": "ng.cdkExperimental.scrolling"}
-ROLLUP_GLOBALS.update({
-    "@angular/cdk-experimental/%s" % p: "ng.cdkExperimental.%s" % p
-    for p in CDK_EXPERIMENTAL_PACKAGES
-})
-
-# Rollup globals for material subpackages, e.g., {"@angular/material/list": "ng.material.list"}
-ROLLUP_GLOBALS.update({
-    "@angular/material/%s" % p: "ng.material.%s" % p
-    for p in MATERIAL_PACKAGES
-})
-
-# Rollup globals for material experimental subpackages, e.g.,
-# {"@angular/material-experimental/list": "ng.materialExperimental.list"}
-ROLLUP_GLOBALS.update({
-    "@angular/material-experimental/%s" % p: "ng.materialExperimental.%s" % p
-    for p in MATERIAL_EXPERIMENTAL_PACKAGES
-})
-
-# Rollup globals the examples package. Since individual examples are
-# grouped by package and component, the primary entry-point imports
-# from entry-points which should be treated as external imports.
-ROLLUP_GLOBALS.update({
-    "@angular/material-examples/cdk/%s" % p: "ng.materialExamples.cdk.%s" % p
-    for p in CDK_PACKAGES
-})
-ROLLUP_GLOBALS.update({
-    "@angular/material-examples/cdk-experimental/%s" % p: "ng.materialExamples.cdkExperimental.%s" % p
-    for p in CDK_EXPERIMENTAL_PACKAGES
-})
-ROLLUP_GLOBALS.update({
-    "@angular/material-examples/material/%s" % p: "ng.materialExamples.material.%s" % p
-    for p in MATERIAL_PACKAGES
-})
-ROLLUP_GLOBALS.update({
-    "@angular/material-examples/material-experimental/%s" % p: "ng.materialExamples.materialExperimental.%s" % p
-    for p in MATERIAL_EXPERIMENTAL_PACKAGES
-})
-
 # UMD bundles for Angular packages and subpackages we depend on for development and testing.
 ANGULAR_LIBRARY_UMDS = [
     "@npm//:node_modules/@angular/animations/bundles/animations-browser.umd.js",

diff --git a/rollup-globals.bzl b/rollup-globals.bzl
@@ -0,0 +1,92 @@
+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",
+)
+
+# Base rollup globals for everything in the repo.
+ROLLUP_GLOBALS = {
+    "@angular/cdk": "ng.cdk",
+    "@angular/cdk-experimental": "ng.cdkExperimental",
+    "@angular/google-maps": "ng.googleMaps",
+    "@angular/material": "ng.material",
+    "@angular/material-experimental": "ng.materialExperimental",
+    "@angular/youtube-player": "ng.youtubePlayer",
+
+    # MDC Web
+    "@material/animation": "mdc.animation",
+    "@material/auto-init": "mdc.autoInit",
+    "@material/base": "mdc.base",
+    "@material/checkbox": "mdc.checkbox",
+    "@material/chips": "mdc.chips",
+    "@material/dialog": "mdc.dialog",
+    "@material/dom": "mdc.dom",
+    "@material/drawer": "mdc.drawer",
+    "@material/floating-label": "mdc.floatingLabel",
+    "@material/form-field": "mdc.formField",
+    "@material/grid-list": "mdc.gridList",
+    "@material/icon-button": "mdc.iconButton",
+    "@material/line-ripple": "mdc.lineRipple",
+    "@material/linear-progress": "mdc.linearProgress",
+    "@material/list": "mdc.list",
+    "@material/menu": "mdc.menu",
+    "@material/menu-surface": "mdc.menuSurface",
+    "@material/notched-outline": "mdc.notchedOutline",
+    "@material/radio": "mdc.radio",
+    "@material/ripple": "mdc.ripple",
+    "@material/select": "mdc.select",
+    "@material/slider": "mdc.slider",
+    "@material/snackbar": "mdc.snackbar",
+    "@material/switch": "mdc.switch",
+    "@material/tab": "mdc.tab",
+    "@material/tab-bar": "mdc.tabBar",
+    "@material/tab-indicator": "mdc.tabIndicator",
+    "@material/tab-scroller": "mdc.tabScroller",
+    "@material/text-field": "mdc.textField",
+    "@material/top-app-bar": "mdc.topAppBar",
+    "moment": "moment",
+    "tslib": "tslib",
+}
+
+# Converts a string from dash-case to lower camel case.
+def to_camel_case(input):
+    segments = input.split("-")
+    return segments[0] + "".join([x.title() for x in segments[1:]])
+
+# Converts an entry-point name to a UMD module name.
+# e.g. "snack-bar/testing" will become "snackBar.testing".
+def to_umd_name(name):
+    segments = name.split("/")
+    return ".".join([to_camel_case(x) for x in segments])
+
+# Creates globals for a given package and its entry-points.
+def create_globals(packageName, entryPoints):
+    ROLLUP_GLOBALS.update({
+        "@angular/%s/%s" % (packageName, ep): "ng.%s.%s" % (to_umd_name(packageName), to_umd_name(ep))
+        for ep in entryPoints
+    })
+
+create_globals("cdk", CDK_ENTRYPOINTS)
+create_globals("cdk-experimental", CDK_EXPERIMENTAL_ENTRYPOINTS)
+create_globals("material", MATERIAL_ENTRYPOINTS + MATERIAL_TESTING_ENTRYPOINTS)
+create_globals(
+    "material-experimental",
+    MATERIAL_EXPERIMENTAL_ENTRYPOINTS + MATERIAL_EXPERIMENTAL_TESTING_ENTRYPOINTS,
+)
+
+# Rollup globals the examples package. Since individual examples are
+# grouped by package and component, the primary entry-point imports
+# from entry-points which should be treated as external imports.
+create_globals("material-examples/cdk", CDK_ENTRYPOINTS)
+create_globals("material-examples/cdk-experimental", CDK_EXPERIMENTAL_ENTRYPOINTS)
+create_globals(
+    "material-examples/material",
+    MATERIAL_ENTRYPOINTS + MATERIAL_TESTING_ENTRYPOINTS,
+)
+create_globals(
+    "material-examples/material-experimental",
+    MATERIAL_EXPERIMENTAL_ENTRYPOINTS + MATERIAL_EXPERIMENTAL_TESTING_ENTRYPOINTS,
+)
diff --git a/src/BUILD.bazel b/src/BUILD.bazel
@@ -1,14 +1,15 @@
 package(default_visibility = ["//visibility:public"])
 
 load("@npm_bazel_typescript//:index.bzl", "ts_config")
-load("//:packages.bzl", "CDK_PACKAGES", "MATERIAL_PACKAGES")
+load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS")
+load("//src/material:config.bzl", "MATERIAL_ENTRYPOINTS")
 load("//tools:defaults.bzl", "ts_library")
 load("//tools/dgeni:index.bzl", "dgeni_api_docs")
 
 # List that contains all source files that need to be processed by Dgeni.
-apiSourceFiles = ["//src/cdk/%s:source-files" % name for name in CDK_PACKAGES] + [
+apiSourceFiles = ["//src/cdk/%s:source-files" % name for name in CDK_ENTRYPOINTS] + [
     "//src/material/%s:source-files" % name
-    for name in MATERIAL_PACKAGES
+    for name in MATERIAL_ENTRYPOINTS
 ]
 
 exports_files([
@@ -41,8 +42,8 @@ dgeni_api_docs(
         "@npm//@angular/platform-browser",
     ],
     entry_points = {
-        "cdk": CDK_PACKAGES,
-        "material": MATERIAL_PACKAGES,
+        "cdk": CDK_ENTRYPOINTS,
+        "material": MATERIAL_ENTRYPOINTS,
     },
     tags = ["docs-package"],
 )
diff --git a/src/a11y-demo/BUILD.bazel b/src/a11y-demo/BUILD.bazel
@@ -1,6 +1,7 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//:packages.bzl", "CDK_TARGETS", "MATERIAL_TARGETS")
+load("//src/cdk:config.bzl", "CDK_TARGETS")
+load("//src/material:config.bzl", "MATERIAL_TARGETS")
 load("//tools:defaults.bzl", "ng_module")
 load("//tools:sass_generate_binaries.bzl", "sass_generate_binaries")
 

diff --git a/src/cdk-experimental/BUILD.bazel b/src/cdk-experimental/BUILD.bazel
@@ -1,28 +1,22 @@
 package(default_visibility = ["//visibility:public"])
 
-load(
-    "//:packages.bzl",
-    "CDK_EXPERIMENTAL_PACKAGES",
-    "CDK_EXPERIMENTAL_TARGETS",
-    "ROLLUP_GLOBALS",
-)
-load("//tools:defaults.bzl", "ng_module", "ng_package")
+load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS")
+load("//tools:defaults.bzl", "ng_package", "ts_library")
 
-ng_module(
+ts_library(
     name = "cdk-experimental",
     srcs = glob(
         ["*.ts"],
         exclude = ["**/*.spec.ts"],
     ),
     module_name = "@angular/cdk-experimental",
-    deps = ["//src/cdk-experimental/%s" % p for p in CDK_EXPERIMENTAL_PACKAGES],
+    deps = ["@npm//@angular/core"],
 )
 
 ng_package(
     name = "npm_package",
     srcs = ["package.json"],
     entry_point = ":public-api.ts",
-    globals = ROLLUP_GLOBALS,
     tags = ["release-package"],
     deps = CDK_EXPERIMENTAL_TARGETS,
 )