netlify-cli 8.9.9 → 8.9.10

package/bin/run

@@ -1,5 +1,4 @@
 #!/usr/bin/env node
-/* eslint-disable promise/prefer-await-to-then,promise/prefer-await-to-callbacks,eslint-comments/disable-enable-pair */
 const process = require('process')
 
 const updateNotifier = require('update-notifier')
@@ -18,23 +17,13 @@ if (require.main === module) {
       pkg,
       updateCheckInterval: UPDATE_CHECK_INTERVAL,
     }).notify()
-  } catch (error) {
+  } catch (error_) {
     console.log('Error checking for updates:')
-    console.log(error)
+    console.log(error_)
   }
 
-  /** @type {Error} */
-  let caughtError
-
   const program = createMainCommand()
 
-  program.parseAsync(process.argv).catch((error) => {
-    caughtError = error
-  })
-
-  // long running commands like dev server cannot be caught by a post action hook
-  // they are running on the main command
-  process.on('exit', () => {
-    program.onEnd(caughtError)
-  })
+  // eslint-disable-next-line promise/prefer-await-to-then
+  program.parseAsync(process.argv).catch((error_) => program.onEnd(error_))
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "netlify-cli",
-  "version": "8.9.9",
+  "version": "8.9.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "netlify-cli",
-      "version": "8.9.9",
+      "version": "8.9.10",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {
@@ -134,6 +134,7 @@
         "mock-fs": "^5.1.2",
         "mock-require": "^3.0.3",
         "p-timeout": "^4.0.0",
+        "proxyquire": "^2.1.3",
         "seedrandom": "^3.0.5",
         "serialize-javascript": "^6.0.0",
         "sinon": "^12.0.0",
@@ -10432,6 +10433,19 @@
         "node": ">=6"
       }
     },
+    "node_modules/fill-keys": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
+      "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=",
+      "dev": true,
+      "dependencies": {
+        "is-object": "~1.0.1",
+        "merge-descriptors": "~1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -14854,6 +14868,12 @@
         "node": ">=6.0"
       }
     },
+    "node_modules/module-not-found-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
+      "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=",
+      "dev": true
+    },
     "node_modules/moize": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/moize/-/moize-6.1.0.tgz",
@@ -17488,6 +17508,34 @@
         "node": ">= 0.10"
       }
     },
+    "node_modules/proxyquire": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz",
+      "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==",
+      "dev": true,
+      "dependencies": {
+        "fill-keys": "^1.0.2",
+        "module-not-found-error": "^1.0.1",
+        "resolve": "^1.11.1"
+      }
+    },
+    "node_modules/proxyquire/node_modules/resolve": {
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz",
+      "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.8.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/ps-list": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/ps-list/-/ps-list-7.2.0.tgz",
@@ -29792,6 +29840,16 @@
         "trim-repeated": "^1.0.0"
       }
     },
+    "fill-keys": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/fill-keys/-/fill-keys-1.0.2.tgz",
+      "integrity": "sha1-mo+jb06K1jTjv2tPPIiCVRRS6yA=",
+      "dev": true,
+      "requires": {
+        "is-object": "~1.0.1",
+        "merge-descriptors": "~1.0.0"
+      }
+    },
     "fill-range": {
       "version": "7.0.1",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -33098,6 +33156,12 @@
         "node-source-walk": "^4.0.0"
       }
     },
+    "module-not-found-error": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/module-not-found-error/-/module-not-found-error-1.0.1.tgz",
+      "integrity": "sha1-z4tP9PKWQGdNbN0CsOO8UjwrvcA=",
+      "dev": true
+    },
     "moize": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/moize/-/moize-6.1.0.tgz",
@@ -35107,6 +35171,30 @@
         "ipaddr.js": "1.9.1"
       }
     },
+    "proxyquire": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/proxyquire/-/proxyquire-2.1.3.tgz",
+      "integrity": "sha512-BQWfCqYM+QINd+yawJz23tbBM40VIGXOdDw3X344KcclI/gtBbdWF6SlQ4nK/bYhF9d27KYug9WzljHC6B9Ysg==",
+      "dev": true,
+      "requires": {
+        "fill-keys": "^1.0.2",
+        "module-not-found-error": "^1.0.1",
+        "resolve": "^1.11.1"
+      },
+      "dependencies": {
+        "resolve": {
+          "version": "1.21.0",
+          "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.21.0.tgz",
+          "integrity": "sha512-3wCbTpk5WJlyE4mSOtDLhqQmGFi0/TD9VPwmiolnk8U0wRgMEktqCXd3vy5buTO3tljvalNvKrjHEfrd2WpEKA==",
+          "dev": true,
+          "requires": {
+            "is-core-module": "^2.8.0",
+            "path-parse": "^1.0.7",
+            "supports-preserve-symlinks-flag": "^1.0.0"
+          }
+        }
+      }
+    },
     "ps-list": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/ps-list/-/ps-list-7.2.0.tgz",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "8.9.9",
