fix(deps): move angular-cli to @angular/cli (#61)

* fix(deps): move angular-cli to @angular/cli

* travis use ng local

.travis.yml

@@ -24,10 +24,10 @@ before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sh -e /etc/init.d/xvfb start; fi
 
 before_script:
-  - npm install -g angular-cli
+#  - npm install -g @angular/cli
 #  - npm install -g karma
   - npm install
-  - ng build
+  - npm run build.prod
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then nohup bash -c "ng serve 2>&1 &"; fi  # Protractor CI
 
 #branches:

angular-cli.json

@@ -1,6 +1,6 @@
 {
   "project": {
-    "version": "1.0.0-beta.28.3",
+    "version": "1.0.0-beta.30",
     "name": "igo"
   },
   "apps": [

karma.conf.js

@@ -4,19 +4,19 @@
 module.exports = function (config) {
   config.set({
     basePath: '',
-    frameworks: ['jasmine', 'angular-cli'],
+    frameworks: ['jasmine', '@angular/cli'],
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
       require('karma-remap-istanbul'),
-      require('angular-cli/plugins/karma')
+      require('@angular/cli/plugins/karma')
     ],
     files: [
       './node_modules/openlayers/dist/ol.js',
       { pattern: './src/test.ts', watched: false }
     ],
     preprocessors: {
-      './src/test.ts': ['angular-cli']
+      './src/test.ts': ['@angular/cli']
     },
     mime: {
       'text/x-typescript': ['ts','tsx']

package.json

@@ -66,7 +66,6 @@
     "@angular/platform-browser-dynamic": "^2.4.5",
     "@angular/platform-server": "^2.4.5",
     "@angular/router": "^3.4.5",
-    "@angular2-material/icon": "^2.0.0-alpha.8-2",
     "@ngrx/core": "^1.2.0",
     "@ngrx/store": "^2.2.1",
     "core-js": "^2.4.1",
@@ -79,11 +78,11 @@
     "zone.js": "^0.7.2"
   },
   "devDependencies": {
+    "@angular/cli": "1.0.0-beta.30",
     "@angular/compiler-cli": "^2.3.1",
     "@types/jasmine": "^2.5.41",
     "@types/node": "^7.0.4",
     "@types/openlayers": "^3.20.4",
-    "angular-cli": "^1.0.0-beta.28.3",
     "codelyzer": "~2.0.0-beta.1",
     "compodoc": "0.0.38",
     "conventional-changelog-cli": "^1.2.0",
@@ -96,7 +95,7 @@
     "karma-remap-istanbul": "^0.2.1",
     "npm-check": "^5.4.0",
     "nsp": "^2.6.2",
-    "protractor": "^4.0.13",
+    "protractor": "~4.0.13",
     "rimraf": "^2.5.4",
     "ts-node": "1.2.1",
     "tslint": "^4.4.2",