Skip to content

build: bazel and gulp tsconfigs need to be in sync #13707

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
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
3 changes: 0 additions & 3 deletions src/bazel-tsconfig-build.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,5 @@
"lib": ["es2015", "dom"],
"skipLibCheck": true,
"types": ["tslib"]
},
"bazelOptions": {
"suppressTsconfigOverrideWarnings": true
}
}
2 changes: 1 addition & 1 deletion src/cdk/tsconfig-build.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// TypeScript config file that is used to compile the cdk's ES2015 package through Gulp. As the
// long term goal is to switch to Bazel, and we already want to run tests with Bazel, we need to
// ensure the TypeScript build options are the same for Gulp and Bazel. We archive this by
// ensure the TypeScript build options are the same for Gulp and Bazel. We achieve this by
// extending the generic Bazel build tsconfig which will be used for each entry-point.
{
"extends": "../bazel-tsconfig-build.json",
Expand Down
29 changes: 6 additions & 23 deletions src/lib/tsconfig-build.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,17 @@
// TypeScript config file that is used to compile the library into ES2015.
// TypeScript config file that is used to compile the Material package through Gulp. As the
// long term goal is to switch to Bazel, and we already want to run tests with Bazel, we need to
// ensure the TypeScript build options are the same for Gulp and Bazel. We achieve this by
// extending the generic Bazel build tsconfig which will be used for each entry-point.
{
"extends": "../bazel-tsconfig-build.json",
"compilerOptions": {
"declaration": true,
"stripInternal": false,
"experimentalDecorators": true,
"noUnusedParameters": true,
"strictNullChecks": true,
"strictFunctionTypes": true,
"noImplicitAny": true,
"noImplicitThis": true,
"importHelpers": true,
"newLine": "lf",
"module": "es2015",
"moduleResolution": "node",
"baseUrl": ".",
"outDir": "../../dist/packages/material",
"rootDir": ".",
"rootDirs": [
".",
"../../dist/packages/material"
],
"sourceMap": true,
"inlineSources": true,
"target": "es2015",
"lib": ["es2015", "dom"],
"skipLibCheck": true,
"types": [],
"baseUrl": ".",
"paths": {
"@angular/cdk/*": ["../../dist/packages/cdk/*"],
"@angular/material/*": ["../../dist/packages/material/*"]
Expand All @@ -42,8 +28,5 @@
"flatModuleId": "@angular/material",
"skipTemplateCodegen": true,
"fullTemplateTypeCheck": true
},
"bazelOptions": {
"suppressTsconfigOverrideWarnings": true
}
}
2 changes: 1 addition & 1 deletion src/lib/tsconfig-tests.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
// Unset options inherited from tsconfig-build
"annotateForClosureCompiler": false,
"flatModuleOutFile": null,
"flatModuleId": null,
"flatModuleId": null
},
"include": [
"**/*.spec.ts",
Expand Down