chore(dependencies): use angular router and our custom router impl for now

This commit is contained in:
Dan Bucholtz
2018-01-31 12:01:22 -06:00
parent fd9fb7a766
commit 3af493f4d1
17 changed files with 26 additions and 17 deletions

View File

@ -489,6 +489,14 @@
"tslib": "1.9.0"
}
},
"@angular/router": {
"version": "5.2.2",
"resolved": "https://registry.npmjs.org/@angular/router/-/router-5.2.2.tgz",
"integrity": "sha512-Yn71rFMMyIjwairBWGcUFbdiAVuTp7y5yEin8vJK3DAWgTyk0FYfhKHY3r9NofNH9M7Id53WafC02+3SseFBlA==",
"requires": {
"tslib": "1.9.0"
}
},
"@danbucholtz/ng-router": {
"version": "6.0.0-beta.1-20a6848be",
"resolved": "https://registry.npmjs.org/@danbucholtz/ng-router/-/ng-router-6.0.0-beta.1-20a6848be.tgz",

View File

@ -20,7 +20,8 @@
"@angular/http": "latest",
"@angular/platform-browser": "latest",
"@angular/platform-browser-dynamic": "latest",
"@danbucholtz/ng-router": "latest",
"@angular/router": "latest",
"@danbucholtz/ng-router": "6.0.0-beta.1-20a6848be",
"@ionic/angular": "next",
"@ionic/core": "next",
"core-js": "^2.4.1",

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { ActionSheetPageComponent } from './action-sheet-page.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { AlertPageComponent } from './alert-page.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
const routes: Routes = [
{ path: '', redirectTo: '/home', pathMatch: 'full' },

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { BadgePageComponent } from './badge-page.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { BasicInputsPageComponent } from './basic-inputs-page.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { CardPageComponent } from './card-page.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { ContentPageComponent } from './content-page.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { GroupInputsPageComponent } from './group-inputs-page.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { HomePageComponent } from './home-page.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { LoadingPageComponent } from './loading-page.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { ModalPageComponent } from './modal-page.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { NavPageComponent } from './nav.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { PopoverPageComponent } from './popover-page.component';

View File

@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@danbucholtz/ng-router';
import { Routes, RouterModule } from '@angular/router';
import { ToastPageComponent } from './toast-page.component';

View File

@ -3,10 +3,10 @@
/* tslint:disable:use-host-property-decorator */
/* tslint:disable:no-input-rename */
// export for convenience.
export { ActivatedRoute, Router, RouterLink, RouterOutlet} from '@danbucholtz/ng-router';
export { ActivatedRoute, Router, RouterLink, RouterOutlet} from '@angular/router';
import { Component, Directive, Injectable, Input } from '@angular/core';
import { NavigationExtras } from '@danbucholtz/ng-router';
import { NavigationExtras } from '@angular/router';
@Directive({
selector: '[routerLink]',