Skip to content

Commit a35fcb4

Browse files
brandonrobertswardbell
brandonroberts
authored and
wardbell
committed
chore(router): Added ModuleWithProviders to routing exports
closes angular#2113
1 parent 7972ecc commit a35fcb4

33 files changed

+89
-56
lines changed

‎public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.module.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,16 @@
22
import { NgModule } from '@angular/core';
33
import { BrowserModule } from '@angular/platform-browser';
44
import { FormsModule } from '@angular/forms';
5-
import { RouterModule } from '@angular/router';
65

76
import { AppComponent } from './app.component';
87
import { MovieListComponent } from './movie-list.component';
9-
import { routes } from './app.routes';
8+
import { routing } from './app.routing';
109

1110
@NgModule({
1211
imports: [
1312
BrowserModule,
1413
FormsModule,
15-
RouterModule.forRoot(routes, {})
14+
routing
1615
],
1716
declarations: [
1817
AppComponent,

‎public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.routes.ts

-9
This file was deleted.

‎public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.routing.ts

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// #docregion
2+
import { ModuleWithProviders } from '@angular/core';
3+
import { Routes, RouterModule } from '@angular/router';
4+
5+
import { MovieListComponent } from './movie-list.component';
6+
7+
const routes: Routes = [
8+
{ path: '', redirectTo: '/movies', pathMatch: 'full' },
9+
{ path: 'movies', component: MovieListComponent }
10+
];
11+
12+
export const routing: ModuleWithProviders = RouterModule.forRoot(routes);

‎public/docs/_examples/cb-dependency-injection/ts/app/app.module.ts

+8-4
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
import { BrowserModule } from '@angular/platform-browser';
33
import { FormsModule } from '@angular/forms';
44
import { XHRBackend } from '@angular/http';
5-
// import { appRouterProviders } from './app.routes';
5+
/* import { routing,
6+
appRoutingProviders } from './app.routing';*/
67
import { LocationStrategy,
78
HashLocationStrategy } from '@angular/common';
89
import { NgModule } from '@angular/core';
@@ -51,15 +52,19 @@ const C_DIRECTIVES = [
5152

5253
// #docregion bootstrap
5354
@NgModule({
54-
imports: [ BrowserModule, FormsModule ],
55+
imports: [
56+
BrowserModule,
57+
FormsModule,
58+
// routing TODO: add routes
59+
],
5560
declarations: [ ...DIRECTIVES,
5661
...B_DIRECTIVES,
5762
...C_DIRECTIVES,
5863
AliceComponent,
5964
AlexComponent ],
6065
bootstrap: [ AppComponent ],
6166
providers: [
62-
// appRouterProviders, TODO: add routes
67+
// appRoutingProviders, TODO: add routes
6368
{ provide: LocationStrategy, useClass: HashLocationStrategy },
6469

6570
{ provide: XHRBackend, useClass: InMemoryBackendService }, // in-mem server
@@ -71,4 +76,3 @@ export class AppModule {
7176
}
7277
}
7378
// #enddocregion bootstraps
74-

‎public/docs/_examples/cb-dependency-injection/ts/app/app.routes.ts

-7
This file was deleted.

‎public/docs/_examples/cb-dependency-injection/ts/app/app.routing.ts

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { ModuleWithProviders } from '@angular/core';
2+
import { Routes, RouterModule } from '@angular/router';
3+
4+
const routes: Routes = [];
5+
6+
export const routing: ModuleWithProviders = RouterModule.forRoot(routes);
7+
8+
export const appRoutingProviders: any[] = [
9+
10+
];

‎public/docs/_examples/ngmodule/ts/app/app.routing.3.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { ModuleWithProviders } from '@angular/core';
12
import { Routes,
23
RouterModule } from '@angular/router';
34

@@ -7,4 +8,4 @@ export const routes: Routes = [
78
{ path: 'heroes', loadChildren: 'app/hero/hero.module.3' }
89
];
910

10-
export const routing = RouterModule.forRoot(routes);
11+
export const routing: ModuleWithProviders = RouterModule.forRoot(routes);

‎public/docs/_examples/ngmodule/ts/app/app.routing.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// #docregion
2+
import { ModuleWithProviders } from '@angular/core';
23
import { Routes,
34
RouterModule } from '@angular/router';
45

@@ -11,5 +12,5 @@ export const routes: Routes = [
1112
];
1213

1314
// #docregion forRoot
14-
export const routing = RouterModule.forRoot(routes);
15+
export const routing: ModuleWithProviders = RouterModule.forRoot(routes);
1516
// #enddocregion forRoot

‎public/docs/_examples/ngmodule/ts/app/contact/contact.routing.3.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1+
import { ModuleWithProviders } from '@angular/core';
12
import { RouterModule } from '@angular/router';
23

34
import { ContactComponent } from './contact.component.3';
45

5-
export const routing = RouterModule.forChild([
6+
export const routing: ModuleWithProviders = RouterModule.forChild([
67
{ path: 'contact', component: ContactComponent}
78
]);

‎public/docs/_examples/ngmodule/ts/app/contact/contact.routing.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
import { ModuleWithProviders } from '@angular/core';
12
import { RouterModule } from '@angular/router';
23

34
import { ContactComponent } from './contact.component';
45

56
// #docregion routing
6-
export const routing = RouterModule.forChild([
7+
export const routing: ModuleWithProviders = RouterModule.forChild([
78
{ path: 'contact', component: ContactComponent}
89
]);
910
// #enddocregion

‎public/docs/_examples/ngmodule/ts/app/crisis/crisis.routing.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { ModuleWithProviders } from '@angular/core';
12
import { Routes,
23
RouterModule } from '@angular/router';
34

@@ -10,4 +11,4 @@ const routes: Routes = [
1011
{ path: ':id', component: CrisisDetailComponent }
1112
];
1213

13-
export const routing = RouterModule.forChild(routes);
14+
export const routing: ModuleWithProviders = RouterModule.forChild(routes);

‎public/docs/_examples/ngmodule/ts/app/hero/hero.routing.3.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { ModuleWithProviders } from '@angular/core';
12
import { Routes,
23
RouterModule } from '@angular/router';
34

@@ -15,4 +16,4 @@ const routes: Routes = [
1516
}
1617
];
1718

18-
export const routing = RouterModule.forChild(routes);
19+
export const routing: ModuleWithProviders = RouterModule.forChild(routes);

‎public/docs/_examples/ngmodule/ts/app/hero/hero.routing.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { ModuleWithProviders } from '@angular/core';
12
import { Routes,
23
RouterModule } from '@angular/router';
34

@@ -15,4 +16,4 @@ const routes: Routes = [
1516
}
1617
];
1718

18-
export const routing = RouterModule.forChild(routes);
19+
export const routing: ModuleWithProviders = RouterModule.forChild(routes);

‎public/docs/_examples/router/ts/app/app.routing.1.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// #docplaster
22
// #docregion
3+
import { ModuleWithProviders } from '@angular/core';
34
// #docregion route-config
45
import { Routes, RouterModule } from '@angular/router';
56

@@ -36,6 +37,6 @@ export const appRoutingProviders: any[] = [
3637

3738
];
3839

39-
export const routing = RouterModule.forRoot(appRoutes);
40+
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);
4041
// #enddocregion route-config
4142
// #enddocregion

‎public/docs/_examples/router/ts/app/app.routing.2.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// #docplaster
22
// #docregion
3+
import { ModuleWithProviders } from '@angular/core';
34
// #docregion route-config
45
import { Routes, RouterModule } from '@angular/router';
56

@@ -17,5 +18,5 @@ export const appRoutingProviders: any[] = [
1718

1819
];
1920

20-
export const routing = RouterModule.forRoot(appRoutes);
21+
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);
2122
// #enddocregion route-config

‎public/docs/_examples/router/ts/app/app.routing.3.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// #docplaster
22
// #docregion
3+
import { ModuleWithProviders } from '@angular/core';
34
import { Routes, RouterModule } from '@angular/router';
45

56
import { CrisisListComponent } from './crisis-center/crisis-list.component';
@@ -12,4 +13,4 @@ export const appRoutingProviders: any[] = [
1213

1314
];
1415

15-
export const routing = RouterModule.forRoot(appRoutes);
16+
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);

‎public/docs/_examples/router/ts/app/app.routing.4.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// #docregion
2+
import { ModuleWithProviders } from '@angular/core';
23
import { Routes, RouterModule } from '@angular/router';
34

45
const appRoutes: Routes = [
@@ -9,4 +10,4 @@ export const appRoutingProviders: any[] = [
910

1011
];
1112

12-
export const routing = RouterModule.forRoot(appRoutes);
13+
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);

‎public/docs/_examples/router/ts/app/app.routing.5.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// #docregion
2+
import { ModuleWithProviders } from '@angular/core';
23
import { Routes, RouterModule } from '@angular/router';
34

45
import { loginRoutes,
@@ -12,4 +13,4 @@ export const appRoutingProviders: any[] = [
1213
authProviders
1314
];
1415

15-
export const routing = RouterModule.forRoot(appRoutes);
16+
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);

‎public/docs/_examples/router/ts/app/app.routing.6.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// #docregion
2+
import { ModuleWithProviders } from '@angular/core';
23
// #docregion import-router
34
import { Routes, RouterModule } from '@angular/router';
45
// #enddocregion import-router
@@ -32,7 +33,7 @@ export const appRoutingProviders: any[] = [
3233
CanDeactivateGuard
3334
];
3435

35-
export const routing = RouterModule.forRoot(appRoutes);
36+
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);
3637
// #enddocregion
3738

3839
/* A link parameters array

‎public/docs/_examples/router/ts/app/app.routing.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// #docregion
2+
import { ModuleWithProviders } from '@angular/core';
23
// #docregion import-router
34
import { Routes, RouterModule } from '@angular/router';
45
// #enddocregion import-router
@@ -32,4 +33,4 @@ export const appRoutingProviders: any[] = [
3233
CanDeactivateGuard
3334
];
3435

35-
export const routing = RouterModule.forRoot(appRoutes);
36+
export const routing: ModuleWithProviders = RouterModule.forRoot(appRoutes);

‎public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.1.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// #docregion
2+
import { ModuleWithProviders } from '@angular/core';
23
import { Routes, RouterModule } from '@angular/router';
34

45
import { CrisisDetailComponent } from './crisis-detail.component';
@@ -17,5 +18,5 @@ const crisisCenterRoutes: Routes = [
1718
}
1819
];
1920

20-
export const crisisCenterRouting = RouterModule.forChild(crisisCenterRoutes);
21+
export const crisisCenterRouting: ModuleWithProviders = RouterModule.forChild(crisisCenterRoutes);
2122
// #enddocregion routes

‎public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.2.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// #docregion
2+
import { ModuleWithProviders } from '@angular/core';
23
import { Routes, RouterModule } from '@angular/router';
34

45
import { CrisisDetailComponent } from './crisis-detail.component';
@@ -24,5 +25,5 @@ const crisisCenterRoutes: Routes = [
2425
}
2526
];
2627

27-
export const crisisCenterRouting = RouterModule.forChild(crisisCenterRoutes);
28+
export const crisisCenterRouting: ModuleWithProviders = RouterModule.forChild(crisisCenterRoutes);
2829
// #enddocregion routes

‎public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.3.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// #docplaster
22
// #docregion
3+
import { ModuleWithProviders } from '@angular/core';
34
import { Routes, RouterModule } from '@angular/router';
45

56
import { CrisisDetailComponent } from './crisis-detail.component';
@@ -38,7 +39,7 @@ const crisisCenterRoutes: Routes = [
3839
}
3940
];
4041

41-
export const crisisCenterRouting = RouterModule.forChild(crisisCenterRoutes);
42+
export const crisisCenterRouting: ModuleWithProviders = RouterModule.forChild(crisisCenterRoutes);
4243
// #enddocregion
4344

4445
/*

‎public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.4.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// #docplaster
22
// #docregion
3+
import { ModuleWithProviders } from '@angular/core';
34
import { Routes, RouterModule } from '@angular/router';
45

56
import { CrisisDetailComponent } from './crisis-detail.component';
@@ -40,7 +41,7 @@ const crisisCenterRoutes: Routes = [
4041
}
4142
];
4243

43-
export const crisisCenterRouting = RouterModule.forChild(crisisCenterRoutes);
44+
export const crisisCenterRouting: ModuleWithProviders = RouterModule.forChild(crisisCenterRoutes);
4445
// #enddocregion
4546

4647
/*

‎public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.5.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// #docplaster
22
// #docregion
3+
import { ModuleWithProviders } from '@angular/core';
34
import { Routes, RouterModule } from '@angular/router';
45

56
import { CrisisCenterComponent } from './crisis-center.component';
@@ -49,4 +50,4 @@ const crisisCenterRoutes: Routes = [
4950
}
5051
];
5152

52-
export const crisisCenterRouting = RouterModule.forChild(crisisCenterRoutes);
53+
export const crisisCenterRouting: ModuleWithProviders = RouterModule.forChild(crisisCenterRoutes);

‎public/docs/_examples/router/ts/app/crisis-center/crisis-center.routing.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// #docplaster
22
// #docregion
3+
import { ModuleWithProviders } from '@angular/core';
34
import { Routes, RouterModule } from '@angular/router';
45

56
import { CrisisCenterComponent } from './crisis-center.component';
@@ -45,6 +46,6 @@ const crisisCenterRoutes: Routes = [
4546
}
4647
];
4748

48-
export const crisisCenterRouting = RouterModule.forChild(crisisCenterRoutes);
49+
export const crisisCenterRouting: ModuleWithProviders = RouterModule.forChild(crisisCenterRoutes);
4950
// #enddocregion lazy-load-crisis-center
5051
// #enddocregion

‎public/docs/_examples/router/ts/app/heroes/heroes.routing.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
// #docregion
2+
import { ModuleWithProviders } from '@angular/core';
23
import { Routes, RouterModule } from '@angular/router';
34

45
import { HeroListComponent } from './hero-list.component';
@@ -11,5 +12,5 @@ const heroesRoutes: Routes = [
1112
// #enddocregion hero-detail-route
1213
];
1314

14-
export const heroesRouting = RouterModule.forChild(heroesRoutes);
15+
export const heroesRouting: ModuleWithProviders = RouterModule.forChild(heroesRoutes);
1516
// #enddocregion

‎public/docs/_examples/style-guide/ts/app/app.routes.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { RouterConfig } from '@angular/router';
1+
import { Routes } from '@angular/router';
22

33
import { AppComponent as S0101 } from '../01-01/app';
44
// import { AppComponent as S0207 } from '../02-07/app';
@@ -27,7 +27,7 @@ import { AppComponent as S0101 } from '../01-01/app';
2727
// import { AppComponent as S0704 } from '../07-04/app';
2828
// import { AppComponent as S0901 } from '../09-01/app';
2929

30-
export const routes: RouterConfig = [
30+
export const routes: Routes = [
3131
{ path: '', redirectTo: '/01-01', pathMatch: 'full' },
3232
{ path: '01-01', component: S0101 },
3333
// { path: '02-07', component: S0207 },
@@ -56,4 +56,3 @@ export const routes: RouterConfig = [
5656
// { path: '07-04', component: S0704 },
5757
// { path: '09-01', component: S0901 },
5858
];
59-

0 commit comments

Comments
 (0)