honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(build): prevent package tsconfigs from shadowing main tsconfig (#11454)

This commit is contained in:
Rob Wormald 2016-09-08 15:01:22 -07:00 committed by Evan Martin
parent 077e0be1e7
commit d296298282
16 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.sh
View File

@ -82,7 +82,7 @@ do
LICENSE_BANNER=${PWD}/modules/@angular/license-banner.txt LICENSE_BANNER=${PWD}/modules/@angular/license-banner.txt
echo "====== COMPILING: ${TSC} -p ${SRCDIR}/tsconfig.json =====" echo "====== COMPILING: ${TSC} -p ${SRCDIR}/tsconfig.json ====="
$TSC -p ${SRCDIR}/tsconfig.json $TSC -p ${SRCDIR}/tsconfig-build.json
cp ${SRCDIR}/package.json ${DESTDIR}/ cp ${SRCDIR}/package.json ${DESTDIR}/

0
modules/@angular/benchpress/tsconfig.json → modules/@angular/benchpress/tsconfig-build.json
View File

0
modules/@angular/common/tsconfig.json → modules/@angular/common/tsconfig-build.json
View File

0
modules/@angular/compiler-cli/tsconfig.json → modules/@angular/compiler-cli/tsconfig-build.json
View File

0
modules/@angular/compiler/tsconfig.json → modules/@angular/compiler/tsconfig-build.json
View File

0
modules/@angular/core/tsconfig.json → modules/@angular/core/tsconfig-build.json
View File

0
modules/@angular/forms/tsconfig.json → modules/@angular/forms/tsconfig-build.json
View File

0
modules/@angular/http/tsconfig.json → modules/@angular/http/tsconfig-build.json
View File

0
modules/@angular/platform-browser-dynamic/tsconfig.json → modules/@angular/platform-browser-dynamic/tsconfig-build.json
View File

0
modules/@angular/platform-browser/tsconfig.json → modules/@angular/platform-browser/tsconfig-build.json
View File

0
modules/@angular/platform-server/tsconfig.json → modules/@angular/platform-server/tsconfig-build.json
View File

0
modules/@angular/platform-webworker-dynamic/tsconfig.json → modules/@angular/platform-webworker-dynamic/tsconfig-build.json
View File

0
modules/@angular/platform-webworker/tsconfig.json → modules/@angular/platform-webworker/tsconfig-build.json
View File

0
modules/@angular/router/tsconfig.json → modules/@angular/router/tsconfig-build.json
View File

0
modules/@angular/upgrade/tsconfig.json → modules/@angular/upgrade/tsconfig-build.json
View File

6
scripts/ci-lite/build.sh
View File

@ -13,8 +13,8 @@ $(npm bin)/tsc -v
$(npm bin)/tsc -p tools $(npm bin)/tsc -p tools
cp tools/@angular/tsc-wrapped/package.json dist/tools/@angular/tsc-wrapped cp tools/@angular/tsc-wrapped/package.json dist/tools/@angular/tsc-wrapped
node dist/tools/@angular/tsc-wrapped/src/main -p modules node dist/tools/@angular/tsc-wrapped/src/main -p modules
node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/core node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/core/tsconfig-build.json
node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/common node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/common/tsconfig-build.json
node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/router node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/router/tsconfig-build.json
echo 'travis_fold:end:BUILD' echo 'travis_fold:end:BUILD'