Merge pull request #24 from hoatle/features/#23-angular-cli-upgrade

@ #23 | should upgrade to use @angular/cli 1.0.0-beta.30

.gitignore

@@ -41,6 +41,7 @@ Thumbs.db
 
 # angular-boilerplate
 .env
+angular-cli.json
 package.json
 docker-compose.yml
 docker-compose.prod.yml

Dockerfile-dev

-FROM teracy/angular-cli:1.0.0-beta.28.3
+FROM teracy/angular-cli:1.0.0-beta.30
 
 LABEL authors="hoatle <hoatle@teracy.com>"
 

README.md

@@ -70,6 +70,7 @@ Remove these lines from `.gitignore` to keep these files on your project:
 ```
 # angular-boilerplate
 .env
+angular-cli.json
 package.json
 docker-compose.yml
 docker-compose.prod.yml

angular-cli.json → angular-cli.tpl.json

 {
   "project": {
-    "version": "1.0.0-beta.28.3",
-    "name": "angular-boilerplate"
+    "version": "1.0.0-beta.30",
+    "name": "${PROJECT_NAME}"
   },
   "apps": [
     {

karma.conf.js

@@ -4,18 +4,18 @@
 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: [
       { pattern: './src/test.ts', watched: false }
     ],
     preprocessors: {
-      './src/test.ts': ['angular-cli']
+      './src/test.ts': ['@angular/cli']
     },
     mime: {
       'text/x-typescript': ['ts','tsx']

package.tpl.json

@@ -26,10 +26,10 @@
     "zone.js": "^0.7.2"
   },
   "devDependencies": {
+    "@angular/cli": "1.0.0-beta.30",
     "@angular/compiler-cli": "^2.3.1",
     "@types/jasmine": "2.5.38",
     "@types/node": "^6.0.42",
-    "angular-cli": "1.0.0-beta.28.3",
     "codelyzer": "~2.0.0-beta.1",
     "jasmine-core": "2.5.2",
     "jasmine-spec-reporter": "2.5.0",

setup.sh

 #!/bin/bash
 
+# generate angular-cli.json
+rm -rf angular-cli.json
+envsubst '${PROJECT_NAME}' <angular-cli.tpl.json >angular-cli.json
+
 # generate package.json
 rm -rf package.json
 envsubst '${PROJECT_NAME} ${PROJECT_VERSION}' <package.tpl.json >package.json