fix: remove deprecated forRoot functions (#3539)

* In beta.2 the `forRoot` calls have been deprecated, and it was stated that those will be removed in the next release (https://goo.gl/2yFPFc)
angular · Apr 28, 2017 · c94f471 · c94f471
1 parent 29e503a
commit c94f471
Show file tree

Hide file tree

Showing 63 changed files with 97 additions and 412 deletions.
diff --git a/src/demo-app/demo-app-module.ts b/src/demo-app/demo-app-module.ts
@@ -53,7 +53,7 @@ import {StyleDemo} from './style/style-demo';
     HttpModule,
     ReactiveFormsModule,
     RouterModule.forRoot(DEMO_APP_ROUTES),
-    MaterialModule.forRoot(),
+    MaterialModule,
     MdSelectionModule,
   ],
   declarations: [

diff --git a/src/e2e-app/e2e-app-module.ts b/src/e2e-app/e2e-app-module.ts
@@ -24,7 +24,7 @@ import {InputE2E} from './input/input-e2e';
   imports: [
     BrowserModule,
     RouterModule.forRoot(E2E_APP_ROUTES),
-    MaterialModule.forRoot(),
+    MaterialModule,
     NoopAnimationsModule,
   ],
   declarations: [

diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
@@ -39,8 +39,8 @@ describe('MdAutocomplete', () => {
     dir = 'ltr';
     TestBed.configureTestingModule({
       imports: [
-        MdAutocompleteModule.forRoot(),
-        MdInputModule.forRoot(),
+        MdAutocompleteModule,
+        MdInputModule,
         FormsModule,
         ReactiveFormsModule,
         NoopAnimationsModule

diff --git a/src/lib/autocomplete/index.ts b/src/lib/autocomplete/index.ts
@@ -1,6 +1,5 @@
-import {ModuleWithProviders, NgModule} from '@angular/core';
-
-import {MdOptionModule, OverlayModule, OVERLAY_PROVIDERS, MdCommonModule} from '../core';
+import {NgModule} from '@angular/core';
+import {MdOptionModule, OverlayModule, MdCommonModule} from '../core';
 import {CommonModule} from '@angular/common';
 import {MdAutocomplete} from './autocomplete';
 import {MdAutocompleteTrigger} from './autocomplete-trigger';
@@ -10,15 +9,7 @@ import {MdAutocompleteTrigger} from './autocomplete-trigger';
   exports: [MdAutocomplete, MdOptionModule, MdAutocompleteTrigger, MdCommonModule],
   declarations: [MdAutocomplete, MdAutocompleteTrigger],
 })
-export class MdAutocompleteModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: MdAutocompleteModule,
-      providers: [OVERLAY_PROVIDERS]
-    };
-  }
-}
+export class MdAutocompleteModule {}
 
 
 export * from './autocomplete';

diff --git a/src/lib/button-toggle/button-toggle.spec.ts b/src/lib/button-toggle/button-toggle.spec.ts
@@ -21,7 +21,7 @@ describe('MdButtonToggle', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdButtonToggleModule.forRoot(), FormsModule, ReactiveFormsModule],
+      imports: [MdButtonToggleModule, FormsModule, ReactiveFormsModule],
       declarations: [
         ButtonTogglesInsideButtonToggleGroup,
         ButtonToggleGroupWithNgModel,

diff --git a/src/lib/button-toggle/index.ts b/src/lib/button-toggle/index.ts
@@ -1,4 +1,4 @@
-import {NgModule, ModuleWithProviders} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {FormsModule} from '@angular/forms';
 import {MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle} from './button-toggle';
 import {
@@ -19,15 +19,7 @@ import {
   declarations: [MdButtonToggleGroup, MdButtonToggleGroupMultiple, MdButtonToggle],
   providers: [UNIQUE_SELECTION_DISPATCHER_PROVIDER, FocusOriginMonitor]
 })
-export class MdButtonToggleModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: MdButtonToggleModule,
-      providers: []
-    };
-  }
-}
+export class MdButtonToggleModule {}
 
 
 export * from './button-toggle';
diff --git a/src/lib/button/button.spec.ts b/src/lib/button/button.spec.ts
@@ -10,7 +10,7 @@ describe('MdButton', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdButtonModule.forRoot()],
+      imports: [MdButtonModule],
       declarations: [TestApp],
       providers: [
         {provide: ViewportRuler, useClass: FakeViewportRuler},

diff --git a/src/lib/button/index.ts b/src/lib/button/index.ts
@@ -1,4 +1,4 @@
-import {ModuleWithProviders, NgModule} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {MdCommonModule, MdRippleModule, StyleModule} from '../core';
 import {
@@ -42,12 +42,4 @@ export * from './button';
     MdMiniFabCssMatStyler,
   ],
 })
