refactor: replace inherited log, exit utils in commands.(build|env|lm|link|unlink)

src/commands/build/index.js

@@ -2,7 +2,17 @@ const { flags: flagsLib } = require('@oclif/command')
 
 const { getBuildOptions, runBuild } = require('../../lib/build')
 const Command = require('../../utils/command')
-const { getToken } = require('../../utils/command-helpers')
+const { error, exit, getToken } = require('../../utils/command-helpers')
+
+const checkOptions = ({ cachedConfig: { siteInfo = {} }, token }) => {
+  if (!siteInfo.id) {
+    error('Could not find the site ID. Please run netlify link.', { exit: 1 })
+  }
+
+  if (!token) {
+    error('Could not find the access token. Please run netlify login.', { exit: 1 })
+  }
+}
 
 class BuildCommand extends Command {
   // Run Netlify Build
@@ -21,21 +31,11 @@ class BuildCommand extends Command {
     })
 
     if (!flags.offline) {
-      this.checkOptions(options)
+      checkOptions(options)
     }
 
     const { exitCode } = await runBuild(options)
-    this.exit(exitCode)
-  }
-
-  checkOptions({ cachedConfig: { siteInfo = {} }, token }) {
-    if (!siteInfo.id) {
-      this.error('Could not find the site ID. Please run netlify link.', { exit: 1 })
-    }
-
-    if (!token) {
-      this.error('Could not find the access token. Please run netlify login.', { exit: 1 })
-    }
+    exit(exitCode)
   }
 }
 

src/commands/env/import.js

@@ -6,7 +6,7 @@ const dotenv = require('dotenv')
 const isEmpty = require('lodash/isEmpty')
 
 const Command = require('../../utils/command')
-const { log, logJson } = require('../../utils/command-helpers')
+const { log, logJson, exit } = require('../../utils/command-helpers')
 
 class EnvImportCommand extends Command {
   async run() {
@@ -34,7 +34,7 @@ class EnvImportCommand extends Command {
       importedEnv = dotenv.parse(envFileContents)
     } catch (error) {
       log(error.message)
-      this.exit(1)
+      exit(1)
     }
 
     if (isEmpty(importedEnv)) {

src/commands/link.js

@@ -6,7 +6,7 @@ const chalk = require('chalk')
 
 const { listSites } = require('../lib/api')
 const Command = require('../utils/command')
-const { log } = require('../utils/command-helpers')
+const { log, error, exit } = require('../utils/command-helpers')
 const ensureNetlifyIgnore = require('../utils/gitignore')
 const linkPrompt = require('../utils/link/link-by-prompt')
 const { track } = require('../utils/telemetry')
@@ -26,7 +26,7 @@ class LinkCommand extends Command {
     let siteData
     try {
       siteData = await api.getSite({ siteId })
-    } catch (error) {
+    } catch {
       // silent api error
     }
 
@@ -37,7 +37,7 @@ class LinkCommand extends Command {
     if (siteId && !siteData) {
       console.log(`"${siteId}" was not found in your Netlify account.`)
       console.log(`Please double check your siteID and which account you are logged into via \`netlify status\`.`)
-      return this.exit()
+      return exit()
     }
 
     // If already linked to site. exit and prompt for unlink
@@ -46,17 +46,17 @@ class LinkCommand extends Command {
       log(`Admin url: ${siteData.admin_url}`)
       log()
       log(`To unlink this site, run: ${chalk.cyanBright('netlify unlink')}`)
-      return this.exit()
+      return exit()
     }
 
     if (flags.id) {
       try {
         siteData = await api.getSite({ site_id: flags.id })
-      } catch (error) {
-        if (error.status === 404) {
-          this.error(new Error(`Site id ${flags.id} not found`))
+      } catch (error_) {
+        if (error_.status === 404) {
+          error(new Error(`Site id ${flags.id} not found`))
         } else {
-          this.error(error)
+          error(error_)
         }
       }
 
@@ -70,7 +70,7 @@ class LinkCommand extends Command {
         kind: 'byId',
       })
 
-      return this.exit()
+      return exit()
     }
 
     if (flags.name) {
@@ -83,16 +83,16 @@ class LinkCommand extends Command {
             filter: 'all',
           },
         })
-      } catch (error) {
-        if (error.status === 404) {
-          this.error(new Error(`${flags.name} not found`))
+      } catch (error_) {
+        if (error_.status === 404) {
+          error(new Error(`${flags.name} not found`))
         } else {
-          this.error(error)
+          error(error_)
         }
       }
 
       if (results.length === 0) {
-        this.error(new Error(`No sites found named ${flags.name}`))
+        error(new Error(`No sites found named ${flags.name}`))
       }
       const [firstSiteData] = results
       state.set('siteId', firstSiteData.id)
@@ -105,7 +105,7 @@ class LinkCommand extends Command {
         kind: 'byName',
       })
 
-      return this.exit()
+      return exit()
     }
 
     siteData = await linkPrompt(this, flags)

src/commands/lm/setup.js

@@ -3,6 +3,7 @@ const execa = require('execa')
 const Listr = require('listr')
 
 const Command = require('../../utils/command')
+const { error } = require('../../utils/command-helpers')
 const { installPlatform } = require('../../utils/lm/install')
 const { checkHelperVersion } = require('../../utils/lm/requirements')
 const { printBanner } = require('../../utils/lm/ui')
@@ -14,7 +15,7 @@ const installHelperIfMissing = async function ({ force }) {
     if (!version) {
       installHelper = true
     }
-  } catch (error) {
+  } catch {
     installHelper = true
   }
 
@@ -37,9 +38,9 @@ const provisionService = async function (siteId, api) {
       addon: addonName,
       body: {},
     })
-  } catch (error) {
+  } catch (error_) {
     // error is JSONHTTPError
-    throw new Error(error.json.error)
+    throw new Error(error_.json.error)
   }
 }
 
@@ -62,7 +63,7 @@ class LmSetupCommand extends Command {
       try {
         helperInstalled = await installHelperIfMissing({ force: flags['force-install'] })
       } catch (error_) {
-        this.error(error_)
+        error(error_)
       }
     }
 

src/commands/unlink.js

@@ -1,5 +1,5 @@
 const Command = require('../utils/command')
-const { log } = require('../utils/command-helpers')
+const { log, exit } = require('../utils/command-helpers')
 const { track } = require('../utils/telemetry')
 
 class UnlinkCommand extends Command {
@@ -9,7 +9,7 @@ class UnlinkCommand extends Command {
 
     if (!siteId) {
       log(`Folder is not linked to a Netlify site. Run 'netlify link' to link it`)
-      return this.exit()
+      return exit()
     }
 
     let siteData = {}