fix(all): add forRoot() to all modules (#1166)

angular · Sep 2, 2016 · 21dc44a · 21dc44a
1 parent 3ef7ece
commit 21dc44a
Show file tree

Hide file tree

Showing 29 changed files with 164 additions and 45 deletions.
diff --git a/src/lib/all/all.ts b/src/lib/all/all.ts
@@ -55,29 +55,29 @@ const MATERIAL_MODULES = [
 
 @NgModule({
   imports: [
-    MdButtonModule,
-    MdCardModule,
-    MdCheckboxModule,
-    MdGridListModule,
-    MdInputModule,
-    MdListModule,
-    MdProgressBarModule,
-    MdProgressCircleModule,
-    MdRippleModule,
-    MdSidenavModule,
-    MdSliderModule,
-    MdSlideToggleModule,
-    MdTabsModule,
-    MdToolbarModule,
-    PortalModule,
-    RtlModule,
+    MdButtonModule.forRoot(),
+    MdCardModule.forRoot(),
+    MdCheckboxModule.forRoot(),
+    MdGridListModule.forRoot(),
+    MdInputModule.forRoot(),
+    MdListModule.forRoot(),
+    MdProgressBarModule.forRoot(),
+    MdProgressCircleModule.forRoot(),
+    MdRippleModule.forRoot(),
+    MdSidenavModule.forRoot(),
+    MdTabsModule.forRoot(),
+    MdToolbarModule.forRoot(),
+    PortalModule.forRoot(),
+    RtlModule.forRoot(),
 
     // These modules include providers.
     MdButtonToggleModule.forRoot(),
     MdDialogModule.forRoot(),
     MdIconModule.forRoot(),
     MdMenuModule.forRoot(),
     MdRadioModule.forRoot(),
+    MdSliderModule.forRoot(),
+    MdSlideToggleModule.forRoot(),
     MdTooltipModule.forRoot(),
     OverlayModule.forRoot(),
   ],

diff --git a/src/lib/button/button.spec.ts b/src/lib/button/button.spec.ts
@@ -11,7 +11,7 @@ describe('MdButton', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdButtonModule],
+      imports: [MdButtonModule.forRoot()],
       declarations: [TestApp],
     });
 

diff --git a/src/lib/button/button.ts b/src/lib/button/button.ts
@@ -7,6 +7,7 @@ import {
   ElementRef,
   Renderer,
   NgModule,
+  ModuleWithProviders,
 } from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {BooleanFieldValue} from '@angular2-material/core';
@@ -161,4 +162,11 @@ export class MdAnchor extends MdButton {
   exports: [MdButton, MdAnchor],
   declarations: [MdButton, MdAnchor],
 })
-export class MdButtonModule { }
+export class MdButtonModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdButtonModule,
+      providers: []
+    };
+  }
+}
diff --git a/src/lib/card/card.ts b/src/lib/card/card.ts
@@ -1,5 +1,6 @@
 import {
   NgModule,
+  ModuleWithProviders,
   Component,
   ViewEncapsulation,
   ChangeDetectionStrategy,
@@ -124,4 +125,11 @@ export class MdCardTitleGroup {}
     MdCardActions
   ],
 })
-export class MdCardModule { }
+export class MdCardModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdCardModule,
+      providers: []
+    };
+  }
+}
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, FormsModule],
+      imports: [MdCheckboxModule.forRoot(), FormsModule],
       declarations: [
         SingleCheckbox,
         CheckboxWithFormDirectives,

diff --git a/src/lib/checkbox/checkbox.ts b/src/lib/checkbox/checkbox.ts
@@ -9,6 +9,7 @@ import {
     ViewEncapsulation,
     forwardRef,
     NgModule,
+    ModuleWithProviders,
 } from '@angular/core';
 import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
 
@@ -309,4 +310,11 @@ export class MdCheckbox implements ControlValueAccessor {
   exports: [MdCheckbox],
   declarations: [MdCheckbox],
 })
-export class MdCheckboxModule { }
+export class MdCheckboxModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdCheckboxModule,
+      providers: []
+    };
+  }
+}
diff --git a/src/lib/core/portal/portal-directives.ts b/src/lib/core/portal/portal-directives.ts
@@ -1,5 +1,6 @@
 import {
     NgModule,
+    ModuleWithProviders,
     ComponentRef,
     Directive,
     TemplateRef,
@@ -107,4 +108,11 @@ export class PortalHostDirective extends BasePortalHost {
   exports: [TemplatePortalDirective, PortalHostDirective],
   declarations: [TemplatePortalDirective, PortalHostDirective],
 })
