refactor(app): fix some ESLint issues

Awk34 · Awk34 · commit acb09d13a546 · 2017-10-12T18:38:19.000-04:00
diff --git a/src/test/get-expected-files.js b/src/test/get-expected-files.js
@@ -90,6 +90,7 @@ export function app(options) {
     '.babelrc',
     '.buildignore',
     '.editorconfig',
+    '.eslintignore',
     '.eslintrc',
     '.gitattributes',
     '.gitignore',
diff --git a/templates/app/.eslintignore b/templates/app/.eslintignore
@@ -0,0 +1 @@
+client/components/socket/primus.js
diff --git a/templates/app/client/.eslintrc(babel) b/templates/app/client/.eslintrc(babel)
@@ -3,5 +3,11 @@
     "env": {
         "browser": true,
         "commonjs": true
+    },
+    "globals": {
+        "process": true
+    },
+    "rules": {
+        "no-process-env": 0
     }
 }
diff --git a/templates/app/client/app/account(auth)/account.module.js b/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 --git a/templates/app/client/app/account(auth)/account.routes.js b/templates/app/client/app/account(auth)/account.routes.js
diff --git a/templates/app/client/app/admin(auth)/admin.routes.js b/templates/app/client/app/admin(auth)/admin.routes.js
diff --git a/templates/app/client/app/app.module.js b/templates/app/client/app/app.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,11 +21,10 @@ 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 { AccountModule } from './account/account.module';
 import { AdminModule } from './admin/admin.module';
@@ -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,
@@ -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
   }
 }
diff --git a/templates/app/client/components/auth(auth)/auth.service.js b/templates/app/client/components/auth(auth)/auth.service.js
@@ -1,9 +1,7 @@
 import { Injectable, EventEmitter, Output } from '@angular/core';
-import { Response } from '@angular/http';
 import { AuthHttp } from 'angular2-jwt';
 import { UserService } from './user.service';
 import { Http } from '@angular/http';
-import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/toPromise';
 import { safeCb, extractData } from '../util';
 import constants from '../../app/app.constants';
diff --git a/templates/app/client/components/navbar/navbar.component.js b/templates/app/client/components/navbar/navbar.component.js
@@ -53,11 +53,9 @@ export class NavbarComponent {
   }
 
   logout() {
-    let promise = this.AuthService.logout();
-    <%_ if(filters.uirouter) { -%>
-    this.StateService.go('login');<% } -%>
-    <%_ if(filters.ngroute) { -%>
-    this.Router.navigateByUrl('/home');<% } -%>
+    let promise = this.AuthService.logout();<% if(filters.uirouter) { %>
+    this.StateService.go('login');<% } %><% if(filters.ngroute) { %>
+    this.Router.navigateByUrl('/home');<% } %>
     return promise;
   }<% } -%>
 }
diff --git a/templates/app/client/components/socket(ws)/socket.mock.js b/templates/app/client/components/socket(ws)/socket.mock.js
@@ -1,7 +1,6 @@
 'use strict';
 
 export class SocketServiceStub {
-  constructor() {}
   syncUpdates() {}
   unsyncUpdates() {}
 }