-export class MdButtonModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: MdButtonModule,
-      providers: []
-    };
-  }
-}
+export class MdButtonModule {}
diff --git a/src/lib/card/index.ts b/src/lib/card/index.ts
@@ -1,4 +1,4 @@
-import {NgModule, ModuleWithProviders} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {MdCommonModule} from '../core';
 import {
   MdCard,
@@ -43,15 +43,7 @@ import {
     MdCardXlImage, MdCardAvatar,
   ],
 })
-export class MdCardModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: MdCardModule,
-      providers: []
-    };
-  }
-}
+export class MdCardModule {}
 
 
 export * from './card';
diff --git a/src/lib/checkbox/checkbox.spec.ts b/src/lib/checkbox/checkbox.spec.ts
@@ -21,7 +21,7 @@ describe('MdCheckbox', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdCheckboxModule.forRoot(), FormsModule, ReactiveFormsModule],
+      imports: [MdCheckboxModule, FormsModule, ReactiveFormsModule],
       declarations: [
         SingleCheckbox,
         CheckboxWithFormDirectives,

diff --git a/src/lib/checkbox/index.ts b/src/lib/checkbox/index.ts
@@ -1,4 +1,4 @@
-import {NgModule, ModuleWithProviders} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {MdRippleModule, MdCommonModule, FocusOriginMonitor} from '../core';
 import {MdCheckbox} from './checkbox';
@@ -10,15 +10,7 @@ import {MdCheckbox} from './checkbox';
   declarations: [MdCheckbox],
   providers: [FocusOriginMonitor]
 })
-export class MdCheckboxModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: MdCheckboxModule,
-      providers: []
-    };
-  }
-}
+export class MdCheckboxModule {}
 
 
 export * from './checkbox';
diff --git a/src/lib/chips/chip-list.spec.ts b/src/lib/chips/chip-list.spec.ts
@@ -25,7 +25,7 @@ describe('MdChipList', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdChipsModule.forRoot()],
+      imports: [MdChipsModule],
       declarations: [
         StaticChipList
       ]

diff --git a/src/lib/chips/chip.spec.ts b/src/lib/chips/chip.spec.ts
@@ -12,7 +12,7 @@ describe('Chips', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdChipsModule.forRoot()],
+      imports: [MdChipsModule],
       declarations: [
         BasicChip, SingleChip
       ]

diff --git a/src/lib/chips/index.ts b/src/lib/chips/index.ts
@@ -1,4 +1,4 @@
-import {NgModule, ModuleWithProviders} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {MdChipList} from './chip-list';
 import {MdChip} from './chip';
 
@@ -8,15 +8,7 @@ import {MdChip} from './chip';
   exports: [MdChipList, MdChip],
   declarations: [MdChipList, MdChip]
 })
-export class MdChipsModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: MdChipsModule,
-      providers: []
-    };
-  }
-}
+export class MdChipsModule {}
 
 
 export * from './chip-list';

diff --git a/src/lib/core/a11y/index.ts b/src/lib/core/a11y/index.ts
@@ -1,4 +1,4 @@
-import {NgModule, ModuleWithProviders} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {FocusTrapDirective, FocusTrapDeprecatedDirective, FocusTrapFactory} from './focus-trap';
 import {LIVE_ANNOUNCER_PROVIDER} from './live-announcer';
 import {InteractivityChecker} from './interactivity-checker';
@@ -11,12 +11,4 @@ import {PlatformModule} from '../platform/index';
   exports: [FocusTrapDirective, FocusTrapDeprecatedDirective],
   providers: [InteractivityChecker, FocusTrapFactory, LIVE_ANNOUNCER_PROVIDER]
 })
