Merge pull request #187 from bitsoflogic/master

Trailing whitespace cleanup (#186)
feathersjs · Aug 25, 2018 · f2030dc · f2030dc
1 parent 4c4f445
commit f2030dc
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 24 deletions.
diff --git a/packages/generator-feathers/generators/app/index.js b/packages/generator-feathers/generators/app/index.js
@@ -7,7 +7,7 @@ const makeConfig = require('./configs');
 module.exports = class AppGenerator extends Generator {
   constructor(args, opts) {
     super(args, opts);
-    
+
     this.props = {
       name: this.pkg.name || process.cwd().split(path.sep).pop(),
       description: this.pkg.description,
@@ -102,7 +102,7 @@ module.exports = class AppGenerator extends Generator {
         if(input.indexOf('primus') !== -1 && input.indexOf('socketio') !== -1) {
           return 'You can only pick SocketIO or Primus, not both.';
         }
-        
+
         return true;
       }
     }];
@@ -161,11 +161,11 @@ module.exports = class AppGenerator extends Generator {
     this.props.providers.forEach(
       provider => this.dependencies.push(`feathers-${provider}`)
     );
-    
+
     this._packagerInstall(this.dependencies, {
       save: true
     });
-    
+
     this._packagerInstall(this.devDependencies, {
       saveDev: true
     });

diff --git a/packages/generator-feathers/generators/app/templates/README.md b/packages/generator-feathers/generators/app/templates/README.md
@@ -12,13 +12,13 @@ Getting up and running is as easy as 1, 2, 3.
 
 1. Make sure you have [NodeJS](https://nodejs.org/) and [npm](https://www.npmjs.com/) installed.
 2. Install your dependencies
-    
+
     ```
     cd path/to/<%= name %>; npm install
     ```
 
 3. Start your app
-    
+
     ```
     npm start
     ```

diff --git a/packages/generator-feathers/generators/authentication/index.js b/packages/generator-feathers/generators/authentication/index.js
@@ -14,7 +14,7 @@ const OAUTH2_STRATEGY_MAPPINGS = {
 module.exports = class AuthGenerator extends Generator {
   prompting() {
     this.checkPackage();
-    
+
     const prompts = [{
       type: 'checkbox',
       name: 'strategies',

diff --git a/packages/generator-feathers/generators/connection/index.js b/packages/generator-feathers/generators/connection/index.js
@@ -63,26 +63,26 @@ module.exports = class ConnectionGenerator extends Generator {
           }
         ]
       };
-    
+
     case 'memory':
       return null;
 
     case 'mongodb':
       this.dependencies.push(adapter);
       return connectionString;
-    
+
     case 'mariadb':
     case 'mysql':
     case 'mssql':
     // case oracle:
     case 'postgres': // eslint-disable-line no-fallthrough
     case 'sqlite':
       this.dependencies.push(adapter);
-      
+
       if (sqlPackages[database]) {
         this.dependencies.push(sqlPackages[database]);
       }
-      
+
       if (adapter === 'sequelize') {
         return connectionString;
       }
@@ -98,7 +98,7 @@ module.exports = class ConnectionGenerator extends Generator {
       throw new Error(`Invalid database '${database}'. Cannot assemble configuration.`);
     }
   }
-  
+
   _writeConfiguration() {
     const { database } = this.props;
     const config = Object.assign({}, this.defaultConfig);
@@ -116,13 +116,13 @@ module.exports = class ConnectionGenerator extends Generator {
 
   prompting() {
     this.checkPackage();
-    
+
     const databaseName = snakeCase(this.pkg.name);
     const { defaultConfig } = this;
 
     const getProps = answers => Object.assign({}, this.props, answers);
     const setProps = props => Object.assign(this.props, props);
-    
+
     const prompts = [
       {
         type: 'list',
@@ -144,7 +144,7 @@ module.exports = class ConnectionGenerator extends Generator {
         when(current) {
           const answers = getProps(current);
           const { database, adapter } = answers;
-          
+
           if (database) {
             return false;
           }
@@ -232,14 +232,14 @@ module.exports = class ConnectionGenerator extends Generator {
             sqlite: `sqlite://${databaseName}.sqlite`,
             mssql: `mssql://root:password@localhost:1433/${databaseName}`
           };
-          
+
           return defaultConnectionStrings[database];
         },
         when(current) {
           const answers = getProps(current);
           const { database } = answers;
           const connectionString = defaultConfig[database];
-          
+
           if (connectionString) {
             setProps({ connectionString });
             return false;

diff --git a/packages/generator-feathers/generators/connection/templates/sequelize-mssql.js b/packages/generator-feathers/generators/connection/templates/sequelize-mssql.js
@@ -8,7 +8,7 @@ module.exports = function() {
   const connectionString = app.get('mssql');
   const connection = url.parse(connectionString);
   const database = connection.path.substring(1, connection.path.length);
-  const { port, hostname, username, password } = connection; 
+  const { port, hostname, username, password } = connection;
   const sequelize = new Sequelize(database, username, password, {
     dialect: 'mssql',
     host: hostname,
@@ -28,7 +28,7 @@ module.exports = function() {
 
   app.setup = function(...args) {
     const result = oldSetup.apply(this, args);
-    
+
     // Set up data relationships
     const models = sequelize.models;
     Object.keys(models).forEach(name => {

diff --git a/packages/generator-feathers/generators/connection/templates/sequelize.js b/packages/generator-feathers/generators/connection/templates/sequelize.js
@@ -18,7 +18,7 @@ module.exports = function() {
 
   app.setup = function(...args) {
     const result = oldSetup.apply(this, args);
-    
+
     // Set up data relationships
     const models = sequelize.models;
     Object.keys(models).forEach(name => {

diff --git a/packages/generator-feathers/generators/hook/index.js b/packages/generator-feathers/generators/hook/index.js
@@ -58,7 +58,7 @@ module.exports = class HookGenerator extends Generator {
 
   prompting() {
     this.checkPackage();
-    
+
     const services = this._listDirectories(this.libDirectory, 'services');
     const prompts = [
       {

diff --git a/packages/generator-feathers/generators/middleware/index.js b/packages/generator-feathers/generators/middleware/index.js
@@ -7,7 +7,7 @@ const j = require('../../lib/transform');
 module.exports = class MiddlewareGenerator extends Generator {
   prompting() {
     this.checkPackage();
-    
+
     const prompts = [
       {
         name: 'name',

diff --git a/packages/generator-feathers/generators/service/index.js b/packages/generator-feathers/generators/service/index.js
@@ -14,7 +14,7 @@ const createExpression = (object, property, args = []) =>
 module.exports = class ServiceGenerator extends Generator {
   prompting() {
     this.checkPackage();
-    
+
     const { props } = this;
     const prompts = [
       {

diff --git a/packages/generator-feathers/generators/service/templates/model/mongoose-user.js b/packages/generator-feathers/generators/service/templates/model/mongoose-user.js
@@ -1,7 +1,7 @@
 'use strict';
 
 // <%= name %>-model.js - A mongoose model
-// 
+//
 // See http://mongoosejs.com/docs/models.html
 // for more of what you can do here.
 module.exports = function(app) {