build: make cdk-experimental and material-experimental build settings (#15843)

consistent with cdk and material.

Author: mmalerba

src/cdk-experimental/tsconfig-build.json

@@ -1,32 +1,17 @@
-// TypeScript config file that is used to compile the experimental package into ES2015.
+// TypeScript config file that is used to compile the cdk-experimental'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 achieve this
+// by extending the generic Bazel build tsconfig which will be used for each entry-point.
 {
+  "extends": "../bazel-tsconfig-build.json",
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": false,
-    "experimentalDecorators": true,
-    "noUnusedParameters": true,
-    "noUnusedLocals": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "importHelpers": true,
-    "newLine": "lf",
-    "module": "es2015",
-    "moduleResolution": "node",
     "outDir": "../../dist/packages/cdk-experimental",
     "rootDir": ".",
     "rootDirs": [
       ".",
       "../../dist/packages/cdk-experimental"
     ],
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "lib": ["es2015", "dom"],
-    "skipLibCheck": true,
-    "types": ["jasmine", "tslib"],
     "paths": {
       "@angular/cdk/*": ["../../dist/packages/cdk/*"],
       "@angular/cdk-experimental/*": ["../../dist/packages/cdk-experimental/*"]
@@ -43,8 +28,5 @@
     "flatModuleId": "@angular/cdk-experimental",
     "skipTemplateCodegen": true,
     "fullTemplateTypeCheck": true
-  },
-  "bazelOptions": {
-    "suppressTsconfigOverrideWarnings": true
   }
 }

src/material-experimental/mdc-checkbox/checkbox.ts

@@ -27,13 +27,8 @@ import {
   ViewEncapsulation
 } from '@angular/core';
 import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/forms';
-import {
-  MAT_CHECKBOX_CLICK_ACTION,
-  MatCheckboxClickAction,
-  RippleRenderer,
-  RippleTarget,
-  ThemePalette
-} from '@angular/material';
+import {MAT_CHECKBOX_CLICK_ACTION, MatCheckboxClickAction} from '@angular/material/checkbox';
+import {RippleRenderer, RippleTarget, ThemePalette} from '@angular/material/core';
 import {ANIMATION_MODULE_TYPE} from '@angular/platform-browser/animations';
 import {MDCCheckboxAdapter, MDCCheckboxFoundation} from '@material/checkbox';
 

src/material-experimental/mdc-checkbox/public-api.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {_MatCheckboxRequiredValidatorModule} from '@angular/material';
+import {_MatCheckboxRequiredValidatorModule} from '@angular/material/checkbox';
 
 export * from './checkbox';
 export * from './module';
@@ -27,4 +27,4 @@ export {
    * @breaking-change 9.0.0
    */
   TransitionCheckState,
-} from '@angular/material';
+} from '@angular/material/checkbox';

src/material-experimental/tsconfig-build.json

@@ -1,39 +1,21 @@
-// TypeScript config file that is used to compile the experimental package into ES2015.
+// TypeScript config file that is used to compile the material-experimental'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 achieve this
+// by extending the generic Bazel build tsconfig which will be used for each entry-point.
 {
+  "extends": "../bazel-tsconfig-build.json",
   "compilerOptions": {
     "baseUrl": ".",
-    "declaration": true,
-    "stripInternal": false,
-    "experimentalDecorators": true,
-    "noUnusedParameters": true,
-    "noUnusedLocals": true,
-    "strictNullChecks": true,
-    "strictFunctionTypes": true,
-    "noImplicitAny": true,
-    "noImplicitThis": true,
-    "importHelpers": true,
-    "newLine": "lf",
-    "module": "es2015",
-    "moduleResolution": "node",
     "outDir": "../../dist/packages/material-experimental",
     "rootDir": ".",
     "rootDirs": [
       ".",
       "../../dist/packages/material-experimental"
     ],
-    "sourceMap": true,
-    "inlineSources": true,
-    "target": "es2015",
-    "lib": ["es2015", "dom"],
-    "skipLibCheck": true,
-    "types": ["jasmine", "tslib"],
     "paths": {
-      "@angular/material/*": ["../../dist/packages/material/*"],
-      "@angular/material": ["../../dist/packages/material"],
       "@angular/cdk/*": ["../../dist/packages/cdk/*"],
-      "@angular/cdk": ["../../dist/packages/cdk"],
       "@angular/cdk-experimental/*": ["../../dist/packages/cdk-experimental/*"],
-      "@angular/cdk-experimental": ["../../dist/packages/cdk-experimental"],
+      "@angular/material/*": ["../../dist/packages/material/*"],
       "@angular/material-experimental/*": ["../../dist/packages/material-experimental/*"]
     }
   },
@@ -45,11 +27,8 @@
     "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
     "flatModuleOutFile": "index.js",
-    "flatModuleId": "@angular/material-experimental",
+    "flatModuleId": "@angular/cdk-experimental",
     "skipTemplateCodegen": true,
     "fullTemplateTypeCheck": true
-  },
-  "bazelOptions": {
-    "suppressTsconfigOverrideWarnings": true
   }
 }

src/material-experimental/tsconfig.json

@@ -6,9 +6,7 @@
     "baseUrl": ".",
     "paths": {
       "@angular/cdk/*": ["../cdk/*"],
-      "@angular/cdk": ["../cdk"],
       "@angular/material/*": ["../lib/*"],
-      "@angular/material": ["../lib/public-api.ts"],
       "@angular/cdk-experimental/*": ["../cdk-experimental/*"],
       "@material/*": ["../../node_modules/@material/*/index.d.ts"]
     }

tools/gulp/packages.ts

@@ -5,7 +5,7 @@ export const cdkPackage = new BuildPackage('cdk');
 export const materialPackage = new BuildPackage('material', [cdkPackage]);
 export const cdkExperimentalPackage = new BuildPackage('cdk-experimental', [cdkPackage]);
 export const materialExperimentalPackage = new BuildPackage('material-experimental',
-    [materialPackage]);
+    [cdkPackage, cdkExperimentalPackage, materialPackage]);
 export const momentAdapterPackage = new BuildPackage('material-moment-adapter', [materialPackage]);
 export const examplesPackage = new BuildPackage('material-examples', [
   cdkPackage,