netlify-cli 6.9.11 → 6.9.15

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

@@ -1,7 +1,7 @@
 const { Octokit } = require('@octokit/rest')
 const chalk = require('chalk')
 
-const { log } = require('../command-helpers')
+const { log, error: failAndExit } = require('../command-helpers')
 const ghauth = require('../gh-auth')
 
 const { getBuildSettings, saveNetlifyToml, formatErrorMessage, createDeployKey, setupSite } = require('./utils')
@@ -35,9 +35,9 @@ const getGitHubClient = ({ token }) => {
   return octokit
 }
 
-const addDeployKey = async ({ api, octokit, repoOwner, repoName, failAndExit }) => {
+const addDeployKey = async ({ api, octokit, repoOwner, repoName }) => {
   log('Adding deploy key to repository...')
-  const key = await createDeployKey({ api, failAndExit })
+  const key = await createDeployKey({ api })
   try {
     await octokit.repos.createDeployKey({
       title: 'Netlify Deploy Key',
@@ -58,7 +58,7 @@ const addDeployKey = async ({ api, octokit, repoOwner, repoName, failAndExit })
   }
 }
 
-const getGitHubRepo = async ({ octokit, repoOwner, repoName, failAndExit }) => {
+const getGitHubRepo = async ({ octokit, repoOwner, repoName }) => {
   try {
     const { data } = await octokit.repos.get({
       owner: repoOwner,
@@ -90,7 +90,7 @@ const hookExists = async ({ deployHook, octokit, repoOwner, repoName }) => {
   }
 }
 
-const addDeployHook = async ({ deployHook, octokit, repoOwner, repoName, failAndExit }) => {
+const addDeployHook = async ({ deployHook, octokit, repoOwner, repoName }) => {
   const exists = await hookExists({ deployHook, octokit, repoOwner, repoName })
   if (!exists) {
     try {
@@ -148,7 +148,7 @@ const upsertHook = async ({ ntlHooks, event, api, siteId, token }) => {
   })
 }
 
-const addNotificationHooks = async ({ failAndExit, siteId, api, token }) => {
+const addNotificationHooks = async ({ siteId, api, token }) => {
   log(`Creating Netlify GitHub Notification Hooks...`)
 
   let ntlHooks
@@ -173,7 +173,7 @@ const addNotificationHooks = async ({ failAndExit, siteId, api, token }) => {
 }
 
 module.exports = async function configGithub({ context, siteId, repoOwner, repoName }) {
-  const { warn, error: failAndExit, netlify } = context
+  const { netlify } = context
   const {
     api,
     globalConfig,
@@ -190,14 +190,13 @@ module.exports = async function configGithub({ context, siteId, repoOwner, repoN
     siteRoot,
     config,
     env,
-    warn,
   })
-  await saveNetlifyToml({ repositoryRoot, config, configPath, baseDir, buildCmd, buildDir, functionsDir, warn })
+  await saveNetlifyToml({ repositoryRoot, config, configPath, baseDir, buildCmd, buildDir, functionsDir })
 
   const octokit = getGitHubClient({ token })
   const [deployKey, githubRepo] = await Promise.all([
-    addDeployKey({ api, octokit, repoOwner, repoName, failAndExit }),
-    getGitHubRepo({ octokit, repoOwner, repoName, failAndExit }),
+    addDeployKey({ api, octokit, repoOwner, repoName }),
+    getGitHubRepo({ octokit, repoOwner, repoName }),
   ])
 
   const repo = {
@@ -215,13 +214,12 @@ module.exports = async function configGithub({ context, siteId, repoOwner, repoN
 
   const updatedSite = await setupSite({
     api,
-    failAndExit,
     siteId,
     repo,
     configPlugins: config.plugins,
     pluginsToInstall,
   })
-  await addDeployHook({ deployHook: updatedSite.deploy_hook, octokit, repoOwner, repoName, failAndExit })
+  await addDeployHook({ deployHook: updatedSite.deploy_hook, octokit, repoOwner, repoName })
   log()
-  await addNotificationHooks({ failAndExit, siteId, api, token })
+  await addNotificationHooks({ siteId, api, token })
 }

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

@@ -1,10 +1,10 @@
 const inquirer = require('inquirer')
 
-const { log } = require('../command-helpers')
+const { log, exit } = require('../command-helpers')
 
 const { getBuildSettings, saveNetlifyToml, createDeployKey, setupSite } = require('./utils')
 
-const addDeployKey = async ({ exit, deployKey }) => {
+const addDeployKey = async ({ deployKey }) => {
   log('\nGive this Netlify SSH public key access to your repository:\n')
   log(`\n${deployKey.public_key}\n\n`)
 
@@ -52,7 +52,7 @@ const addDeployHook = async ({ deployHook }) => {
 }
 
 module.exports = async function configManual({ context, siteId, repoData }) {
-  const { warn, error: failAndExit, exit, netlify } = context
+  const { netlify } = context
   const {
     api,
     config,
@@ -66,12 +66,11 @@ module.exports = async function configManual({ context, siteId, repoData }) {
     siteRoot,
     config,
     env,
-    warn,
   })
-  await saveNetlifyToml({ repositoryRoot, config, configPath, baseDir, buildCmd, buildDir, functionsDir, warn })
+  await saveNetlifyToml({ repositoryRoot, config, configPath, baseDir, buildCmd, buildDir, functionsDir })
 
-  const deployKey = await createDeployKey({ api, failAndExit })
-  await addDeployKey({ exit, deployKey })
+  const deployKey = await createDeployKey({ api })
+  await addDeployKey({ deployKey })
 
   const repoPath = await getRepoPath({ repoData })
   const repo = {
@@ -88,7 +87,6 @@ module.exports = async function configManual({ context, siteId, repoData }) {
 
   const updatedSite = await setupSite({
     api,
-    failAndExit,
     siteId,
     repo,
     configPlugins: config.plugins,

package/src/utils/init/node-version.js

@@ -3,6 +3,7 @@ const locatePath = require('locate-path')
 const nodeVersionAlias = require('node-version-alias')
 
 const { readFileAsync } = require('../../lib/fs')
+const { warn } = require('../command-helpers')
 
 const DEFAULT_NODE_VERSION = '12.18.0'
 const NVM_FLAG_PREFIX = '--'
@@ -11,7 +12,7 @@ const NVM_FLAG_PREFIX = '--'
 const normalizeConfiguredVersion = (version) =>
   version.startsWith(NVM_FLAG_PREFIX) ? version.slice(NVM_FLAG_PREFIX.length) : version
 
-const detectNodeVersion = async ({ baseDirectory, env, warn }) => {
+const detectNodeVersion = async ({ baseDirectory, env }) => {
   try {
     const nodeVersionFile = await locatePath(['.nvmrc', '.node-version'], { cwd: baseDirectory })
     const configuredVersion =

package/src/utils/init/utils.js

@@ -9,6 +9,7 @@ const isEmpty = require('lodash/isEmpty')
 
 const { fileExistsAsync, writeFileAsync } = require('../../lib/fs')
 const { normalizeBackslash } = require('../../lib/path')
+const { error: failAndExit, warn } = require('../command-helpers')
 
 const { getFrameworkInfo } = require('./frameworks')
 const { detectNodeVersion } = require('./node-version')
@@ -131,9 +132,9 @@ const getPromptInputs = async ({
 const getBaseDirectory = ({ repositoryRoot, siteRoot }) =>
   path.normalize(repositoryRoot) === path.normalize(siteRoot) ? process.cwd() : siteRoot
 
-const getBuildSettings = async ({ repositoryRoot, siteRoot, config, env, warn }) => {
+const getBuildSettings = async ({ repositoryRoot, siteRoot, config, env }) => {
   const baseDirectory = getBaseDirectory({ repositoryRoot, siteRoot })
-  const nodeVersion = await detectNodeVersion({ baseDirectory, env, warn })
+  const nodeVersion = await detectNodeVersion({ baseDirectory, env })
   const {
     frameworkName,
     frameworkBuildCommand,
@@ -200,16 +201,7 @@ const getNetlifyToml = ({
   ## more info on configuring this file: https://www.netlify.com/docs/netlify-toml-reference/
 `
 
-const saveNetlifyToml = async ({
-  repositoryRoot,
-  config,
-  configPath,
-  baseDir,
-  buildCmd,
-  buildDir,
-  functionsDir,
-  warn,
-}) => {
+const saveNetlifyToml = async ({ repositoryRoot, config, configPath, baseDir, buildCmd, buildDir, functionsDir }) => {
   const tomlPathParts = [repositoryRoot, baseDir, 'netlify.toml'].filter(Boolean)
   const tomlPath = path.join(...tomlPathParts)
   const exists = await fileExistsAsync(tomlPath)
@@ -248,7 +240,7 @@ const formatErrorMessage = ({ message, error }) => {
 
 const formatTitle = (title) => chalk.cyan(title)
 
-const createDeployKey = async ({ api, failAndExit }) => {
+const createDeployKey = async ({ api }) => {
   try {
     const deployKey = await api.createDeployKey()
     return deployKey
@@ -258,7 +250,7 @@ const createDeployKey = async ({ api, failAndExit }) => {
   }
 }
 
-const updateSite = async ({ siteId, api, failAndExit, options }) => {
+const updateSite = async ({ siteId, api, options }) => {
   try {
     const updatedSite = await api.updateSite({ siteId, body: options })
     return updatedSite
@@ -268,11 +260,10 @@ const updateSite = async ({ siteId, api, failAndExit, options }) => {
   }
 }
 
-const setupSite = async ({ api, failAndExit, siteId, repo, configPlugins, pluginsToInstall }) => {
+const setupSite = async ({ api, siteId, repo, configPlugins, pluginsToInstall }) => {
   const updatedSite = await updateSite({
     siteId,
     api,
-    failAndExit,
     // merge existing plugins with new ones
     options: { repo, plugins: [...getUIPlugins(configPlugins), ...pluginsToInstall] },
   })

package/src/utils/link/link-by-prompt.js

@@ -5,7 +5,7 @@ const inquirer = require('inquirer')
 const isEmpty = require('lodash/isEmpty')
 
 const { listSites } = require('../../lib/api')
-const { log } = require('../command-helpers')
+const { log, error, exit } = require('../command-helpers')
 const { getRepoData } = require('../get-repo-data')
 const { track } = require('../telemetry')
 
@@ -70,7 +70,7 @@ Double check you are in the correct working directory and a remote origin repo i
 
 Run ${chalk.cyanBright('git remote -v')} to see a list of your git remotes.`)
 
-        context.exit()
+        exit()
       }
 
       // Matches a single site hooray!
@@ -94,7 +94,7 @@ Run ${chalk.cyanBright('git remote -v')} to see a list of your git remotes.`)
           },
         ])
         if (!selectedSite) {
-          context.error('No site selected')
+          error('No site selected')
         }
         site = selectedSite
       }
@@ -118,16 +118,16 @@ Run ${chalk.cyanBright('git remote -v')} to see a list of your git remotes.`)
           api,
           options: { name: searchTerm, filter: 'all' },
         })
-      } catch (error) {
-        if (error.status === 404) {
-          context.error(`'${searchTerm}' not found`)
+      } catch (error_) {
+        if (error_.status === 404) {
+          error(`'${searchTerm}' not found`)
         } else {
-          context.error(error)
+          error(error_)
         }
       }
 
       if (isEmpty(matchingSites)) {
-        context.error(`No site names found containing '${searchTerm}'.
+        error(`No site names found containing '${searchTerm}'.
 
 Run ${chalk.cyanBright('netlify link')} again to try a new search,
 or run ${chalk.cyanBright('netlify sites:create')} to create a site.`)
@@ -162,12 +162,12 @@ or run ${chalk.cyanBright('netlify sites:create')} to create a site.`)
       let sites
       try {
         sites = await listSites({ api, options: { maxPages: 1, filter: 'all' } })
-      } catch (error) {
-        context.error(error)
+      } catch (error_) {
+        error(error_)
       }
 
       if (isEmpty(sites)) {
-        context.error(`You don't have any sites yet. Run ${chalk.cyanBright('netlify sites:create')} to create a site.`)
+        error(`You don't have any sites yet. Run ${chalk.cyanBright('netlify sites:create')} to create a site.`)
       }
 
       const { selectedSite } = await inquirer.prompt([
@@ -180,7 +180,7 @@ or run ${chalk.cyanBright('netlify sites:create')} to create a site.`)
         },
       ])
       if (!selectedSite) {
-        context.error('No site selected')
+        error('No site selected')
       }
       site = selectedSite
       break
@@ -197,11 +197,11 @@ or run ${chalk.cyanBright('netlify sites:create')} to create a site.`)
 
       try {
         site = await api.getSite({ siteId })
-      } catch (error) {
-        if (error.status === 404) {
-          context.error(new Error(`Site ID '${siteId}' not found`))
+      } catch (error_) {
+        if (error_.status === 404) {
+          error(new Error(`Site ID '${siteId}' not found`))
         } else {
-          context.error(error)
+          error(error_)
         }
       }
       break
@@ -211,7 +211,7 @@ or run ${chalk.cyanBright('netlify sites:create')} to create a site.`)
   }
 
   if (!site) {
-    context.error(new Error(`No site found`))
+    error(new Error(`No site found`))
   }
 
   // Save site ID to config