alpha38, first pass

demos/barkpark/index.ts

@@ -1,4 +1,4 @@
-import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
+import {FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
 import {Log} from 'ionic/util'
 
 import {App, IonicView, NavController} from 'ionic/ionic'

demos/i18n/index.ts

@@ -1,10 +1,9 @@
-import {Component} from 'angular2/angular2';
+import {Component, Control, ControlGroup} from 'angular2/angular2';
-import {Control, ControlGroup} from 'angular2/forms';
 
 import {IonicApp, App, Http} from 'ionic/ionic';
-
 import {Translate, TranslatePipe} from 'ionic/ionic';
 
+
 @App({
   templateUrl: 'main.html',
   pipes: [TranslatePipe]

demos/music/index.ts

@@ -1,5 +1,4 @@
-import {Directive, ElementRef} from 'angular2/angular2';
+import {Directive, ElementRef, FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
-import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
 
 import {App, NavController, IonicView} from 'ionic/ionic';
 

demos/native/index.ts

@@ -1,5 +1,4 @@
-import {Component} from 'angular2/angular2';
+import {Component, Control, ControlGroup} from 'angular2/angular2';
-import {Control, ControlGroup} from 'angular2/forms';
 
 import {IonicApp, App, Http} from 'ionic/ionic';
 

demos/net/index.ts

@@ -1,5 +1,4 @@
-import {Component} from 'angular2/angular2';
+import {Component, Control, ControlGroup} from 'angular2/angular2';
-import {Control, ControlGroup} from 'angular2/forms';
 
 import {App, Http} from 'ionic/ionic';
 

demos/profile/index.ts

@@ -1,6 +1,5 @@
-import {ElementRef} from 'angular2/angular2'
+import {ElementRef, Component, Directive} from 'angular2/angular2';
-import {Component, Directive} from 'angular2/angular2';
+import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/angular2';
-import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/forms';
 
 import {App, Modal, Animation, Content} from 'ionic/ionic';
 import {NavController, NavParams, IonicView} from 'ionic/ionic';

demos/sink/pages/search-bar.ts

@@ -1,5 +1,4 @@
-import {Component} from 'angular2/angular2';
+import {Component, FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
-import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
 
 import {IonicApp, IonicView} from 'ionic/ionic';
 

demos/sink/pages/table-search.ts

@@ -1,5 +1,4 @@
-import {Component} from 'angular2/angular2';
+import {Component, FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
-import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
 
 import {IonicView} from 'ionic/ionic';
 

demos/sink/pages/tabs.ts

@@ -1,4 +1,4 @@
-import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
+import {FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
 
 import {IonicApp, IonicView, NavController} from 'ionic/ionic';
 

demos/snapcat/index.ts

@@ -1,4 +1,4 @@
-import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/forms';
+import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/angular2';
 
 import {App, IonicView, Animation, Modal, NavController, NavParams} from 'ionic/ionic';
 

demos/storage/index.ts

@@ -1,5 +1,4 @@
-import {Component} from 'angular2/angular2';
+import {Component, Control, ControlGroup} from 'angular2/angular2';
-import {Control, ControlGroup} from 'angular2/forms';
 
 import {App, Http, Storage, LocalStorage, SqlStorage} from 'ionic/ionic';
 

demos/weather/index.ts

@@ -1,6 +1,5 @@
-import {Component, Directive, View} from 'angular2/angular2';
+import {Component, Directive, View, NgIf, NgFor, NgClass, ElementRef} from 'angular2/angular2';
-import {NgIf, NgFor, NgClass, ElementRef} from 'angular2/angular2';
+import {FormBuilder, Control, ControlGroup, Validators, FORM_DIRECTIVES} from 'angular2/angular2';
-import {FormBuilder, Control, ControlGroup, Validators, FORM_DIRECTIVES} from 'angular2/forms';
 
 import {App, IonicView, Animation, Content, Scroll, Modal, NavController, NavParams} from 'ionic/ionic';
 
@@ -9,7 +8,6 @@ import {Weather} from './weather';
 import {Flickr} from './flickr';
 
 
-
 @IonicView({
   template: `<ion-view id="settings-modal">
     <ion-toolbar><ion-title>Settings</ion-title></ion-toolbar>

ionic/components/checkbox/test/basic/index.ts

@@ -9,7 +9,7 @@ import {
   NgControlName,
   NgFormModel,
   FormBuilder
-} from 'angular2/forms';
+} from 'angular2/angular2';
 
 @App({
   templateUrl: 'main.html'

ionic/components/nav/nav-controller.ts

@@ -1,7 +1,4 @@
-import {Component, ComponentRef, Compiler, ElementRef, Injector, bind, NgZone} from 'angular2/angular2';
+import {Component, ComponentRef, Compiler, ElementRef, Injector, bind, NgZone, DynamicComponentLoader, DirectiveBinding, AppViewManager} from 'angular2/angular2';
-import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
-import {DirectiveBinding} from 'angular2/src/core/compiler/element_injector';
-import {AppViewManager} from 'angular2/src/core/compiler/view_manager';
 
 import {Ion} from '../ion';
 import {IonicConfig} from '../../config/config';

ionic/components/nav/nav.ts

@@ -1,5 +1,4 @@
-import {Component, Directive, View, ElementRef, Host, Optional, forwardRef, Inject, Injector, NgZone, Renderer} from 'angular2/angular2';
+import {Component, Directive, View, ElementRef, Host, Optional, forwardRef, Inject, Injector, NgZone, Renderer, ViewContainerRef} from 'angular2/angular2';
-import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 
 import {IonicComponent} from '../../config/decorators';
 import {NavController} from './nav-controller';

ionic/components/overlay/overlay.ts

@@ -1,5 +1,4 @@
-import {Component} from 'angular2/angular2';
+import {Component, DirectiveBinding} from 'angular2/angular2';
-import {DirectiveBinding} from 'angular2/src/core/compiler/element_injector';
 
 import {IonicApp} from '../app/app';
 import {Animation} from '../../animations/animation';

ionic/components/radio/test/basic/index.ts

@@ -9,7 +9,7 @@ import {
   NgControlName,
   NgFormModel,
   FormBuilder
-} from 'angular2/forms';
+} from 'angular2/angular2';
 
 
 @App({

ionic/components/search-bar/search-bar.ts

@@ -1,5 +1,4 @@
 import {ElementRef, Pipe} from 'angular2/angular2';
-//import {ControlGroup, ControlDirective} from 'angular2/forms'
 
 import {Ion} from '../ion';
 import {IonicConfig} from '../../config/config';

ionic/components/search-bar/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms';
+import {FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
 
 import {App} from 'ionic/ionic';
 import {SearchPipe} from 'ionic/components/search-bar/search-bar';

ionic/components/segment/segment.ts

@@ -1,6 +1,5 @@
 import {View, Renderer, ElementRef, EventEmitter, Host, forwardRef, Optional} from 'angular2/angular2';
-import {Control, NgControl,NgFormControl} from 'angular2/forms';
+import {Control, NgControl, NgFormControl, ControlGroup, ControlDirective} from 'angular2/angular2';
-import {ControlGroup, ControlDirective} from 'angular2/forms'
 
 import {Ion} from '../ion';
 import {IonicConfig} from '../../config/config';

ionic/components/segment/test/basic/index.ts

@@ -1,4 +1,4 @@
-import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/forms';
+import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
 
 import {App} from 'ionic/ionic';
 

ionic/components/show-hide-when/test/basic/index.ts

@@ -9,7 +9,7 @@ import {
   NgControlName,
   NgFormModel,
   FormBuilder
-} from 'angular2/forms';
+} from 'angular2/angular2';
 
 @App({
   templateUrl: 'main.html'

ionic/components/switch/test/basic/index.ts

@@ -9,7 +9,7 @@ import {
   NgControlName,
   NgFormModel,
   FormBuilder
-} from 'angular2/forms';
+} from 'angular2/angular2';
 
 @App({
   templateUrl: 'main.html'

ionic/components/tabs/tab.ts

@@ -1,5 +1,4 @@
-import {Directive, Component, View, Host, ElementRef, forwardRef, Injector, NgZone} from 'angular2/angular2';
+import {Directive, Component, View, Host, ElementRef, forwardRef, Injector, NgZone, ViewContainerRef} from 'angular2/angular2';
-import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 
 import {NavController} from '../nav/nav-controller';
 import {ViewController} from '../nav/view-controller';

ionic/components/tabs/tabs.ts

@@ -1,5 +1,4 @@
-import {Component, Directive, View, Injector, NgFor, ElementRef, Optional, Host, forwardRef, NgZone} from 'angular2/angular2';
+import {Component, Directive, View, Injector, NgFor, ElementRef, Optional, Host, forwardRef, NgZone, ViewContainerRef} from 'angular2/angular2';
-import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
 
 import {Ion} from '../ion';
 import {IonicApp} from '../app/app';

ionic/platform/applinks/applinks.ts

@@ -1,6 +1,3 @@
-import * as Rx from 'rx';
-
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 /**

ionic/platform/barcode/barcode.ts

@@ -1,6 +1,3 @@
-import * as Rx from 'rx';
-
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 /**

ionic/platform/camera-roll/camera-roll.ts

@@ -1,6 +1,3 @@
-import * as Rx from 'rx';
-
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 /**

ionic/platform/contacts/contacts.ts

@@ -1,6 +1,3 @@
-import * as Rx from 'rx';
-
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 /**

ionic/platform/device-motion/device-motion.ts

@@ -1,4 +1,6 @@
-import * as Rx from 'rx';
+// TODO: temporary until https://github.com/angular/angular/issues/4390 decided
+// var Rx = require('@reactivex/rxjs/dist/cjs/Rx');
+// var {Observable} = Rx;
 
 import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';

ionic/platform/device-orientation/device-orientation.ts

@@ -1,4 +1,6 @@
-import * as Rx from 'rx';
+// TODO: temporary until https://github.com/angular/angular/issues/4390 decided
+// var Rx = require('@reactivex/rxjs/dist/cjs/Rx');
+// var {Observable} = Rx;
 
 import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';

ionic/platform/device/device.ts

@@ -1,6 +1,3 @@
-import * as Rx from 'rx';
-
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 

ionic/platform/dialogs/dialogs.ts

@@ -1,6 +1,3 @@
-import * as Rx from 'rx';
-
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 /**

ionic/platform/geolocation/geolocation.ts

@@ -1,6 +1,7 @@
-import * as Rx from 'rx';
+// TODO: temporary until https://github.com/angular/angular/issues/4390 decided
+// var Rx = require('@reactivex/rxjs/dist/cjs/Rx');
+// var {Observable} = Rx;
 
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 /**

ionic/platform/keyboard/keyboard.ts

@@ -1,6 +1,3 @@
-import * as Rx from 'rx';
-
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 /**

ionic/platform/loading/loading.ts

@@ -1,6 +1,3 @@
-import * as Rx from 'rx';
-
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 /**

ionic/platform/network/network.ts

@@ -1,6 +1,3 @@
-import * as Rx from 'rx';
-
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 /**

ionic/platform/statusbar/statusbar.ts

@@ -1,6 +1,3 @@
-import * as Rx from 'rx';
-
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 /**

ionic/platform/vibration/vibration.ts

@@ -1,6 +1,3 @@
-import * as Rx from 'rx';
-
-import * as util from 'ionic/util';
 import {NativePlugin} from '../plugin';
 
 /**

package.json

@@ -7,14 +7,10 @@
     "url": "https://github.com/driftyco/ionic2.git"
   },
   "dependencies": {
-    "angular2": "2.0.0-alpha.37",
+    "angular2": "2.0.0-alpha.38",
+    "@reactivex/rxjs": "0.0.0-prealpha.3",
     "reflect-metadata": "0.1.1",
-    "rtts_assert": "2.0.0-alpha.37",
+    "zone.js": "0.5.7"
-    "rx": "2.5.1",
-    "swiper": "^3.1.2",
-    "systemjs": "0.18.10",
-    "traceur": "0.0.91",
-    "zone.js": "0.5.4"
   },
   "devDependencies": {
     "canonical-path": "0.0.2",
@@ -59,6 +55,7 @@
     "semver": "^5.0.1",
     "serve-static": "^1.9.2",
     "source-map-support": "^0.2.10",
+    "systemjs": "0.18.10",
     "through2": "^0.6.3",
     "traceur-runtime": "0.0.59",
     "typescript": "1.5.3",