-export class A11yModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: A11yModule,
-      providers: [],
-    };
-  }
-}
+export class A11yModule {}
diff --git a/src/lib/core/compatibility/compatibility.spec.ts b/src/lib/core/compatibility/compatibility.spec.ts
@@ -26,7 +26,7 @@ describe('Style compatibility', () => {
       TestBed.configureTestingModule({
         // Specifically do *not* directly import the DefaultStyleCompatibilityModeModule
         // to ensure that it is the default behavior.
-        imports: [MdCheckboxModule.forRoot()],
+        imports: [MdCheckboxModule],
         declarations: [ComponentWithMdCheckbox, ComponentWithMatCheckbox],
       });
 
@@ -45,7 +45,7 @@ describe('Style compatibility', () => {
   describe('in no-conflict mode', () => {
     beforeEach(async(() => {
       TestBed.configureTestingModule({
-        imports: [MdCheckboxModule.forRoot(), NoConflictStyleCompatibilityMode],
+        imports: [MdCheckboxModule, NoConflictStyleCompatibilityMode],
         declarations: [ComponentWithMdCheckbox, ComponentWithMatCheckbox],
       });
 
@@ -97,7 +97,7 @@ class ComponentWithMatCheckbox { }
 
 
 @NgModule({
-  imports: [MdCheckboxModule.forRoot()],
+  imports: [MdCheckboxModule],
   exports: [ComponentWithMdCheckbox, ComponentWithMatCheckbox],
   declarations: [ComponentWithMdCheckbox, ComponentWithMatCheckbox],
 })

diff --git a/src/lib/core/compatibility/compatibility.ts b/src/lib/core/compatibility/compatibility.ts
@@ -1,6 +1,5 @@
 import {
   NgModule,
-  ModuleWithProviders,
   Directive,
   Inject,
   Optional,
@@ -196,13 +195,6 @@ export class CompatibilityModule {
   /** Whether we've done the global sanity checks (e.g. a theme is loaded, there is a doctype). */
   private _hasDoneGlobalChecks = false;
 
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: CompatibilityModule,
-      providers: [],
-    };
-  }
-
   constructor(
     @Optional() @Inject(DOCUMENT) private _document: any,
     @Optional() @Inject(MATERIAL_SANITY_CHECKS) _sanityChecksEnabled: boolean) {

diff --git a/src/lib/core/core.ts b/src/lib/core/core.ts
@@ -1,4 +1,4 @@
-import {NgModule, ModuleWithProviders} from '@angular/core';
+import {NgModule} from '@angular/core';
 import {MdLineModule} from './line/line';
 import {RtlModule} from './rtl/dir';
 import {ObserveContentModule} from './observe-content/observe-content';
@@ -141,12 +141,4 @@ export {MdCommonModule} from './common-behaviors/common-module';
     MdSelectionModule,
   ],
 })
-export class MdCoreModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: MdCoreModule,
-      providers: [],
-    };
-  }
-}
+export class MdCoreModule {}
diff --git a/src/lib/core/observe-content/observe-content.ts b/src/lib/core/observe-content/observe-content.ts
@@ -2,7 +2,6 @@ import {
   Directive,
   ElementRef,
   NgModule,
-  ModuleWithProviders,
   Output,
   EventEmitter,
   OnDestroy,
@@ -45,12 +44,4 @@ export class ObserveContent implements AfterContentInit, OnDestroy {
   exports: [ObserveContent],
   declarations: [ObserveContent]
 })
-export class ObserveContentModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: ObserveContentModule,
-      providers: []
-    };
-  }
-}
+export class ObserveContentModule {}
diff --git a/src/lib/core/option/option.ts b/src/lib/core/option/option.ts
@@ -5,7 +5,6 @@ import {
   Input,
   Output,
   NgModule,
-  ModuleWithProviders,
   ViewEncapsulation,
   Inject,
   Optional,
@@ -179,11 +178,4 @@ export class MdOption {
   exports: [MdOption],
   declarations: [MdOption]
 })
-export class MdOptionModule {
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: MdOptionModule,
-      providers: []
-    };
-  }
-}
+export class MdOptionModule {}
diff --git a/src/lib/core/overlay/overlay-directives.spec.ts b/src/lib/core/overlay/overlay-directives.spec.ts
@@ -17,7 +17,7 @@ describe('Overlay directives', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [OverlayModule.forRoot()],
+      imports: [OverlayModule],
       declarations: [ConnectedOverlayDirectiveTest],
       providers: [
         {provide: OverlayContainer, useFactory: () => {

diff --git a/src/lib/core/overlay/overlay-directives.ts b/src/lib/core/overlay/overlay-directives.ts
@@ -1,6 +1,5 @@
 import {
     NgModule,
-    ModuleWithProviders,
     Directive,
     EventEmitter,
     TemplateRef,
@@ -321,12 +320,4 @@ export class ConnectedOverlayDirective implements OnDestroy {
   declarations: [ConnectedOverlayDirective, OverlayOrigin, Scrollable],
   providers: [OVERLAY_PROVIDERS],
 })
-export class OverlayModule {
-  /** @deprecated */
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: OverlayModule,
-      providers: [],
-    };
-  }
-}
+export class OverlayModule {}
diff --git a/src/lib/core/overlay/overlay.spec.ts b/src/lib/core/overlay/overlay.spec.ts
@@ -18,7 +18,7 @@ describe('Overlay', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [OverlayModule.forRoot(), PortalModule, OverlayTestModule],
+      imports: [OverlayModule, PortalModule, OverlayTestModule],
       providers: [
         {provide: OverlayContainer, useFactory: () => {
           overlayContainerElement = document.createElement('div');

diff --git a/src/lib/core/overlay/scroll/scroll-dispatcher.spec.ts b/src/lib/core/overlay/scroll/scroll-dispatcher.spec.ts
@@ -9,7 +9,7 @@ describe('Scroll Dispatcher', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [OverlayModule.forRoot(), ScrollTestModule],
+      imports: [OverlayModule, ScrollTestModule],
     });
 
     TestBed.compileComponents();