Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit 86010bf

Browse files
ThomasBurlesontinayuangao
authored andcommitted
fix(api): remove use of static ngModule.forRoot() (#167)
BREAKING CHANGE: Previously releases used FlexLayoutModule.forRoot(). This has been deprecated and removed. -*before*- ```js @NgModule({ declarations : [...], imports : [ CommonModule, FlexLayoutModule.forRoot() ] }) export class DemosResponsiveLayoutsModule { } ``` -*after*- ```js @NgModule({ declarations : [...], imports : [ CommonModule, FlexLayoutModule ] }) export class DemosResponsiveLayoutsModule { } ```
1 parent d78527c commit 86010bf

File tree

10 files changed

+16
-25
lines changed

10 files changed

+16
-25
lines changed

src/demo-app/app/demo-app-module.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { DemosResponsiveLayoutsModule } from './docs-layout-responsive/DemosResp
1616
imports : [
1717
BrowserModule,
1818
MaterialModule.forRoot(),
19-
FlexLayoutModule.forRoot(),
19+
FlexLayoutModule,
2020
DemoAppRoutingModule,
2121

2222
/* Internal Demo App Modules */

src/demo-app/app/docs-layout-responsive/DemosResponsiveLayouts.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import {DemoResponsiveFlexOrder} from "./responsiveFlexOrder.demo";
4040
CommonModule,
4141
FormsModule,
4242
MaterialModule,
43-
FlexLayoutModule.forRoot()
43+
FlexLayoutModule
4444
]
4545

4646
})

src/lib/flexbox/_module.ts

+5-7
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88
import 'rxjs/add/operator/filter';
99
import 'rxjs/add/operator/map';
1010

11-
import {ModuleWithProviders, NgModule} from '@angular/core';
11+
import {NgModule} from '@angular/core';
12+
1213
import {MediaMonitor} from '../media-query/media-monitor';
1314
import {MediaQueriesModule} from '../media-query/_module';
15+
1416
import {FlexDirective} from './api/flex';
1517
import {LayoutDirective} from './api/layout';
1618
import {HideDirective} from './api/hide';
@@ -52,10 +54,6 @@ const ALL_DIRECTIVES = [
5254
declarations: ALL_DIRECTIVES,
5355
imports: [MediaQueriesModule],
5456
exports: [MediaQueriesModule, ...ALL_DIRECTIVES],
55-
providers: []
57+
providers: [ MediaMonitor ]
5658
})
57-
export class FlexLayoutModule {
58-
static forRoot(): ModuleWithProviders {
59-
return {ngModule: FlexLayoutModule, providers: [MediaMonitor]};
60-
}
61-
}
59+
export class FlexLayoutModule { }

src/lib/flexbox/api/flex.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ describe('flex directive', () => {
3737

3838
// Configure testbed to prepare services
3939
TestBed.configureTestingModule({
40-
imports: [CommonModule, FlexLayoutModule.forRoot()],
40+
imports: [CommonModule, FlexLayoutModule],
4141
declarations: [TestFlexComponent],
4242
providers: [
4343
BreakPointRegistry, BreakPointsProvider,

src/lib/flexbox/api/hide.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('hide directive', () => {
5151

5252
// Configure testbed to prepare services
5353
TestBed.configureTestingModule({
54-
imports: [CommonModule, MediaQueriesModule.forRoot()],
54+
imports: [CommonModule, MediaQueriesModule],
5555
declarations: [TestHideComponent, HideDirective],
5656
providers: [
5757
BreakPointRegistry, BreakPointsProvider,

src/lib/flexbox/api/layout-align.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ describe('layout-align directive', () => {
3434

3535
// Configure testbed to prepare services
3636
TestBed.configureTestingModule({
37-
imports: [CommonModule, FlexLayoutModule.forRoot()],
37+
imports: [CommonModule, FlexLayoutModule],
3838
declarations: [TestLayoutAlignComponent],
3939
providers: [
4040
BreakPointRegistry, BreakPointsProvider,

src/lib/flexbox/api/layout-gap.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('layout-gap directive', () => {
3232

3333
// Configure testbed to prepare services
3434
TestBed.configureTestingModule({
35-
imports: [CommonModule, FlexLayoutModule.forRoot()],
35+
imports: [CommonModule, FlexLayoutModule],
3636
declarations: [TestLayoutGapComponent],
3737
providers: [
3838
BreakPointRegistry, BreakPointsProvider,

src/lib/flexbox/api/layout.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ describe('layout directive', () => {
3838

3939
// Configure testbed to prepare services
4040
TestBed.configureTestingModule({
41-
imports: [CommonModule, FlexLayoutModule.forRoot()],
41+
imports: [CommonModule, FlexLayoutModule],
4242
declarations: [TestLayoutComponent],
4343
providers: [
4444
BreakPointRegistry, BreakPointsProvider,

src/lib/flexbox/api/show.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('show directive', () => {
3232

3333
// Configure testbed to prepare services
3434
TestBed.configureTestingModule({
35-
imports: [CommonModule, FlexLayoutModule.forRoot()],
35+
imports: [CommonModule, FlexLayoutModule],
3636
declarations: [TestShowComponent],
3737
providers: [
3838
BreakPointRegistry, BreakPointsProvider,

src/lib/media-query/_module.ts

+3-10
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@
55
* Use of this source code is governed by an MIT-style license that can be
66
* found in the LICENSE file at https://angular.io/license
77
*/
8-
import {NgModule, ModuleWithProviders} from '@angular/core';
8+
import {NgModule} from '@angular/core';
99

1010
import {MatchMedia} from './match-media';
1111
import {MediaMonitor} from './media-monitor';
1212
import {ObservableMediaProvider} from './observable-media-service';
1313
import {BreakPointsProvider} from './breakpoints/break-points';
1414
import {BreakPointRegistry} from './breakpoints/break-point-registry';
1515

16-
17-
1816
/**
1917
* *****************************************************************
2018
* Define module for the MediaQuery API
@@ -24,18 +22,13 @@ import {BreakPointRegistry} from './breakpoints/break-point-registry';
2422
@NgModule({
2523
providers: [
2624
MatchMedia, // Low-level service to publish observables w/ window.matchMedia()
27-
MediaMonitor, // MediaQuery monitor service observes all known breakpoints
28-
BreakPointRegistry, // Registry of known/used BreakPoint(s)
2925
BreakPointsProvider, // Supports developer overrides of list of known breakpoints
26+
BreakPointRegistry, // Registry of known/used BreakPoint(s)
27+
MediaMonitor, // MediaQuery monitor service observes all known breakpoints
3028
ObservableMediaProvider // easy subscription injectable `media$` matchMedia observable
3129
]
3230
})
3331
export class MediaQueriesModule {
34-
static forRoot(): ModuleWithProviders {
35-
return {
36-
ngModule: MediaQueriesModule
37-
};
38-
}
3932
}
4033

4134

0 commit comments

Comments
 (0)