-export class PortalModule { }
+export class PortalModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: PortalModule,
+      providers: []
+    };
+  }
+}
diff --git a/src/lib/core/portal/portal.spec.ts b/src/lib/core/portal/portal.spec.ts
@@ -25,7 +25,7 @@ describe('Portals', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [PortalModule, PortalTestModule],
+      imports: [PortalModule.forRoot(), PortalTestModule],
     });
 
     TestBed.compileComponents();

diff --git a/src/lib/core/ripple/ripple.spec.ts b/src/lib/core/ripple/ripple.spec.ts
@@ -63,7 +63,7 @@ describe('MdRipple', () => {
 
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [MdRippleModule],
+      imports: [MdRippleModule.forRoot()],
       declarations: [BasicRippleContainer, RippleContainerWithInputBindings],
     });
   });

diff --git a/src/lib/core/ripple/ripple.ts b/src/lib/core/ripple/ripple.ts
@@ -1,5 +1,6 @@
 import {
   NgModule,
+  ModuleWithProviders,
   Directive,
   ElementRef,
   HostBinding,
@@ -173,4 +174,11 @@ export class MdRipple implements OnInit, OnDestroy, OnChanges {
   exports: [MdRipple],
   declarations: [MdRipple],
 })
-export class MdRippleModule { }
+export class MdRippleModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdRippleModule,
+      providers: []
+    };
+  }
+}
diff --git a/src/lib/core/rtl/dir.ts b/src/lib/core/rtl/dir.ts
@@ -1,4 +1,12 @@
-import {NgModule, Directive, HostBinding, Output, Input, EventEmitter} from '@angular/core';
+import {
+    NgModule,
+    ModuleWithProviders,
+    Directive,
+    HostBinding,
+    Output,
+    Input,
+    EventEmitter
+} from '@angular/core';
 
 export type LayoutDirection = 'ltr' | 'rtl';
 
@@ -39,4 +47,11 @@ export class Dir {
   exports: [Dir],
   declarations: [Dir]
 })
-export class RtlModule { }
+export class RtlModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: RtlModule,
+      providers: []
+    };
+  }
+}
diff --git a/src/lib/grid-list/grid-list.spec.ts b/src/lib/grid-list/grid-list.spec.ts
@@ -8,7 +8,7 @@ import {MdGridTile, MdGridTileText} from './grid-tile';
 describe('MdGridList', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdGridListModule],
+      imports: [MdGridListModule.forRoot()],
       declarations: [
         GridListWithoutCols,
         GridListWithInvalidRowHeightRatio,

diff --git a/src/lib/grid-list/grid-list.ts b/src/lib/grid-list/grid-list.ts
@@ -1,5 +1,6 @@
 import {
   NgModule,
+  ModuleWithProviders,
   Component,
   ViewEncapsulation,
   AfterContentChecked,
@@ -156,4 +157,11 @@ export class MdGridList implements OnInit, AfterContentChecked {
   exports: [MdGridList, MdGridTile, MdGridTileText, MdLineModule],
   declarations: [MdGridList, MdGridTile, MdGridTileText],
 })
-export class MdGridListModule { }
+export class MdGridListModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdGridListModule,
+      providers: []
+    };
+  }
+}
diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
@@ -11,7 +11,7 @@ import {MdInput, MdInputModule} from './input';
 describe('MdInput', function () {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdInputModule, FormsModule],
+      imports: [MdInputModule.forRoot(), FormsModule],
       declarations: [
         MdInputNumberTypeConservedTestComponent,
         MdInputPlaceholderRequiredTestComponent,

diff --git a/src/lib/input/input.ts b/src/lib/input/input.ts
@@ -15,6 +15,7 @@ import {
   EventEmitter,
   Output,
   NgModule,
+  ModuleWithProviders,
 } from '@angular/core';
 import {
   NG_VALUE_ACCESSOR,
@@ -312,4 +313,11 @@ export class MdInput implements ControlValueAccessor, AfterContentInit, OnChange
   imports: [CommonModule, FormsModule],
   exports: [MdPlaceholder, MdInput, MdHint],
 })
-export class MdInputModule { }
+export class MdInputModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdInputModule,
+      providers: []
+    };
+  }
+}
diff --git a/src/lib/list/list.spec.ts b/src/lib/list/list.spec.ts
@@ -8,7 +8,7 @@ describe('MdList', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdListModule],
+      imports: [MdListModule.forRoot()],
       declarations: [
         ListWithOneAnchorItem,
         ListWithOneItem,

diff --git a/src/lib/list/list.ts b/src/lib/list/list.ts
@@ -9,6 +9,7 @@ import {
     Renderer,
     AfterContentInit,
     NgModule,
+    ModuleWithProviders,
 } from '@angular/core';
 import {MdLine, MdLineSetter, MdLineModule} from '@angular2-material/core';
 
@@ -76,4 +77,11 @@ export class MdListItem implements AfterContentInit {
   exports: [MdList, MdListItem, MdListDivider, MdListAvatar, MdLineModule],
   declarations: [MdList, MdListItem, MdListDivider, MdListAvatar],
 })
