Merge pull request #98 from mavogel/updateIonicBeta8_confApp_6249cbb

Update to ionic.beta8 regarding latest confApp.

Thanks a lot for this, now they've removed the @app we should be able to dump some of the hacky stuff around `<ion-app>`, will raise that separately

CHANGELOG.md

@@ -1,3 +1,11 @@
+<a name="1.3.2"></a>
+# 1.3.2 (2016-06-07)
+
+### Features
+
+* **Update**: Update to Ionic 2.0.0.beta.8
+
+
 <a name="1.3.1"></a>
 # 1.3.1 (2016-05-25)
 

app/app.ts

@@ -1,14 +1,13 @@
 'use strict';
 
-import { Type, ViewChild }                    from '@angular/core';
-import { App, Platform, MenuController, Nav } from 'ionic-angular';
-import { StatusBar }                          from 'ionic-native';
-import { ClickerList }                        from './pages/clickerList/clickerList';
-import { Page2 }                              from './pages/page2/page2';
+import { Component, Type, ViewChild }                         from '@angular/core';
+import { Platform, ionicBootstrap, MenuController, Nav } from 'ionic-angular';
+import { StatusBar }                                          from 'ionic-native';
+import { ClickerList }                                        from './pages/clickerList/clickerList';
+import { Page2 }                                              from './pages/page2/page2';
 
-@App({
+@Component({
   templateUrl: 'build/app.html',
-  config: {}, // http://ionicframework.com/docs/v2/api/config/Config/
 })
 export class ClickerApp {
 
@@ -49,3 +48,10 @@ export class ClickerApp {
     this.nav.setRoot(page.component);
   };
 }
+
+// Pass the main app component as the first argument
+// Pass any providers for your app in the second argument
+// Set any config for your app as the third argument:
+// http://ionicframework.com/docs/v2/api/config/Config/
+
+ionicBootstrap(ClickerApp, [], {});

app/components/clickerForm/clickerForm.spec.ts

@@ -14,7 +14,7 @@ import { provide }       from '@angular/core';
 import {
   Config,
   Form,
-  IonicApp,
+  App,
   Platform,
 }                        from 'ionic-angular';
 import { ClickerForm }   from './clickerForm';
@@ -50,7 +50,7 @@ describe('ClickerForm', () => {
   beforeEachProviders(() => [
     Form,
     provide(Clickers, {useClass: MockClickers}),
-    provide(IonicApp, {useClass: MockClass}),
+    provide(App, {useClass: MockClass}),
     provide(Platform, {useClass: MockClass}),
     provide(Config, {useClass: MockClass}),
   ]);

app/pages/clickerList/clickerList.spec.ts

@@ -16,7 +16,7 @@ import { Utils }                from '../../services/utils';
 import {
   Config,
   Form,
-  IonicApp,
+  App,
   NavController,
   NavParams,
   Platform,
@@ -46,7 +46,7 @@ describe('ClickerList', () => {
     provide(NavController, {useClass: MockClass}),
     provide(NavParams, {useClass: MockClass}),
     provide(Config, {useClass: MockClass}),
-    provide(IonicApp, {useClass: MockClass}),
+    provide(App, {useClass: MockClass}),
     provide(Platform, {useClass: MockClass}),
   ]);
 

app/pages/clickerList/clickerList.ts

@@ -1,11 +1,12 @@
 'use strict';
 
-import { Page, NavController } from 'ionic-angular';
-import { Clickers }            from '../../services/clickers';
-import { ClickerButton }       from '../../components/clickerButton/clickerButton';
-import { ClickerForm }         from '../../components/clickerForm/clickerForm';
+import { Component }     from '@angular/core';
+import { NavController } from 'ionic-angular';
+import { Clickers }      from '../../services/clickers';
+import { ClickerButton } from '../../components/clickerButton/clickerButton';
+import { ClickerForm }   from '../../components/clickerForm/clickerForm';
 
-@Page({
+@Component({
   templateUrl: 'build/pages/clickerList/clickerList.html',
   providers: [Clickers],
   directives: [ClickerButton, ClickerForm],

app/pages/page2/page2.spec.ts

@@ -16,7 +16,7 @@ import { Utils }                from '../../services/utils';
 import {
   Config,
   Form,
-  IonicApp,
+  App,
   NavController,
   NavParams,
   Platform,
@@ -46,7 +46,7 @@ describe('Page2', () => {
     provide(NavController, {useClass: MockClass}),
     provide(NavParams, {useClass: MockClass}),
     provide(Config, {useClass: MockClass}),
-    provide(IonicApp, {useClass: MockClass}),
+    provide(App, {useClass: MockClass}),
     provide(Platform, {useClass: MockClass}),
   ]);
 

app/pages/page2/page2.ts

@@ -1,8 +1,8 @@
 'use strict';
 
-import { Page } from 'ionic-angular';
+import {Component} from '@angular/core';
 
-@Page({
+@Component({
   templateUrl: 'build/pages/page2/page2.html',
 })
 export class Page2 {

package.json

@@ -1,14 +1,14 @@
 {
   "dependencies": {
-    "@angular/common": "^2.0.0-rc.1",
+    "@angular/common": "2.0.0-rc.1",
     "@angular/compiler": "2.0.0-rc.1",
     "@angular/core": "2.0.0-rc.1",
     "@angular/http": "2.0.0-rc.1",
     "@angular/platform-browser": "2.0.0-rc.1",
     "@angular/platform-browser-dynamic": "2.0.0-rc.1",
     "@angular/router": "2.0.0-rc.1",
     "es6-shim": "0.35.1",
-    "ionic-angular": "2.0.0-beta.7",
+    "ionic-angular": "2.0.0-beta.8",
     "ionic-native": "1.2.2",
     "ionicons": "3.0.0",
     "reflect-metadata": "0.1.3",
@@ -24,11 +24,11 @@
     "gulp-tslint": "5.0.0",
     "gulp-typescript": "2.13.4",
     "gulp-watch": "4.3.5",
-    "ionic-gulp-browserify-typescript": "1.1.0",
-    "ionic-gulp-fonts-copy": "1.0.0",
-    "ionic-gulp-html-copy": "1.0.0",
-    "ionic-gulp-sass-build": "1.0.0",
-    "ionic-gulp-scripts-copy": "2.0.0",
+    "ionic-gulp-browserify-typescript": "^1.1.0",
+    "ionic-gulp-fonts-copy": "^1.0.0",
+    "ionic-gulp-html-copy": "^1.0.0",
+    "ionic-gulp-sass-build": "^1.0.0",
+    "ionic-gulp-scripts-copy": "^2.0.0",
     "isparta": "4.0.0",
     "jasmine-core": "2.4.1",
     "jasmine-spec-reporter": "2.4.0",
@@ -45,7 +45,7 @@
     "ts-node": "0.7.3",
     "tsify": "0.16.0",
     "tslint": "3.10.2",
-    "tslint-eslint-rules": "1.3.0",
+    "tslint-eslint-rules": "^1.3.0",
     "typings": "1.0.4"
   },
   "name": "clicker",