package.json atualizado para rodar sem WARNINGS e sem instalar dependencias...

 package.json atualizado para rodar sem WARNINGS e sem instalar dependencias externas. Para compilar o portal basta rodar npm install e depois npm run-script ng build. O segundo passo vai ser verificar se TODOS os pacotes estão sendo instalados localmente.
 Solved merge conflicts

README.md

 <!-- This file is part of the project Pinsis-Portal.
-Copyright (C),2018, by C3SL(Centro de Computação Científica e 
+Copyright (C),2018, by C3SL(Centro de Computação Científica e
 Software Live)
 
 This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,10 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.5.5.
 
+##Compile the Portal
+
+Run `npm install --loglevel=error` to compile the portal and than run `npm start`. Navigate to `http://localhost:4200/`.
+
 ## Development server
 
 Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.

package.json

@@ -8,22 +8,22 @@
     "build": "ng build",
     "test": "ng test",
     "lint": "ng lint",
-    "e2e": "ng e2e"
+    "e2e": "ng e2e",
+    "webpack-defaults": "webpack-defaults"
   },
   "private": true,
   "dependencies": {
-    "@angular-devkit/build-optimizer": "https://registry.npmjs.org/@angular-devkit/build-optimizer/-/build-optimizer-0.0.36.tgz",
-    "@angular-devkit/core": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.0.22.tgz",
-    "@angular-devkit/schematics": "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-0.0.42.tgz",
+    "@angular-devkit/core": "https://registry.npmjs.org/@angular-devkit/core/-/core-0.0.29.tgz",
     "@angular/animations": "^5.0.0",
     "@angular/common": "^5.0.0",
     "@angular/compiler": "^5.0.0",
-    "@angular/core": "^5.0.0",
+    "@angular/core": "^5.1.1",
     "@angular/forms": "^5.0.0",
     "@angular/http": "^5.0.0",
     "@angular/platform-browser": "^5.0.0",
     "@angular/platform-browser-dynamic": "^5.0.0",
     "@angular/router": "^5.0.0",
+    "ajv": "^6.10.0",
     "angular-highcharts": "^5.2.10",
     "bootstrap": "^4.0.0-beta",
     "core-js": "^2.4.1",
@@ -46,15 +46,17 @@
     "codelyzer": "^4.0.1",
     "jasmine-core": "~2.6.2",
     "jasmine-spec-reporter": "~4.1.0",
-    "karma": "1.7.0",
+    "karma": "~1.7.0",
     "karma-chrome-launcher": "~2.1.1",
     "karma-cli": "~1.0.1",
     "karma-coverage-istanbul-reporter": "^1.2.1",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "5.1.2",
+    "protractor": "~5.1.2",
     "ts-node": "~3.2.0",
     "tslint": "~5.7.0",
-    "typescript": "~2.4.2"
+    "typescript": "~2.4.2",
+    "webpack": "^3.1.0",
+    "webpack-defaults": "^1.6.0"
   }
 }