diff --git a/templates/app/server/api/user(auth)/user.model(mongooseModels).js b/templates/app/server/api/user(auth)/user.model(mongooseModels).js
@@ -197,14 +197,16 @@ UserSchema.methods = {
    * @return {String}
    * @api public
    */
-  makeSalt(byteSize, callback) {
+  makeSalt(...args) {
     var defaultByteSize = 16;
+    let byteSize;
+    let callback;
 
-    if(typeof arguments[0] === 'function') {
-      callback = arguments[0];
+    if(typeof args[0] === 'function') {
+      callback = args[0];
       byteSize = defaultByteSize;
-    } else if(typeof arguments[1] === 'function') {
-      callback = arguments[1];
+    } else if(typeof args[1] === 'function') {
+      callback = args[1];
     } else {
       throw new Error('Missing Callback');
     }
diff --git a/templates/app/server/api/user(auth)/user.model(sequelizeModels).js b/templates/app/server/api/user(auth)/user.model(sequelizeModels).js
@@ -135,14 +135,16 @@ export default function(sequelize, DataTypes) {
        * @return {String}
        * @api public
        */
-      makeSalt(byteSize, callback) {
+      makeSalt(...args) {
         var defaultByteSize = 16;
+        let byteSize;
+        let callback;
 
-        if(typeof arguments[0] === 'function') {
-          callback = arguments[0];
+        if(typeof args[0] === 'function') {
+          callback = args[0];
           byteSize = defaultByteSize;
-        } else if(typeof arguments[1] === 'function') {
-          callback = arguments[1];
+        } else if(typeof args[1] === 'function') {
+          callback = args[1];
         } else {
           throw new Error('Missing Callback');
         }
diff --git a/templates/app/server/config/environment/shared.js b/templates/app/server/config/environment/shared.js
@@ -1,4 +1,5 @@
 'use strict';
+/*eslint no-process-env:0*/
 
 module.exports.default = {
   env: process.env.NODE_ENV,
diff --git a/templates/app/server/config/express.js b/templates/app/server/config/express.js
@@ -72,7 +72,7 @@ export default function(app) {
    * Lusca - express server security
    * https://github.com/krakenjs/lusca
    */
-  if(env !== 'test' && env !== 'development' && !process.env.SAUCE_USERNAME) {
+  if(env !== 'test' && env !== 'development' && !process.env.SAUCE_USERNAME) { // eslint-disable-line no-process-env
     app.use(lusca({
       csrf: true,
       xframe: 'SAMEORIGIN',
diff --git a/templates/app/server/index.js b/templates/app/server/index.js
@@ -1,4 +1,5 @@
 'use strict';
+/*eslint no-process-env:0*/
 
 // Set default node environment to development
 var env = process.env.NODE_ENV = process.env.NODE_ENV || 'development';
diff --git a/templates/endpoint/basename.controller.js b/templates/endpoint/basename.controller.js
@@ -96,7 +96,7 @@ export function create(req, res) {
 // Upserts the given <%= classedName %> in the DB at the specified ID
 export function upsert(req, res) {
   if(req.body._id) {
-    delete req.body._id;
+    Reflect.deleteProperty(req.body, '_id');
   }
   <%_ if(filters.mongooseModels) { -%>
   return <%= classedName %>.findOneAndUpdate({_id: req.params.id}, req.body, {new: true, upsert: true, setDefaultsOnInsert: true, runValidators: true}).exec()<% } %>
@@ -113,7 +113,7 @@ export function upsert(req, res) {
 // Updates an existing <%= classedName %> in the DB
 export function patch(req, res) {
   if(req.body._id) {
-    delete req.body._id;
+    Reflect.deleteProperty(req.body, '_id');
   }
   <% if(filters.mongooseModels) { %>return <%= classedName %>.findById(req.params.id).exec()<% }
      if(filters.sequelizeModels) { %>return <%= classedName %>.find({

Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,11 @@`
`3`	`3`	`"env": {`
`4`	`4`	`"browser": true,`
`5`	`5`	`"commonjs": true`
	`6`	`+ },`
	`7`	`+ "globals": {`
	`8`	`+ "process": true`
	`9`	`+ },`
	`10`	`+ "rules": {`
	`11`	`+ "no-process-env": 0`
`6`	`12`	`}`
`7`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,11 +53,9 @@ export class NavbarComponent {`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`logout() {`
`56`		`- let promise = this.AuthService.logout();`
`57`		`- <%_ if(filters.uirouter) { -%>`
`58`		`- this.StateService.go('login');<% } -%>`
`59`		`- <%_ if(filters.ngroute) { -%>`
`60`		`- this.Router.navigateByUrl('/home');<% } -%>`
	`56`	`+ let promise = this.AuthService.logout();<% if(filters.uirouter) { %>`
	`57`	`+ this.StateService.go('login');<% } %><% if(filters.ngroute) { %>`
	`58`	`+ this.Router.navigateByUrl('/home');<% } %>`
`61`	`59`	`return promise;`
`62`	`60`	`}<% } -%>`
`63`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`'use strict';`
`2`	`2`
`3`	`3`	`export class SocketServiceStub {`
`4`		`- constructor() {}`
`5`	`4`	`syncUpdates() {}`
`6`	`5`	`unsyncUpdates() {}`
`7`	`6`	`}`