Merge pull request #2655 from angular-fullstack/feat/awk34-dev

Various canary features / fixes

Author: Awk34

Diff for: src/generators/app/USAGE

@@ -1,5 +1,5 @@
 Description:
-  Creates a Full-Stack AngularJS + Node app
+  Creates a Full-Stack Angular + Node app
 
 Example:
   yo angular-fullstack

Diff for: src/generators/app/index.js

@@ -158,7 +158,7 @@ export class Generator extends Base {
           }, {
             type: 'confirm',
             name: 'flow',
-            default: false,
+            default: true,
             message: 'Would you like to use Flow types with Babel?',
             when: answers => answers.transpiler === 'babel'
           }, {
@@ -466,35 +466,37 @@ export class Generator extends Base {
         const codeshiftStream = tap(function(file, t) {
           var contents = file.contents.toString();
 
-          // remove `implements Foo` from class declarations
-          contents = jscodeshift(contents)
-            .find(jscodeshift.ClassDeclaration)
-            .forEach(path => {
-              path.value.implements = null;
-            })
-            .toSource();
-
-          // remove any type annotations
-          contents = jscodeshift(contents)
-            .find(jscodeshift.TypeAnnotation)
-            .remove()
-            .toSource();
-          contents = jscodeshift(contents)
-            .find(jscodeshift.GenericTypeAnnotation)
-            .remove()
-            .toSource();
-
-          // remove any `type Foo = { .. }` declarations
-          contents = jscodeshift(contents)
-            .find(jscodeshift.TypeAlias)
-            .remove()
-            .toSource();
-
-          // remove any flow directive comments
-          contents = jscodeshift(contents)
-            .find(jscodeshift.Comment, path => path.type === 'CommentLine' && path.value.includes('@flow'))
-            .forEach(path => path.prune())
-            .toSource();
+          if(!flow) {
+            // remove `implements Foo` from class declarations
+            contents = jscodeshift(contents)
+              .find(jscodeshift.ClassDeclaration)
+              .forEach(path => {
+                path.value.implements = null;
+              })
+              .toSource();
+
+            // remove any type annotations
+            contents = jscodeshift(contents)
+              .find(jscodeshift.TypeAnnotation)
+              .remove()
+              .toSource();
+            contents = jscodeshift(contents)
+              .find(jscodeshift.GenericTypeAnnotation)
+              .remove()
+              .toSource();
+
+            // remove any `type Foo = { .. }` declarations
+            contents = jscodeshift(contents)
+              .find(jscodeshift.TypeAlias)
+              .remove()
+              .toSource();
+
+            // remove any flow directive comments
+            contents = jscodeshift(contents)
+              .find(jscodeshift.Comment, path => path.type === 'CommentLine' && path.value.includes('@flow'))
+              .forEach(path => path.prune())
+              .toSource();
+          }
 
           file.contents = new Buffer(contents);
         });

Diff for: src/test/fixtures/.yo-rc.json

@@ -15,7 +15,7 @@
     "filters": {
       "js": true,
       "babel": true,
-      "flow": false,
+      "flow": true,
       "html": true,
       "sass": true,
       "ngroute": true,

Diff for: src/test/get-expected-files.js

@@ -90,6 +90,7 @@ export function app(options) {
     '.babelrc',
     '.buildignore',
     '.editorconfig',
+    '.eslintignore',
     '.eslintrc',
     '.gitattributes',
     '.gitignore',
@@ -156,7 +157,6 @@ export function app(options) {
   if (options.auth) {
     files = files.concat([
       'client/app/account/account.module.' + script,
-      'client/app/account/account.routes.' + script,
       'client/app/account/login/login.' + markup,
       'client/app/account/login/login.component.' + script,
       'client/app/account/settings/settings.' + markup,
@@ -167,7 +167,6 @@ export function app(options) {
       'client/app/admin/admin.' + stylesheet,
       'client/app/admin/admin.component.' + script,
       'client/app/admin/admin.module.' + script,
-      'client/app/admin/admin.routes.' + script,
       'client/components/auth/auth.module.' + script,
       'client/components/auth/auth.service.' + script,
       'client/components/auth/interceptor.service.' + script,

Diff for: src/test/main.test.js

@@ -17,6 +17,7 @@ import {
 const defaultOptions = {
   buildtool: 'gulp',
   transpiler: 'babel',
+  flow: true,
   markup: 'html',
   stylesheet: 'sass',
   router: 'ngroute',
@@ -263,6 +264,7 @@ describe('angular-fullstack:app', function() {
     var testOptions = {
       buildtool: 'gulp',
       transpiler: 'babel',
+      flow: true,
       markup: 'pug',
       stylesheet: 'css',
       router: 'ngroute',

Diff for: templates/app/.eslintignore

@@ -0,0 +1 @@
+client/components/socket/primus.js

Diff for: templates/app/_package.json

@@ -3,6 +3,7 @@
   "version": "0.0.0",
   "main": "server/index.js",
   "dependencies": {
+    "compression": "^1.7.1",
     "core-js": "^2.4.1",
     "cors": "^2.8.1",
     "express": "^4.13.3",
@@ -45,8 +46,7 @@
     "primus": "^7.0.1",
     "primus-emit": "^1.0.0",
     "uws": "^8.14.1",<% } %>
-    "serve-favicon": "^2.3.0",
-    "shrink-ray": "^0.1.3"
+    "serve-favicon": "^2.3.0"
   },
   "devDependencies": {
     <%# CLIENT %>
@@ -213,6 +213,9 @@
     "npm": "^3.9.5"
   },
   "scripts": {
+    "lint": "npm run lint:client && npm run lint:server",
+    "lint:client": "eslint ./client/**/*.<%= scriptExt %> -c ./client/.eslintrc --ignore-pattern *.spec.<%= scriptExt %>",
+    "lint:server": "eslint ./server/**/*.js -c ./server/.eslintrc --ignore-pattern *.spec.js --ignore-pattern *.integration.js",
     "test": "gulp test",
     "test:client": "karma start ./karma.conf.js --single-run",
     <%_ if(filters.flow) { -%>

Diff for: templates/app/client/.eslintrc(babel)

@@ -3,5 +3,11 @@
     "env": {
         "browser": true,
         "commonjs": true
+    },
+    "globals": {
+        "process": true
+    },
+    "rules": {
+        "no-process-env": 0
     }
 }

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

@@ -8,9 +8,6 @@ import { RouterModule, Routes } from '@angular/router';<% } %>
 <%_ if(filters.oauth) { -%>
 import { DirectivesModule } from '../../components/directives.module';<% } %>
 
-<%_ if(filters.uirouter) { -%>
-import { STATES } from './account.routes';<% } %>
-
 import { LoginComponent } from './login/login.component';
 import { SettingsComponent } from './settings/settings.component';
 import { SignupComponent } from './signup/signup.component';
@@ -19,7 +16,6 @@ import { SignupComponent } from './signup/signup.component';
 const accountRoutes: Routes = [{
   path: 'login',
   component: LoginComponent,
-  //data: { title: 'Home' }
 }, {
   path: 'settings',
   component: SettingsComponent,

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

@@ -38,6 +38,8 @@ export class SettingsComponent {
   }
 
   changePassword(form) {
+    if(form.invalid) return;
+
     this.submitted = true;
 
     return this.AuthService.changePassword(this.user.oldPassword, this.user.newPassword)

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

@@ -47,6 +47,8 @@ export class SignupComponent {
   }
 
   register(form) {
+    if(form.invalid) return;
+
     this.submitted = true;
 
     return this.AuthService.createUser({

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

@@ -1,10 +1,8 @@
 import { NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-<%_ if(filters.uirouter) { %>
-import { UIRouterModule } from 'ui-router-ng2';<% } %>
-<%_ if(filters.ngroute) { %>
+import { BrowserModule } from '@angular/platform-browser';<% if(filters.uirouter) { %>
+import { UIRouterModule } from 'ui-router-ng2';<% } %><% if(filters.ngroute) { %>
 import { RouterModule, Routes } from '@angular/router';<% } %>
-
+import { AuthGuard } from '../../components/auth/auth-guard.service';
 import { AdminComponent } from './admin.component';
 
 <%_ if(filters.uirouter) { -%>
@@ -13,6 +11,7 @@ import { STATES } from './admin.routes';<% } %>
 const adminRoutes: Routes = [{
   path: 'admin',
   component: AdminComponent,
+  canActivate: [AuthGuard],
 }];<% } %>
 
 @NgModule({

Diff for: templates/app/client/app/admin(auth)/admin.module.js

@@ -1,17 +1,16 @@
 import {
   NgModule,
-  ErrorHandler,
   Injectable,
-  ApplicationRef,
-  Provider,
+  ApplicationRef,<% if(filters.ts || filters.flow) { %>
+  Provider,<% } %>
 } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import {
   Http,
   HttpModule,
-  BaseRequestOptions,
+  BaseRequestOptions,<% if(filters.ts || filters.flow) { %>
   RequestOptions,
-  RequestOptionsArgs,
+  RequestOptionsArgs,<% } %>
 } from '@angular/http';
 import {
   removeNgStyles,
@@ -22,14 +21,13 @@ import {
 import { UIRouterModule } from 'ui-router-ng2';<% } %>
 <%_ if (filters.ngroute) { -%>
 import { RouterModule, Routes } from '@angular/router';<% } %>
-import { provideAuth, AuthHttp, AuthConfig } from 'angular2-jwt';
+import { AuthHttp, AuthConfig } from 'angular2-jwt';
 
 import { AppComponent } from './app.component';
 import { MainModule } from './main/main.module';
-// import { MainComponent } from './main/main.component';
-import { DirectivesModule } from '../components/directives.module';
+import { DirectivesModule } from '../components/directives.module';<% if(filters.auth) { %>
 import { AccountModule } from './account/account.module';
-import { AdminModule } from './admin/admin.module';
+import { AdminModule } from './admin/admin.module';<% } %>
 
 import constants from './app.constants';
 
@@ -50,7 +48,7 @@ let providers: Provider[] = [{
 if(constants.env === 'development') {
   @Injectable()
   class HttpOptions extends BaseRequestOptions {
-    merge(options/*:RequestOptionsArgs*/)/*:RequestOptions*/ {
+    merge(options: RequestOptionsArgs):RequestOptions {
       options.url = `http://localhost:9000${options.url}`;
       return super.merge(options);
     }
@@ -59,20 +57,10 @@ if(constants.env === 'development') {
   providers.push({ provide: RequestOptions, useClass: HttpOptions });
 }
 
-const appRoutes: Routes = [
-  //{ path: 'crisis-center', component: CrisisListComponent },
-  //{ path: 'hero/:id',      component: HeroDetailComponent },
-  // {
-  //   path: 'home',
-  //   component: MainComponent,
-  //   data: { title: 'Home' }
-  // },
-  { path: '',
-    redirectTo: '/home',
-    pathMatch: 'full'
-  },
-  //{ path: '**', component: PageNotFoundComponent }
-];
+const appRoutes: Routes = [{ path: '',
+  redirectTo: '/home',
+  pathMatch: 'full'
+}];
 
 @NgModule({
     providers,
@@ -84,9 +72,9 @@ const appRoutes: Routes = [
         <%_ if (filters.ngroute) { -%>
         RouterModule.forRoot(appRoutes, { enableTracing: process.env.NODE_ENV === 'development' }),<% } %>
         MainModule,
-        DirectivesModule,
+        DirectivesModule,<% if(filters.auth) { %>
         AccountModule,
-        AdminModule,
+        AdminModule,<% } %>
     ],
     declarations: [
         AppComponent,
@@ -110,8 +98,8 @@ export class AppModule {
     }
     // change detection
     this.appRef.tick();
-    delete store.state;
-    delete store.restoreInputValues;
+    Reflect.deleteProperty(store, 'state');
+    Reflect.deleteProperty(store, 'restoreInputValues');
   }
 
   hmrOnDestroy(store) {
@@ -131,7 +119,7 @@ export class AppModule {
   hmrAfterDestroy(store) {
     // display new elements
     store.disposeOldHosts()
-    delete store.disposeOldHosts;
+    Reflect.deleteProperty(store, 'disposeOldHosts');
     // anything you need done the component is removed
   }
 }