From 5df5d30fa8c3538fec49d8e258ad09e9cf3ef793 Mon Sep 17 00:00:00 2001 From: Kristiyan Kostadinov Date: Sun, 6 Feb 2022 11:30:14 +0100 Subject: [PATCH] refactor(multiple): remove PlatformModule usages The `PlatformModule` is a noop so we don't need to import it. --- src/cdk/a11y/a11y-module.ts | 3 +-- src/cdk/scrolling/scrolling-module.ts | 3 +-- src/cdk/text-field/text-field-module.ts | 2 -- src/components-examples/cdk/platform/index.ts | 2 -- src/dev-app/platform/platform-demo-module.ts | 7 +------ src/material/core/datetime/index.ts | 2 -- src/material/core/ripple/index.ts | 3 +-- src/material/sidenav/sidenav-module.ts | 3 +-- tools/public_api_guard/cdk/a11y.md | 5 ++--- tools/public_api_guard/cdk/scrolling.md | 3 +-- tools/public_api_guard/cdk/text-field.md | 3 +-- tools/public_api_guard/material/core.md | 11 +++++------ tools/public_api_guard/material/sidenav.md | 5 ++--- 13 files changed, 16 insertions(+), 36 deletions(-) diff --git a/src/cdk/a11y/a11y-module.ts b/src/cdk/a11y/a11y-module.ts index 0670bc5a78a3..b83eacd7f1f3 100644 --- a/src/cdk/a11y/a11y-module.ts +++ b/src/cdk/a11y/a11y-module.ts @@ -7,7 +7,6 @@ */ import {ObserversModule} from '@angular/cdk/observers'; -import {PlatformModule} from '@angular/cdk/platform'; import {NgModule} from '@angular/core'; import {CdkMonitorFocus} from './focus-monitor/focus-monitor'; import {CdkTrapFocus} from './focus-trap/focus-trap'; @@ -15,7 +14,7 @@ import {HighContrastModeDetector} from './high-contrast-mode/high-contrast-mode- import {CdkAriaLive} from './live-announcer/live-announcer'; @NgModule({ - imports: [PlatformModule, ObserversModule], + imports: [ObserversModule], declarations: [CdkAriaLive, CdkTrapFocus, CdkMonitorFocus], exports: [CdkAriaLive, CdkTrapFocus, CdkMonitorFocus], }) diff --git a/src/cdk/scrolling/scrolling-module.ts b/src/cdk/scrolling/scrolling-module.ts index a05ca7f521cf..0f3dcecdc8f0 100644 --- a/src/cdk/scrolling/scrolling-module.ts +++ b/src/cdk/scrolling/scrolling-module.ts @@ -7,7 +7,6 @@ */ import {BidiModule} from '@angular/cdk/bidi'; -import {PlatformModule} from '@angular/cdk/platform'; import {NgModule} from '@angular/core'; import {CdkFixedSizeVirtualScroll} from './fixed-size-virtual-scroll'; import {CdkScrollable} from './scrollable'; @@ -24,7 +23,7 @@ export class CdkScrollableModule {} * @docs-primary-export */ @NgModule({ - imports: [BidiModule, PlatformModule, CdkScrollableModule], + imports: [BidiModule, CdkScrollableModule], exports: [ BidiModule, CdkScrollableModule, diff --git a/src/cdk/text-field/text-field-module.ts b/src/cdk/text-field/text-field-module.ts index 2f87b4496476..09b6b9481a2a 100644 --- a/src/cdk/text-field/text-field-module.ts +++ b/src/cdk/text-field/text-field-module.ts @@ -6,14 +6,12 @@ * found in the LICENSE file at https://angular.io/license */ -import {PlatformModule} from '@angular/cdk/platform'; import {NgModule} from '@angular/core'; import {CdkAutofill} from './autofill'; import {CdkTextareaAutosize} from './autosize'; @NgModule({ declarations: [CdkAutofill, CdkTextareaAutosize], - imports: [PlatformModule], exports: [CdkAutofill, CdkTextareaAutosize], }) export class TextFieldModule {} diff --git a/src/components-examples/cdk/platform/index.ts b/src/components-examples/cdk/platform/index.ts index b0d0decb692b..a9356a25b0b0 100644 --- a/src/components-examples/cdk/platform/index.ts +++ b/src/components-examples/cdk/platform/index.ts @@ -1,4 +1,3 @@ -import {PlatformModule} from '@angular/cdk/platform'; import {NgModule} from '@angular/core'; import {CdkPlatformOverviewExample} from './cdk-platform-overview/cdk-platform-overview-example'; @@ -7,7 +6,6 @@ export {CdkPlatformOverviewExample}; const EXAMPLES = [CdkPlatformOverviewExample]; @NgModule({ - imports: [PlatformModule], declarations: EXAMPLES, exports: EXAMPLES, }) diff --git a/src/dev-app/platform/platform-demo-module.ts b/src/dev-app/platform/platform-demo-module.ts index 0fe3b841c462..413c7ab44a06 100644 --- a/src/dev-app/platform/platform-demo-module.ts +++ b/src/dev-app/platform/platform-demo-module.ts @@ -6,18 +6,13 @@ * found in the LICENSE file at https://angular.io/license */ -import {PlatformModule} from '@angular/cdk/platform'; import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; import {RouterModule} from '@angular/router'; import {PlatformDemo} from './platform-demo'; @NgModule({ - imports: [ - CommonModule, - PlatformModule, - RouterModule.forChild([{path: '', component: PlatformDemo}]), - ], + imports: [CommonModule, RouterModule.forChild([{path: '', component: PlatformDemo}])], declarations: [PlatformDemo], }) export class PlatformDemoModule {} diff --git a/src/material/core/datetime/index.ts b/src/material/core/datetime/index.ts index 3e37c8f74725..7a41960438ce 100644 --- a/src/material/core/datetime/index.ts +++ b/src/material/core/datetime/index.ts @@ -6,7 +6,6 @@ * found in the LICENSE file at https://angular.io/license */ -import {PlatformModule} from '@angular/cdk/platform'; import {NgModule} from '@angular/core'; import {DateAdapter} from './date-adapter'; import {MAT_DATE_FORMATS} from './date-formats'; @@ -19,7 +18,6 @@ export * from './native-date-adapter'; export * from './native-date-formats'; @NgModule({ - imports: [PlatformModule], providers: [{provide: DateAdapter, useClass: NativeDateAdapter}], }) export class NativeDateModule {} diff --git a/src/material/core/ripple/index.ts b/src/material/core/ripple/index.ts index d76f94314e58..97b4bc7e7647 100644 --- a/src/material/core/ripple/index.ts +++ b/src/material/core/ripple/index.ts @@ -7,7 +7,6 @@ */ import {NgModule} from '@angular/core'; -import {PlatformModule} from '@angular/cdk/platform'; import {MatCommonModule} from '../common-behaviors/common-module'; import {MatRipple} from './ripple'; @@ -16,7 +15,7 @@ export * from './ripple-ref'; export * from './ripple-renderer'; @NgModule({ - imports: [MatCommonModule, PlatformModule], + imports: [MatCommonModule], exports: [MatRipple, MatCommonModule], declarations: [MatRipple], }) diff --git a/src/material/sidenav/sidenav-module.ts b/src/material/sidenav/sidenav-module.ts index f43299397e0f..6e57d4931995 100644 --- a/src/material/sidenav/sidenav-module.ts +++ b/src/material/sidenav/sidenav-module.ts @@ -5,7 +5,6 @@ * Use of this source code is governed by an MIT-style license that can be * found in the LICENSE file at https://angular.io/license */ -import {PlatformModule} from '@angular/cdk/platform'; import {CdkScrollableModule} from '@angular/cdk/scrolling'; import {CommonModule} from '@angular/common'; import {NgModule} from '@angular/core'; @@ -14,7 +13,7 @@ import {MatDrawer, MatDrawerContainer, MatDrawerContent} from './drawer'; import {MatSidenav, MatSidenavContainer, MatSidenavContent} from './sidenav'; @NgModule({ - imports: [CommonModule, MatCommonModule, PlatformModule, CdkScrollableModule], + imports: [CommonModule, MatCommonModule, CdkScrollableModule], exports: [ CdkScrollableModule, MatCommonModule, diff --git a/tools/public_api_guard/cdk/a11y.md b/tools/public_api_guard/cdk/a11y.md index 1018a7477689..44dbf705732f 100644 --- a/tools/public_api_guard/cdk/a11y.md +++ b/tools/public_api_guard/cdk/a11y.md @@ -12,8 +12,7 @@ import { DoCheck } from '@angular/core'; import { ElementRef } from '@angular/core'; import { EventEmitter } from '@angular/core'; import * as i0 from '@angular/core'; -import * as i4 from '@angular/cdk/platform'; -import * as i5 from '@angular/cdk/observers'; +import * as i4 from '@angular/cdk/observers'; import { InjectionToken } from '@angular/core'; import { NgZone } from '@angular/core'; import { Observable } from 'rxjs'; @@ -32,7 +31,7 @@ export class A11yModule { // (undocumented) static ɵinj: i0.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: i0.ɵɵNgModuleDeclaration; } // @public (undocumented) diff --git a/tools/public_api_guard/cdk/scrolling.md b/tools/public_api_guard/cdk/scrolling.md index 2b729d0fbc7a..d37bc51abb8b 100644 --- a/tools/public_api_guard/cdk/scrolling.md +++ b/tools/public_api_guard/cdk/scrolling.md @@ -13,7 +13,6 @@ import { DoCheck } from '@angular/core'; import { ElementRef } from '@angular/core'; import * as i0 from '@angular/core'; import * as i5 from '@angular/cdk/bidi'; -import * as i6 from '@angular/cdk/platform'; import { InjectionToken } from '@angular/core'; import { IterableDiffers } from '@angular/core'; import { ListRange } from '@angular/cdk/collections'; @@ -251,7 +250,7 @@ export class ScrollingModule { // (undocumented) static ɵinj: i0.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: i0.ɵɵNgModuleDeclaration; } // @public (undocumented) diff --git a/tools/public_api_guard/cdk/text-field.md b/tools/public_api_guard/cdk/text-field.md index b9e09078050e..3a025e917714 100644 --- a/tools/public_api_guard/cdk/text-field.md +++ b/tools/public_api_guard/cdk/text-field.md @@ -10,7 +10,6 @@ import { DoCheck } from '@angular/core'; import { ElementRef } from '@angular/core'; import { EventEmitter } from '@angular/core'; import * as i0 from '@angular/core'; -import * as i3 from '@angular/cdk/platform'; import { NgZone } from '@angular/core'; import { NumberInput } from '@angular/cdk/coercion'; import { Observable } from 'rxjs'; @@ -92,7 +91,7 @@ export class TextFieldModule { // (undocumented) static ɵinj: i0.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: i0.ɵɵNgModuleDeclaration; } // (No @packageDocumentation comment for this package) diff --git a/tools/public_api_guard/material/core.md b/tools/public_api_guard/material/core.md index 40f3dbf8ec50..7684f834ed28 100644 --- a/tools/public_api_guard/material/core.md +++ b/tools/public_api_guard/material/core.md @@ -19,7 +19,6 @@ import { FormGroupDirective } from '@angular/forms'; import { HighContrastModeDetector } from '@angular/cdk/a11y'; import * as i0 from '@angular/core'; import * as i1 from '@angular/cdk/bidi'; -import * as i1_2 from '@angular/cdk/platform'; import * as i4 from '@angular/common'; import { InjectionToken } from '@angular/core'; import { NgControl } from '@angular/forms'; @@ -232,7 +231,7 @@ export class MatLineModule { // (undocumented) static ɵinj: i0.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: i0.ɵɵNgModuleDeclaration; } // @public (undocumented) @@ -318,7 +317,7 @@ export class MatOptionModule { // (undocumented) static ɵinj: i0.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: i0.ɵɵNgModuleDeclaration; } // @public @@ -360,7 +359,7 @@ export class MatPseudoCheckboxModule { // (undocumented) static ɵinj: i0.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: i0.ɵɵNgModuleDeclaration; } // @public @@ -401,7 +400,7 @@ export class MatRippleModule { // (undocumented) static ɵinj: i0.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: i0.ɵɵNgModuleDeclaration; } // @public @@ -486,7 +485,7 @@ export class NativeDateModule { // (undocumented) static ɵinj: i0.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: i0.ɵɵNgModuleDeclaration; } // @public diff --git a/tools/public_api_guard/material/sidenav.md b/tools/public_api_guard/material/sidenav.md index 8e4cc8e41f00..6704e09ed7a4 100644 --- a/tools/public_api_guard/material/sidenav.md +++ b/tools/public_api_guard/material/sidenav.md @@ -22,8 +22,7 @@ import { FocusTrapFactory } from '@angular/cdk/a11y'; import * as i0 from '@angular/core'; import * as i3 from '@angular/common'; import * as i4 from '@angular/material/core'; -import * as i5 from '@angular/cdk/platform'; -import * as i6 from '@angular/cdk/scrolling'; +import * as i5 from '@angular/cdk/scrolling'; import { InjectionToken } from '@angular/core'; import { InteractivityChecker } from '@angular/cdk/a11y'; import { NgZone } from '@angular/core'; @@ -207,7 +206,7 @@ export class MatSidenavModule { // (undocumented) static ɵinj: i0.ɵɵInjectorDeclaration; // (undocumented) - static ɵmod: i0.ɵɵNgModuleDeclaration; + static ɵmod: i0.ɵɵNgModuleDeclaration; } // @public