Upgrade eslint & standard and fix linting accordingly

.eslintrc

@@ -3,8 +3,5 @@
   "env": {
     "browser": false,
     "node": true
-  },
-  "globals": {
-    "window": false
   }
 }

package.json

@@ -24,9 +24,9 @@
   "license": "ISC",
   "homepage": "https://github.com/transloadit/uppy-server#readme",
   "devDependencies": {
-    "eslint": "1.10.3",
-    "eslint-config-standard": "4.4.0",
-    "eslint-plugin-standard": "1.3.1",
+    "eslint": "2.4.0",
+    "eslint-config-standard": "5.1.0",
+    "eslint-plugin-standard": "1.3.2",
     "frey": "0.3.7",
     "fakefile": "0.0.8",
     "nodemon": "1.8.1"

server/controllers/drive/get.js

@@ -8,7 +8,7 @@ var clientSecret = config.drive.secret
 var redirectUrl = config.server.url + config.drive.callback
 
 module.exports = function () {
-  return function *(next) {
+  return function * (next) {
     var service = google.drive('v2')
     var auth = new GoogleAuth()
 

server/controllers/drive/list.js

@@ -7,7 +7,7 @@ var clientSecret = config.drive.secret
 var redirectUrl = config.server.url + config.drive.callback
 
 module.exports = function () {
-  return function *(next) {
+  return function * (next) {
     var service = google.drive('v2')
     var auth = new GoogleAuth()
 

server/controllers/dropbox/auth.js

@@ -3,7 +3,7 @@ var config = require('../../../config/auth')
 var callback = config.server.protocol + '://' + config.server.host + config.dropbox.callback
 
 module.exports = function () {
-  return function *(next) {
+  return function * (next) {
     if (!this.session.dropbox) {
       this.session.dropbox = {}
     }

server/controllers/dropbox/fetch.js

@@ -1,6 +1,6 @@
 // var request = require('request')
 
 module.exports = function () {
-  return function *(next) {
+  return function * (next) {
   }
 }

server/controllers/dropbox/readdir.js

@@ -1,5 +1,5 @@
 module.exports = function () {
-  return function *(next) {
+  return function * (next) {
     var dir = 'todo' // @todo Where is dir coming from?
     this.session.dropbox.client.readdir(dir, (error, entries, stat, statFiles) => {
       if (error) {

server/controllers/google/callback.js

@@ -1,4 +1,4 @@
-module.exports = function *(next) {
+module.exports = function * (next) {
   this.session.google.token = this.query.access_token
   this.body = this.session.google
 }

server/controllers/google/get.js

@@ -1,6 +1,6 @@
 var fs = require('fs')
 
-module.exports = function *(next) {
+module.exports = function * (next) {
   var Purest = require('purest')
   var google = new Purest({provider: 'google', api: 'drive'})
   yield function listFiles (cb) {

server/controllers/google/list.js

@@ -1,4 +1,4 @@
-module.exports = function *(next) {
+module.exports = function * (next) {
   var self = this
   var Purest = require('purest')
   var google = new Purest({provider: 'google', api: 'drive'})

server/controllers/google/logout.js

@@ -1,3 +1,3 @@
-module.exports = function *(next) {
+module.exports = function * (next) {
   this.session.google.token = null
 }

server/controllers/redirect.js

@@ -5,7 +5,7 @@ var protocol = config.server.protocol
 var host = config.server.host
 
 module.exports = function (opts) {
-  return function *(next) {
+  return function * (next) {
     this.redirect(config.dropbox.authURI + '?response_type=code&client_id=' + config.dropbox.key + '&redirect_uri=' + protocol + '://' + host + config.dropbox.callback)
   }
 }

server/routes/google.js

@@ -2,7 +2,7 @@ var router = require('koa-router')({ prefix: '/google' })
 var handlers = require('../controllers/google')
 
 module.exports = function (app) {
-  router.use('/', function *(next) {
+  router.use('/', function * (next) {
     if (!this.session.google) {
       this.session.google = {}
     }