chore(e2e): make typescript and e2e friends

This commit is contained in:
Tim Lancina
2016-02-12 11:37:39 -06:00
parent 2dacac2186
commit 5f254f285f
89 changed files with 100 additions and 95 deletions

View File

@ -1,4 +1,4 @@
import {App, Page, ActionSheet, NavController} from 'ionic/ionic'; import {App, Page, ActionSheet, NavController} from '../../../../../ionic/ionic';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App, Page, Alert, NavController} from 'ionic/ionic'; import {App, Page, Alert, NavController} from '../../../../../ionic/ionic';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App, Page, Animation} from 'ionic/ionic'; import {App, Page, Animation} from '../../../../../ionic/ionic';
@Page({ @Page({

View File

@ -1,7 +1,7 @@
import {Component} from 'angular2/core'; import {Component} from 'angular2/core';
import {Control, ControlGroup} from 'angular2/common'; import {Control, ControlGroup} from 'angular2/common';
import {App, Storage, LocalStorage, SqlStorage} from 'ionic/ionic'; import {App, Storage, LocalStorage, SqlStorage} from '../../../../../ionic/ionic';
@App({ @App({
templateUrl: 'main.html' templateUrl: 'main.html'

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from 'ionic/ionic'; import {App, IonicApp} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from 'ionic/ionic'; import {App, IonicApp} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from 'ionic/ionic'; import {App, IonicApp} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
import { import {
Control, Control,
ControlGroup, ControlGroup,

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from 'ionic/ionic'; import {App, IonicApp} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from 'ionic/ionic'; import {App, IonicApp} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from 'ionic/ionic'; import {App, IonicApp} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from 'ionic/ionic'; import {App, IonicApp} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
import {FormBuilder, Validators} from 'angular2/common'; import {FormBuilder, Validators} from 'angular2/common';

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, Page, NavController, NavParams} from 'ionic/ionic'; import {App, Page, NavController, NavParams} from '../../../../../ionic/ionic';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, Page, IonicApp, Alert, NavController} from 'ionic/ionic'; import {App, Page, IonicApp, Alert, NavController} from '../../../../../ionic/ionic';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -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({ @Page({

View File

@ -1,4 +1,4 @@
import {App, Page, NavController, MenuController} from 'ionic/ionic'; import {App, Page, NavController, MenuController} from '../../../../../ionic/ionic';
@Page({ @Page({
templateUrl: 'page1.html' templateUrl: 'page1.html'

View File

@ -1,4 +1,4 @@
import {App, Page, MenuController} from 'ionic/ionic'; import {App, Page, MenuController} from '../../../../../ionic/ionic';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App, IonicApp, Page} from 'ionic/ionic'; import {App, IonicApp, Page} from '../../../../../ionic/ionic';
@Page({templateUrl: 'page1.html'}) @Page({templateUrl: 'page1.html'})

View File

@ -1,4 +1,4 @@
import {App, IonicApp, Page} from 'ionic/ionic'; import {App, IonicApp, Page} from '../../../../../ionic/ionic';
@Page({templateUrl: 'page1.html'}) @Page({templateUrl: 'page1.html'})

View File

@ -1,4 +1,4 @@
import {App, IonicApp, Page} from 'ionic/ionic'; import {App, IonicApp, Page} from '../../../../../ionic/ionic';
@Page({templateUrl: 'page1.html'}) @Page({templateUrl: 'page1.html'})

View File

@ -1,5 +1,5 @@
import {App, Page, Config, Platform} from 'ionic/ionic'; import {App, Page, Config, Platform} from '../../../../../ionic/ionic';
import {Modal, ActionSheet, NavController, NavParams, Transition, TransitionOptions, ViewController} from 'ionic/ionic'; import {Modal, ActionSheet, NavController, NavParams, Transition, TransitionOptions, ViewController} from '../../../../../ionic/ionic';;
@Page({ @Page({

View File

@ -1,7 +1,7 @@
import {Component, Type} from 'angular2/core'; import {Component, Type} from 'angular2/core';
import {App, NavController, Alert} from 'ionic/ionic'; import {App, NavController, Alert} from '../../../../../ionic/ionic';
import {Page, Config, IonicApp} from 'ionic/ionic'; import {Page, Config, IonicApp} from '../../../../../ionic/ionic';
import {NavParams, ViewController, IONIC_DIRECTIVES} from 'ionic/ionic'; import {NavParams, ViewController, IONIC_DIRECTIVES} from '../../../../../ionic/ionic';;
@Component({ @Component({

View File

@ -1,4 +1,4 @@
import {App, Page, NavController} from 'ionic/ionic'; import {App, Page, NavController} from '../../../../../ionic/ionic';

View File

@ -1,5 +1,5 @@
import {App, NavParams, NavController, ViewController, MenuController} from 'ionic/ionic'; import {App, NavParams, NavController, ViewController, MenuController} from '../../../../../ionic/ionic';
import {Page, Config, IonicApp} from 'ionic/ionic'; import {Page, Config, IonicApp} from '../../../../../ionic/ionic';
@Page({ @Page({

View File

@ -1,6 +1,6 @@
import {RouteConfig, Location} from 'angular2/router'; 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'}) @Page({templateUrl: 'view1.html'})

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
import { import {
Control, Control,
ControlGroup, ControlGroup,

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,6 +1,6 @@
import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common'; import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({
templateUrl: 'main.html', templateUrl: 'main.html',

View File

@ -1,4 +1,4 @@
import {App, Page, NavController} from 'ionic/ionic'; import {App, Page, NavController} from '../../../../../ionic/ionic';
@Page({ @Page({
templateUrl: 'first.html' templateUrl: 'first.html'

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({
templateUrl: 'main.html' templateUrl: 'main.html'

View File

@ -1,6 +1,6 @@
import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common'; import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
import {App, IonicApp} from 'ionic/ionic'; import {App, IonicApp} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,5 +1,5 @@
import {Validators, Control, ControlGroup} from 'angular2/common'; import {Validators, Control, ControlGroup} from 'angular2/common';
import {App, Page, NavController} from 'ionic/ionic'; import {App, Page, NavController} from '../../../../../ionic/ionic';
@Page({ @Page({

View File

@ -1,7 +1,6 @@
import {Validators, Control, ControlGroup} from 'angular2/common'; import {Validators, Control, ControlGroup} from 'angular2/common';
import {Http} from 'angular2/http'; import {Http} from 'angular2/http';
import {App, Page, IonicApp, NavController} from 'ionic/ionic'; import {App, Page, IonicApp, NavController} from '../../../../../ionic/ionic';
import _ from 'lodash';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App, Page} from 'ionic/ionic'; import {App, Page} from '../../../../../ionic/ionic';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App, Page} from 'ionic/ionic'; import {App, Page} from '../../../../../ionic/ionic';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
import { import {
Control, Control,
ControlGroup, ControlGroup,

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from 'ionic/ionic'; import {App, IonicApp} from '../../../../../ionic/ionic';
import {Http} from 'angular2/http'; import {Http} from 'angular2/http';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from 'ionic/ionic'; import {App, IonicApp} from '../../../../../ionic/ionic';
@App({ @App({
templateUrl: 'main.html' templateUrl: 'main.html'

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({
templateUrl: 'main.html', templateUrl: 'main.html',

View File

@ -1,7 +1,7 @@
import {ViewChild} from 'angular2/core'; import {ViewChild} from 'angular2/core';
import {RouteConfig, Location} from 'angular2/router'; 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({ @Page({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -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 // Modal

View File

@ -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'; import {ContentChild, QueryList, ViewChildren} from 'angular2/core';

View File

@ -1,4 +1,4 @@
import {App, Page} from 'ionic/ionic'; import {App, Page} from '../../../../../ionic/ionic';
@Page({template:'hi'}) @Page({template:'hi'})

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
import { import {
Control, Control,
ControlGroup, ControlGroup,

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from '../../../../../ionic/ionic';
@App({ @App({

View File

@ -36,6 +36,14 @@
<script src="../../../js/es6-shim.min.js"></script> <script src="../../../js/es6-shim.min.js"></script>
<script src="../../../js/es6-module-loader.src.js"></script> <script src="../../../js/es6-module-loader.src.js"></script>
<script src="../../../js/system.src.js"></script> <script src="../../../js/system.src.js"></script>
<script>
System.config({
map: {
angular2: '/angular2',
ionic: '/ionic'
}
});
</script>
<script src="../../../js/angular2-polyfills.js"></script> <script src="../../../js/angular2-polyfills.js"></script>
<script src="../../../js/angular2.dev.js"></script> <script src="../../../js/angular2.dev.js"></script>
<script src="../../../js/router.dev.js"></script> <script src="../../../js/router.dev.js"></script>
@ -101,6 +109,7 @@
document.body.classList.remove('rtl'); document.body.classList.remove('rtl');
} }
System.import('index.js').then(function(m) {}, console.error.bind(console)); System.import('index.js').then(function(m) {}, console.error.bind(console));
</script> </script>

View File

@ -7,9 +7,6 @@
"declaration": true, "declaration": true,
"outDir": "dist" "outDir": "dist"
}, },
"files": [
"ionic/ionic.ts"
],
"compileOnSave" : false, "compileOnSave" : false,
"buildOnSave": false, "buildOnSave": false,
"exclude": [ "exclude": [