Skip to content
This repository was archived by the owner on Dec 4, 2017. It is now read-only.

Commit 115de96

Browse files
docs(router): Removed references to deprecated router
1 parent e4c5fe3 commit 115de96

File tree

21 files changed

+226
-196
lines changed

21 files changed

+226
-196
lines changed

public/docs/_examples/cb-a1-a2-quick-reference/ts/app/app.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ <h1>{{title}}</h1>
44
<h3>Routed Movies</h3>
55
<nav>
66
<!-- #docregion router-link -->
7-
<a [routerLink]="['Movies']">Movies</a>
7+
<a [routerLink]="['/movies']">Movies</a>
88
<!-- #enddocregion router-link -->
99
</nav>
1010
<router-outlet></router-outlet>

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component } from '@angular/core';
2-
import { RouteConfig, ROUTER_DIRECTIVES, ROUTER_PROVIDERS } from '@angular/router-deprecated';
2+
import { ROUTER_DIRECTIVES } from '@angular/router';
33

44
import { MovieListComponent } from './movie-list.component';
55
import { MovieService } from './movie.service';
@@ -12,11 +12,8 @@ import { StringSafeDatePipe } from './date.pipe';
1212
styleUrls: ['app/app.component.css'],
1313
directives: [MovieListComponent, ROUTER_DIRECTIVES],
1414
pipes: [StringSafeDatePipe],
15-
providers: [MovieService, ROUTER_PROVIDERS]
15+
providers: [MovieService]
1616
})
17-
@RouteConfig([
18-
{path: '/movies', name: 'Movies', component: MovieListComponent, useAsDefault: true}
19-
])
2017
export class AppComponent {
2118

2219
angularDocsUrl = 'https://angular.io/';
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// #docregion
2+
import { provideRouter, RouterConfig } from '@angular/router';
3+
4+
import { MovieListComponent } from './movie-list.component';
5+
6+
const routes: RouterConfig = [
7+
{ path: '', redirectTo: '/movies', pathMatch: 'full' },
8+
{ path: 'movies', component: MovieListComponent }
9+
];
10+
11+
export const APP_ROUTER_PROVIDERS = [
12+
provideRouter(routes)
13+
];
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
// #docregion
2+
import { bootstrap } from '@angular/platform-browser-dynamic';
3+
import { AppComponent } from './app.component';
4+
5+
bootstrap(AppComponent);
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// #docregion
22
import { bootstrap } from '@angular/platform-browser-dynamic';
3-
43
import { AppComponent } from './app.component';
4+
import { APP_ROUTER_PROVIDERS } from './app.routes';
55

6-
bootstrap(AppComponent);
6+
bootstrap(AppComponent, [
7+
APP_ROUTER_PROVIDERS
8+
]);

public/docs/_examples/cb-a1-a2-quick-reference/ts/app/movie-list.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
// #docplaster
33
// #docregion import
44
import { Component } from '@angular/core';
5-
import { ROUTER_DIRECTIVES } from '@angular/router-deprecated';
65
// #enddocregion import
76
import { MovieService } from './movie.service';
87
import { IMovie } from './movie';
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import { provideRouter, RouterConfig } from '@angular/router';
2+
3+
const routes: RouterConfig = [];
4+
5+
export const APP_ROUTER_PROVIDERS = [
6+
provideRouter(routes)
7+
];

public/docs/_examples/cb-dependency-injection/ts/app/main.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// #docregion
2-
import { bootstrap } from '@angular/platform-browser-dynamic';
3-
import { XHRBackend } from '@angular/http';
4-
import { ROUTER_PROVIDERS } from '@angular/router-deprecated';
2+
import { bootstrap } from '@angular/platform-browser-dynamic';
3+
import { XHRBackend } from '@angular/http';
4+
import { APP_ROUTER_PROVIDERS } from './app.routes';
55
import { LocationStrategy,
66
HashLocationStrategy } from '@angular/common';
77

@@ -13,7 +13,7 @@ import { AppComponent } from './app.component';
1313

1414
// #docregion bootstrap
1515
bootstrap(AppComponent, [
16-
ROUTER_PROVIDERS,
16+
APP_ROUTER_PROVIDERS,
1717
{ provide: LocationStrategy, useClass: HashLocationStrategy },
1818

1919
{ provide: XHRBackend, useClass: InMemoryBackendService }, // in-mem server

public/docs/_examples/router/ts/app/app.routes.1.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import { HeroDetailComponent } from './heroes/hero-detail.component';
1414

1515
// #docregion
1616
// #docregion route-config
17-
export const routes: RouterConfig = [
17+
const routes: RouterConfig = [
1818
// #docregion route-defs
1919
{ path: 'crisis-center', component: CrisisCenterComponent },
2020
{ path: 'heroes', component: HeroListComponent },

public/docs/_examples/router/ts/app/app.routes.2.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { CrisisListComponent } from './crisis-list.component';
88
import { HeroListComponent } from './hero-list.component';
99

1010
// #docregion route-config
11-
export const routes: RouterConfig = [
11+
const routes: RouterConfig = [
1212
{ path: 'crisis-center', component: CrisisListComponent },
1313
{ path: 'heroes', component: HeroListComponent }
1414
];

public/docs/_examples/router/ts/app/app.routes.3.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { provideRouter } from '@angular/router';
55
import { CrisisListComponent } from './crisis-center/crisis-list.component';
66
import { HeroesRoutes } from './heroes/heroes.routes';
77

8-
export const routes = [
8+
const routes = [
99
...HeroesRoutes,
1010
{ path: 'crisis-center', component: CrisisListComponent }
1111
];

public/docs/_examples/router/ts/app/app.routes.4.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { provideRouter, RouterConfig } from '@angular/router';
44
import { CrisisCenterRoutes } from './crisis-center/crisis-center.routes';
55
import { HeroesRoutes } from './heroes/heroes.routes';
66

7-
export const routes: RouterConfig = [
7+
const routes: RouterConfig = [
88
...HeroesRoutes,
99
...CrisisCenterRoutes
1010
];

public/docs/_examples/router/ts/app/app.routes.5.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { HeroesRoutes } from './heroes/heroes.routes';
77
import { LoginRoutes,
88
AUTH_PROVIDERS } from './login.routes';
99

10-
export const routes: RouterConfig = [
10+
const routes: RouterConfig = [
1111
...HeroesRoutes,
1212
...LoginRoutes,
1313
...CrisisCenterRoutes

public/docs/_examples/router/ts/app/app.routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { LoginRoutes,
99

1010
import { CanDeactivateGuard } from './interfaces';
1111

12-
export const routes: RouterConfig = [
12+
const routes: RouterConfig = [
1313
...HeroesRoutes,
1414
...LoginRoutes,
1515
...CrisisCenterRoutes
Lines changed: 1 addition & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,9 @@
11
import { Component } from '@angular/core';
2-
import { RouteConfig, ROUTER_DIRECTIVES } from '@angular/router-deprecated';
3-
4-
import { AppComponent as S0101 } from '../01-01/app';
5-
import { AppComponent as S0207 } from '../02-07/app';
6-
import { AppComponent as S0208 } from '../02-08/app';
7-
import { AppComponent as S0301 } from '../03-01/app';
8-
import { AppComponent as S0302 } from '../03-02/app';
9-
import { AppComponent as S0303 } from '../03-03/app';
10-
import { AppComponent as S0304 } from '../03-04/app';
11-
import { AppComponent as S0305 } from '../03-05/app';
12-
import { AppComponent as S0306 } from '../03-06/app';
13-
import { AppComponent as S0410 } from '../04-10/app';
14-
import { AppComponent as S0414 } from '../04-14/app';
15-
import { AppComponent as S0502 } from '../05-02/app';
16-
import { AppComponent as S0503 } from '../05-03/app';
17-
import { AppComponent as S0504 } from '../05-04/app';
18-
import { AppComponent as S0512 } from '../05-12/app';
19-
import { AppComponent as S0513 } from '../05-13/app';
20-
import { AppComponent as S0514 } from '../05-14/app';
21-
import { AppComponent as S0515 } from '../05-15/app';
22-
import { AppComponent as S0516 } from '../05-16/app';
23-
import { AppComponent as S0517 } from '../05-17/app';
24-
import { AppComponent as S0601 } from '../06-01/app';
25-
import { AppComponent as S0603 } from '../06-03/app';
26-
import { AppComponent as S0701 } from '../07-01/app';
27-
import { AppComponent as S0703 } from '../07-03/app';
28-
import { AppComponent as S0704 } from '../07-04/app';
29-
import { AppComponent as S0901 } from '../09-01/app';
2+
import { ROUTER_DIRECTIVES } from '@angular/router';
303

314
@Component({
325
selector: 'my-app',
336
templateUrl: 'app/app.component.html',
347
directives: [ROUTER_DIRECTIVES]
358
})
36-
@RouteConfig([
37-
{ path: '/01-01', name: '01-01', component: S0101 },
38-
{ path: '/02-07', name: '02-07', component: S0207 },
39-
{ path: '/02-08', name: '02-08', component: S0208 },
40-
{ path: '/03-01', name: '03-01', component: S0301 },
41-
{ path: '/03-02', name: '03-02', component: S0302 },
42-
{ path: '/03-03', name: '03-03', component: S0303 },
43-
{ path: '/03-04', name: '03-04', component: S0304 },
44-
{ path: '/03-05', name: '03-05', component: S0305 },
45-
{ path: '/03-06', name: '03-06', component: S0306 },
46-
{ path: '/04-10', name: '04-10', component: S0410 },
47-
{ path: '/04-14', name: '04-14', component: S0414 },
48-
{ path: '/05-02', name: '05-02', component: S0502 },
49-
{ path: '/05-03', name: '05-03', component: S0503 },
50-
{ path: '/05-04', name: '05-04', component: S0504 },
51-
{ path: '/05-12', name: '05-12', component: S0512 },
52-
{ path: '/05-13', name: '05-13', component: S0513 },
53-
{ path: '/05-14', name: '05-14', component: S0514 },
54-
{ path: '/05-15', name: '05-15', component: S0515 },
55-
{ path: '/05-16', name: '05-16', component: S0516 },
56-
{ path: '/05-17', name: '05-17', component: S0517 },
57-
{ path: '/06-01', name: '06-01', component: S0601 },
58-
{ path: '/06-03', name: '06-03', component: S0603 },
59-
{ path: '/07-01', name: '07-01', component: S0701 },
60-
{ path: '/07-03', name: '07-03', component: S0703 },
61-
{ path: '/07-04', name: '07-04', component: S0704 },
62-
{ path: '/09-01', name: '09-01', component: S0901 },
63-
64-
])
659
export class AppComponent { }
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import { provideRouter, RouterConfig } from '@angular/router';
2+
3+
import { AppComponent as S0101 } from '../01-01/app';
4+
import { AppComponent as S0207 } from '../02-07/app';
5+
import { AppComponent as S0208 } from '../02-08/app';
6+
import { AppComponent as S0301 } from '../03-01/app';
7+
import { AppComponent as S0302 } from '../03-02/app';
8+
import { AppComponent as S0303 } from '../03-03/app';
9+
import { AppComponent as S0304 } from '../03-04/app';
10+
import { AppComponent as S0305 } from '../03-05/app';
11+
import { AppComponent as S0306 } from '../03-06/app';
12+
import { AppComponent as S0410 } from '../04-10/app';
13+
import { AppComponent as S0414 } from '../04-14/app';
14+
import { AppComponent as S0502 } from '../05-02/app';
15+
import { AppComponent as S0503 } from '../05-03/app';
16+
import { AppComponent as S0504 } from '../05-04/app';
17+
import { AppComponent as S0512 } from '../05-12/app';
18+
import { AppComponent as S0513 } from '../05-13/app';
19+
import { AppComponent as S0514 } from '../05-14/app';
20+
import { AppComponent as S0515 } from '../05-15/app';
21+
import { AppComponent as S0516 } from '../05-16/app';
22+
import { AppComponent as S0517 } from '../05-17/app';
23+
import { AppComponent as S0601 } from '../06-01/app';
24+
import { AppComponent as S0603 } from '../06-03/app';
25+
import { AppComponent as S0701 } from '../07-01/app';
26+
import { AppComponent as S0703 } from '../07-03/app';
27+
import { AppComponent as S0704 } from '../07-04/app';
28+
import { AppComponent as S0901 } from '../09-01/app';
29+
30+
const routes: RouterConfig = [
31+
{ path: '/01-01', component: S0101 },
32+
{ path: '/02-07', component: S0207 },
33+
{ path: '/02-08', component: S0208 },
34+
{ path: '/03-01', component: S0301 },
35+
{ path: '/03-02', component: S0302 },
36+
{ path: '/03-03', component: S0303 },
37+
{ path: '/03-04', component: S0304 },
38+
{ path: '/03-05', component: S0305 },
39+
{ path: '/03-06', component: S0306 },
40+
{ path: '/04-10', component: S0410 },
41+
{ path: '/04-14', component: S0414 },
42+
{ path: '/05-02', component: S0502 },
43+
{ path: '/05-03', component: S0503 },
44+
{ path: '/05-04', component: S0504 },
45+
{ path: '/05-12', component: S0512 },
46+
{ path: '/05-13', component: S0513 },
47+
{ path: '/05-14', component: S0514 },
48+
{ path: '/05-15', component: S0515 },
49+
{ path: '/05-16', component: S0516 },
50+
{ path: '/05-17', component: S0517 },
51+
{ path: '/06-01', component: S0601 },
52+
{ path: '/06-03', component: S0603 },
53+
{ path: '/07-01', component: S0701 },
54+
{ path: '/07-03', component: S0703 },
55+
{ path: '/07-04', component: S0704 },
56+
{ path: '/09-01', component: S0901 }
57+
];
58+
59+
export const APP_ROUTER_PROVIDERS = [
60+
provideRouter(routes)
61+
];
Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
import { bootstrap } from '@angular/platform-browser-dynamic';
2-
import { ROUTER_PROVIDERS } from '@angular/router-deprecated';
1+
import { bootstrap } from '@angular/platform-browser-dynamic';
2+
import { APP_ROUTER_PROVIDERS } from './app.routes';
33
import { XHRBackend, HTTP_PROVIDERS } from '@angular/http';
4-
import { HashLocationStrategy, LocationStrategy } from '@angular/common';
5-
import { InMemoryBackendService, SEED_DATA } from 'angular2-in-memory-web-api';
4+
import { HashLocationStrategy,
5+
LocationStrategy } from '@angular/common';
6+
import { InMemoryBackendService,
7+
SEED_DATA } from 'angular2-in-memory-web-api';
68
import 'rxjs/add/operator/map';
79

8-
import { HeroData } from './hero-data';
9-
import { AppComponent } from './app.component';
10+
import { HeroData } from './hero-data';
11+
import { AppComponent } from './app.component';
1012

1113
bootstrap(AppComponent, [
12-
ROUTER_PROVIDERS,
14+
APP_ROUTER_PROVIDERS,
1315
HTTP_PROVIDERS,
1416
{ provide: LocationStrategy, useClass: HashLocationStrategy },
1517
{ provide: XHRBackend, useClass: InMemoryBackendService },
1618
{ provide: SEED_DATA, useClass: HeroData }
17-
]);
19+
]);

public/docs/_examples/toh-5/ts/app/app.routes.1.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { HeroesComponent } from './heroes.component';
66
import { HeroDetailComponent } from './hero-detail.component';
77
// #enddocregion hero-detail-import
88

9-
export const routes: RouterConfig = [
9+
const routes: RouterConfig = [
1010
// #docregion redirect-route
1111
{
1212
path: '',

public/docs/_examples/toh-5/ts/app/app.routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { HeroesComponent } from './heroes.component';
77
import { HeroDetailComponent } from './hero-detail.component';
88
// #enddocregion hero-detail-import
99

10-
export const routes: RouterConfig = [
10+
const routes: RouterConfig = [
1111
{
1212
path: '',
1313
redirectTo: '/dashboard',

public/docs/_examples/toh-6/ts/app/app.routes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { DashboardComponent } from './dashboard.component';
55
import { HeroesComponent } from './heroes.component';
66
import { HeroDetailComponent } from './hero-detail.component';
77

8-
export const routes: RouterConfig = [
8+
const routes: RouterConfig = [
99
{
1010
path: '',
1111
redirectTo: '/dashboard',

0 commit comments

Comments
 (0)