Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/demo-app/tsconfig-aot.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/* Config file for the Angular Compiler. Paths need to be relative to the dist folder. */
{
"extends": "./tsconfig",
"extends": "./tsconfig-build",
"compilerOptions": {
"experimentalDecorators": true,
"paths": {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/lib/tsconfig-specs.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"extends": "./tsconfig",
"extends": "./tsconfig-build",
"compilerOptions": {
"module": "commonjs",
"target": "es5",
Expand Down
15 changes: 15 additions & 0 deletions src/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// TypeScript config file that matches all source files in the project. This file is read by
// IDEs and ensures that `experimentalDecorator` warnings are not showing up.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

While we're doing this, could you add a top-level comment to all of the tsconfig files that say what they're used for?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done.

{
"compilerOptions": {
"experimentalDecorators": true,
"module": "es2015",
"moduleResolution": "node",
"outDir": "../../dist/packages/all",
"sourceMap": true,
"inlineSources": true,
"target": "es2015",
"lib": ["es2015", "dom"],
"types": ["jasmine"]
}
}
2 changes: 1 addition & 1 deletion tools/gulp/tasks/development.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ task(':watch:devapp', () => {
});

/** Path to the demo-app tsconfig file. */
const tsconfigPath = join(appDir, 'tsconfig.json');
const tsconfigPath = join(appDir, 'tsconfig-build.json');

task(':build:devapp:ts', tsBuildTask(tsconfigPath));
task(':build:devapp:scss', sassBuildTask(outDir, appDir));
Expand Down
2 changes: 1 addition & 1 deletion tools/gulp/tasks/e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const appDir = path.join(SOURCE_ROOT, 'e2e-app');
const outDir = DIST_E2EAPP;

const PROTRACTOR_CONFIG_PATH = path.join(PROJECT_ROOT, 'test/protractor.conf.js');
const tsconfigPath = path.join(appDir, 'tsconfig.json');
const tsconfigPath = path.join(appDir, 'tsconfig-build.json');

task(':watch:e2eapp', () => {
watch(path.join(appDir, '**/*.ts'), [':build:e2eapp:ts']);
Expand Down
2 changes: 1 addition & 1 deletion tools/gulp/tasks/library.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const inlineResources = require('../../../scripts/release/inline-resources');
const uglify = require('uglify-js');

const libraryRoot = join(SOURCE_ROOT, 'lib');
const tsconfigPath = join(libraryRoot, 'tsconfig.json');
const tsconfigPath = join(libraryRoot, 'tsconfig-build.json');

// Paths to the different output directories.
const materialDir = DIST_MATERIAL;
Expand Down