diff --git a/scripts/docs/typescript-definition-package/index.js b/scripts/docs/typescript-definition-package/index.js index 532cfe5d3d..38d174fa75 100644 --- a/scripts/docs/typescript-definition-package/index.js +++ b/scripts/docs/typescript-definition-package/index.js @@ -38,24 +38,17 @@ module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage, // Configure file reading readFilesProcessor.basePath = path.resolve(__dirname, '../..'); readTypeScriptModules.sourceFiles = [ - 'angular2/angular2.ts', - 'angular2/router.ts' + 'angular2/angular2.ts' ]; readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../../modules')); - + createTypeDefinitionFile.typeDefinitions = [ { id: 'angular2/angular2', modules: { 'angular2/angular2': 'angular2/angular2', } - }, - { - id: 'angular2/router', - modules: { - 'angular2/router': 'angular2/router' - } - } + } ]; }) diff --git a/scripts/karma/karma.conf.js b/scripts/karma/karma.conf.js index 94eeadd9e3..9adc295991 100644 --- a/scripts/karma/karma.conf.js +++ b/scripts/karma/karma.conf.js @@ -22,6 +22,7 @@ module.exports = function(config) { 'dist/bundles/ionic.system.js', { pattern: 'node_modules/@angular/**/*.js', included: false}, { pattern: 'dist/tests/**/*.spec.js', included: false }, + // { pattern: 'dist/tests/components/nav/**/*.spec.js', included: false }, { pattern: 'src/**/*.js', included: false }, 'scripts/karma/test-main.js' ], diff --git a/scripts/karma/system.config.js b/scripts/karma/system.config.js index 61553c4223..0c485eeb42 100644 --- a/scripts/karma/system.config.js +++ b/scripts/karma/system.config.js @@ -36,10 +36,6 @@ System.config({ main: 'index.js', defaultExtension: 'js' }, - '@angular/upgrade': { - main: 'index.js', - defaultExtension: 'js' - }, '@angular/platform-browser': { main: 'index.js', defaultExtension: 'js' @@ -47,10 +43,6 @@ System.config({ '@angular/platform-browser-dynamic': { main: 'index.js', defaultExtension: 'js' - }, - '@angular/platform-server': { - main: 'index.js', - defaultExtension: 'js' } } }); diff --git a/scripts/npm/ionic.min.webpack.config.js b/scripts/npm/ionic.min.webpack.config.js index 80554a8b9e..2c85011869 100644 --- a/scripts/npm/ionic.min.webpack.config.js +++ b/scripts/npm/ionic.min.webpack.config.js @@ -17,9 +17,6 @@ module.exports = { 'angular2/common': { commonjs2: ['angular2', 'common'] }, - 'angular2/router' : { - commonjs2: ['angular2', 'router'] - }, 'angular2/http': { commonjs2: ['angular2', 'http'] }, diff --git a/src/config/directives.ts b/src/config/directives.ts index 040ce3ec0c..9d342e306f 100644 --- a/src/config/directives.ts +++ b/src/config/directives.ts @@ -43,7 +43,6 @@ import { Searchbar } from '../components/searchbar/searchbar'; import { Nav } from '../components/nav/nav'; import { NavPop } from '../components/nav/nav-pop'; import { NavPush } from '../components/nav/nav-push'; -import { NavRouter } from '../components/nav/nav-router'; import { NavbarTemplate, Navbar } from '../components/navbar/navbar'; import { ShowWhen, HideWhen } from '../components/show-hide-when/show-hide-when'; @@ -113,7 +112,6 @@ import { ShowWhen, HideWhen } from '../components/show-hide-when/show-hide-when' * - Navbar * - NavPush * - NavPop - * - NavRouter * - IdRef * - ShowWhen * - HideWhen @@ -195,7 +193,6 @@ export const IONIC_DIRECTIVES: any[] = [ NavPush, NavPop, - NavRouter, ShowWhen, HideWhen