Merge pull request #63 from leifwells/chore/lw-update-ionic-angular-3.6.0

Chore/lw update ionic angular 3.6.0

Author: leifwells

ionic.config.json

@@ -1,5 +1,6 @@
 {
   "name": "ionic-unit-testing-example",
   "app_id": "",
-  "type": "ionic-angular"
+  "type": "ionic-angular",
+  "integrations": {}
 }

package.json

@@ -23,19 +23,19 @@
     "@angular/http": "4.1.3",
     "@angular/platform-browser": "4.1.3",
     "@angular/platform-browser-dynamic": "4.1.3",
-    "@ionic-native/core": "3.13.1",
-    "@ionic-native/splash-screen": "3.13.1",
-    "@ionic-native/status-bar": "3.13.1",
+    "@ionic-native/core": "3.12.1",
+    "@ionic-native/splash-screen": "3.12.1",
+    "@ionic-native/status-bar": "3.12.1",
     "@ionic/storage": "2.0.1",
-    "ionic-angular": "3.5.0",
+    "ionic-angular": "3.6.0",
     "ionicons": "3.0.0",
     "rxjs": "5.4.0",
     "sw-toolbox": "3.6.0",
     "zone.js": "0.8.12"
   },
   "devDependencies": {
-    "@ionic/app-scripts": "1.3.12",
-    "@ionic/cli-plugin-ionic-angular": "1.3.1",
+    "@angular/cli": "1.1.2",
+    "@ionic/app-scripts": "2.1.3",
     "@types/jasmine": "^2.5.41",
     "@types/node": "^7.0.8",
     "angular2-template-loader": "^0.6.2",
@@ -52,8 +52,8 @@
     "protractor": "^5.1.1",
     "ts-loader": "^2.0.3",
     "ts-node": "^3.0.2",
-    "typescript": "2.3.3"
+    "typescript": "2.3.4"
   },
-  "version": "0.0.1",
+  "version": "0.0.4",
   "description": "An Ionic project"
 }

src/index.html

@@ -10,7 +10,7 @@
   <link rel="icon" type="image/x-icon" href="assets/icon/favicon.ico">
   <link rel="manifest" href="manifest.json">
   <meta name="theme-color" content="#4e8ef7">
-  
+
   <!-- cordova.js required for cordova apps -->
   <script src="cordova.js"></script>
 
@@ -19,7 +19,7 @@
     if ('serviceWorker' in navigator) {
       navigator.serviceWorker.register('service-worker.js')
         .then(() => console.log('service worker installed'))
-        .catch(err => console.log('Error', err));
+        .catch(err => console.error('Error', err));
     }
   </script>-->
 
@@ -34,7 +34,11 @@
   <!-- The polyfills js is generated during the build process -->
   <script src="build/polyfills.js"></script>
 
-  <!-- The bundle js is generated during the build process -->
+  <!-- The vendor js is generated during the build process
+       It contains all of the dependencies in node_modules -->
+  <script src="build/vendor.js"></script>
+
+  <!-- The main bundle js is generated during the build process -->
   <script src="build/main.js"></script>
 
 </body>

typings/cordova-typings.d.ts

@@ -0,0 +1,3 @@
+
+/// <reference path="../.vscode/typings/cordova-ionic/plugins/keyboard.d.ts"/>
+/// <reference path="../.vscode/typings/jquery/jquery.d.ts"/>