Merge pull request angular-fullstack#2729 from angular-fullstack/deps

Deps updates

Author: Awk34

Diff for: docs/package-lock.json

@@ -4,10 +4,9 @@
   "main": "server/index.js",
   "dependencies": {
     "compression": "^1.7.1",
-    "core-js": "^2.4.1",
-    "cors": "^2.8.1",
+    "core-js": "^2.5.0",
     "express": "^4.13.3",
-    "morgan": "~1.8.2",
+    "morgan": "^1.9.0",
     "body-parser": "^1.13.3",
     "method-override": "^2.3.10",
     "cookie-parser": "^1.3.5",
@@ -45,7 +44,7 @@
     "passport-google-oauth20": "^1.0.0",<% } %><% if(filters.ws) { %>
     "primus": "^7.0.1",
     "primus-emit": "^1.0.0",
-    "uws": "^8.14.1",<% } %>
+    "uws": "^10.148.0",<% } %>
     "serve-favicon": "^2.3.0"
   },
   "devDependencies": {
@@ -64,7 +63,7 @@
     <%#"@angular/material": "5.0.0-rc0",%>
     "@angularclass/hmr": "^2.1.3",
   <%_ if(filters.ts) { -%>
-    "@types/core-js": "^0.9.41",
+    "@types/core-js": "^2.5.0",
     <%_ if(filters.jasmine) { -%>
     "@types/jasmine": "^2.5.47",
     <%_ } -%>
@@ -104,7 +103,7 @@
 
     <%# END CLIENT %>
 
-    "autoprefixer": "^7.1.3",
+    "autoprefixer": "^8.6.0",
     "babel-eslint": "^8.2.3",
     "babel-register": "^6.16.0",
     "bs-fullscreen-message": "^1.0.0",
@@ -115,6 +114,7 @@
     "babel-plugin-transform-class-properties": "^6.6.0",
     "babel-plugin-istanbul": "^4.1.4",
     "babel-preset-env": "^1.6.1",
+    "cors": "^2.8.4",
     "cross-env": "^5.1.1",
     "eslint": "^4.19.1",
     "del": "^3.0.0",
@@ -155,8 +155,8 @@
     "html-webpack-harddisk-plugin": "~0.2.0",
     <%_ if(filters.pug) { _%>
     "pug-html-loader": "^1.1.5",<% } %>
-    "typescript": "~2.6.1",
-    "awesome-typescript-loader": "^3.3.0",
+    "typescript": "~2.9.0",
+    "awesome-typescript-loader": "^4.0.0",
     "babel-loader": "^7.1.2",
     "css-loader": "^0.28.7",
     "file-loader": "^0.11.2",

Diff for: package-lock.json

@@ -3,7 +3,8 @@ import { Component } from '@angular/core';
 <%_ if(filters.uirouter) { -%>
 import { StateService } from 'ui-router-ng2';<% } %>
 <%_ if(filters.ngroute) { -%>
-import { Router } from '@angular/router';<% } %>
+import { Router } from '@angular/router';<% } %><% if(filters.mongoose) { %>
+import { ValidationError } from 'mongoose';<% } %>
 import { AuthService } from '../../../components/auth/auth.service';
 
 <%_ if(filters.flow) { -%>
@@ -28,7 +29,7 @@ export class SignupComponent {
         email: '',
         password: ''
     };
-    errors = {};
+    errors: {field?: Error} = {};
     submitted = false;
     AuthService;
     <%_ if(filters.ngroute) { -%>
@@ -56,21 +57,22 @@ export class SignupComponent {
             password: this.user.password
         })
             .then(() => {
-                // Account created, redirect to home
-                <% if(filters.ngroute) { %>this.Router.navigateByUrl('/home');<% } -%>
-                <% if(filters.uirouter) { %>this.StateService.go('main');<% } -%>
-            })
-            .catch(err => {<% if(filters.mongooseModels) { %>
+                // Account created, redirect to home<% if(filters.ngroute) { %>
+                this.Router.navigateByUrl('/home');<% } %><% if(filters.uirouter) { %>
+                this.StateService.go('main');<% } %>
+            })<% if(filters.mongooseModels) { %>
+            .catch((err: {errors: {field: ValidationError}}) => {
                 this.errors = err.errors;
 
                 // Update validity of form fields that match the mongoose errors
-                Object.entries(err.errors).forEach(([field, error]) => {
+                Object.entries(err.errors).forEach(([field, error]: [string, ValidationError]) => {
                     this.errors[field] = error.message;
 
                     if(field === 'email' && error.kind === 'user defined') {
-                        form.form.controls[field].setErrors({inUse: true});
-                    }
+                    form.form.controls[field].setErrors({inUse: true});
+                }
                 });<% } %><% if(filters.sequelizeModels) { %>
+            .catch(err => {
                 this.errors = {};
 
                 // Update validity of form fields that match the sequelize errors

Diff for: templates/app/_package.json

@@ -1,6 +1 @@
-<%_ if(filters.babel) { -%>
-export default from '../../server/config/environment/shared';<% } %>
-<%_ if(filters.ts) { -%>
-import shared from '../../server/config/environment/shared.js';
-
-export default shared;<% } %>
+export * from '../../server/config/environment/shared';

Diff for: templates/app/client/app/account(auth)/signup/signup.component.js

@@ -2,7 +2,7 @@ import { Injectable, EventEmitter, Output } from '@angular/core';
 import { UserService } from './user.service';
 import { HttpClient } from '@angular/common/http';
 import { safeCb } from '../util';
-import constants from '../../app/app.constants';
+import { userRoles } from '../../app/app.constants';
 
 // @flow
 class User {
@@ -16,7 +16,7 @@ class User {
 export class AuthService {
     _currentUser: User = new User();
     @Output() currentUserChanged = new EventEmitter(true);
-    userRoles = constants.userRoles || [];
+    userRoles = userRoles || [];
     UserService;
 
     static parameters = [HttpClient, UserService];
@@ -43,7 +43,7 @@ export class AuthService {
      * @param {String} role - role to check against
      */
     static hasRole(userRole, role) {
-        return constants.userRoles.indexOf(userRole) >= constants.userRoles.indexOf(role);
+        return userRoles.indexOf(userRole) >= userRoles.indexOf(role);
     }
 
     get currentUser() {

Diff for: templates/app/client/app/app.constants.js

@@ -1,9 +1,13 @@
 'use strict';
 /*eslint no-process-env:0*/
 
-module.exports.default = {
-    env: process.env.NODE_ENV,
-    port: process.env.PORT || <%= devPort %>,
-    // List of user roles
-    userRoles: ['guest', 'user', 'admin']
+export const env = process.env.NODE_ENV;
+export const port = process.env.PORT || 9000;
+// List of user roles
+export const userRoles = ['guest', 'user', 'admin'];
+
+export default {
+    env,
+    port,
+    userRoles,
 };

Diff for: templates/app/client/components/auth(auth)/auth.service.js

@@ -2,8 +2,6 @@
  * Express configuration
  */
 
-'use strict';
-
 import express from 'express';
 import favicon from 'serve-favicon';
 import morgan from 'morgan';
@@ -31,6 +29,7 @@ export default function(app) {
 
     if(env === 'development' || env === 'test') {
         app.use(express.static(path.join(config.root, '.tmp')));
+        app.use(require('cors')());
     }
 
     if(env === 'production') {