Skip to content

Commit 19614cd

Browse files
devversiontinayuangao
authored andcommitted
build(closure): detect cdk entry points from filesystem (#6144)
* The closure script now detects the CDK entry points from the filesystem. This is important to avoid hard-coding the CDK entry points multiple times in the project.
1 parent 9cff8c7 commit 19614cd

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

scripts/closure-compiler/build-devapp-bundle.sh

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ $(npm bin)/ngc -p scripts/closure-compiler/tsconfig-rxjs.json
2323
# Create a list of all RxJS source files.
2424
rxjsSourceFiles=$(find dist/packages/rxjs -name '*.js');
2525

26+
# List of entry points in the CDK package. Exclude "testing" since it's not an entry point.
27+
cdkEntryPoints=($(find src/cdk/* -type d ! -name testing -exec basename {} \;))
28+
2629
# Due a Closure Compiler issue https://github.com/google/closure-compiler/issues/2247
2730
# we need to add exports to the different RxJS ES2015 files.
2831
for i in $rxjsSourceFiles; do
@@ -43,15 +46,6 @@ OPTS=(
4346
"--js_module_root=dist/packages"
4447
"--js_module_root=dist/releases/material"
4548
"--js_module_root=dist/releases/cdk"
46-
"--js_module_root=dist/releases/cdk/a11y"
47-
"--js_module_root=dist/releases/cdk/bidi"
48-
"--js_module_root=dist/releases/cdk/coercion"
49-
"--js_module_root=dist/releases/cdk/keyboard"
50-
"--js_module_root=dist/releases/cdk/observe-content"
51-
"--js_module_root=dist/releases/cdk/platform"
52-
"--js_module_root=dist/releases/cdk/portal"
53-
"--js_module_root=dist/releases/cdk/rxjs"
54-
"--js_module_root=dist/releases/cdk/table"
5549
"--js_module_root=node_modules/@angular/core"
5650
"--js_module_root=node_modules/@angular/common"
5751
"--js_module_root=node_modules/@angular/compiler"
@@ -71,15 +65,6 @@ OPTS=(
7165
# Include the Material and CDK FESM bundles
7266
dist/releases/material/@angular/material.js
7367
dist/releases/cdk/@angular/cdk.js
74-
dist/releases/cdk/@angular/cdk/a11y.js
75-
dist/releases/cdk/@angular/cdk/bidi.js
76-
dist/releases/cdk/@angular/cdk/coercion.js
77-
dist/releases/cdk/@angular/cdk/keyboard.js
78-
dist/releases/cdk/@angular/cdk/observe-content.js
79-
dist/releases/cdk/@angular/cdk/platform.js
80-
dist/releases/cdk/@angular/cdk/portal.js
81-
dist/releases/cdk/@angular/cdk/rxjs.js
82-
dist/releases/cdk/@angular/cdk/table.js
8368

8469
# Include all Angular FESM bundles.
8570
node_modules/@angular/core/@angular/core.js
@@ -105,6 +90,12 @@ OPTS=(
10590
"--dependency_mode=STRICT"
10691
)
10792

93+
# Walk through every entry-point of the CDK and add it to closure options.
94+
for i in "${cdkEntryPoints[@]}"; do
95+
OPTS+=("--js_module_root=dist/releases/cdk/${i}")
96+
OPTS+=("dist/releases/cdk/@angular/cdk/${i}.js")
97+
done
98+
10899
# Write closure flags to a closure flagfile.
109100
closureFlags=$(mktemp)
110101
echo ${OPTS[*]} > $closureFlags

0 commit comments

Comments
 (0)