fix: enable and fix unicorn/prefer-spread (#2943)

tinfoil-knight · erezrokah · web-flow · commit 77c6ebbbbb36 · 2021-07-15T11:52:39.000Z
Co-authored-by: Erez Rokah &lt;erezrokah@users.noreply.github.com&gt;
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -25,7 +25,6 @@ module.exports = {
     'fp/no-this': 0,
     'import/max-dependencies': 0,
     'node/no-sync': 0,
-    'unicorn/prefer-spread': 0,
     'unicorn/consistent-destructuring': 0,
     // TODO: harmonize with filename snake_case in other Netlify Dev projects
     'unicorn/filename-case': [2, { case: 'kebabCase' }],
diff --git a/src/commands/dev/trace.js b/src/commands/dev/trace.js
@@ -12,7 +12,7 @@ class TraceCommand extends Command {
   async run() {
     this.parse(TraceCommand)
 
-    const args = ['trace'].concat(this.argv)
+    const args = ['trace', ...this.argv]
     const { subprocess } = runProcess({ log: this.log, args })
     await subprocess
   }
diff --git a/src/utils/addons/compare.js b/src/utils/addons/compare.js
@@ -12,14 +12,14 @@ module.exports = function compare(oldValues, newValues) {
 
   const oldKeys = Object.keys(oldValues)
   const newKeys = Object.keys(newValues)
-  const set = new Set(newKeys.concat(oldKeys))
+  const set = new Set([...newKeys, ...oldKeys])
 
   return [...set].reduce((acc, current) => {
     // if values not deep equal. There are changes
     if (!isEqual(newValues[current], oldValues[current])) {
       return {
         isEqual: false,
-        keys: acc.keys.concat(current),
+        keys: [...acc.keys, current],
         diffs: {
           ...acc.diffs,
           [`${current}`]: {
diff --git a/src/utils/deploy/util.js b/src/utils/deploy/util.js
@@ -96,6 +96,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/utils/detect-server-settings.js b/src/utils/detect-server-settings.js
@@ -310,15 +310,16 @@ const filterSettings = function (scriptInquirerOptions, input) {
 }
 
 const formatSettingsArrForInquirer = function (frameworks) {
-  return [].concat(
-    ...frameworks.map((framework) =>
-      framework.dev.commands.map((command) => ({
-        name: `[${chalk.yellow(framework.name)}] '${command}'`,
-        value: { ...framework, commands: [command] },
-        short: `${framework.name}-${command}`,
-      })),
-    ),
+  const formattedArr = frameworks.map((framework) =>
+    framework.dev.commands.map((command) => ({
+      name: `[${chalk.yellow(framework.name)}] '${command}'`,
+      value: { ...framework, commands: [command] },
+      short: `${framework.name}-${command}`,
+    })),
   )
+  // Replace by .flatMap() when Node.js support >= 11.0.0
+  // eslint-disable-next-line unicorn/prefer-spread
+  return [].concat(...formattedArr)
 }
 
 module.exports = {
diff --git a/src/utils/proxy.js b/src/utils/proxy.js
@@ -201,7 +201,7 @@ const serveRedirect = async function ({ req, res, proxy, match, options }) {
     // We pass through request params in one of the following cases:
     // 1. The redirect rule doesn't have any query params
     // 2. This is a function redirect https://github.com/netlify/cli/issues/1605
-    if (Array.from(dest.searchParams).length === 0 || isFunction(options.functionsPort, stripOrigin(dest))) {
+    if ([...dest.searchParams].length === 0 || isFunction(options.functionsPort, stripOrigin(dest))) {
       dest.searchParams.forEach((_, key) => {
         dest.searchParams.delete(key)
       })

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class TraceCommand extends Command {`
`12`	`12`	`async run() {`
`13`	`13`	`this.parse(TraceCommand)`
`14`	`14`
`15`		`- const args = ['trace'].concat(this.argv)`
	`15`	`+ const args = ['trace', ...this.argv]`
`16`	`16`	`const { subprocess } = runProcess({ log: this.log, args })`
`17`	`17`	`await subprocess`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ const waitForDeploy = async (api, deployId, siteId, timeout) => {`
`96`	`96`	`const getUploadList = (required, shaMap) => {`
`97`	`97`	`if (!required \|\| !shaMap) return []`
`98`	`98`	// TODO: use `Array.flatMap()` instead once we remove support for Node <11.0.0
	`99`	`+ // eslint-disable-next-line unicorn/prefer-spread`
`99`	`100`	`return [].concat(...required.map((sha 10000 ) => shaMap[sha]))`
`100`	`101`	`}`
`101`	`102`