Remove module imports that were only for providers

Author: jelbourn

package-lock.json

@@ -28,7 +28,7 @@ interface Query {
 }
 
 /** Utility for checking the matching state of @media queries. */
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class BreakpointObserver implements OnDestroy {
   /**  A map of all media queries currently being listened for. */
   private _queries: Map<string, Query> = new Map();

src/cdk/layout/breakpoints-observer.ts

@@ -6,12 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 import {NgModule} from '@angular/core';
-import {PlatformModule} from '@angular/cdk/platform';
-import {BreakpointObserver} from './breakpoints-observer';
-import {MediaMatcher} from './media-matcher';
 
-@NgModule({
-  providers: [BreakpointObserver, MediaMatcher],
-  imports: [PlatformModule],
-})
+
+@NgModule()
 export class LayoutModule {}

src/cdk/layout/layout-module.ts

@@ -14,7 +14,7 @@ import {Platform} from '@angular/cdk/platform';
 const styleElementForWebkitCompatibility: Map<string, HTMLStyleElement> = new Map();
 
 /** A utility for calling matchMedia queries. */
-@Injectable()
+@Injectable({providedIn: 'root'})
 export class MediaMatcher {
   /** The internal matchMedia method to return back a MediaQueryList like object. */
   private _matchMedia: (query: string) => MediaQueryList;

src/cdk/layout/media-matcher.ts

@@ -8,20 +8,12 @@
 
 import {NgModule} from '@angular/core';
 import {MatCommonModule} from '@angular/material/core';
-import {A11yModule} from '@angular/cdk/a11y';
 import {MatBadge} from './badge';
 
 
 @NgModule({
-  imports: [
-    MatCommonModule,
-    A11yModule,
-  ],
-  exports: [
-    MatBadge,
-  ],
-  declarations: [
-    MatBadge,
-  ],
+  imports: [MatCommonModule],
+  exports: [MatBadge],
+  declarations: [MatBadge],
 })
 export class MatBadgeModule {}

src/lib/badge/badge-module.ts

@@ -6,25 +6,21 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {MatCommonModule} from '@angular/material/core';
-import {A11yModule} from '@angular/cdk/a11y';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {PortalModule} from '@angular/cdk/portal';
-import {LayoutModule} from '@angular/cdk/layout';
-import {MatBottomSheetContainer} from './bottom-sheet-container';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MatCommonModule} from '@angular/material/core';
 import {MatBottomSheet} from './bottom-sheet';
+import {MatBottomSheetContainer} from './bottom-sheet-container';
 
 
 @NgModule({
   imports: [
-    A11yModule,
     CommonModule,
     OverlayModule,
     MatCommonModule,
     PortalModule,
-    LayoutModule,
   ],
   exports: [MatBottomSheetContainer, MatCommonModule],
   declarations: [MatBottomSheetContainer],

src/lib/bottom-sheet/bottom-sheet-module.ts

@@ -6,14 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {A11yModule} from '@angular/cdk/a11y';
 import {NgModule} from '@angular/core';
 import {MatCommonModule, MatRippleModule} from '@angular/material/core';
 import {MatButtonToggle, MatButtonToggleGroup} from './button-toggle';
 
 
 @NgModule({
-  imports: [MatCommonModule, MatRippleModule, A11yModule],
+  imports: [MatCommonModule, MatRippleModule],
   exports: [MatCommonModule, MatButtonToggleGroup, MatButtonToggle],
   declarations: [MatButtonToggleGroup, MatButtonToggle],
 })

src/lib/button-toggle/button-toggle-module.ts

@@ -6,22 +6,17 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
 import {MatCommonModule, MatRippleModule} from '@angular/material/core';
-import {A11yModule} from '@angular/cdk/a11y';
-import {
-  MatAnchor,
-  MatButton,
-} from './button';
+import {MatAnchor, MatButton} from './button';
 
 
 @NgModule({
   imports: [
     CommonModule,
     MatRippleModule,
     MatCommonModule,
-    A11yModule,
   ],
   exports: [
     MatButton,

src/lib/button/button-module.ts

@@ -10,19 +10,19 @@ import {NgModule} from '@angular/core';
 import {MatCommonModule} from '@angular/material/core';
 import {
   MatCard,
-  MatCardHeader,
-  MatCardTitleGroup,
-  MatCardContent,
-  MatCardTitle,
-  MatCardSubtitle,
   MatCardActions,
+  MatCardAvatar,
+  MatCardContent,
   MatCardFooter,
-  MatCardSmImage,
-  MatCardMdImage,
-  MatCardLgImage,
+  MatCardHeader,
   MatCardImage,
+  MatCardLgImage,
+  MatCardMdImage,
+  MatCardSmImage,
+  MatCardSubtitle,
+  MatCardTitle,
+  MatCardTitleGroup,
   MatCardXlImage,
-  MatCardAvatar,
 } from './card';
 
 

src/lib/card/card-module.ts

@@ -6,16 +6,16 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
 import {ObserversModule} from '@angular/cdk/observers';
-import {MatRippleModule, MatCommonModule} from '@angular/material/core';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
+import {MatCommonModule, MatRippleModule} from '@angular/material/core';
 import {MatCheckbox} from './checkbox';
 import {MatCheckboxRequiredValidator} from './checkbox-required-validator';
-import {A11yModule} from '@angular/cdk/a11y';
+
 
 @NgModule({
-  imports: [CommonModule, MatRippleModule, MatCommonModule, ObserversModule, A11yModule],
+  imports: [CommonModule, MatRippleModule, MatCommonModule, ObserversModule],
   exports: [MatCheckbox, MatCheckboxRequiredValidator, MatCommonModule],
   declarations: [MatCheckbox, MatCheckboxRequiredValidator],
 })

src/lib/checkbox/checkbox-module.ts

@@ -6,14 +6,13 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {PlatformModule} from '@angular/cdk/platform';
+import {ENTER} from '@angular/cdk/keycodes';
 import {NgModule} from '@angular/core';
 import {ErrorStateMatcher} from '@angular/material/core';
 import {MatChip, MatChipAvatar, MatChipRemove, MatChipTrailingIcon} from './chip';
+import {MAT_CHIPS_DEFAULT_OPTIONS, MatChipsDefaultOptions} from './chip-default-options';
 import {MatChipInput} from './chip-input';
 import {MatChipList} from './chip-list';
-import {MAT_CHIPS_DEFAULT_OPTIONS, MatChipsDefaultOptions} from './chip-default-options';
-import {ENTER} from '@angular/cdk/keycodes';
 
 const CHIP_DECLARATIONS = [
   MatChipList,
@@ -25,7 +24,6 @@ const CHIP_DECLARATIONS = [
 ];
 
 @NgModule({
-  imports: [PlatformModule],
   exports: CHIP_DECLARATIONS,
   declarations: CHIP_DECLARATIONS,
   providers: [

src/lib/chips/chips-module.ts

@@ -25,11 +25,11 @@ import {MatYearView} from './year-view';
 
 @NgModule({
   imports: [
+    A11yModule,
     CommonModule,
     MatButtonModule,
     MatDialogModule,
     OverlayModule,
-    A11yModule,
   ],
   exports: [
     MatCalendar,

src/lib/datepicker/datepicker-module.ts

@@ -6,22 +6,18 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
 import {OverlayModule} from '@angular/cdk/overlay';
 import {PortalModule} from '@angular/cdk/portal';
-import {A11yModule} from '@angular/cdk/a11y';
+import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
 import {MatCommonModule} from '@angular/material/core';
-import {
-  MatDialog,
-  MAT_DIALOG_SCROLL_STRATEGY_PROVIDER
-} from './dialog';
+import {MAT_DIALOG_SCROLL_STRATEGY_PROVIDER, MatDialog} from './dialog';
 import {MatDialogContainer} from './dialog-container';
 import {
+  MatDialogActions,
   MatDialogClose,
   MatDialogContent,
   MatDialogTitle,
-  MatDialogActions
 } from './dialog-content-directives';
 
 
@@ -30,7 +26,6 @@ import {
     CommonModule,
     OverlayModule,
     PortalModule,
-    A11yModule,
     MatCommonModule,
   ],
   exports: [

src/lib/dialog/dialog-module.ts

@@ -6,20 +6,15 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
+import {NgModule} from '@angular/core';
 import {MatCommonModule} from '@angular/material/core';
 import {MatDivider} from './divider';
 
 
 @NgModule({
   imports: [MatCommonModule, CommonModule],
-  exports: [
-    MatDivider,
-    MatCommonModule,
-  ],
-  declarations: [
-    MatDivider,
-  ],
+  exports: [MatDivider, MatCommonModule],
+  declarations: [MatDivider],
 })
 export class MatDividerModule {}

src/lib/divider/divider-module.ts

@@ -6,7 +6,6 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {A11yModule} from '@angular/cdk/a11y';
 import {CdkAccordionModule} from '@angular/cdk/accordion';
 import {PortalModule} from '@angular/cdk/portal';
 import {CommonModule} from '@angular/common';
@@ -22,7 +21,7 @@ import {
 
 
 @NgModule({
-  imports: [CommonModule, A11yModule, CdkAccordionModule, PortalModule],
+  imports: [CommonModule, CdkAccordionModule, PortalModule],
   exports: [
     MatAccordion,
     MatExpansionPanel,

src/lib/expansion/expansion-module.ts

@@ -8,38 +8,34 @@
 
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
-import {PlatformModule} from '@angular/cdk/platform';
 import {MatError} from './error';
 import {MatFormField} from './form-field';
 import {MatHint} from './hint';
+import {MatLabel} from './label';
 import {MatPlaceholder} from './placeholder';
 import {MatPrefix} from './prefix';
 import {MatSuffix} from './suffix';
-import {MatLabel} from './label';
 
 
 @NgModule({
   declarations: [
     MatError,
-    MatHint,
     MatFormField,
+    MatHint,
+    MatLabel,
     MatPlaceholder,
     MatPrefix,
     MatSuffix,
-    MatLabel,
-  ],
-  imports: [
-    CommonModule,
-    PlatformModule,
   ],
+  imports: [CommonModule],
   exports: [
     MatError,
-    MatHint,
     MatFormField,
+    MatHint,
+    MatLabel,
     MatPlaceholder,
     MatPrefix,
     MatSuffix,
-    MatLabel,
   ],
 })
 export class MatFormFieldModule {}

src/lib/form-field/form-field-module.ts

@@ -7,7 +7,6 @@
  */
 
 import {TextFieldModule} from '@angular/cdk/text-field';
-import {PlatformModule} from '@angular/cdk/platform';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {ErrorStateMatcher} from '@angular/material/core';
@@ -22,7 +21,6 @@ import {MatInput} from './input';
     CommonModule,
     TextFieldModule,
     MatFormFieldModule,
-    PlatformModule,
   ],
   exports: [
     TextFieldModule,

src/lib/input/input-module.ts

@@ -6,9 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {A11yModule} from '@angular/cdk/a11y';
 import {OverlayModule} from '@angular/cdk/overlay';
-import {PortalModule} from '@angular/cdk/portal';
 import {CommonModule} from '@angular/common';
 import {NgModule} from '@angular/core';
 import {MatCommonModule, MatRippleModule} from '@angular/material/core';
@@ -20,12 +18,10 @@ import {MatMenuTrigger} from './menu-trigger';
 
 @NgModule({
   imports: [
-    A11yModule,
     CommonModule,
     MatCommonModule,
     MatRippleModule,
     OverlayModule,
-    PortalModule,
   ],
   exports: [MatMenu, MatMenuItem, MatMenuTrigger, MatMenuContent, MatCommonModule],
   declarations: [MatMenu, MatMenuItem, MatMenuTrigger, MatMenuContent],