feat(core): update angular-cli to 1.0.0-rc.0

Author: kucharzyk

.angular-cli.json

@@ -1,6 +1,6 @@
 {
   "project": {
-    "version": "1.0.0-beta.32.3",
+    "version": "1.0.0-rc.0",
     "name": "shardis"
   },
   "apps": [
@@ -15,7 +15,8 @@
       "main": "main.ts",
       "polyfills": "polyfills.ts",
       "test": "test.ts",
-      "tsconfig": "tsconfig.json",
+      "tsconfig": "tsconfig.app.json",
+      "testTsconfig": "tsconfig.spec.json",
       "prefix": "shardis",
       "styles": [
         "../../../node_modules/clarity-icons/clarity-icons.min.css",
@@ -38,12 +39,13 @@
   },
   "lint": [
     {
-      "files": "src/main/typescript/**/*.ts",
-      "project": "src/main/typescript/tsconfig.json"
+      "project": "src/tsconfig.app.json"
     },
     {
-      "files": "e2e/**/*.ts",
-      "project": "e2e/tsconfig.json"
+      "project": "src/tsconfig.spec.json"
+    },
+    {
+      "project": "e2e/tsconfig.e2e.json"
     }
   ],
   "test": {
@@ -67,5 +69,6 @@
       "service": true
     }
   },
-  "packageManager": "yarn"
+  "packageManager": "npm",
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json"
 }

e2e/tsconfig.json e2e/tsconfig.e2e.jsone2e/tsconfig.json renamed to e2e/tsconfig.e2e.json

@@ -1,22 +1,25 @@
 {
-  "compileOnSave": false,
   "compilerOptions": {
+    "sourceMap": true,
     "declaration": false,
+    "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "lib": [
-      "es6",
+      "es2016",
       "dom"
     ],
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "noImplicitAny": true,
-    "suppressImplicitAnyIndexErrors": true,
     "outDir": "../src/main/resources/static/out-tsc-e2e",
-    "sourceMap": true,
-    "target": "es5",
+    "module": "commonjs",
+    "target": "es6",
+    "types": [
+      "jasmine",
+      "node"
+    ],
     "typeRoots": [
       "../node_modules/@types"
-    ]
+    ],
+    "noImplicitAny": true,
+    "suppressImplicitAnyIndexErrors": true
   }
 }

package.json

@@ -42,7 +42,7 @@
     "zone.js": "0.7.7"
   },
   "devDependencies": {
-    "@angular/cli": "1.0.0-beta.32.3",
+    "@angular/cli": "1.0.0-rc.0",
     "@angular/compiler-cli": "2.4.8",
     "@types/jasmine": "2.5.43",
     "@types/node": "7.0.5",
@@ -57,6 +57,7 @@
     "karma-cli": "1.0.1",
     "karma-coverage-istanbul-reporter": "0.2.3",
     "karma-jasmine": "1.1.0",
+    "karma-jasmine-html-reporter": "0.2.2",
     "npm-check": "5.4.0",
     "protractor": "5.1.1",
     "rimraf": "2.6.1",
@@ -72,7 +73,7 @@
     "preclean:start": "npm run clean",
     "clean:start": "npm start",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "docs": "compodoc -n Shardis -n Shardis -r 9999 -p src/main/typescript/tsconfig.json",
+    "docs": "compodoc -n Shardis -r 9999 -p src/main/typescript/tsconfig.app.json",
     "e2e": "ng e2e",
     "e2e:live": "ng e2e --elementExplorer",
     "lint": "ng lint",

protractor.conf.js

@@ -2,7 +2,7 @@
 // https://github.com/angular/protractor/blob/master/lib/config.ts
 
 /*global jasmine */
-var SpecReporter = require('jasmine-spec-reporter').SpecReporter;
+const {SpecReporter} = require('jasmine-spec-reporter');
 
 exports.config = {
   allScriptsTimeout: 11000,
@@ -24,10 +24,10 @@ exports.config = {
   useAllAngular2AppRoots: true,
   beforeLaunch: function () {
     require('ts-node').register({
-      project: 'e2e'
+      project: 'e2e/tsconfig.e2e.json'
     });
   },
   onPrepare: function () {
-    jasmine.getEnv().addReporter(new SpecReporter());
+    jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
   }
 };

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

@@ -23,6 +23,7 @@ export function authReducer(state = initialState, action: Actions): AuthState {
     case ActionTypes.PROCESS_TOKEN:
       const processTokenAction: ProcessTokenAction = action as ProcessTokenAction;
       const userData = decodeAccessToken(processTokenAction.payload);
+      console.log('userdata is ', userData);
       return (!userData) ? state : Object.assign({}, initialState, {
           authenticated: true,
           tokenExpirationDate: new Date(userData.exp * 1000),
@@ -32,10 +33,10 @@ export function authReducer(state = initialState, action: Actions): AuthState {
 
     case ActionTypes.AUTH_ERROR:
       const authErrorAction: AuthErrorAction = action as AuthErrorAction;
-      return Object.assign({}, userData, {error: authErrorAction.payload});
+      return Object.assign({}, state, {error: authErrorAction.payload});
 
     case ActionTypes.CLEAR_AUTH_ERROR:
-      return Object.assign({}, userData, {error: null});
+      return Object.assign({}, state, {error: null});
 
     default:
       return state;

src/main/typescript/tsconfig.json src/main/typescript/tsconfig.app.jsonsrc/main/typescript/tsconfig.json renamed to src/main/typescript/tsconfig.app.json

@@ -1,23 +1,28 @@
 {
   "compilerOptions": {
-    "baseUrl": "",
+    "sourceMap": true,
     "declaration": false,
+    "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "lib": [
-      "es6",
+      "es2016",
       "dom"
     ],
+    "outDir": "../out-tsc/app",
+    "target": "es5",
+    "module": "es2015",
+    "baseUrl": "",
+    "types": [],
     "mapRoot": "./",
-    "module": "es6",
-    "moduleResolution": "node",
     "noImplicitAny": true,
     "suppressImplicitAnyIndexErrors": true,
-    "outDir": "../../../src/main/resources/static/out-tsc",
-    "sourceMap": true,
-    "target": "es5",
     "typeRoots": [
       "../../../node_modules/@types"
     ]
-  }
+  },
+  "exclude": [
+    "test.ts",
+    "**/*.spec.ts"
+  ]
 }

src/main/typescript/tsconfig.spec.json

@@ -0,0 +1,33 @@
+{
+  "compilerOptions": {
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "es2016",
+      "dom"
+    ],
+    "outDir": "../out-tsc/spec",
+    "module": "commonjs",
+    "target": "es6",
+    "baseUrl": "",
+    "types": [
+      "jasmine",
+      "node"
+    ],
+    "mapRoot": "./",
+    "noImplicitAny": true,
+    "suppressImplicitAnyIndexErrors": true,
+    "typeRoots": [
+      "../../../node_modules/@types"
+    ]
+  },
+  "files": [
+    "test.ts"
+  ],
+  "include": [
+    "**/*.spec.ts"
+  ]
+}

tsconfig.json

@@ -0,0 +1,15 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "outDir": "./src/main/resources/static",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "es2016",
+      "dom"
+    ]
+  }
+}

tslint.json

@@ -46,7 +46,7 @@
     "no-empty": false,
     "no-empty-interface": true,
     "no-eval": true,
-    "no-inferrable-types": true,
+    "no-inferrable-types": [true, "ignore-params"],
     "no-shadowed-variable": true,
     "no-string-literal": false,
     "no-string-throw": true,