Merge pull request #60 from netlify/refactor/reorder-imports

Group `require()` statements

Author: ehmicky

.eslintrc.json

@@ -21,7 +21,8 @@
         "args": "none",
         "ignoreRestSiblings": true
       }
-    ]
+    ],
+    "import/order": [2, { "newlines-between": "always" }]
   },
   "overrides": [
     {

src/deploy/hash-files.js

@@ -1,6 +1,8 @@
 const { promisify } = require('util')
+
 const walker = require('folder-walker')
 const pump = promisify(require('pump'))
+
 const { hasherCtor, manifestCollectorCtor, fileFilterCtor, fileNormalizerCtor } = require('./hasher-segments')
 
 module.exports = hashFiles

src/deploy/hash-files.test.js

@@ -1,7 +1,9 @@
+const path = require('path')
+
 const test = require('ava')
+
 const hashFiles = require('./hash-files')
 const { defaultFilter } = require('./util')
-const path = require('path')
 
 test('hashes files in a folder', async t => {
   const { files, filesShaMap } = await hashFiles(__dirname, path.resolve(__dirname, '../../fixtures/netlify.toml'), {

src/deploy/hash-fns.js

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

src/deploy/hash-fns.test.js

@@ -1,7 +1,8 @@
 const test = require('ava')
+const tempy = require('tempy')
+
 const hashFns = require('./hash-fns')
 const { defaultFilter } = require('./util')
-const tempy = require('tempy')
 
 test('hashes files in a folder', async t => {
   const { functions, fnShaMap } = await hashFns(__dirname, { filter: defaultFilter, tmpDir: tempy.directory() })

src/deploy/hasher-segments.js

@@ -1,10 +1,11 @@
 const objFilterCtor = require('through2-filter').objCtor
 const objWriter = require('flush-write-stream').obj
-const { normalizePath } = require('./util')
 const transform = require('parallel-transform')
 const hasha = require('hasha')
 const map = require('through2-map').obj
 
+const { normalizePath } = require('./util')
+
 // a parallel transform stream segment ctor that hashes fileObj's created by folder-walker
 exports.hasherCtor = ({ concurrentHash, hashAlgorithm = 'sha1' }) => {
   const hashaOpts = { algorithm: hashAlgorithm }

src/deploy/index.js

@@ -1,12 +1,13 @@
-const uploadFiles = require('./upload-files')
-const hashFiles = require('./hash-files')
-const hashFns = require('./hash-fns')
+const { promisify } = require('util')
+
 const cleanDeep = require('clean-deep')
 const tempy = require('tempy')
-const { promisify } = require('util')
 const rimraf = promisify(require('rimraf'))
-const { waitForDiff } = require('./util')
 
+const hashFns = require('./hash-fns')
+const hashFiles = require('./hash-files')
+const uploadFiles = require('./upload-files')
+const { waitForDiff } = require('./util')
 const { waitForDeploy, getUploadList, defaultFilter } = require('./util')
 
 module.exports = async (api, siteId, dir, opts) => {

src/deploy/upload-files.js

@@ -1,5 +1,6 @@
-const pMap = require('p-map')
 const fs = require('fs')
+
+const pMap = require('p-map')
 const backoff = require('backoff')
 const debug = require('debug')('netlify:deploy')
 

src/deploy/util.js

@@ -1,4 +1,5 @@
 const path = require('path')
+
 const pWaitFor = require('p-wait-for')
 const flatten = require('lodash.flatten')
 

src/deploy/util.test.js

@@ -1,4 +1,5 @@
 const test = require('ava')
+
 const { normalizePath } = require('./util')
 
 test('normalizes relative file paths', t => {