Merge pull request #94 from netlify/chore/fix-eslintrc

Fix linting

Author: ehmicky

.eslintrc.json

@@ -14,15 +14,20 @@
   ],
   "rules": {
     "no-console": 0,
-    "no-unused-vars": [
-      "error",
+    "no-unused-vars": 2,
+    "import/order": [
+      2,
       {
-        "vars": "all",
-        "args": "none",
-        "ignoreRestSiblings": true
+        "newlines-between": "always",
+        "alphabetize": {
+          "order": "asc",
+          "caseInsensitive": true
+        }
       }
     ],
-    "import/order": [2, { "newlines-between": "always" }]
+    "no-process-exit": 0,
+    "require-atomic-updates": 0,
+    "no-undef": [2, { "typeof": true }]
   },
   "overrides": [
     {

package.json

@@ -84,19 +84,19 @@
     "through2-map": "^3.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.4.3",
-    "@babel/plugin-transform-runtime": "^7.4.3",
-    "@babel/preset-env": "^7.4.3",
-    "@babel/runtime": "^7.4.3",
+    "@babel/core": "^7.9.0",
+    "@babel/plugin-transform-runtime": "^7.9.0",
+    "@babel/preset-env": "^7.9.0",
+    "@babel/runtime": "^7.9.2",
     "auto-changelog": "^1.13.0",
     "ava": "^2.4.0",
-    "babel-eslint": "^10.0.3",
-    "babel-loader": "^8.0.5",
-    "eslint": "^5.16.0",
-    "eslint-config-prettier": "^6.5.0",
-    "eslint-plugin-import": "2.18.1",
-    "eslint-plugin-node": "^10.0.0",
-    "eslint-plugin-prettier": "^3.1.1",
+    "babel-eslint": "^10.1.0",
+    "babel-loader": "^8.1.0",
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.10.1",
+    "eslint-plugin-import": "^2.20.2",
+    "eslint-plugin-node": "^11.1.0",
+    "eslint-plugin-prettier": "^3.1.2",
     "from2-string": "^1.1.0",
     "gh-release": "^3.5.0",
     "husky": "^3.0.9",

src/deploy/hash-fns.js

@@ -1,9 +1,9 @@
-const { promisify } = require('util')
 const path = require('path')
+const { promisify } = require('util')
 
-const pump = promisify(require('pump'))
-const fromArray = require('from2-array')
 const zipIt = require('@netlify/zip-it-and-ship-it')
+const fromArray = require('from2-array')
+const pump = promisify(require('pump'))
 
 const { hasherCtor, manifestCollectorCtor } = require('./hasher-segments')
 

src/deploy/hasher-segments.js

@@ -1,7 +1,7 @@
-const objFilterCtor = require('through2-filter').objCtor
 const objWriter = require('flush-write-stream').obj
-const transform = require('parallel-transform')
 const hasha = require('hasha')
+const transform = require('parallel-transform')
+const objFilterCtor = require('through2-filter').objCtor
 const map = require('through2-map').obj
 
 const { normalizePath } = require('./util')

src/deploy/index.js

@@ -1,11 +1,11 @@
 const { promisify } = require('util')
 
 const cleanDeep = require('clean-deep')
-const tempy = require('tempy')
 const rimraf = promisify(require('rimraf'))
+const tempy = require('tempy')
 
-const hashFns = require('./hash-fns')
 const hashFiles = require('./hash-files')
+const hashFns = require('./hash-fns')
 const uploadFiles = require('./upload-files')
 const { waitForDiff } = require('./util')
 const { waitForDeploy, getUploadList, defaultFilter } = require('./util')
@@ -24,7 +24,7 @@ module.exports = async (api, siteId, dir, opts) => {
       filter: defaultFilter,
       syncFileLimit: 7000, // number of files
       maxRetry: 5, // number of times to retry an upload
-      statusCb: statusObj => {
+      statusCb: () => {
         /* default to noop */
         /* statusObj: {
             type: name-of-step

src/deploy/upload-files.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
 
-const pMap = require('p-map')
 const backoff = require('backoff')
+const pMap = require('p-map')
 
 module.exports = uploadFiles
 async function uploadFiles(api, deployId, uploadList, { concurrentUpload, statusCb, maxRetry }) {
@@ -77,7 +77,7 @@ function retryUpload(uploadFn, maxRetry) {
     })
     fibonacciBackoff.failAfter(maxRetry)
 
-    fibonacciBackoff.on('backoff', (number, delay) => {
+    fibonacciBackoff.on('backoff', () => {
       // Do something when backoff starts, e.g. show to the
       // user the delay before next reconnection attempt.
     })
@@ -88,7 +88,7 @@ function retryUpload(uploadFn, maxRetry) {
       reject(lastError)
     })
 
-    function tryUpload(number, delay) {
+    function tryUpload() {
       uploadFn()
         .then(results => resolve(results))
         .catch(e => {

src/deploy/util.js

@@ -1,7 +1,7 @@
 const path = require('path')
 
-const pWaitFor = require('p-wait-for')
 const flatten = require('lodash.flatten')
+const pWaitFor = require('p-wait-for')
 
 // Default filter when scanning for files
 exports.defaultFilter = filename => {
@@ -111,4 +111,4 @@ exports.getUploadList = function(required, shaMap) {
   return flatten(required.map(sha => shaMap[sha]))
 }
 
-exports.retry = async (fn, errHandler, opts) => {}
+exports.retry = async () => {}

src/index.js

@@ -1,11 +1,11 @@
-const set = require('lodash.set')
-const get = require('lodash.get')
 const dfn = require('@netlify/open-api')
+const get = require('lodash.get')
+const set = require('lodash.set')
 const pWaitFor = require('p-wait-for')
 
+const deploy = require('./deploy')
 const { addMethods } = require('./methods')
 const { getOperations } = require('./operations')
-const deploy = require('./deploy')
 
 class NetlifyAPI {
   constructor(accessToken, opts) {

src/index.test.js

@@ -1,7 +1,7 @@
 const test = require('ava')
-const nock = require('nock')
 const fromString = require('from2-string')
 const { TextHTTPError, JSONHTTPError } = require('micro-api-client')
+const nock = require('nock')
 
 const NetlifyAPI = require('./index')
 

src/methods/index.js

@@ -2,10 +2,10 @@ const fetch = require('node-fetch').default || require('node-fetch') // Webpack
 
 const { getOperations } = require('../operations')
 
-const { getUrl } = require('./url.js')
 const { addBody } = require('./body.js')
-const { shouldRetry, waitForRetry, MAX_RETRY } = require('./retry.js')
 const { parseResponse, getFetchError } = require('./response.js')
+const { shouldRetry, waitForRetry, MAX_RETRY } = require('./retry.js')
+const { getUrl } = require('./url.js')
 
 // For each OpenAPI operation, add a corresponding method.
 // The `operationId` is the method name.