Merge branch 'main' into renovate/nrwl-monorepo

kodiakhq[bot] · web-flow · commit a772c6c51d70 · 2021-12-06T14:53:21.000Z
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,7 @@
-const { overrides } = require('@netlify/eslint-config-node/react_config')
+const { overrides } = require('@netlify/eslint-config-node')
 
 module.exports = {
-  extends: '@netlify/eslint-config-node/react_config',
+  extends: '@netlify/eslint-config-node',
   rules: {
     'max-depth': 0,
     complexity: 0,
@@ -19,11 +19,9 @@ module.exports = {
     'no-param-reassign': 0,
     'no-promise-executor-return': 0,
     'no-prototype-builtins': 0,
-    'no-shadow': 0,
     'no-unused-vars': 0,
     'prefer-regex-literals': 0,
     'promise/prefer-await-to-callbacks': 0,
-    'require-await': 0,
     'unicorn/consistent-function-scoping': 0,
     'unicorn/filename-case': 0,
     'unicorn/no-array-push-push': 0,
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -76,7 +76,7 @@
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.16.0",
     "@netlify/build": "^20.1.0",
-    "@netlify/eslint-config-node": "^3.3.11",
+    "@netlify/eslint-config-node": "^4.0.0",
     "@testing-library/cypress": "^8.0.1",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^27.0.2",
diff --git a/src/helpers/files.js b/src/helpers/files.js
@@ -104,12 +104,12 @@ exports.moveStaticPages = async ({ netlifyConfig, target, i18n }) => {
   const moveFile = async (file) => {
     const isData = file.endsWith('.json')
     const source = join(root, file)
-    const target = isData ? join(dataDir, file) : file
+    const targetFile = isData ? join(dataDir, file) : file
 
     files.push(file)
-    filesManifest[file] = target
+    filesManifest[file] = targetFile
 
-    const dest = join(netlifyConfig.build.publish, target)
+    const dest = join(netlifyConfig.build.publish, targetFile)
 
     try {
       await move(source, dest)
@@ -130,7 +130,7 @@ exports.moveStaticPages = async ({ netlifyConfig, target, i18n }) => {
 
   // Limit concurrent file moves to number of cpus or 2 if there is only 1
   const limit = pLimit(Math.max(2, cpus().length))
-  const promises = pages.map(async (rawPath) => {
+  const promises = pages.map((rawPath) => {
     const filePath = slash(rawPath)
     // Don't move ISR files, as they're used for the first request
     if (isrFiles.has(filePath)) {
diff --git a/src/helpers/verification.js b/src/helpers/verification.js
@@ -78,15 +78,15 @@ exports.checkZipSize = async (file, maxSize = LAMBDA_MAX_SIZE) => {
     console.warn(`Could not check zip size because ${file} does not exist`)
     return
   }
-  const size = await promises.stat(file).then(({ size }) => size)
-  if (size < maxSize) {
+  const fileSize = await promises.stat(file).then(({ size }) => size)
+  if (fileSize < maxSize) {
     return
   }
   // We don't fail the build, because the actual hard max size is larger so it might still succeed
   console.log(
     redBright(outdent`
       The function zip ${yellowBright(relative(process.cwd(), file))} size is ${prettyBytes(
-      size,
+      fileSize,
     )}, which is larger than the maximum supported size of ${prettyBytes(maxSize)}.
       There are a few reasons this could happen. You may have accidentally bundled a large dependency, or you might have a
       large number of pre-rendered pages included.
