diff --git a/modules/@angular/common/tsconfig-testing.json b/modules/@angular/common/tsconfig-testing.json index 67dbcf0eaa..53755ba011 100644 --- a/modules/@angular/common/tsconfig-testing.json +++ b/modules/@angular/common/tsconfig-testing.json @@ -1,22 +1,12 @@ { + "extends": "./tsconfig-build", + "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "stripInternal": true, - "experimentalDecorators": true, - "module": "es2015", - "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/common/", "paths": { "@angular/core": ["../../../dist/packages-dist/core/"], "@angular/common": ["../../../dist/packages-dist/common"] }, - "rootDir": ".", - "sourceMap": true, - "inlineSources": true, - "lib": ["es6", "dom"], - "target": "es5", - "skipLibCheck": true + "target": "es5" }, "files": [ "testing/index.ts", diff --git a/modules/@angular/compiler-cli/tsconfig-2015.json b/modules/@angular/compiler-cli/tsconfig-2015.json index eb0fc3b16c..93dc59d24a 100644 --- a/modules/@angular/compiler-cli/tsconfig-2015.json +++ b/modules/@angular/compiler-cli/tsconfig-2015.json @@ -1,34 +1,8 @@ { + "extends": "./tsconfig-build", "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "experimentalDecorators": true, - "noImplicitAny": true, "module": "es2015", "moduleResolution": "node", - "outDir": "../../../dist/esm/compiler-cli", - "paths": { - "@angular/core": ["../../../dist/packages-dist/core"], - "@angular/common": ["../../../dist/packages-dist/common"], - "@angular/compiler": ["../../../dist/packages-dist/compiler"], - "@angular/platform-server": ["../../../dist/packages-dist/platform-server"], - "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], - "@angular/tsc-wrapped": ["../../../dist/tools/@angular/tsc-wrapped"] - }, - "rootDir": ".", - "sourceMap": true, - "inlineSources": true, - "target": "es5", - "lib": ["es6", "dom"], - "skipLibCheck": true - }, - "exclude": ["integrationtest"], - "files": [ - "index.ts", - "src/main.ts", - "src/extract_i18n.ts", - "../../../node_modules/@types/node/index.d.ts", - "../../../node_modules/@types/jasmine/index.d.ts", - "../../../node_modules/zone.js/dist/zone.js.d.ts" - ] + "outDir": "../../../dist/esm/compiler-cli" + } } diff --git a/modules/@angular/compiler/tsconfig-testing.json b/modules/@angular/compiler/tsconfig-testing.json index 5ccab8de0d..cd278208ac 100644 --- a/modules/@angular/compiler/tsconfig-testing.json +++ b/modules/@angular/compiler/tsconfig-testing.json @@ -1,23 +1,14 @@ { + "extends": "./tsconfig-build", + "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "stripInternal": true, - "experimentalDecorators": true, - "module": "es2015", - "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/compiler/", + // Test that we rely on decorator downleveling + "emitDecoratorMetadata": false, "paths": { "@angular/core": ["../../../dist/packages-dist/core"], "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], "@angular/compiler": ["../../../dist/packages-dist/compiler"] - }, - "rootDir": ".", - "sourceMap": true, - "inlineSources": true, - "lib": ["es6", "dom"], - "target": "es5", - "skipLibCheck": true + } }, "files": [ "testing/index.ts", diff --git a/modules/@angular/core/tsconfig-testing.json b/modules/@angular/core/tsconfig-testing.json index 3d7613bacd..adde454a0f 100644 --- a/modules/@angular/core/tsconfig-testing.json +++ b/modules/@angular/core/tsconfig-testing.json @@ -1,22 +1,11 @@ { + "extends": "./tsconfig-build", + "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "stripInternal": true, - "experimentalDecorators": true, - "module": "es2015", - "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/core", "paths": { "rxjs/*": ["../../../node_modules/rxjs/*"], "@angular/core": ["../../../dist/packages-dist/core"] - }, - "rootDir": ".", - "sourceMap": true, - "inlineSources": true, - "lib": ["es6", "dom"], - "target": "es5", - "skipLibCheck": true + } }, "files": [ "testing/index.ts", diff --git a/modules/@angular/http/tsconfig-testing.json b/modules/@angular/http/tsconfig-testing.json index 3abad28775..7f7bd0eac5 100644 --- a/modules/@angular/http/tsconfig-testing.json +++ b/modules/@angular/http/tsconfig-testing.json @@ -1,23 +1,11 @@ { + "extends": "./tsconfig-build", "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "stripInternal": true, - "experimentalDecorators": true, - "module": "es2015", - "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/http", "paths": { "@angular/core": ["../../../dist/packages-dist/core"], "@angular/http": ["../../../dist/packages-dist/http"], "rxjs/*": ["../../../node_modules/rxjs/*"] - }, - "rootDir": ".", - "sourceMap": true, - "inlineSources": true, - "lib": ["es6", "dom"], - "target": "es5", - "skipLibCheck": true + } }, "files": [ "testing/index.ts" diff --git a/modules/@angular/platform-browser-dynamic/tsconfig-testing.json b/modules/@angular/platform-browser-dynamic/tsconfig-testing.json index 776e5dbc34..2355e245c5 100644 --- a/modules/@angular/platform-browser-dynamic/tsconfig-testing.json +++ b/modules/@angular/platform-browser-dynamic/tsconfig-testing.json @@ -1,12 +1,6 @@ { + "extends": "./tsconfig-build", "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "stripInternal": true, - "experimentalDecorators": true, - "module": "es2015", - "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/platform-browser-dynamic/", "paths": { "@angular/core": ["../../../dist/packages-dist/core"], "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], @@ -17,13 +11,7 @@ "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], "@angular/platform-browser/testing": ["../../../dist/packages-dist/platform-browser/testing"], "@angular/platform-browser-dynamic": ["../../../dist/packages-dist/platform-browser-dynamic"] - }, - "rootDir": ".", - "sourceMap": true, - "inlineSources": true, - "lib": ["es2015", "dom"], - "target": "es5", - "skipLibCheck": true + } }, "files": [ "testing/index.ts", diff --git a/modules/@angular/platform-browser/tsconfig-testing.json b/modules/@angular/platform-browser/tsconfig-testing.json index e99984c709..c14de7e836 100644 --- a/modules/@angular/platform-browser/tsconfig-testing.json +++ b/modules/@angular/platform-browser/tsconfig-testing.json @@ -1,25 +1,13 @@ { + "extends": "./tsconfig-build", "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "stripInternal": true, - "experimentalDecorators": true, - "module": "es2015", - "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/platform-browser/", "paths": { "@angular/core": ["../../../dist/packages-dist/core"], "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], "@angular/common": ["../../../dist/packages-dist/common"], "@angular/common/testing": ["../../../dist/packages-dist/common/testing"], "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"] - }, - "rootDir": ".", - "sourceMap": true, - "inlineSources": true, - "lib": ["es6", "dom"], - "target": "es5", - "skipLibCheck": true + } }, "files": [ "testing/index.ts", diff --git a/modules/@angular/platform-server/tsconfig-testing.json b/modules/@angular/platform-server/tsconfig-testing.json index 548ccce429..1fec1894bc 100644 --- a/modules/@angular/platform-server/tsconfig-testing.json +++ b/modules/@angular/platform-server/tsconfig-testing.json @@ -1,12 +1,6 @@ { + "extends": "./tsconfig-build", "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "stripInternal": true, - "experimentalDecorators": true, - "module": "es2015", - "moduleResolution": "node", - "outDir": "../../../dist/packages-dist/platform-server/", "paths": { "@angular/core": ["../../../dist/packages-dist/core/"], "@angular/core/testing": ["../../../dist/packages-dist/core/testing"], @@ -19,13 +13,7 @@ "@angular/platform-browser-dynamic": ["../../../dist/packages-dist/platform-browser-dynamic"], "@angular/platform-browser-dynamic/testing": ["../../../dist/packages-dist/platform-browser-dynamic/testing"], "@angular/platform-server": ["../../../dist/packages-dist/platform-server"] - }, - "rootDir": ".", - "sourceMap": true, - "inlineSources": true, - "lib": ["es6", "dom"], - "target": "es5", - "skipLibCheck": true + } }, "files": [ "testing/index.ts", diff --git a/modules/@angular/router/tsconfig-testing.json b/modules/@angular/router/tsconfig-testing.json index 242fa3e099..f6a106efe7 100644 --- a/modules/@angular/router/tsconfig-testing.json +++ b/modules/@angular/router/tsconfig-testing.json @@ -1,29 +1,13 @@ { + "extends": "./tsconfig-build", "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "stripInternal": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "module": "es2015", - "moduleResolution": "node", - "noEmitOnError": false, - "noImplicitAny": true, - "noImplicitReturns": true, - "outDir": "../../../dist/packages-dist/router/", "paths": { "@angular/core": ["../../../dist/packages-dist/core"], "@angular/common": ["../../../dist/packages-dist/common"], "@angular/common/testing": ["../../../dist/packages-dist/common/testing"], "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], "@angular/router": ["../../../dist/packages-dist/router"] - }, - "rootDir": ".", - "sourceMap": true, - "inlineSources": true, - "lib": ["es6", "dom"], - "target": "es5", - "skipLibCheck": true + } }, "files": [ "testing/index.ts" diff --git a/modules/@angular/router/tsconfig-upgrade.json b/modules/@angular/router/tsconfig-upgrade.json index afa6c8a97b..80194268e9 100644 --- a/modules/@angular/router/tsconfig-upgrade.json +++ b/modules/@angular/router/tsconfig-upgrade.json @@ -1,28 +1,12 @@ { + "extends": "./tsconfig-build", "compilerOptions": { - "baseUrl": ".", - "declaration": true, - "stripInternal": true, - "emitDecoratorMetadata": true, - "experimentalDecorators": true, - "module": "es2015", - "moduleResolution": "node", - "noEmitOnError": false, - "noImplicitAny": true, - "noImplicitReturns": true, - "outDir": "../../../dist/packages-dist/router", "paths": { "@angular/core": ["../../../dist/packages-dist/core"], "@angular/platform-browser": ["../../../dist/packages-dist/platform-browser"], "@angular/router": ["../../../dist/packages-dist/router"], "@angular/upgrade/static": ["../../../dist/packages-dist/upgrade/static"] - }, - "rootDir": ".", - "sourceMap": true, - "inlineSources": true, - "lib": ["es2015", "dom"], - "target": "es5", - "skipLibCheck": true + } }, "files": [ "upgrade.ts"