-export class MdListModule { }
+export class MdListModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdListModule,
+      providers: []
+    };
+  }
+}
diff --git a/src/lib/progress-bar/progress-bar.spec.ts b/src/lib/progress-bar/progress-bar.spec.ts
@@ -8,7 +8,7 @@ describe('MdProgressBar', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdProgressBarModule],
+      imports: [MdProgressBarModule.forRoot()],
       declarations: [
         BasicProgressBar,
         BufferProgressBar,

diff --git a/src/lib/progress-bar/progress-bar.ts b/src/lib/progress-bar/progress-bar.ts
@@ -1,5 +1,6 @@
 import {
     NgModule,
+    ModuleWithProviders,
     Component,
     ChangeDetectionStrategy,
     HostBinding,
@@ -92,4 +93,11 @@ function clamp(v: number, min = 0, max = 100) {
   exports: [MdProgressBar],
   declarations: [MdProgressBar],
 })
-export class MdProgressBarModule { }
+export class MdProgressBarModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdProgressBarModule,
+      providers: []
+    };
+  }
+}
diff --git a/src/lib/progress-circle/progress-circle.spec.ts b/src/lib/progress-circle/progress-circle.spec.ts
@@ -8,7 +8,7 @@ describe('MdProgressCircular', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdProgressCircleModule],
+      imports: [MdProgressCircleModule.forRoot()],
       declarations: [
         BasicProgressSpinner,
         IndeterminateProgressSpinner,

diff --git a/src/lib/progress-circle/progress-circle.ts b/src/lib/progress-circle/progress-circle.ts
@@ -1,5 +1,6 @@
 import {
   NgModule,
+  ModuleWithProviders,
   Component,
   HostBinding,
   ChangeDetectorRef,
@@ -318,4 +319,11 @@ function getSvgArc(currentValue: number, rotation: number) {
   exports: [MdProgressCircle, MdSpinner],
   declarations: [MdProgressCircle, MdSpinner],
 })
-export class MdProgressCircleModule { }
+export class MdProgressCircleModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdProgressCircleModule,
+      providers: []
+    };
+  }
+}
diff --git a/src/lib/sidenav/sidenav.spec.ts b/src/lib/sidenav/sidenav.spec.ts
@@ -18,7 +18,7 @@ describe('MdSidenav', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSidenavModule],
+      imports: [MdSidenavModule.forRoot()],
       declarations: [
         BasicTestApp,
         SidenavLayoutTwoSidenavTestApp,

diff --git a/src/lib/sidenav/sidenav.ts b/src/lib/sidenav/sidenav.ts
@@ -1,5 +1,6 @@
 import {
     NgModule,
+    ModuleWithProviders,
     AfterContentInit,
     Component,
     ContentChildren,
@@ -389,4 +390,11 @@ export class MdSidenavLayout implements AfterContentInit {
   exports: [MdSidenavLayout, MdSidenav],
   declarations: [MdSidenavLayout, MdSidenav],
 })
-export class MdSidenavModule { }
+export class MdSidenavModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: MdSidenavModule,
+      providers: []
+    };
+  }
+}
diff --git a/src/lib/slide-toggle/slide-toggle.spec.ts b/src/lib/slide-toggle/slide-toggle.spec.ts
@@ -8,7 +8,7 @@ describe('MdSlideToggle', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [MdSlideToggleModule, FormsModule],
+      imports: [MdSlideToggleModule.forRoot(), FormsModule],
       declarations: [SlideToggleTestApp],
     });