Update Ionic to latest and remove ionic cli pin

.travis.yml

@@ -1,11 +1,12 @@
 language: node_js
 node_js:
   - "7"
+before_install:
+  - npm install -g cordova
 before_script:
   - export CHROME_BIN=chromium-browser
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
-  - npm install -g ionic@2
 script: 
   - npm run lint
   - npm run test-coverage

e2e/settings.e2e-spec.ts

@@ -13,7 +13,6 @@ describe('Settings E2E Test', () => {
   let settingImageFieldsPage = new SettingImageFieldsPageOjbect();
   let settingsShowRestUrlFieldToggle: ElementFinder = element(by.id('settingsShowRestUrlFieldToggle'));
   let settingsImageFieldBOOLEANNOToggle: ElementFinder = element(by.id('settingsImageFieldBOOLEANNOToggle'));
-  let settingsImageFieldBOOLEANNOToggleChecked: ElementFinder = $('#settingsImageFieldBOOLEANNOToggle .toggle-checked');
 
   beforeEach(function () {
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL;
@@ -55,11 +54,11 @@ describe('Settings E2E Test', () => {
 
   it('Should persist image field settings', () => {
     settingImageFieldsPage.loadPage();
-    browser.isElementPresent(settingsImageFieldBOOLEANNOToggleChecked).then(present => expect(present).toBeFalsy());
+    settingsImageFieldBOOLEANNOToggle.getAttribute('class').then(classes => expect(classes).not.toContain('toggle-checked'));
     settingsImageFieldBOOLEANNOToggle.click();
     waitUntilStorageReady();
     settingImageFieldsPage.reloadPage();
-    browser.isElementPresent(settingsImageFieldBOOLEANNOToggleChecked).then(present => expect(present).toBeTruthy());
+    settingsImageFieldBOOLEANNOToggle.getAttribute('class').then(classes => expect(classes).toContain('toggle-checked'));
   });
 
   it('Should filter image field settings', () => {

ionic.config.json

@@ -1,6 +1,5 @@
 {
   "name": "ims",
   "app_id": "4f2a84b8",
-  "v2": true,
-  "typescript": true
+  "type": "ionic-angular"
 }

package.json

@@ -17,42 +17,43 @@
     "ionic_source_map": "source-map"
   },
   "dependencies": {
-    "@angular/common": "2.4.8",
-    "@angular/compiler": "2.4.8",
-    "@angular/compiler-cli": "2.4.8",
-    "@angular/core": "2.4.8",
-    "@angular/forms": "2.4.8",
-    "@angular/http": "2.4.8",
-    "@angular/platform-browser": "2.4.8",
-    "@angular/platform-browser-dynamic": "2.4.8",
-    "@angular/platform-server": "2.4.8",
+    "@angular/common": "4.1.0",
+    "@angular/compiler": "4.1.0",
+    "@angular/compiler-cli": "4.1.0",
+    "@angular/core": "4.1.0",
+    "@angular/forms": "4.1.0",
+    "@angular/http": "4.1.0",
+    "@angular/platform-browser": "4.1.0",
+    "@angular/platform-browser-dynamic": "4.1.0",
+    "@angular/platform-server": "4.1.0",
     "@ionic-native/camera": "^3.5.0",
     "@ionic-native/core": "^3.6.1",
     "@ionic-native/file": "^3.5.0",
-    "@ionic-native/splash-screen": "3.1.0",
-    "@ionic-native/status-bar": "3.1.0",
+    "@ionic-native/splash-screen": "3.8.0",
+    "@ionic-native/status-bar": "3.8.0",
     "@ionic-native/transfer": "^3.5.0",
     "@ionic/cloud-angular": "^0.12.0",
-    "@ionic/storage": "^2.0.0",
-    "ionic-angular": "2.3.0",
+    "@ionic/storage": "^2.0.1",
+    "ionic-angular": "3.2.1",
     "ionicons": "3.0.0",
-    "rxjs": "5.0.1",
-    "sw-toolbox": "3.4.0",
-    "zone.js": "0.7.2"
+    "rxjs": "5.1.1",
+    "sw-toolbox": "3.6.0",
+    "zone.js": "0.8.10"
   },
   "devDependencies": {
     "@ionic/app-scripts": "^1.3.7",
-    "@ionic/cli-build-ionic-angular": "0.0.3",
-    "@ionic/cli-plugin-cordova": "0.0.9",
+    "@ionic/cli-plugin-cordova": "1.0.0",
+    "@ionic/cli-plugin-ionic-angular": "1.0.0",
     "@types/jasmine": "^2.5.41",
     "@types/node": "^7.0.8",
     "angular2-template-loader": "^0.6.2",
     "connect": "^3.6.1",
     "html-loader": "^0.4.5",
+    "ionic": "^3.0.0",
     "istanbul-instrumenter-loader": "^2.0.0",
-    "jasmine": "^2.5.3",
+    "jasmine": "^2.6.0",
     "jasmine-spec-reporter": "^4.0.0",
-    "karma": "^1.5.0",
+    "karma": "^1.7.0",
     "karma-chrome-launcher": "^2.0.0",
     "karma-coverage": "^1.1.1",
     "karma-coverage-istanbul-reporter": "^1.0.0",
@@ -67,10 +68,10 @@
     "remap-istanbul": "^0.9.5",
     "systemjs": "^0.20.12",
     "ts-loader": "^2.0.3",
-    "ts-node": "^3.0.2",
-    "tslint": "^5.0.0",
+    "ts-node": "^3.0.4",
+    "tslint": "^5.2.0",
     "tslint-ionic-rules": "0.0.8",
-    "typescript": "2.1.6"
+    "typescript": "2.2.1"
   },
   "version": "0.0.1",
   "description": "Cross-Platform Ionic App for IMS"

scripts/run-ionic-cloud-builds-on-pr-or-master.sh

@@ -1,17 +1,19 @@
 #!/bin/bash
 set -e
 
+PATH="$(dirname $0)/../node_modules/ionic/bin:$PATH"
+
 if [ "$TRAVIS_PULL_REQUEST" != "false" ] || [ "$TRAVIS_BRANCH" == "master" ]; then
-  echo "Preparing project assets for upload:"
-  npm run ionic:build
+  echo "Logging in:"
+  ionic login "$IONIC_EMAIL" "$IONIC_PASSWORD"
 
   echo "Submitting Android build:"
   ionic package build android --noresources --profile dev | tee android-submit.out
-  androidBuildId=$(awk '/Build ID:/ {print $NF}' android-submit.out)
+  androidBuildId=$(awk '/ Build / {print $3}' android-submit.out)
 
   echo "Submitting iOS build:"
   ionic package build ios --noresources --profile dev | tee ios-submit.out
-  iosBuildId=$(awk '/Build ID:/ {print $NF}' ios-submit.out)
+  iosBuildId=$(awk '/ Build / {print $3}' ios-submit.out)
 
   echo "Awaiting build completion... "
   for i in $(seq 1 180); do

src/app/app.module.ts

@@ -1,3 +1,5 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { HttpModule } from '@angular/http';
 import { ModelService } from './../providers/model-service';
 import { SettingImageFieldsPage } from './../pages/setting-image-fields/setting-image-fields';
 import { IonicStorageModule } from '@ionic/storage';
@@ -45,6 +47,8 @@ const cloudSettings: CloudSettings = {
     SettingImageFieldsPage
   ],
   imports: [
+    BrowserModule,
+    HttpModule,
     IonicModule.forRoot(MobileClient),
     CloudModule.forRoot(cloudSettings),
     IonicStorageModule.forRoot({

src/pages/login/login.html

@@ -8,15 +8,15 @@
   <h2>Imagic IMS Mobile Client</h2>
   <form [formGroup]="loginForm" (ngSubmit)="login()">
     <ion-item *ngIf="isShowRestUrlField === true">
-      <ion-icon name="cloud" item-left></ion-icon>
+      <ion-icon name="cloud" item-start></ion-icon>
       <ion-input placeholder="Ims Rest Base Url" formControlName="server"></ion-input>
     </ion-item>
     <ion-item>
-      <ion-icon name="person" item-left></ion-icon>
+      <ion-icon name="person" item-start></ion-icon>
       <ion-input placeholder="Ims Username" formControlName="user" [class.invalid]="submitAttempt"></ion-input>
     </ion-item>
     <ion-item>
-      <ion-icon name="lock" item-left></ion-icon>
+      <ion-icon name="lock" item-start></ion-icon>
       <ion-input type="password" placeholder="Ims Password" formControlName="password"></ion-input>
     </ion-item>
     <ion-item>

test-config/webpack.test.js

@@ -41,7 +41,7 @@ module.exports = {
   plugins: [
     new webpack.ContextReplacementPlugin(
       // The (\\|\/) piece accounts for path separators in *nix and Windows
-      /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/,
+      /(ionic-angular)|(angular(\\|\/)core(\\|\/)@angular)/, 
       root('./src'), // location of your src
       {} // a map of your routes
     )