+  "version": "8.9.10",
   "author": "Netlify Inc.",
   "contributors": [
     "Mathias Biilmann <matt@netlify.com> (https://twitter.com/biilmann)",
@@ -196,6 +196,7 @@
     "mock-fs": "^5.1.2",
     "mock-require": "^3.0.3",
     "p-timeout": "^4.0.0",
+    "proxyquire": "^2.1.3",
     "seedrandom": "^3.0.5",
     "serialize-javascript": "^6.0.0",
     "sinon": "^12.0.0",

package/src/commands/base-command.js

@@ -303,12 +303,14 @@ class BaseCommand extends Command {
     debug(`${this.name()}:onEnd`)(`Status: ${status}`)
     debug(`${this.name()}:onEnd`)(`Duration: ${duration}ms`)
 
-    await track('command', {
-      ...payload,
-      command: this.name(),
-      duration,
-      status,
-    })
+    try {
+      await track('command', {
+        ...payload,
+        command: this.name(),
+        duration,
+        status,
+      })
+    } catch {}
 
     if (error_ !== undefined) {
       error(error_ instanceof Error ? error_ : format(error_), { exit: false })

package/src/lib/exec-fetcher.js

@@ -4,10 +4,11 @@ const process = require('process')
 
 const { fetchLatest, fetchVersion, newerVersion, updateAvailable } = require('gh-release-fetch')
 const isExe = require('isexe')
+const terminalLink = require('terminal-link')
 
 // cannot directly import from ../utils as it would create a circular dependency.
 // the file `src/utils/live-tunnel.js` depends on this file
-const { NETLIFYDEVWARN, log } = require('../utils/command-helpers')
+const { NETLIFYDEVWARN, chalk, error, log } = require('../utils/command-helpers')
 const execa = require('../utils/execa')
 
 const isWindows = () => process.platform === 'win32'
@@ -62,27 +63,80 @@ const shouldFetchLatestVersion = async ({ binPath, execArgs, execName, latestVer
       latestVersion,
     })
     return outdated
-  } catch (error) {
+  } catch (error_) {
     if (exists) {
       log(NETLIFYDEVWARN, `failed checking for new version of '${packageName}'. Using existing version`)
       return false
     }
-    throw error
+    throw error_
   }
 }
 
+const getArch = () => {
+  switch (process.arch) {
+    case 'x64':
+      return 'amd64'
+    case 'ia32':
+      return '386'
+    default:
+      return process.arch
+  }
+}
+
+/**
+ * Tries to get the latest release from the github releases to download the binary.
+ * Is throwing an error if there is no binary that matches the system os or arch
+ * @param {object} config
+ * @param {string} config.destination
+ * @param {string} config.execName
+ * @param {string} config.destination
+ * @param {string} config.extension
+ * @param {string} config.packageName
+ * @param {string} [config.latestVersion ]
+ */
 const fetchLatestVersion = async ({ destination, execName, extension, latestVersion, packageName }) => {
   const win = isWindows()
+  const arch = getArch()
   const platform = win ? 'windows' : process.platform
+  const pkgName = `${execName}-${platform}-${arch}.${extension}`
+
   const release = {
     repository: getRepository({ packageName }),
-    package: `${execName}-${platform}-amd64.${extension}`,
+    package: pkgName,
     destination,
     extract: true,
   }
 
   const options = getOptions()
-  await (latestVersion ? fetchVersion({ ...release, version: latestVersion }, options) : fetchLatest(release, options))
+  const fetch = latestVersion
+    ? fetchVersion({ ...release, version: latestVersion }, options)
+    : fetchLatest(release, options)
+
+  try {
+    await fetch
+  } catch (error_) {
+    if (typeof error_ === 'object' && 'statusCode' in error_ && error_.statusCode === 404) {
+      const createIssueLink = new URL('https://github.com/netlify/cli/issues/new')
+      createIssueLink.searchParams.set('assignees', '')
+      createIssueLink.searchParams.set('labels', 'type: bug')
+      createIssueLink.searchParams.set('template', 'bug_report.md')
+      createIssueLink.searchParams.set(
+        'title',
+        `${execName} is not supported on ${platform} with CPU architecture ${arch}`,
+      )
+
+      const issueLink = terminalLink('Create a new CLI issue', createIssueLink.href)
+
+      error(`The operating system ${chalk.cyan(platform)} with the CPU architecture ${chalk.cyan(
+        arch,
+      )} is currently not supported!
+
+Please open up an issue on our CLI repository so that we can support it:
+${issueLink}`)
+    }
+
+    error(error_)
+  }
 }
 
-module.exports = { getExecName, shouldFetchLatestVersion, fetchLatestVersion }
+module.exports = { getArch, getExecName, shouldFetchLatestVersion, fetchLatestVersion }

package/src/utils/command-helpers.js

@@ -179,7 +179,7 @@ const error = (message = '', options = {}) => {
     if (process.env.DEBUG) {
       process.stderr.write(` ${bang}   Warning: ${err.stack.split('\n').join(`\n ${bang}   `)}`)
     } else {
-      process.stderr.write(` ${bang}   ${err.name}: ${err.message}\n`)
+      process.stderr.write(` ${bang}   ${chalk.red(`${err.name}:`)} ${err.message}\n`)
     }
   } else {
     throw err