chore: remove deprecated router api use (#1098)

Author: jelbourn

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

@@ -3,9 +3,9 @@ import {BrowserModule} from '@angular/platform-browser';
 import {HttpModule} from '@angular/http';
 import {FormsModule} from '@angular/forms';
 import {DemoApp, Home} from './demo-app/demo-app';
-import {DEMO_APP_ROUTE_PROVIDER} from './demo-app/routes';
 import {RouterModule} from '@angular/router';
 import {MaterialModule} from '@angular2-material/all/all';
+import {DEMO_APP_ROUTES} from './demo-app/routes';
 import {ProgressBarDemo} from './progress-bar/progress-bar-demo';
 import {JazzDialog, DialogDemo} from './dialog/dialog-demo';
 import {RippleDemo} from './ripple/ripple-demo';
@@ -33,16 +33,14 @@ import {MenuDemo} from './menu/menu-demo';
 import {TabsDemo} from './tabs/tab-group-demo';
 
 
+
 @NgModule({
   imports: [
     BrowserModule,
     FormsModule,
     HttpModule,
     MaterialModule,
-    RouterModule,
-  ],
-  providers: [
-    DEMO_APP_ROUTE_PROVIDER,
+    RouterModule.forRoot(DEMO_APP_ROUTES)
   ],
   declarations: [
     BaselineDemo,

src/demo-app/demo-app/routes.ts

@@ -1,4 +1,4 @@
-import {provideRouter, Routes} from '@angular/router';
+import {Routes} from '@angular/router';
 import {Home} from './demo-app';
 import {ButtonDemo} from '../button/button-demo';
 import {BaselineDemo} from '../baseline/baseline-demo';
@@ -27,7 +27,7 @@ import {DialogDemo} from '../dialog/dialog-demo';
 import {TooltipDemo} from '../tooltip/tooltip-demo';
 
 
-export const routes: Routes = [
+export const DEMO_APP_ROUTES: Routes = [
   {path: '', component: Home},
   {path: 'button', component: ButtonDemo},
   {path: 'card', component: CardDemo},
@@ -55,5 +55,3 @@ export const routes: Routes = [
   {path: 'dialog', component: DialogDemo},
   {path: 'tooltip', component: TooltipDemo},
 ];
-
-export const DEMO_APP_ROUTE_PROVIDER = provideRouter(routes);

src/e2e-app/e2e-app-module.ts

@@ -6,18 +6,15 @@ import {IconE2E} from './icon/icon-e2e';
 import {ButtonE2E} from './button/button-e2e';
 import {MenuE2E} from './menu/menu-e2e';
 import {BasicTabs} from './tabs/tabs-e2e';
-import {E2E_APP_ROUTE_PROVIDER} from './e2e-app/routes';
 import {MaterialModule} from '@angular2-material/all/all';
+import {E2E_APP_ROUTES} from './e2e-app/routes';
 
 
 @NgModule({
   imports: [
     BrowserModule,
     MaterialModule,
-    RouterModule,
-  ],
-  providers: [
-    E2E_APP_ROUTE_PROVIDER,
+    RouterModule.forRoot(E2E_APP_ROUTES),
   ],
   declarations: [
     E2EApp,

src/e2e-app/e2e-app/routes.ts

@@ -1,16 +1,14 @@
-import {provideRouter, RouterConfig} from '@angular/router';
+import {Routes} from '@angular/router';
 import {Home} from './e2e-app';
 import {ButtonE2E} from '../button/button-e2e';
 import {BasicTabs} from '../tabs/tabs-e2e';
 import {IconE2E} from '../icon/icon-e2e';
 import {MenuE2E} from '../menu/menu-e2e';
 
-export const routes: RouterConfig = [
+export const E2E_APP_ROUTES: Routes = [
   {path: '', component: Home},
   {path: 'button', component: ButtonE2E},
   {path: 'menu', component: MenuE2E},
   {path: 'icon', component: IconE2E},
   {path: 'tabs', component: BasicTabs}
 ];
-
-export const E2E_APP_ROUTE_PROVIDER = provideRouter(routes);