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

2016-09-08 15:01:22 -07:00 · 2016-09-08 15:01:22 -07:00 · d296298282
parent 077e0be1e7
commit d296298282
16 changed files with 4 additions and 4 deletions
--- a/build.sh
+++ b/build.sh
@ -82,7 +82,7 @@ do
  LICENSE_BANNER=${PWD}/modules/@angular/license-banner.txt

  echo "======      COMPILING: ${TSC} -p ${SRCDIR}/tsconfig.json        ====="
-  $TSC -p ${SRCDIR}/tsconfig.json
+  $TSC -p ${SRCDIR}/tsconfig-build.json

  cp ${SRCDIR}/package.json ${DESTDIR}/

--- a/modules/@angular/benchpress/tsconfig-build.json
+++ b/modules/@angular/benchpress/tsconfig-build.json
--- a/modules/@angular/common/tsconfig-build.json
+++ b/modules/@angular/common/tsconfig-build.json
--- a/modules/@angular/compiler-cli/tsconfig-build.json
+++ b/modules/@angular/compiler-cli/tsconfig-build.json
--- a/modules/@angular/compiler/tsconfig-build.json
+++ b/modules/@angular/compiler/tsconfig-build.json
--- a/modules/@angular/core/tsconfig-build.json
+++ b/modules/@angular/core/tsconfig-build.json
--- a/modules/@angular/forms/tsconfig-build.json
+++ b/modules/@angular/forms/tsconfig-build.json
--- a/modules/@angular/http/tsconfig-build.json
+++ b/modules/@angular/http/tsconfig-build.json
--- a/modules/@angular/platform-browser-dynamic/tsconfig-build.json
+++ b/modules/@angular/platform-browser-dynamic/tsconfig-build.json
--- a/modules/@angular/platform-browser/tsconfig-build.json
+++ b/modules/@angular/platform-browser/tsconfig-build.json
--- a/modules/@angular/platform-server/tsconfig-build.json
+++ b/modules/@angular/platform-server/tsconfig-build.json
--- a/modules/@angular/platform-webworker-dynamic/tsconfig-build.json
+++ b/modules/@angular/platform-webworker-dynamic/tsconfig-build.json
--- a/modules/@angular/platform-webworker/tsconfig-build.json
+++ b/modules/@angular/platform-webworker/tsconfig-build.json
--- a/modules/@angular/router/tsconfig-build.json
+++ b/modules/@angular/router/tsconfig-build.json
--- a/modules/@angular/upgrade/tsconfig-build.json
+++ b/modules/@angular/upgrade/tsconfig-build.json
--- a/scripts/ci-lite/build.sh
+++ b/scripts/ci-lite/build.sh
@ -13,8 +13,8 @@ $(npm bin)/tsc -v
 $(npm bin)/tsc -p tools
 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/@angular/core
-node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/common
-node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/router
+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/tsconfig-build.json
+node dist/tools/@angular/tsc-wrapped/src/main -p modules/@angular/router/tsconfig-build.json

 echo 'travis_fold:end:BUILD'