chore(deps): update dependency @netlify/eslint-config-node to ^2.2.7 (#324)

renovate[bot] · web-flow · commit a2f936695fa9 · 2021-02-15T17:34:32.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -92,7 +92,7 @@
     "@babel/plugin-transform-runtime": "^7.12.15",
     "@babel/preset-env": "^7.12.16",
     "@babel/runtime": "^7.12.13",
-    "@netlify/eslint-config-node": "^2.2.5",
+    "@netlify/eslint-config-node": "^2.2.7",
     "ava": "^2.4.0",
     "babel-loader": "^8.2.2",
     "from2-string": "^1.1.0",
diff --git a/src/deploy/index.js b/src/deploy/index.js
@@ -111,7 +111,9 @@ const deploySite = async (
     phase: 'stop',
   })
 
-  const uploadList = getUploadList(requiredFiles, filesShaMap).concat(getUploadList(requiredFns, fnShaMap))
+  const filesUploadList = getUploadList(requiredFiles, filesShaMap)
+  const functionsUploadList = getUploadList(requiredFns, fnShaMap)
+  const uploadList = [...filesUploadList, ...functionsUploadList]
 
   await uploadFiles(api, deployId, uploadList, { concurrentUpload, statusCb, maxRetry })
 
diff --git a/src/deploy/upload_files.js b/src/deploy/upload_files.js
@@ -14,8 +14,8 @@ const uploadFiles = async (api, deployId, uploadList, { concurrentUpload, status
   })
 
   const uploadFile = async (fileObj, index) => {
-    const { normalizedPath, assetType, runtime } = fileObj
-    const readStreamCtor = () => fs.createReadStream(fileObj.filepath)
+    const { normalizedPath, assetType, runtime, filepath } = fileObj
+    const readStreamCtor = () => fs.createReadStream(filepath)
 
     statusCb({
       type: 'upload',
diff --git a/src/deploy/util.js b/src/deploy/util.js
@@ -111,6 +111,7 @@ const waitForDeploy = async (api, deployId, siteId, timeout) => {
 const getUploadList = (required, shaMap) => {
   if (!required || !shaMap) return []
   // TODO: use `Array.flatMap()` instead once we remove support for Node <11.0.0
+  // eslint-disable-next-line unicorn/prefer-spread
   return [].concat(...required.map((sha) => shaMap[sha]))
 }
 
diff --git a/src/operations.js b/src/operations.js
@@ -3,6 +3,8 @@ const omit = require('omit.js').default
 
 // Retrieve all OpenAPI operations
 const getOperations = function () {
+  // TODO: switch to Array.flat() once we drop support for Node.js < 11.0.0
+  // eslint-disable-next-line unicorn/prefer-spread
   return [].concat(
     ...Object.entries(paths).map(([path, pathItem]) => {
       const operations = omit(pathItem, ['parameters'])

Original file line number	Diff line number	Diff line change
`@@ -111,6 +111,7 @@ const waitForDeploy = async (api, deployId, siteId, timeout) => {`
`111`	`111`	`const getUploadList = (required, shaMap) => {`
`112`	`112`	`if (!required \|\| !shaMap) return []`
`113`	`113`	// TODO: use `Array.flatMap()` instead once we remove support for Node <11.0.0
	`114`	`+ // eslint-disable-next-line unicorn/prefer-spread`
`114`	`115`	`return [].concat(...required.map((sha) => shaMap[sha]))`
`115`	`116`	`}`
`116`	`117`