Merge pull request #80 from davidgovea/bump-node

Bump supported node version, and update xo lint rules

.babelrc

@@ -2,7 +2,7 @@
   "presets": [
     ["@babel/env", {
       "targets": {
-        "node": "6.4.0",
+        "node": "8.9.4",
         "browsers": "last 2 versions"
       }
     }]

.travis.yml

@@ -1,11 +1,7 @@
 language: node_js
 node_js:
-  - '6'
   - '8'
-  - '9'
   - '10'
-install:
-  - yarn install --ignore-engines
 script:
   npm run test-coverage
 after_success:

package.json

@@ -68,10 +68,10 @@
     "remark-cli": "^5.0.0",
     "remark-preset-github": "^0.0.8",
     "sinon": "^5.0.7",
-    "xo": "0.21.0"
+    "xo": "0.24.0"
   },
   "engines": {
-    "node": ">=6.12.3 <7 || >=8.9.4"
+    "node": ">=8.9.4"
   },
   "files": [
     "lib"
@@ -160,8 +160,7 @@
       "capitalized-comments": "off",
       "camelcase": "off",
       "no-warning-comments": "off",
-      "prettier/prettier": "error",
-      "ava/use-t-well": "off"
+      "prettier/prettier": "error"
     },
     "space": true,
     "overrides": [

src/index.js

@@ -63,7 +63,7 @@ function createFrisbeeResponse(origResp) {
 
   const headersObj = {};
   origResp.headers.forEach(pair => {
-    headersObj[pair[0]] = pair[1]; // eslint-disable-line prefer-destructuring
+    headersObj[pair[0]] = pair[1];
   });
   Object.defineProperty(resp, 'headersObj', {
     value: headersObj
@@ -153,12 +153,13 @@ class Frisbee {
         ) {
           try {
             opts.body = JSON.stringify(opts.body);
-          } catch (err) {
-            throw err;
+          } catch (error) {
+            throw error;
           }
         }
       }
 
+      // eslint-disable-next-line no-async-promise-executor
       return new Promise(async (resolve, reject) => {
         try {
           const fullUri = this.opts.baseURI
@@ -201,10 +202,11 @@ class Frisbee {
                   if (res.body.error.param)
                     res.err.param = res.body.error.param;
                 }
-              } catch (e) {
+              } catch (error) {
                 res.err = this.parseErr;
               }
             }
+
             resolve(res);
             return;
           }
@@ -222,7 +224,7 @@ class Frisbee {
                 res.body = await res.text();
                 res.body = JSON.parse(res.body);
               }
-            } catch (err) {
+            } catch (error) {
               if (contentType === 'application/json') {
                 res.err = this.parseErr;
                 resolve(res);
@@ -234,8 +236,8 @@ class Frisbee {
           }
 
           resolve(res);
-        } catch (err) {
-          reject(err);
+        } catch (error) {
+          reject(error);
         }
       });
     };

src/interceptor.js

@@ -13,6 +13,7 @@ module.exports = class Interceptor {
     });
   }
 
+  /* eslint-disable promise/prefer-await-to-then */
   interceptedMethod(methodFn, ...args) {
     const { interceptors } = this;
     const reversedInterceptors = interceptors.slice().reverse();
@@ -40,6 +41,7 @@ module.exports = class Interceptor {
 
     return promise;
   }
+  /* eslint-enable promise/prefer-await-to-then */
 
   register(interceptor) {
     this.interceptors.push(interceptor);

test/browser.test.js

@@ -82,8 +82,8 @@ test('should create Frisbee instance with all methods', t => {
       const res = await api[method]('/', {});
       t.true(_.isObject(res));
       t.true(_.isObject(res.body));
-    } catch (err) {
-      throw err;
+    } catch (error) {
+      throw error;
     }
   });
 });

test/node.test.js

@@ -119,8 +119,8 @@ standardMethods.forEach(method => {
       const res = await api[method]('/', opts);
       t.true(_.isObject(res));
       t.true(_.isObject(res.body));
-    } catch (err) {
-      throw err;
+    } catch (error) {
+      throw error;
     }
   });
 });
@@ -153,9 +153,7 @@ test(
     should stringify querystring parameters with
     arrayFormat for GET and DELETE requests`,
   async t => {
-    const api = new Frisbee(
-      Object.assign({}, options, { formatArray: 'brackets' })
-    );
+    const api = new Frisbee({ ...options, formatArray: 'brackets' });
     const querystring = {
       a: 'blue',
       b: 'cyan',
@@ -252,8 +250,8 @@ methods.forEach(method => {
     try {
       await api[method]('/');
       t.true(interceptor.request.calledOnce);
-    } catch (err) {
-      throw err;
+    } catch (error) {
+      throw error;
     }
   });
 });