upgrade and bug fix caused by bug in ng cli

code/moya-angular-common/src/index.ts

-import { MoyaRestModule} from './moya-rest/moya-rest.module';
+import {MoyaRestModule} from './moya-rest/moya-rest.module';
 import {NgModule} from "@angular/core";
 
 

code/moya-angular-common/src/package.json

@@ -3,17 +3,5 @@
   "version": "0.0.1",
   "license": "UNLICENSED",
   "scripts": {},
-  "private": true,
-  "peerDependencies": {
-    "@angular/common": "^4.1.2",
-    "@angular/compiler": "^4.1.2",
-    "@angular/core": "^4.1.2",
-    "@angular/forms": "^4.1.2",
-    "@angular/http": "^4.1.2",
-    "@angular/material": "^2.0.0-beta.1",
-    "@angular/platform-browser": "^4.1.2",
-    "@angular/platform-browser-dynamic": "^4.1.2",
-    "@angular/router": "^4.1.2"
-
-  }
+  "private": true
 }

code/moya-angular/package.json

@@ -5,25 +5,25 @@
   "angular-cli": {},
   "scripts": {
     "ng": "ng",
-    "start": "ng serve",
-    "build": "ng build",
+    "start": "ng serve  --preserve-symlinks --proxy-config=moyaproxy.conf.json --base-href=/",
+    "build": "ng build --preserve-symlinks",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.4.4",
-    "@angular/common": "^4.4.4",
-    "@angular/compiler": "^4.4.4",
-    "@angular/core": "^4.4.4",
-    "@angular/forms": "^4.4.4",
-    "@angular/http": "^4.4.4",
-    "@angular/material": "^2.0.0-beta.12",
-    "@angular/platform-browser": "^4.4.4",
-    "@angular/platform-browser-dynamic": "^4.4.4",
-    "@angular/platform-server": "^4.4.4",
-    "@angular/router": "^4.4.4",
+    "@angular/animations": "^5.2.4",
+    "@angular/common": "^5.2.4",
+    "@angular/compiler": "^5.2.4",
+    "@angular/core": "^5.2.4",
+    "@angular/forms": "^5.2.4",
+    "@angular/http": "^5.2.4",
+    "@angular/material": "^5.2.0",
+    "@angular/platform-browser": "^5.2.4",
+    "@angular/platform-browser-dynamic": "^5.2.4",
+    "@angular/platform-server": "^5.2.4",
+    "@angular/router": "^5.2.4",
     "bootstrap": "^4.0.0-beta",
     "core-js": "^2.5.1",
     "moya-angular-common": "file:../moya-angular-common/src",
@@ -34,14 +34,14 @@
   },
   "devDependencies": {
     "@angular/cli": "^1.4.5",
-    "@angular/compiler-cli": "^4.4.4",
-    "@angularclass/hmr": "^1.2.2",
-    "@types/jasmine": "2.5.47",
-    "@types/node": "^7.0.43",
-    "codelyzer": "~3.0.1",
-    "jasmine-core": "2.6.1",
-    "jasmine-spec-reporter": "4.1.0",
-    "karma": "1.7.0",
+    "@angular/compiler-cli": "^5.2.4",
+    "@angularclass/hmr": "^2.1.3",
+    "@types/jasmine": "2.8.6",
+    "@types/node": "^9.4.4",
+    "codelyzer": "~4.1.0",
+    "jasmine-core": "2.99.1",
+    "jasmine-spec-reporter": "4.2.1",
+    "karma": "2.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
     "karma-jasmine": "^1.0.2",
@@ -50,8 +50,8 @@
     "protractor": "^5.1.2",
     "raw-loader": "^0.5.1",
     "sass-loader": "^6.0.6",
-    "ts-node": "3.0.4",
-    "tslint": "^5.7.0",
+    "ts-node": "4.1.0",
+    "tslint": "^5.9.1",
     "typescript": "^2.5.3"
   }
 }

code/moya-angular/src/tsconfig.json

@@ -4,7 +4,10 @@
     "declaration": false,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "lib": ["es6", "dom"],
+    "lib": [
+      "es6",
+      "dom"
+    ],
     "mapRoot": "./",
     "module": "es6",
     "moduleResolution": "node",
@@ -14,5 +17,9 @@
     "typeRoots": [
       "../node_modules/@types"
     ]
-  }
+  },
+  "include": [
+    "**/*.ts",
+    "../node_modules/moya-angular-common/**/*.ts"
+  ]
 }