feat(core): update angular-cli to 1.0.0-beta.31 and yarn to 0.20.0

Author: kucharzyk

angular-cli.json

@@ -1,16 +1,16 @@
 {
   "project": {
-    "version": "1.0.0-beta.30",
+    "version": "1.0.0-beta.31",
     "name": "shardis"
   },
   "apps": [
     {
       "root": "src/main/typescript",
       "outDir": "src/main/resources/static",
       "assets": [
-        "assets",
-        "favicon.ico"
-      ],
+  "assets",
+  "favicon.ico"
+],
       "index": "index.html",
       "main": "main.ts",
       "polyfills": "polyfills.ts",
@@ -22,7 +22,8 @@
         "../../../node_modules/clarity-ui/clarity-ui.min.css",
         "styles.scss"
       ],
-      "scripts": [],
+      "scripts": [
+      ],
       "environments": {
         "source": "environments/environment.ts",
         "dev": "environments/environment.ts",
@@ -65,5 +66,6 @@
       "pipe": true,
       "service": true
     }
-  }
+  },
+  "packageManager": "yarn"
 }

build.gradle.kts

@@ -5,7 +5,6 @@ import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.testing.Test
 import org.gradle.language.jvm.tasks.ProcessResources
 import org.gradle.plugins.ide.idea.model.IdeaModel
-import org.gradle.plugins.ide.idea.model.IdeaModule
 import org.gradle.testing.jacoco.tasks.JacocoReport
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
@@ -85,7 +84,7 @@ configure<IdeaModel>{
 
 configure<NodeExtension> {
   version = "7.5.0"
-  yarnVersion = "0.19.1"
+  yarnVersion = "0.20.0"
   download = true
   workDir = file("${project.buildDir}/nodejs")
   yarnWorkDir = file("${project.buildDir}/yarn")

karma.conf.js

@@ -8,7 +8,7 @@ module.exports = function (config) {
     plugins: [
       require('karma-jasmine'),
       require('karma-chrome-launcher'),
-      require('karma-remap-istanbul'),
+      require('karma-coverage-istanbul-reporter'),
       require('@angular/cli/plugins/karma')
     ],
     files: [
@@ -20,18 +20,16 @@ module.exports = function (config) {
     mime: {
       'text/x-typescript': ['ts', 'tsx']
     },
-    remapIstanbulReporter: {
-      reports: {
-        html: 'coverage',
-        lcovonly: './coverage/coverage.lcov'
-      }
+    coverageIstanbulReporter: {
+      reports: ['html', 'lcovonly'],
+      fixWebpackSourcePaths: true
     },
     angularCli: {
       config: './angular-cli.json',
       environment: 'dev'
     },
     reporters: config.angularCli && config.angularCli.codeCoverage
-      ? ['progress', 'karma-remap-istanbul']
+      ? ['progress', 'coverage-istanbul']
       : ['progress'],
     port: 9876,
     colors: true,

package.json

@@ -41,7 +41,7 @@
     "zone.js": "0.7.6"
   },
   "devDependencies": {
-    "@angular/cli": "1.0.0-beta.30",
+    "@angular/cli": "1.0.0-beta.31",
     "@angular/compiler-cli": "2.4.7",
     "@types/jasmine": "2.5.41",
     "@types/node": "7.0.5",
@@ -55,13 +55,13 @@
     "karma-chrome-launcher": "2.0.0",
     "karma-cli": "1.0.1",
     "karma-jasmine": "1.1.0",
-    "karma-remap-istanbul": "0.6.0",
+    "karma-coverage-istanbul-reporter": "0.2.0",
     "protractor": "5.1.1",
     "rimraf": "2.5.4",
     "ts-node": "2.1.0",
     "tslint": "4.4.2",
     "typescript": "2.1.6",
-    "yarn": "0.19.1"
+    "yarn": "0.20.0"
   },
   "scripts": {
     "clean": "yarn cache clean && rimraf coverage src/main/resources/static/*",
@@ -93,6 +93,6 @@
   },
   "engines": {
     "node": ">= 7.0.0",
-    "yarn": ">= 0.18.0"
+    "yarn": ">= 0.20.0"
   }
 }

src/main/typescript/app/core/store/auth/auth.reducer.ts

@@ -2,7 +2,7 @@ import '@ngrx/core/add/operator/select';
 import 'rxjs/add/operator/map';
 import 'rxjs/add/operator/let';
 import {AuthState, initialState} from './auth.state';
-import {Actions, ActionTypes} from './auth.actions';
+import {Actions, ActionTypes, ProcessTokenAction, AuthErrorAction} from './auth.actions';
 import {AuthService} from './auth.service';
 
 export function authReducer(state = initialState, action: Actions): AuthState {
@@ -12,16 +12,18 @@ export function authReducer(state = initialState, action: Actions): AuthState {
       return Object.assign({}, initialState);
 
     case ActionTypes.PROCESS_TOKEN:
-      const userData = AuthService.decodeAccessToken(action.jwtToken);
+      const processTokenAction: ProcessTokenAction = action as ProcessTokenAction;
+      const userData = AuthService.decodeAccessToken(processTokenAction.jwtToken);
       return Object.assign({}, initialState, {
         authenticated: true,
         tokenExpirationDate: new Date(userData.exp * 1000),
         userData: userData,
-        jwtToken: action.jwtToken
+        jwtToken: processTokenAction.jwtToken
       });
 
     case ActionTypes.AUTH_ERROR:
-      return Object.assign({}, userData, {error: action.error});
+      const authErrorAction: AuthErrorAction = action as AuthErrorAction;
+      return Object.assign({}, userData, {error: authErrorAction.error});
 
     case ActionTypes.CLEAR_AUTH_ERROR:
       return Object.assign({}, userData, {error: null});