From 5f254f285fbceddc8271b01aa00c8e1e826abfc3 Mon Sep 17 00:00:00 2001 From: Tim Lancina Date: Fri, 12 Feb 2016 11:37:39 -0600 Subject: [PATCH] chore(e2e): make typescript and e2e friends --- ionic/components/action-sheet/test/basic/index.ts | 2 +- ionic/components/alert/test/basic/index.ts | 2 +- ionic/components/app/test/animations/index.ts | 2 +- ionic/components/app/test/storage/index.ts | 2 +- ionic/components/app/test/typography/index.ts | 2 +- ionic/components/badge/test/basic/index.ts | 2 +- ionic/components/blur/test/basic/index.ts | 2 +- ionic/components/button/test/basic/index.ts | 2 +- ionic/components/button/test/block/index.ts | 2 +- ionic/components/button/test/clear/index.ts | 2 +- ionic/components/button/test/fab/index.ts | 2 +- ionic/components/button/test/full/index.ts | 2 +- ionic/components/button/test/icons/index.ts | 2 +- ionic/components/button/test/outline/index.ts | 2 +- ionic/components/button/test/round/index.ts | 2 +- ionic/components/button/test/sizes/index.ts | 2 +- ionic/components/card/test/advanced/index.ts | 2 +- ionic/components/card/test/basic/index.ts | 2 +- ionic/components/card/test/images/index.ts | 2 +- ionic/components/card/test/list/index.ts | 2 +- ionic/components/card/test/map/index.ts | 2 +- ionic/components/card/test/social/index.ts | 2 +- ionic/components/checkbox/test/basic/index.ts | 2 +- ionic/components/chip/test/basic/index.ts | 2 +- ionic/components/chip/test/delete/index.ts | 2 +- ionic/components/chip/test/icon/index.ts | 2 +- ionic/components/chip/test/image/index.ts | 2 +- ionic/components/grid/test/alignment/index.ts | 2 +- ionic/components/grid/test/basic/index.ts | 2 +- ionic/components/grid/test/full/index.ts | 2 +- ionic/components/icon/test/basic/index.ts | 2 +- ionic/components/input/test/fixed-inline-labels/index.ts | 2 +- ionic/components/input/test/floating-labels/index.ts | 2 +- ionic/components/input/test/form-inputs/index.ts | 2 +- ionic/components/input/test/inline-labels/index.ts | 2 +- ionic/components/input/test/input-focus/index.ts | 2 +- ionic/components/input/test/inset-inputs/index.ts | 2 +- ionic/components/input/test/placeholder-labels/index.ts | 2 +- ionic/components/input/test/stacked-labels/index.ts | 2 +- ionic/components/item/test/buttons/index.ts | 2 +- ionic/components/item/test/dividers/index.ts | 2 +- ionic/components/item/test/groups/index.ts | 2 +- ionic/components/item/test/images/index.ts | 2 +- ionic/components/item/test/media/index.ts | 2 +- ionic/components/item/test/sliding/index.ts | 2 +- ionic/components/item/test/text/index.ts | 2 +- ionic/components/list/test/headers/index.ts | 2 +- ionic/components/list/test/infinite/index.ts | 2 +- ionic/components/list/test/inset/index.ts | 2 +- ionic/components/list/test/no-lines/index.ts | 2 +- ionic/components/list/test/repeat-headers/index.ts | 2 +- ionic/components/list/test/sticky/index.ts | 2 +- ionic/components/menu/test/basic/index.ts | 2 +- ionic/components/menu/test/disable-swipe/index.ts | 2 +- ionic/components/menu/test/multiple/index.ts | 2 +- ionic/components/menu/test/overlay/index.ts | 2 +- ionic/components/menu/test/push/index.ts | 2 +- ionic/components/menu/test/reveal/index.ts | 2 +- ionic/components/modal/test/basic/index.ts | 4 ++-- ionic/components/nav/test/basic/index.ts | 6 +++--- ionic/components/nav/test/insert-views/index.ts | 2 +- ionic/components/nav/test/nested/index.ts | 4 ++-- ionic/components/nav/test/routing/index.ts | 2 +- ionic/components/radio/test/basic/index.ts | 2 +- ionic/components/scroll/test/basic/index.ts | 2 +- ionic/components/scroll/test/pull-to-refresh/index.ts | 2 +- ionic/components/searchbar/test/floating/index.ts | 2 +- ionic/components/searchbar/test/nav/index.ts | 2 +- ionic/components/searchbar/test/toolbar/index.ts | 2 +- ionic/components/segment/test/basic/index.ts | 2 +- ionic/components/segment/test/nav/index.ts | 2 +- ionic/components/segment/test/swipe/index.ts | 3 +-- ionic/components/select/test/multiple-value/index.ts | 2 +- ionic/components/select/test/single-value/index.ts | 2 +- ionic/components/show-hide-when/test/basic/index.ts | 2 +- ionic/components/slides/test/basic/index.ts | 2 +- ionic/components/slides/test/intro/index.ts | 2 +- ionic/components/slides/test/loop/index.ts | 2 +- ionic/components/slides/test/scroll/index.ts | 2 +- ionic/components/tabs/test/advanced/index.ts | 2 +- ionic/components/tabs/test/badges/index.ts | 2 +- ionic/components/tabs/test/basic/index.ts | 2 +- ionic/components/tabs/test/ghost/index.ts | 2 +- ionic/components/tabs/test/tab-bar-scenarios/index.ts | 2 +- ionic/components/toggle/test/basic/index.ts | 2 +- ionic/components/toolbar/test/colors/index.ts | 2 +- ionic/components/toolbar/test/scenarios/index.ts | 2 +- scripts/e2e/e2e.template.html | 9 +++++++++ tsconfig.json | 3 --- 89 files changed, 100 insertions(+), 95 deletions(-) diff --git a/ionic/components/action-sheet/test/basic/index.ts b/ionic/components/action-sheet/test/basic/index.ts index 0c86f08c4b..134d6258f1 100644 --- a/ionic/components/action-sheet/test/basic/index.ts +++ b/ionic/components/action-sheet/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App, Page, ActionSheet, NavController} from 'ionic/ionic'; +import {App, Page, ActionSheet, NavController} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/alert/test/basic/index.ts b/ionic/components/alert/test/basic/index.ts index cef1da39b3..910ba4243b 100644 --- a/ionic/components/alert/test/basic/index.ts +++ b/ionic/components/alert/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App, Page, Alert, NavController} from 'ionic/ionic'; +import {App, Page, Alert, NavController} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/app/test/animations/index.ts b/ionic/components/app/test/animations/index.ts index 0cd0ff07ff..28e529ad7b 100644 --- a/ionic/components/app/test/animations/index.ts +++ b/ionic/components/app/test/animations/index.ts @@ -1,4 +1,4 @@ -import {App, Page, Animation} from 'ionic/ionic'; +import {App, Page, Animation} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/app/test/storage/index.ts b/ionic/components/app/test/storage/index.ts index 0c60345a83..ad60d39f86 100644 --- a/ionic/components/app/test/storage/index.ts +++ b/ionic/components/app/test/storage/index.ts @@ -1,7 +1,7 @@ import {Component} from 'angular2/core'; import {Control, ControlGroup} from 'angular2/common'; -import {App, Storage, LocalStorage, SqlStorage} from 'ionic/ionic'; +import {App, Storage, LocalStorage, SqlStorage} from '../../../../../ionic/ionic'; @App({ templateUrl: 'main.html' diff --git a/ionic/components/app/test/typography/index.ts b/ionic/components/app/test/typography/index.ts index ff6f299c59..c77689fd38 100644 --- a/ionic/components/app/test/typography/index.ts +++ b/ionic/components/app/test/typography/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from 'ionic/ionic'; +import {App, IonicApp} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/badge/test/basic/index.ts b/ionic/components/badge/test/basic/index.ts index 2dd534c468..b4a0c315f8 100644 --- a/ionic/components/badge/test/basic/index.ts +++ b/ionic/components/badge/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from 'ionic/ionic'; +import {App, IonicApp} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/blur/test/basic/index.ts b/ionic/components/blur/test/basic/index.ts index ac2d757460..bc32179fee 100644 --- a/ionic/components/blur/test/basic/index.ts +++ b/ionic/components/blur/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/button/test/basic/index.ts b/ionic/components/button/test/basic/index.ts index 01b30a6221..0619a93f8d 100644 --- a/ionic/components/button/test/basic/index.ts +++ b/ionic/components/button/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from 'ionic/ionic'; +import {App, IonicApp} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/button/test/block/index.ts b/ionic/components/button/test/block/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/button/test/block/index.ts +++ b/ionic/components/button/test/block/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/button/test/clear/index.ts b/ionic/components/button/test/clear/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/button/test/clear/index.ts +++ b/ionic/components/button/test/clear/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/button/test/fab/index.ts b/ionic/components/button/test/fab/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/button/test/fab/index.ts +++ b/ionic/components/button/test/fab/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/button/test/full/index.ts b/ionic/components/button/test/full/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/button/test/full/index.ts +++ b/ionic/components/button/test/full/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/button/test/icons/index.ts b/ionic/components/button/test/icons/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/button/test/icons/index.ts +++ b/ionic/components/button/test/icons/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/button/test/outline/index.ts b/ionic/components/button/test/outline/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/button/test/outline/index.ts +++ b/ionic/components/button/test/outline/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/button/test/round/index.ts b/ionic/components/button/test/round/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/button/test/round/index.ts +++ b/ionic/components/button/test/round/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/button/test/sizes/index.ts b/ionic/components/button/test/sizes/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/button/test/sizes/index.ts +++ b/ionic/components/button/test/sizes/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/card/test/advanced/index.ts b/ionic/components/card/test/advanced/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/card/test/advanced/index.ts +++ b/ionic/components/card/test/advanced/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/card/test/basic/index.ts b/ionic/components/card/test/basic/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/card/test/basic/index.ts +++ b/ionic/components/card/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/card/test/images/index.ts b/ionic/components/card/test/images/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/card/test/images/index.ts +++ b/ionic/components/card/test/images/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/card/test/list/index.ts b/ionic/components/card/test/list/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/card/test/list/index.ts +++ b/ionic/components/card/test/list/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/card/test/map/index.ts b/ionic/components/card/test/map/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/card/test/map/index.ts +++ b/ionic/components/card/test/map/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/card/test/social/index.ts b/ionic/components/card/test/social/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/card/test/social/index.ts +++ b/ionic/components/card/test/social/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/checkbox/test/basic/index.ts b/ionic/components/checkbox/test/basic/index.ts index f25c1e455d..cbdcaac68f 100644 --- a/ionic/components/checkbox/test/basic/index.ts +++ b/ionic/components/checkbox/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; import { Control, ControlGroup, diff --git a/ionic/components/chip/test/basic/index.ts b/ionic/components/chip/test/basic/index.ts index 2dd534c468..b4a0c315f8 100644 --- a/ionic/components/chip/test/basic/index.ts +++ b/ionic/components/chip/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from 'ionic/ionic'; +import {App, IonicApp} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/chip/test/delete/index.ts b/ionic/components/chip/test/delete/index.ts index e86f128fb0..c35cc11fbc 100644 --- a/ionic/components/chip/test/delete/index.ts +++ b/ionic/components/chip/test/delete/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from 'ionic/ionic'; +import {App, IonicApp} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/chip/test/icon/index.ts b/ionic/components/chip/test/icon/index.ts index 2dd534c468..b4a0c315f8 100644 --- a/ionic/components/chip/test/icon/index.ts +++ b/ionic/components/chip/test/icon/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from 'ionic/ionic'; +import {App, IonicApp} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/chip/test/image/index.ts b/ionic/components/chip/test/image/index.ts index 2dd534c468..b4a0c315f8 100644 --- a/ionic/components/chip/test/image/index.ts +++ b/ionic/components/chip/test/image/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from 'ionic/ionic'; +import {App, IonicApp} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/grid/test/alignment/index.ts b/ionic/components/grid/test/alignment/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/grid/test/alignment/index.ts +++ b/ionic/components/grid/test/alignment/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/grid/test/basic/index.ts b/ionic/components/grid/test/basic/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/grid/test/basic/index.ts +++ b/ionic/components/grid/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/grid/test/full/index.ts b/ionic/components/grid/test/full/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/grid/test/full/index.ts +++ b/ionic/components/grid/test/full/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/icon/test/basic/index.ts b/ionic/components/icon/test/basic/index.ts index 13798b4acc..e390fb7f11 100644 --- a/ionic/components/icon/test/basic/index.ts +++ b/ionic/components/icon/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/input/test/fixed-inline-labels/index.ts b/ionic/components/input/test/fixed-inline-labels/index.ts index 82ea1a071b..bb337d3a10 100644 --- a/ionic/components/input/test/fixed-inline-labels/index.ts +++ b/ionic/components/input/test/fixed-inline-labels/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/input/test/floating-labels/index.ts b/ionic/components/input/test/floating-labels/index.ts index a5b58ac16d..35e138caf5 100644 --- a/ionic/components/input/test/floating-labels/index.ts +++ b/ionic/components/input/test/floating-labels/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/input/test/form-inputs/index.ts b/ionic/components/input/test/form-inputs/index.ts index 0a4f0fd1e2..1c48bec6eb 100644 --- a/ionic/components/input/test/form-inputs/index.ts +++ b/ionic/components/input/test/form-inputs/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; import {FormBuilder, Validators} from 'angular2/common'; diff --git a/ionic/components/input/test/inline-labels/index.ts b/ionic/components/input/test/inline-labels/index.ts index a9bdbc8a78..7c1848b72b 100644 --- a/ionic/components/input/test/inline-labels/index.ts +++ b/ionic/components/input/test/inline-labels/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/input/test/input-focus/index.ts b/ionic/components/input/test/input-focus/index.ts index b8a6ae0b86..f6216ae6b9 100644 --- a/ionic/components/input/test/input-focus/index.ts +++ b/ionic/components/input/test/input-focus/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/input/test/inset-inputs/index.ts b/ionic/components/input/test/inset-inputs/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/input/test/inset-inputs/index.ts +++ b/ionic/components/input/test/inset-inputs/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/input/test/placeholder-labels/index.ts b/ionic/components/input/test/placeholder-labels/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/input/test/placeholder-labels/index.ts +++ b/ionic/components/input/test/placeholder-labels/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/input/test/stacked-labels/index.ts b/ionic/components/input/test/stacked-labels/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/input/test/stacked-labels/index.ts +++ b/ionic/components/input/test/stacked-labels/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/item/test/buttons/index.ts b/ionic/components/item/test/buttons/index.ts index 2afa53ee3b..1759142cf0 100644 --- a/ionic/components/item/test/buttons/index.ts +++ b/ionic/components/item/test/buttons/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/item/test/dividers/index.ts b/ionic/components/item/test/dividers/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/item/test/dividers/index.ts +++ b/ionic/components/item/test/dividers/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/item/test/groups/index.ts b/ionic/components/item/test/groups/index.ts index 806adf048d..40545aad83 100644 --- a/ionic/components/item/test/groups/index.ts +++ b/ionic/components/item/test/groups/index.ts @@ -1,4 +1,4 @@ -import {App, Page, NavController, NavParams} from 'ionic/ionic'; +import {App, Page, NavController, NavParams} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/item/test/images/index.ts b/ionic/components/item/test/images/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/item/test/images/index.ts +++ b/ionic/components/item/test/images/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/item/test/media/index.ts b/ionic/components/item/test/media/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/item/test/media/index.ts +++ b/ionic/components/item/test/media/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/item/test/sliding/index.ts b/ionic/components/item/test/sliding/index.ts index 6b8723c9b7..196760ef88 100644 --- a/ionic/components/item/test/sliding/index.ts +++ b/ionic/components/item/test/sliding/index.ts @@ -1,4 +1,4 @@ -import {App, Page, IonicApp, Alert, NavController} from 'ionic/ionic'; +import {App, Page, IonicApp, Alert, NavController} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/item/test/text/index.ts b/ionic/components/item/test/text/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/item/test/text/index.ts +++ b/ionic/components/item/test/text/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/list/test/headers/index.ts b/ionic/components/list/test/headers/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/list/test/headers/index.ts +++ b/ionic/components/list/test/headers/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/list/test/infinite/index.ts b/ionic/components/list/test/infinite/index.ts index ffb2f827d0..bbfbeb77cf 100644 --- a/ionic/components/list/test/infinite/index.ts +++ b/ionic/components/list/test/infinite/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/list/test/inset/index.ts b/ionic/components/list/test/inset/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/list/test/inset/index.ts +++ b/ionic/components/list/test/inset/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/list/test/no-lines/index.ts b/ionic/components/list/test/no-lines/index.ts index 43aed36502..6a30176f2a 100644 --- a/ionic/components/list/test/no-lines/index.ts +++ b/ionic/components/list/test/no-lines/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/list/test/repeat-headers/index.ts b/ionic/components/list/test/repeat-headers/index.ts index 0aea852e02..55b159d8ab 100644 --- a/ionic/components/list/test/repeat-headers/index.ts +++ b/ionic/components/list/test/repeat-headers/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/list/test/sticky/index.ts b/ionic/components/list/test/sticky/index.ts index 0fe2844026..e753b62ae5 100644 --- a/ionic/components/list/test/sticky/index.ts +++ b/ionic/components/list/test/sticky/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/menu/test/basic/index.ts b/ionic/components/menu/test/basic/index.ts index fa8d5e3f4a..bbe12a8b56 100644 --- a/ionic/components/menu/test/basic/index.ts +++ b/ionic/components/menu/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp, MenuController, Page, NavController, Alert} from 'ionic/ionic'; +import {App, IonicApp, MenuController, Page, NavController, Alert} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/menu/test/disable-swipe/index.ts b/ionic/components/menu/test/disable-swipe/index.ts index cd306e0502..f082752d49 100644 --- a/ionic/components/menu/test/disable-swipe/index.ts +++ b/ionic/components/menu/test/disable-swipe/index.ts @@ -1,4 +1,4 @@ -import {App, Page, NavController, MenuController} from 'ionic/ionic'; +import {App, Page, NavController, MenuController} from '../../../../../ionic/ionic'; @Page({ templateUrl: 'page1.html' diff --git a/ionic/components/menu/test/multiple/index.ts b/ionic/components/menu/test/multiple/index.ts index 46e9d35e60..5e212df941 100644 --- a/ionic/components/menu/test/multiple/index.ts +++ b/ionic/components/menu/test/multiple/index.ts @@ -1,4 +1,4 @@ -import {App, Page, MenuController} from 'ionic/ionic'; +import {App, Page, MenuController} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/menu/test/overlay/index.ts b/ionic/components/menu/test/overlay/index.ts index 849c7cbed5..02f1dee577 100644 --- a/ionic/components/menu/test/overlay/index.ts +++ b/ionic/components/menu/test/overlay/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp, Page} from 'ionic/ionic'; +import {App, IonicApp, Page} from '../../../../../ionic/ionic'; @Page({templateUrl: 'page1.html'}) diff --git a/ionic/components/menu/test/push/index.ts b/ionic/components/menu/test/push/index.ts index 849c7cbed5..02f1dee577 100644 --- a/ionic/components/menu/test/push/index.ts +++ b/ionic/components/menu/test/push/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp, Page} from 'ionic/ionic'; +import {App, IonicApp, Page} from '../../../../../ionic/ionic'; @Page({templateUrl: 'page1.html'}) diff --git a/ionic/components/menu/test/reveal/index.ts b/ionic/components/menu/test/reveal/index.ts index 849c7cbed5..02f1dee577 100644 --- a/ionic/components/menu/test/reveal/index.ts +++ b/ionic/components/menu/test/reveal/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp, Page} from 'ionic/ionic'; +import {App, IonicApp, Page} from '../../../../../ionic/ionic'; @Page({templateUrl: 'page1.html'}) diff --git a/ionic/components/modal/test/basic/index.ts b/ionic/components/modal/test/basic/index.ts index 6fb0c07fb2..713e88f314 100644 --- a/ionic/components/modal/test/basic/index.ts +++ b/ionic/components/modal/test/basic/index.ts @@ -1,5 +1,5 @@ -import {App, Page, Config, Platform} from 'ionic/ionic'; -import {Modal, ActionSheet, NavController, NavParams, Transition, TransitionOptions, ViewController} from 'ionic/ionic'; +import {App, Page, Config, Platform} from '../../../../../ionic/ionic'; +import {Modal, ActionSheet, NavController, NavParams, Transition, TransitionOptions, ViewController} from '../../../../../ionic/ionic';; @Page({ diff --git a/ionic/components/nav/test/basic/index.ts b/ionic/components/nav/test/basic/index.ts index f75bb8a2bb..cad35e3432 100644 --- a/ionic/components/nav/test/basic/index.ts +++ b/ionic/components/nav/test/basic/index.ts @@ -1,7 +1,7 @@ import {Component, Type} from 'angular2/core'; -import {App, NavController, Alert} from 'ionic/ionic'; -import {Page, Config, IonicApp} from 'ionic/ionic'; -import {NavParams, ViewController, IONIC_DIRECTIVES} from 'ionic/ionic'; +import {App, NavController, Alert} from '../../../../../ionic/ionic'; +import {Page, Config, IonicApp} from '../../../../../ionic/ionic'; +import {NavParams, ViewController, IONIC_DIRECTIVES} from '../../../../../ionic/ionic';; @Component({ diff --git a/ionic/components/nav/test/insert-views/index.ts b/ionic/components/nav/test/insert-views/index.ts index f27dc027e9..168e348d2a 100644 --- a/ionic/components/nav/test/insert-views/index.ts +++ b/ionic/components/nav/test/insert-views/index.ts @@ -1,4 +1,4 @@ -import {App, Page, NavController} from 'ionic/ionic'; +import {App, Page, NavController} from '../../../../../ionic/ionic'; diff --git a/ionic/components/nav/test/nested/index.ts b/ionic/components/nav/test/nested/index.ts index 68f6f4ff45..3339ea7e3a 100644 --- a/ionic/components/nav/test/nested/index.ts +++ b/ionic/components/nav/test/nested/index.ts @@ -1,5 +1,5 @@ -import {App, NavParams, NavController, ViewController, MenuController} from 'ionic/ionic'; -import {Page, Config, IonicApp} from 'ionic/ionic'; +import {App, NavParams, NavController, ViewController, MenuController} from '../../../../../ionic/ionic'; +import {Page, Config, IonicApp} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/nav/test/routing/index.ts b/ionic/components/nav/test/routing/index.ts index 2ed275e313..45c0b14278 100644 --- a/ionic/components/nav/test/routing/index.ts +++ b/ionic/components/nav/test/routing/index.ts @@ -1,6 +1,6 @@ import {RouteConfig, Location} from 'angular2/router'; -import {App, Page, NavParams, ViewController} from 'ionic/ionic'; +import {App, Page, NavParams, ViewController} from '../../../../../ionic/ionic'; @Page({templateUrl: 'view1.html'}) diff --git a/ionic/components/radio/test/basic/index.ts b/ionic/components/radio/test/basic/index.ts index 17887cecd5..f17be3e155 100644 --- a/ionic/components/radio/test/basic/index.ts +++ b/ionic/components/radio/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; import { Control, ControlGroup, diff --git a/ionic/components/scroll/test/basic/index.ts b/ionic/components/scroll/test/basic/index.ts index ff21e93aca..5a02c325b6 100644 --- a/ionic/components/scroll/test/basic/index.ts +++ b/ionic/components/scroll/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/scroll/test/pull-to-refresh/index.ts b/ionic/components/scroll/test/pull-to-refresh/index.ts index f0958056d7..f27fb00f95 100644 --- a/ionic/components/scroll/test/pull-to-refresh/index.ts +++ b/ionic/components/scroll/test/pull-to-refresh/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/searchbar/test/floating/index.ts b/ionic/components/searchbar/test/floating/index.ts index 5713049de8..0844e09d10 100644 --- a/ionic/components/searchbar/test/floating/index.ts +++ b/ionic/components/searchbar/test/floating/index.ts @@ -1,6 +1,6 @@ import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common'; -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ templateUrl: 'main.html', diff --git a/ionic/components/searchbar/test/nav/index.ts b/ionic/components/searchbar/test/nav/index.ts index 44046163c4..10f1a73c9c 100644 --- a/ionic/components/searchbar/test/nav/index.ts +++ b/ionic/components/searchbar/test/nav/index.ts @@ -1,4 +1,4 @@ -import {App, Page, NavController} from 'ionic/ionic'; +import {App, Page, NavController} from '../../../../../ionic/ionic'; @Page({ templateUrl: 'first.html' diff --git a/ionic/components/searchbar/test/toolbar/index.ts b/ionic/components/searchbar/test/toolbar/index.ts index 810b63c5bc..119aac7c69 100644 --- a/ionic/components/searchbar/test/toolbar/index.ts +++ b/ionic/components/searchbar/test/toolbar/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ templateUrl: 'main.html' diff --git a/ionic/components/segment/test/basic/index.ts b/ionic/components/segment/test/basic/index.ts index 3b77594c40..a431191455 100644 --- a/ionic/components/segment/test/basic/index.ts +++ b/ionic/components/segment/test/basic/index.ts @@ -1,6 +1,6 @@ import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common'; -import {App, IonicApp} from 'ionic/ionic'; +import {App, IonicApp} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/segment/test/nav/index.ts b/ionic/components/segment/test/nav/index.ts index 7bdae186f2..e8b40ba636 100644 --- a/ionic/components/segment/test/nav/index.ts +++ b/ionic/components/segment/test/nav/index.ts @@ -1,5 +1,5 @@ import {Validators, Control, ControlGroup} from 'angular2/common'; -import {App, Page, NavController} from 'ionic/ionic'; +import {App, Page, NavController} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/segment/test/swipe/index.ts b/ionic/components/segment/test/swipe/index.ts index 1ffab619b0..158b6ec662 100644 --- a/ionic/components/segment/test/swipe/index.ts +++ b/ionic/components/segment/test/swipe/index.ts @@ -1,7 +1,6 @@ import {Validators, Control, ControlGroup} from 'angular2/common'; import {Http} from 'angular2/http'; -import {App, Page, IonicApp, NavController} from 'ionic/ionic'; -import _ from 'lodash'; +import {App, Page, IonicApp, NavController} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/select/test/multiple-value/index.ts b/ionic/components/select/test/multiple-value/index.ts index 70d2f5caae..e2fdaa7a53 100644 --- a/ionic/components/select/test/multiple-value/index.ts +++ b/ionic/components/select/test/multiple-value/index.ts @@ -1,4 +1,4 @@ -import {App, Page} from 'ionic/ionic'; +import {App, Page} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/select/test/single-value/index.ts b/ionic/components/select/test/single-value/index.ts index 3459f210f1..2b872328d5 100644 --- a/ionic/components/select/test/single-value/index.ts +++ b/ionic/components/select/test/single-value/index.ts @@ -1,4 +1,4 @@ -import {App, Page} from 'ionic/ionic'; +import {App, Page} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/show-hide-when/test/basic/index.ts b/ionic/components/show-hide-when/test/basic/index.ts index 611ee2dc2a..43da3f5c87 100644 --- a/ionic/components/show-hide-when/test/basic/index.ts +++ b/ionic/components/show-hide-when/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; import { Control, ControlGroup, diff --git a/ionic/components/slides/test/basic/index.ts b/ionic/components/slides/test/basic/index.ts index a2181da18e..981f2428a2 100644 --- a/ionic/components/slides/test/basic/index.ts +++ b/ionic/components/slides/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from 'ionic/ionic'; +import {App, IonicApp} from '../../../../../ionic/ionic'; import {Http} from 'angular2/http'; @App({ diff --git a/ionic/components/slides/test/intro/index.ts b/ionic/components/slides/test/intro/index.ts index f3795a8ce5..277825b69e 100644 --- a/ionic/components/slides/test/intro/index.ts +++ b/ionic/components/slides/test/intro/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/slides/test/loop/index.ts b/ionic/components/slides/test/loop/index.ts index ecee3ee043..e6d3d71cc3 100644 --- a/ionic/components/slides/test/loop/index.ts +++ b/ionic/components/slides/test/loop/index.ts @@ -1,4 +1,4 @@ -import {App, IonicApp} from 'ionic/ionic'; +import {App, IonicApp} from '../../../../../ionic/ionic'; @App({ templateUrl: 'main.html' diff --git a/ionic/components/slides/test/scroll/index.ts b/ionic/components/slides/test/scroll/index.ts index edfdcec9b6..1f71954369 100644 --- a/ionic/components/slides/test/scroll/index.ts +++ b/ionic/components/slides/test/scroll/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ templateUrl: 'main.html', diff --git a/ionic/components/tabs/test/advanced/index.ts b/ionic/components/tabs/test/advanced/index.ts index f8786ce6fd..725fe6bff7 100644 --- a/ionic/components/tabs/test/advanced/index.ts +++ b/ionic/components/tabs/test/advanced/index.ts @@ -1,7 +1,7 @@ import {ViewChild} from 'angular2/core'; import {RouteConfig, Location} from 'angular2/router'; -import {App, Page, NavController, Modal, ViewController, Tabs} from 'ionic/ionic'; +import {App, Page, NavController, Modal, ViewController, Tabs} from '../../../../../ionic/ionic'; @Page({ diff --git a/ionic/components/tabs/test/badges/index.ts b/ionic/components/tabs/test/badges/index.ts index cdb0c6642f..afc358b1fa 100644 --- a/ionic/components/tabs/test/badges/index.ts +++ b/ionic/components/tabs/test/badges/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/tabs/test/basic/index.ts b/ionic/components/tabs/test/basic/index.ts index 9131f30381..b859cb557b 100644 --- a/ionic/components/tabs/test/basic/index.ts +++ b/ionic/components/tabs/test/basic/index.ts @@ -1,4 +1,4 @@ - import {App, Page, NavController, Alert, Modal, ViewController} from 'ionic/ionic'; + import {App, Page, NavController, Alert, Modal, ViewController} from '../../../../../ionic/ionic'; // // Modal diff --git a/ionic/components/tabs/test/ghost/index.ts b/ionic/components/tabs/test/ghost/index.ts index dabcba3148..1de90c7070 100644 --- a/ionic/components/tabs/test/ghost/index.ts +++ b/ionic/components/tabs/test/ghost/index.ts @@ -1,4 +1,4 @@ - import {App, Page, NavController, Tab} from 'ionic/ionic'; + import {App, Page, NavController, Tab} from '../../../../../ionic/ionic'; import {ContentChild, QueryList, ViewChildren} from 'angular2/core'; diff --git a/ionic/components/tabs/test/tab-bar-scenarios/index.ts b/ionic/components/tabs/test/tab-bar-scenarios/index.ts index 45d9e0103e..67b9bf20ba 100644 --- a/ionic/components/tabs/test/tab-bar-scenarios/index.ts +++ b/ionic/components/tabs/test/tab-bar-scenarios/index.ts @@ -1,4 +1,4 @@ -import {App, Page} from 'ionic/ionic'; +import {App, Page} from '../../../../../ionic/ionic'; @Page({template:'hi'}) diff --git a/ionic/components/toggle/test/basic/index.ts b/ionic/components/toggle/test/basic/index.ts index 1d8c6a59c3..2e4e3c4691 100644 --- a/ionic/components/toggle/test/basic/index.ts +++ b/ionic/components/toggle/test/basic/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; import { Control, ControlGroup, diff --git a/ionic/components/toolbar/test/colors/index.ts b/ionic/components/toolbar/test/colors/index.ts index 590a6f9d35..bc269a63d8 100644 --- a/ionic/components/toolbar/test/colors/index.ts +++ b/ionic/components/toolbar/test/colors/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/ionic/components/toolbar/test/scenarios/index.ts b/ionic/components/toolbar/test/scenarios/index.ts index 590a6f9d35..bc269a63d8 100644 --- a/ionic/components/toolbar/test/scenarios/index.ts +++ b/ionic/components/toolbar/test/scenarios/index.ts @@ -1,4 +1,4 @@ -import {App} from 'ionic/ionic'; +import {App} from '../../../../../ionic/ionic'; @App({ diff --git a/scripts/e2e/e2e.template.html b/scripts/e2e/e2e.template.html index 3be6f6f9d0..08b91bb9f4 100644 --- a/scripts/e2e/e2e.template.html +++ b/scripts/e2e/e2e.template.html @@ -36,6 +36,14 @@ + @@ -101,6 +109,7 @@ document.body.classList.remove('rtl'); } + System.import('index.js').then(function(m) {}, console.error.bind(console)); diff --git a/tsconfig.json b/tsconfig.json index 308d102a5d..fc882ee1ca 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,9 +7,6 @@ "declaration": true, "outDir": "dist" }, - "files": [ - "ionic/ionic.ts" - ], "compileOnSave" : false, "buildOnSave": false, "exclude": [