Skip to content

Commit 141d82e

Browse files
devversiondevversion
committed
fixup! build: ensure all entry-points are included in release package
Address feedback
1 parent 25c48dd commit 141d82e

File tree

8 files changed

+155
-110
lines changed

8 files changed

+155
-110
lines changed

‎rollup-globals.bzl

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
load("//src/cdk:config.bzl", "CDK_ENTRYPOINTS")
22
load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_ENTRYPOINTS")
3-
load("//src/material:config.bzl", "MATERIAL_ENTRYPOINTS")
4-
load("//src/material-experimental:config.bzl", "MATERIAL_EXPERIMENTAL_ENTRYPOINTS")
3+
load("//src/material:config.bzl", "MATERIAL_NO_TEST_ENTRYPOINTS", "MATERIAL_TEST_ENTRYPOINTS")
4+
load(
5+
"//src/material-experimental:config.bzl",
6+
"MATERIAL_EXPERIMENTAL_NO_TEST_ENTRYPOINTS",
7+
"MATERIAL_EXPERIMENTAL_TEST_ENTRYPOINTS",
8+
)
59

610
# Base rollup globals for everything in the repo.
711
ROLLUP_GLOBALS = {
@@ -67,13 +71,22 @@ def create_globals(packageName, entryPoints):
6771

6872
create_globals("cdk", CDK_ENTRYPOINTS)
6973
create_globals("cdk-experimental", CDK_EXPERIMENTAL_ENTRYPOINTS)
70-
create_globals("material", MATERIAL_ENTRYPOINTS)
71-
create_globals("material-experimental", MATERIAL_EXPERIMENTAL_ENTRYPOINTS)
74+
create_globals("material", MATERIAL_NO_TEST_ENTRYPOINTS + MATERIAL_TEST_ENTRYPOINTS)
75+
create_globals(
76+
"material-experimental",
77+
MATERIAL_EXPERIMENTAL_NO_TEST_ENTRYPOINTS + MATERIAL_EXPERIMENTAL_TEST_ENTRYPOINTS,
78+
)
7279

7380
# Rollup globals the examples package. Since individual examples are
7481
# grouped by package and component, the primary entry-point imports
7582
# from entry-points which should be treated as external imports.
7683
create_globals("material-examples/cdk", CDK_ENTRYPOINTS)
7784
create_globals("material-examples/cdk-experimental", CDK_EXPERIMENTAL_ENTRYPOINTS)
78-
create_globals("material-examples/material", MATERIAL_ENTRYPOINTS)
79-
create_globals("material-examples/material-experimental", MATERIAL_EXPERIMENTAL_ENTRYPOINTS)
85+
create_globals(
86+
"material-examples/material",
87+
MATERIAL_NO_TEST_ENTRYPOINTS + MATERIAL_TEST_ENTRYPOINTS,
88+
)
89+
create_globals(
90+
"material-examples/material-experimental",
91+
MATERIAL_EXPERIMENTAL_NO_TEST_ENTRYPOINTS + MATERIAL_EXPERIMENTAL_TEST_ENTRYPOINTS,
92+
)

‎src/cdk-experimental/config.bzl

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
entryPointGroups = [
2-
["clipboard"],
3-
["dialog"],
4-
["popover-edit"],
5-
["scrolling"],
6-
]
7-
81
# List of all entry-points of the Angular cdk-experimental package.
9-
CDK_EXPERIMENTAL_ENTRYPOINTS = [ep for group in entryPointGroups for ep in group]
2+
CDK_EXPERIMENTAL_ENTRYPOINTS = [
3+
"clipboard",
4+
"dialog",
5+
"popover-edit",
6+
"scrolling",
7+
]
108

119
# List of all entry-point targets of the Angular cdk-experimental package.
1210
CDK_EXPERIMENTAL_TARGETS = ["//src/cdk-experimental"] + \

‎src/cdk/config.bzl

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,27 @@
1-
entryPointGroups = [
2-
["a11y"],
3-
["accordion"],
4-
["bidi"],
5-
["coercion"],
6-
["collections"],
7-
["drag-drop"],
8-
["keycodes"],
9-
["layout"],
10-
["observers"],
11-
["overlay"],
12-
["platform"],
13-
["portal"],
14-
["scrolling"],
15-
["stepper"],
16-
["table"],
17-
["text-field"],
18-
["tree"],
1+
# List of all entry-points of the Angular CDK package.
2+
CDK_ENTRYPOINTS = [
3+
"a11y",
4+
"accordion",
5+
"bidi",
6+
"coercion",
7+
"collections",
8+
"drag-drop",
9+
"keycodes",
10+
"layout",
11+
"observers",
12+
"overlay",
13+
"platform",
14+
"portal",
15+
"scrolling",
16+
"stepper",
17+
"table",
18+
"text-field",
19+
"tree",
1920

2021
# NOTE: "testing" should not be listed here as it will be treated as its own
2122
# package that will be included manually in the "ng_package".
2223
]
2324

24-
# List of all entry-points of the Angular CDK package.
25-
CDK_ENTRYPOINTS = [ep for group in entryPointGroups for ep in group]
26-
2725
# List of all entry-point targets of the Angular Material package.
2826
CDK_TARGETS = ["//src/cdk"] + ["//src/cdk/%s" % ep for ep in CDK_ENTRYPOINTS]
2927

‎src/material-experimental/BUILD.bazel

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("//src/material-experimental:config.bzl", "MATERIAL_EXPERIMENTAL_SCSS_LIBS", "MATERIAL_EXPERIMENTAL_TARGETS")
3+
load(
4+
"//src/material-experimental:config.bzl",
5+
"MATERIAL_EXPERIMENTAL_NO_TEST_TARGETS",
6+
"MATERIAL_EXPERIMENTAL_SCSS_LIBS",
7+
"MATERIAL_EXPERIMENTAL_TEST_TARGETS",
8+
)
49
load("//tools:defaults.bzl", "ng_package", "ts_library")
510

611
exports_files(["mdc_require_config.js"])
@@ -21,5 +26,5 @@ ng_package(
2126
data = MATERIAL_EXPERIMENTAL_SCSS_LIBS,
2227
entry_point = ":public-api.ts",
2328
tags = ["release-package"],
24-
deps = MATERIAL_EXPERIMENTAL_TARGETS,
29+
deps = MATERIAL_EXPERIMENTAL_NO_TEST_TARGETS + MATERIAL_EXPERIMENTAL_TEST_TARGETS,
2530
)

‎src/material-experimental/config.bzl

Lines changed: 35 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,54 @@
1-
entryPointGroups = [
2-
["form-field/testing", "form-field/testing/control"],
3-
["input/testing"],
4-
["mdc-autocomplete"],
5-
["mdc-button", "mdc-button/testing"],
6-
["mdc-card"],
7-
["mdc-checkbox", "mdc-checkbox/testing"],
8-
["mdc-chips", "mdc-chips/testing"],
9-
["mdc-helpers"],
10-
["mdc-menu", "mdc-menu/testing"],
11-
["mdc-radio"],
12-
["mdc-select"],
13-
["mdc-sidenav"],
14-
["mdc-slide-toggle", "mdc-slide-toggle/testing"],
15-
["mdc-slider"],
16-
["mdc-tabs"],
17-
["popover-edit"],
18-
["select/testing"],
1+
entryPoints = [
2+
"form-field/testing",
3+
"form-field/testing/control",
4+
"input/testing",
5+
"mdc-autocomplete",
6+
"mdc-button",
7+
"mdc-button/testing",
8+
"mdc-card",
9+
"mdc-checkbox",
10+
"mdc-checkbox/testing",
11+
"mdc-chips",
12+
"mdc-chips/testing",
13+
"mdc-helpers",
14+
"mdc-menu",
15+
"mdc-menu/testing",
16+
"mdc-radio",
17+
"mdc-select",
18+
"mdc-sidenav",
19+
"mdc-slide-toggle",
20+
"mdc-slide-toggle/testing",
21+
"mdc-slider",
22+
"mdc-tabs",
23+
"popover-edit",
24+
"select/testing",
1925
]
2026

21-
# List of all entry-points of the Angular material-experimental package.
22-
MATERIAL_EXPERIMENTAL_ENTRYPOINTS = [ep for group in entryPointGroups for ep in group]
23-
2427
# List of all non-testing entry-points of the Angular material-experimental package.
2528
MATERIAL_EXPERIMENTAL_NO_TEST_ENTRYPOINTS = [
2629
ep
27-
for ep in MATERIAL_EXPERIMENTAL_ENTRYPOINTS
30+
for ep in entryPoints
2831
if not ep.endswith("/testing")
2932
]
3033

31-
# List of all entry-point targets of the Angular material-experimental package.
32-
MATERIAL_EXPERIMENTAL_TARGETS = ["//src/material-experimental"] + \
33-
["//src/material-experimental/%s" % ep for ep in MATERIAL_EXPERIMENTAL_ENTRYPOINTS]
34+
# List of all testing entry-points of the Angular material-experimental package.
35+
MATERIAL_EXPERIMENTAL_TEST_ENTRYPOINTS = [
36+
ep
37+
for ep in entryPoints
38+
if not ep in MATERIAL_EXPERIMENTAL_NO_TEST_ENTRYPOINTS
39+
]
3440

3541
# List of all non-testing entry-point targets of the Angular material-experimental package.
3642
MATERIAL_EXPERIMENTAL_NO_TEST_TARGETS = ["//src/material-experimental"] + \
3743
["//src/material-experimental/%s" % ep for ep in MATERIAL_EXPERIMENTAL_NO_TEST_ENTRYPOINTS]
3844

45+
# List of all testing entry-point targets of the Angular material-experimental package.
46+
MATERIAL_EXPERIMENTAL_TEST_TARGETS = ["//src/material-experimental/%s" % ep for ep in MATERIAL_EXPERIMENTAL_TEST_ENTRYPOINTS]
47+
3948
MATERIAL_EXPERIMENTAL_SCSS_LIBS = [
4049
"//src/material-experimental/%s:%s_scss_lib" % (ep, ep.replace("-", "_"))
4150
# Only secondary entry-points declare theme files currently. Entry-points
4251
# which contain a slash are not in the top-level.
43-
for ep in MATERIAL_EXPERIMENTAL_ENTRYPOINTS
52+
for ep in MATERIAL_EXPERIMENTAL_NO_TEST_ENTRYPOINTS
4453
if not "/" in ep
4554
]

‎src/material/BUILD.bazel

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package(default_visibility = ["//visibility:public"])
22

3-
load("//src/material:config.bzl", "MATERIAL_NO_TEST_ENTRYPOINTS", "MATERIAL_SCSS_LIBS", "MATERIAL_TARGETS")
3+
load(
4+
"//src/material:config.bzl",
5+
"MATERIAL_NO_TEST_ENTRYPOINTS",
6+
"MATERIAL_NO_TEST_TARGETS",
7+
"MATERIAL_SCSS_LIBS",
8+
"MATERIAL_TEST_TARGETS",
9+
)
410
load("//tools:defaults.bzl", "ng_package", "ts_library")
511

612
ts_library(
@@ -31,5 +37,5 @@ ng_package(
3137
entry_point_name = "material",
3238
packages = ["//src/material/schematics:npm_package"],
3339
tags = ["release-package"],
34-
deps = MATERIAL_TARGETS,
40+
deps = MATERIAL_NO_TEST_TARGETS + MATERIAL_TEST_TARGETS,
3541
)

‎src/material/config.bzl

Lines changed: 59 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,75 @@
1-
entryPointGroups = [
2-
["autocomplete", "autocomplete/testing"],
3-
["badge"],
4-
["bottom-sheet"],
5-
["button", "button/testing"],
6-
["button-toggle"],
7-
["card"],
8-
["checkbox", "checkbox/testing"],
9-
["chips"],
10-
["core"],
11-
["datepicker"],
12-
["dialog", "dialog/testing"],
13-
["divider"],
14-
["expansion"],
15-
["form-field"],
16-
["grid-list"],
17-
["icon"],
18-
["input"],
19-
["list"],
20-
["menu", "menu/testing"],
21-
["paginator"],
22-
["progress-bar", "progress-bar/testing"],
23-
["progress-spinner", "progress-spinner/testing"],
24-
["radio", "radio/testing"],
25-
["select"],
26-
["sidenav", "sidenav/testing"],
27-
["slide-toggle", "slide-toggle/testing"],
28-
["slider", "slider/testing"],
29-
["snack-bar", "snack-bar/testing"],
30-
["sort"],
31-
["stepper"],
32-
["table"],
33-
["tabs", "tabs/testing"],
34-
["toolbar"],
35-
["tooltip"],
36-
["tree"],
1+
entryPoints = [
2+
"autocomplete",
3+
"autocomplete/testing",
4+
"badge",
5+
"bottom-sheet",
6+
"button",
7+
"button/testing",
8+
"button-toggle",
9+
"card",
10+
"checkbox",
11+
"checkbox/testing",
12+
"chips",
13+
"core",
14+
"datepicker",
15+
"dialog",
16+
"dialog/testing",
17+
"divider",
18+
"expansion",
19+
"form-field",
20+
"grid-list",
21+
"icon",
22+
"input",
23+
"list",
24+
"menu",
25+
"menu/testing",
26+
"paginator",
27+
"progress-bar",
28+
"progress-bar/testing",
29+
"progress-spinner",
30+
"progress-spinner/testing",
31+
"radio",
32+
"radio/testing",
33+
"select",
34+
"sidenav",
35+
"sidenav/testing",
36+
"slide-toggle",
37+
"slide-toggle/testing",
38+
"slider",
39+
"slider/testing",
40+
"snack-bar",
41+
"snack-bar/testing",
42+
"sort",
43+
"stepper",
44+
"table",
45+
"tabs",
46+
"tabs/testing",
47+
"toolbar",
48+
"tooltip",
49+
"tree",
3750
]
3851

39-
# List of all entry-points of the Angular Material package.
40-
MATERIAL_ENTRYPOINTS = [ep for group in entryPointGroups for ep in group]
41-
4252
# List of all non-testing entry-points of the Angular Material package.
4353
MATERIAL_NO_TEST_ENTRYPOINTS = [
4454
ep
45-
for ep in MATERIAL_ENTRYPOINTS
55+
for ep in entryPoints
4656
if not ep.endswith("/testing")
4757
]
4858

49-
# List of all entry-point targets of the Angular Material package.
50-
MATERIAL_TARGETS = ["//src/material"] + \
51-
["//src/material/%s" % ep for ep in MATERIAL_ENTRYPOINTS]
59+
# List of all testing entry-points of the Angular Material package.
60+
MATERIAL_TEST_ENTRYPOINTS = [
61+
ep
62+
for ep in entryPoints
63+
if not ep in MATERIAL_NO_TEST_ENTRYPOINTS
64+
]
5265

5366
# List of all non-testing entry-point targets of the Angular Material package.
5467
MATERIAL_NO_TEST_TARGETS = ["//src/material"] + \
5568
["//src/material/%s" % ep for ep in MATERIAL_NO_TEST_ENTRYPOINTS]
5669

70+
# List of all testing entry-point targets of the Angular Material package.
71+
MATERIAL_TEST_TARGETS = ["//src/material/%s" % ep for ep in MATERIAL_TEST_ENTRYPOINTS]
72+
5773
# List that references the sass libraries for each Material non-testing entry-point. This
5874
# can be used to specify dependencies for the "all-theme.scss" file in core.
5975
MATERIAL_SCSS_LIBS = [

‎src/universal-app/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
55
load("//src/cdk:config.bzl", "CDK_TARGETS")
66
load("//src/cdk-experimental:config.bzl", "CDK_EXPERIMENTAL_TARGETS")
77
load("//src/material:config.bzl", "MATERIAL_NO_TEST_TARGETS")
8-
load("//src/material-experimental:config.bzl", "MATERIAL_EXPERIMENTAL_TARGETS")
8+
load("//src/material-experimental:config.bzl", "MATERIAL_EXPERIMENTAL_NO_TEST_TARGETS")
99
load("//tools:defaults.bzl", "ng_module", "ts_library")
1010

1111
ng_module(
@@ -22,7 +22,7 @@ ng_module(
2222
deps = [
2323
"@npm//@angular/platform-server",
2424
"//src/youtube-player",
25-
] + CDK_TARGETS + CDK_EXPERIMENTAL_TARGETS + MATERIAL_NO_TEST_TARGETS + MATERIAL_EXPERIMENTAL_TARGETS,
25+
] + CDK_TARGETS + CDK_EXPERIMENTAL_TARGETS + MATERIAL_NO_TEST_TARGETS + MATERIAL_EXPERIMENTAL_NO_TEST_TARGETS,
2626
)
2727

2828
ts_library(

0 commit comments

Comments
 (0)