From 1a035a0dc70c686e86fec9392dc4c9e668173b48 Mon Sep 17 00:00:00 2001 From: Tobias Bosch Date: Thu, 8 Sep 2016 16:48:07 -0700 Subject: [PATCH] build(examples): include in main `tsconfig.json` Also rename `examples/tsconfig.json` into `examples/tsconfig-build.json` so that it does not shadow the main `tsconfig.json` in editors Also adds `noImplicitAny` and `declarations` `examples/tsconfig.json`. --- modules/@angular/examples/build.sh | 2 +- .../@angular/examples/{tsconfig.json => tsconfig-build.json} | 2 ++ modules/tsconfig.json | 1 - tools/cjs-jasmine/index.ts | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) rename modules/@angular/examples/{tsconfig.json => tsconfig-build.json} (94%) diff --git a/modules/@angular/examples/build.sh b/modules/@angular/examples/build.sh index c4e1e92fda..5cdf61b7f6 100755 --- a/modules/@angular/examples/build.sh +++ b/modules/@angular/examples/build.sh @@ -13,7 +13,7 @@ cd `dirname $0` DIST="../../../dist/examples"; rm -rf -- $DIST -$(npm bin)/tsc -p . +$(npm bin)/tsc -p ./tsconfig-build.json mkdir $DIST/vendor/ diff --git a/modules/@angular/examples/tsconfig.json b/modules/@angular/examples/tsconfig-build.json similarity index 94% rename from modules/@angular/examples/tsconfig.json rename to modules/@angular/examples/tsconfig-build.json index 7d1d7db47e..770b08512b 100644 --- a/modules/@angular/examples/tsconfig.json +++ b/modules/@angular/examples/tsconfig-build.json @@ -1,8 +1,10 @@ { "compilerOptions": { "baseUrl": ".", + "declaration": true, "stripInternal": true, "experimentalDecorators": true, + "noImplicitAny": true, "module": "commonjs", "moduleResolution": "node", "outDir": "../../../dist/examples", diff --git a/modules/tsconfig.json b/modules/tsconfig.json index 20400f74c4..550608e1d4 100644 --- a/modules/tsconfig.json +++ b/modules/tsconfig.json @@ -30,7 +30,6 @@ "benchmarks_external", "payload_tests", "rollup-test", - "@angular/examples/**/*.ts", "@angular/compiler-cli/integrationtest" ] } diff --git a/tools/cjs-jasmine/index.ts b/tools/cjs-jasmine/index.ts index 998b9db808..65ff5878b2 100644 --- a/tools/cjs-jasmine/index.ts +++ b/tools/cjs-jasmine/index.ts @@ -52,6 +52,7 @@ var specFiles: any = '@angular/router/test/integration/bootstrap_spec.*', '@angular/integration_test/symbol_inspector/**', '@angular/upgrade/**', + '@angular/**/e2e_test/**', 'angular1_router/**', 'payload_tests/**', ]