From d29629828200b71f0599894642ffaad1b085bdc9 Mon Sep 17 00:00:00 2001
From: Rob Wormald <robwormald@gmail.com>
Date: Thu, 8 Sep 2016 15:01:22 -0700
Subject: [PATCH] fix(build): prevent package tsconfigs from shadowing main
 tsconfig (#11454)

---
 build.sh                                                    | 2 +-
 .../benchpress/{tsconfig.json => tsconfig-build.json}       | 0
 .../@angular/common/{tsconfig.json => tsconfig-build.json}  | 0
 .../compiler-cli/{tsconfig.json => tsconfig-build.json}     | 0
 .../compiler/{tsconfig.json => tsconfig-build.json}         | 0
 .../@angular/core/{tsconfig.json => tsconfig-build.json}    | 0
 .../@angular/forms/{tsconfig.json => tsconfig-build.json}   | 0
 .../@angular/http/{tsconfig.json => tsconfig-build.json}    | 0
 .../{tsconfig.json => tsconfig-build.json}                  | 0
 .../platform-browser/{tsconfig.json => tsconfig-build.json} | 0
 .../platform-server/{tsconfig.json => tsconfig-build.json}  | 0
 .../{tsconfig.json => tsconfig-build.json}                  | 0
 .../{tsconfig.json => tsconfig-build.json}                  | 0
 .../@angular/router/{tsconfig.json => tsconfig-build.json}  | 0
 .../@angular/upgrade/{tsconfig.json => tsconfig-build.json} | 0
 scripts/ci-lite/build.sh                                    | 6 +++---
 16 files changed, 4 insertions(+), 4 deletions(-)
 rename modules/@angular/benchpress/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/common/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/compiler-cli/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/compiler/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/core/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/forms/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/http/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/platform-browser-dynamic/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/platform-browser/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/platform-server/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/platform-webworker-dynamic/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/platform-webworker/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/router/{tsconfig.json => tsconfig-build.json} (100%)
 rename modules/@angular/upgrade/{tsconfig.json => tsconfig-build.json} (100%)

diff --git a/build.sh b/build.sh
index 2eee5cef5d..c55799dc3f 100755
--- 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}/
 
diff --git a/modules/@angular/benchpress/tsconfig.json b/modules/@angular/benchpress/tsconfig-build.json
similarity index 100%
rename from modules/@angular/benchpress/tsconfig.json
rename to modules/@angular/benchpress/tsconfig-build.json
diff --git a/modules/@angular/common/tsconfig.json b/modules/@angular/common/tsconfig-build.json
similarity index 100%
rename from modules/@angular/common/tsconfig.json
rename to modules/@angular/common/tsconfig-build.json
diff --git a/modules/@angular/compiler-cli/tsconfig.json b/modules/@angular/compiler-cli/tsconfig-build.json
similarity index 100%
rename from modules/@angular/compiler-cli/tsconfig.json
rename to modules/@angular/compiler-cli/tsconfig-build.json
diff --git a/modules/@angular/compiler/tsconfig.json b/modules/@angular/compiler/tsconfig-build.json
similarity index 100%
rename from modules/@angular/compiler/tsconfig.json
rename to modules/@angular/compiler/tsconfig-build.json
diff --git a/modules/@angular/core/tsconfig.json b/modules/@angular/core/tsconfig-build.json
similarity index 100%
rename from modules/@angular/core/tsconfig.json
rename to modules/@angular/core/tsconfig-build.json
diff --git a/modules/@angular/forms/tsconfig.json b/modules/@angular/forms/tsconfig-build.json
similarity index 100%
rename from modules/@angular/forms/tsconfig.json
rename to modules/@angular/forms/tsconfig-build.json
diff --git a/modules/@angular/http/tsconfig.json b/modules/@angular/http/tsconfig-build.json
similarity index 100%
rename from modules/@angular/http/tsconfig.json
rename to modules/@angular/http/tsconfig-build.json
diff --git a/modules/@angular/platform-browser-dynamic/tsconfig.json b/modules/@angular/platform-browser-dynamic/tsconfig-build.json
similarity index 100%
rename from modules/@angular/platform-browser-dynamic/tsconfig.json
rename to modules/@angular/platform-browser-dynamic/tsconfig-build.json
diff --git a/modules/@angular/platform-browser/tsconfig.json b/modules/@angular/platform-browser/tsconfig-build.json
similarity index 100%
rename from modules/@angular/platform-browser/tsconfig.json
rename to modules/@angular/platform-browser/tsconfig-build.json
diff --git a/modules/@angular/platform-server/tsconfig.json b/modules/@angular/platform-server/tsconfig-build.json
similarity index 100%
rename from modules/@angular/platform-server/tsconfig.json
rename to modules/@angular/platform-server/tsconfig-build.json
diff --git a/modules/@angular/platform-webworker-dynamic/tsconfig.json b/modules/@angular/platform-webworker-dynamic/tsconfig-build.json
similarity index 100%
rename from modules/@angular/platform-webworker-dynamic/tsconfig.json
rename to modules/@angular/platform-webworker-dynamic/tsconfig-build.json
diff --git a/modules/@angular/platform-webworker/tsconfig.json b/modules/@angular/platform-webworker/tsconfig-build.json
similarity index 100%
rename from modules/@angular/platform-webworker/tsconfig.json
rename to modules/@angular/platform-webworker/tsconfig-build.json
diff --git a/modules/@angular/router/tsconfig.json b/modules/@angular/router/tsconfig-build.json
similarity index 100%
rename from modules/@angular/router/tsconfig.json
rename to modules/@angular/router/tsconfig-build.json
diff --git a/modules/@angular/upgrade/tsconfig.json b/modules/@angular/upgrade/tsconfig-build.json
similarity index 100%
rename from modules/@angular/upgrade/tsconfig.json
rename to modules/@angular/upgrade/tsconfig-build.json
diff --git a/scripts/ci-lite/build.sh b/scripts/ci-lite/build.sh
index bceb7e2c5d..1c6f2f91ab 100755
--- 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'