@@ -25,9 +25,12 @@ PACKAGES=(core
2525 language-service
2626 benchpress)
2727
28+ TSC_PACKAGES=(compiler-cli
29+ language-service
30+ benchpress)
31+
2832NODE_PACKAGES=(compiler-cli
29- benchpress
30- tsc-wrapped)
33+ benchpress)
3134
3235BUILD_ALL=true
3336BUNDLE=true
@@ -38,6 +41,7 @@ BUILD_EXAMPLES=true
3841COMPILE_SOURCE=true
3942TYPECHECK_ALL=true
4043BUILD_TOOLS=true
44+ export NODE_PATH=${NODE_PATH:- } :${currentDir} /dist/tools
4145
4246for ARG in " $@ " ; do
4347 case " $ARG " in
@@ -156,7 +160,7 @@ runRollup() {
156160 if [[ -f " ${1} /rollup.config.js" ]]; then
157161 cd ${1}
158162
159- echo " ====== $ROLLUP -c ${1} /rollup.config.js"
163+ echo " ====== $ROLLUP -c ${1} /rollup.config.js --sourcemap "
160164 $ROLLUP -c rollup.config.js --sourcemap > /dev/null 2>&1
161165
162166 # Recurse for sub directories
@@ -216,11 +220,12 @@ minify() {
216220# None
217221# ######################################
218222compilePackage () {
219- echo " ====== [ ${3} ]: COMPILING: ${NGC} -p ${1} /tsconfig-build.json "
220- # For NODE_PACKAGES items (not getting rolled up)
221- if containsElement " ${3} " " ${NODE_PACKAGES[@]} " ; then
223+ # For TSC_PACKAGES items
224+ if containsElement " ${3} " " ${TSC_PACKAGES[@]} " ; then
225+ echo " ====== [ ${3} ]: COMPILING: ${TSC} -p ${1} /tsconfig-build.json "
222226 $TSC -p ${1} /tsconfig-build.json
223227 else
228+ echo " ====== [${3} ]: COMPILING: ${NGC} -p ${1} /tsconfig-build.json"
224229 local package_name=$( basename " ${2} " )
225230 $NGC -p ${1} /tsconfig-build.json
226231 echo " ====== Create ${1} /../${package_name} .d.ts re-export file for tsickle"
@@ -247,9 +252,15 @@ compilePackage() {
247252# None
248253# ######################################
249254compilePackageES5 () {
250- echo " ====== [${3} ]: COMPILING: ${NGC} -p ${1} /tsconfig-build.json --target es5 -d false --outDir ${2} --importHelpers true --sourceMap"
251- local package_name=$( basename " ${2} " )
252- $NGC -p ${1} /tsconfig-build.json --target es5 -d false --outDir ${2} --importHelpers true --sourceMap
255+ if containsElement " ${3} " " ${TSC_PACKAGES[@]} " ; then
256+ echo " ====== [${3} ]: COMPILING: ${TSC} -p ${1} /tsconfig-build.json --target es5 -d false --outDir ${2} --importHelpers true --sourceMap"
257+ local package_name=$( basename " ${2} " )
258+ $TSC -p ${1} /tsconfig-build.json --target es5 -d false --outDir ${2} --importHelpers true --sourceMap
259+ else
260+ echo " ====== [${3} ]: COMPILING: ${NGC} -p ${1} /tsconfig-build.json --target es5 -d false --outDir ${2} --importHelpers true --sourceMap"
261+ local package_name=$( basename " ${2} " )
262+ $NGC -p ${1} /tsconfig-build.json --target es5 -d false --outDir ${2} --importHelpers true --sourceMap
263+ fi
253264
254265 for DIR in ${1} /* ; do
255266 [ -d " ${DIR} " ] || continue
@@ -315,7 +326,7 @@ echo "====== BUILDING: Version ${VERSION}"
315326N="
316327"
317328TSC=` pwd` /node_modules/.bin/tsc
318- NGC=" node --max-old-space-size=3000 ` pwd` /dist/packages-dist/tsc-wrapped /src/main"
329+ NGC=" node --max-old-space-size=3000 ` pwd` /dist/tools/@angular/compiler-cli /src/main"
319330UGLIFYJS=` pwd` /node_modules/.bin/uglifyjs
320331TSCONFIG=./tools/tsconfig.json
321332ROLLUP=` pwd` /node_modules/.bin/rollup
@@ -394,14 +405,12 @@ if [[ ${BUILD_ALL} == true ]]; then
394405fi
395406
396407if [[ ${BUILD_TOOLS} == true || ${BUILD_ALL} == true ]]; then
397- echo " ====== (tsc-wrapped)COMPILING: \$ (npm bin)/tsc -p packages/tsc-wrapped/tsconfig.json ====="
398- $( npm bin) /tsc -p packages/tsc-wrapped/tsconfig.json
399- echo " ====== (tsc-wrapped)COMPILING: \$ (npm bin)/tsc -p packages/tsc-wrapped/tsconfig-build.json ====="
400- $( npm bin) /tsc -p packages/tsc-wrapped/tsconfig-build.json
401- cp ./packages/tsc-wrapped/package.json ./dist/packages-dist/tsc-wrapped
402- cp ./packages/tsc-wrapped/README.md ./dist/packages-dist/tsc-wrapped
403- updateVersionReferences dist/packages-dist/tsc-wrapped
408+ echo " ====== (compiler)COMPILING: \$ (npm bin)/tsc -p packages/compiler/tsconfig-tools.json"
409+ $( npm bin) /tsc -p packages/compiler/tsconfig-tools.json
410+ echo " ====== (compiler)COMPILING: \$ (npm bin)/tsc -p packages/compiler-cli/tsconfig-tools.json"
411+ $( npm bin) /tsc -p packages/compiler-cli/tsconfig-tools.json
404412
413+ mkdir -p ./dist/packages-dist
405414 rsync -a packages/bazel/ ./dist/packages-dist/bazel
406415 # Remove BEGIN-INTERNAL...END-INTERAL blocks
407416 # https://stackoverflow.com/questions/24175271/how-can-i-match-multi-line-patterns-in-the-command-line-with-perl-style-regex
0 commit comments