netlify-cli 6.9.4 → 6.9.8

package/src/utils/addons/prepare.js

@@ -1,6 +1,6 @@
 const chalk = require('chalk')
 
-const { log } = require('../command-helpers')
+const { log, error } = require('../command-helpers')
 
 const ADDON_VALIDATION = {
   EXISTS: 'EXISTS',
@@ -47,7 +47,7 @@ const validateCurrentAddon = ({ addon, validation, addonName, siteData, warn, ex
   }
 }
 
-const getAddonManifest = async ({ api, addonName, error }) => {
+const getAddonManifest = async ({ api, addonName }) => {
   let manifest
   try {
     manifest = await api.showServiceManifest({ addonName })
@@ -61,7 +61,7 @@ const getAddonManifest = async ({ api, addonName, error }) => {
   return manifest
 }
 
-const getSiteData = async ({ api, siteId, error }) => {
+const getSiteData = async ({ api, siteId }) => {
   let siteData
   try {
     siteData = await api.getSite({ siteId })
@@ -71,7 +71,7 @@ const getSiteData = async ({ api, siteId, error }) => {
   return siteData
 }
 
-const getAddons = async ({ api, siteId, error }) => {
+const getAddons = async ({ api, siteId }) => {
   let addons
   try {
     addons = await api.listServiceInstancesForSite({ siteId })
@@ -82,7 +82,7 @@ const getAddons = async ({ api, siteId, error }) => {
 }
 
 const prepareAddonCommand = async ({ context, addonName, validation }) => {
-  const { netlify, warn, error, exit } = context
+  const { netlify, warn, exit } = context
   const { api, site } = netlify
   const siteId = site.id
   if (!siteId) {
@@ -93,8 +93,8 @@ const prepareAddonCommand = async ({ context, addonName, validation }) => {
 
   const [manifest, siteData, addons] = await Promise.all([
     addonName ? getAddonManifest({ api, addonName, error }) : Promise.resolve(),
-    getSiteData({ api, siteId, error }),
-    getAddons({ api, siteId, error }),
+    getSiteData({ api, siteId }),
+    getAddons({ api, siteId }),
   ])
 
   let addon

package/src/utils/command.js

@@ -123,7 +123,7 @@ class BaseCommand extends TrackedCommand {
     try {
       await this.netlify.api.getCurrentUser()
       return true
-    } catch (_) {
+    } catch {
       return false
     }
   }

package/src/utils/dev.js

@@ -8,7 +8,7 @@ const isEmpty = require('lodash/isEmpty')
 
 const { supportsBackgroundFunctions } = require('../lib/account')
 
-const { log } = require('./command-helpers')
+const { log, warn } = require('./command-helpers')
 const { loadDotEnvFiles } = require('./dot-env')
 const { NETLIFYDEVLOG } = require('./logo')
 
@@ -73,7 +73,7 @@ const getAddonsInformation = ({ siteInfo, addons }) => {
   return { urls, env }
 }
 
-const getSiteAccount = ({ siteInfo, accounts, warn }) => {
+const getSiteAccount = ({ siteInfo, accounts }) => {
   const siteAccount = accounts.find((account) => account.slug === siteInfo.account_slug)
   if (!siteAccount) {
     warn(`Could not find account for site '${siteInfo.name}' with account slug '${siteInfo.account_slug}'`)
@@ -88,7 +88,7 @@ const SYNCHRONOUS_FUNCTION_TIMEOUT = 10
 // default 15 minutes for background functions
 const BACKGROUND_FUNCTION_TIMEOUT = 900
 
-const getSiteInformation = async ({ flags = {}, api, site, warn, error: failAndExit, siteInfo }) => {
+const getSiteInformation = async ({ flags = {}, api, site, error: failAndExit, siteInfo }) => {
   if (site.id && !flags.offline) {
     validateSiteInfo({ site, siteInfo, failAndExit })
     const [accounts, addons] = await Promise.all([
@@ -97,7 +97,7 @@ const getSiteInformation = async ({ flags = {}, api, site, warn, error: failAndE
     ])
 
     const { urls: addonsUrls } = getAddonsInformation({ siteInfo, addons })
-    const account = getSiteAccount({ siteInfo, accounts, warn })
+    const account = getSiteAccount({ siteInfo, accounts })
 
     return {
       addonsUrls,
@@ -132,9 +132,9 @@ const getEnvSourceName = (source) => {
 
 // Takes a set of environment variables in the format provided by @netlify/config, augments it with variables from both
 // dot-env files and the process itself, and injects into `process.env`.
-const injectEnvVariables = async ({ env, site, warn }) => {
+const injectEnvVariables = async ({ env, site }) => {
   const environment = new Map(Object.entries(env))
-  const dotEnvFiles = await loadDotEnvFiles({ projectDir: site.root, warn })
+  const dotEnvFiles = await loadDotEnvFiles({ projectDir: site.root })
 
   dotEnvFiles.forEach(({ file, env: fileEnv }) => {
     Object.keys(fileEnv).forEach((key) => {

package/src/utils/dot-env.js

@@ -4,7 +4,11 @@ const dotenv = require('dotenv')
 
 const { isFileAsync, readFileAsync } = require('../lib/fs')
 
-const loadDotEnvFiles = async function ({ projectDir, warn }) {
+const { warn: warn_ } = require('./command-helpers')
+
+const loadDotEnvFiles = async function ({ projectDir, warnLog }) {
+  // a stub utility is used in tests
+  const warn = warnLog || warn_
   const dotenvFiles = ['.env', '.env.development']
   const results = await Promise.all(
     dotenvFiles.map(async (file) => {

package/src/utils/get-global-config.js

@@ -20,7 +20,7 @@ const getGlobalConfigOnce = async function () {
   // Read legacy config if exists
   try {
     legacyConfig = JSON.parse(await readFileAsync(legacyPath))
-  } catch (_) {}
+  } catch {}
   // Use legacy config as default values
   const defaults = { ...globalConfigDefaults, ...legacyConfig }
   const configStore = new Configstore(null, defaults, { configPath })

package/src/utils/init/config-github.js

@@ -84,7 +84,7 @@ const hookExists = async ({ deployHook, octokit, repoOwner, repoName }) => {
     })
     const exists = hooks.some((hook) => hook.config.url === deployHook)
     return exists
-  } catch (_) {
+  } catch {
     // we don't need to fail if listHooks errors out
     return false
   }

package/src/utils/lm/install.js

@@ -274,7 +274,7 @@ const cleanupShell = async function () {
     }
 
     await removeConfig(configFile, getInitContent(incFilePath))
-  } catch (_) {}
+  } catch {}
 }
 
 const uninstall = async function () {