netlify-cli 6.14.0 → 6.14.4

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

@@ -1,12 +1,12 @@
 const { Octokit } = require('@octokit/rest')
 const chalk = require('chalk')
 
-const { log, error: failAndExit } = require('../command-helpers')
+const { error: failAndExit, log } = require('../command-helpers')
 const ghauth = require('../gh-auth')
 
-const { getBuildSettings, saveNetlifyToml, formatErrorMessage, createDeployKey, setupSite } = require('./utils')
+const { createDeployKey, formatErrorMessage, getBuildSettings, saveNetlifyToml, setupSite } = require('./utils')
 
-const formatRepoAndOwner = ({ repoOwner, repoName }) => ({
+const formatRepoAndOwner = ({ repoName, repoOwner }) => ({
   name: chalk.magenta(repoName),
   owner: chalk.magenta(repoOwner),
 })
@@ -35,7 +35,7 @@ const getGitHubClient = ({ token }) => {
   return octokit
 }
 
-const addDeployKey = async ({ api, octokit, repoOwner, repoName }) => {
+const addDeployKey = async ({ api, octokit, repoName, repoOwner }) => {
   log('Adding deploy key to repository...')
   const key = await createDeployKey({ api })
   try {
@@ -58,7 +58,7 @@ const addDeployKey = async ({ api, octokit, repoOwner, repoName }) => {
   }
 }
 
-const getGitHubRepo = async ({ octokit, repoOwner, repoName }) => {
+const getGitHubRepo = async ({ octokit, repoName, repoOwner }) => {
   try {
     const { data } = await octokit.repos.get({
       owner: repoOwner,
@@ -75,7 +75,7 @@ const getGitHubRepo = async ({ octokit, repoOwner, repoName }) => {
   }
 }
 
-const hookExists = async ({ deployHook, octokit, repoOwner, repoName }) => {
+const hookExists = async ({ deployHook, octokit, repoName, repoOwner }) => {
   try {
     const { data: hooks } = await octokit.repos.listWebhooks({
       owner: repoOwner,
@@ -90,7 +90,7 @@ const hookExists = async ({ deployHook, octokit, repoOwner, repoName }) => {
   }
 }
 
-const addDeployHook = async ({ deployHook, octokit, repoOwner, repoName }) => {
+const addDeployHook = async ({ deployHook, octokit, repoName, repoOwner }) => {
   const exists = await hookExists({ deployHook, octokit, repoOwner, repoName })
   if (!exists) {
     try {
@@ -122,7 +122,7 @@ const addDeployHook = async ({ deployHook, octokit, repoOwner, repoName }) => {
 const GITHUB_HOOK_EVENTS = ['deploy_created', 'deploy_failed', 'deploy_building']
 const GITHUB_HOOK_TYPE = 'github_commit_status'
 
-const upsertHook = async ({ ntlHooks, event, api, siteId, token }) => {
+const upsertHook = async ({ api, event, ntlHooks, siteId, token }) => {
   const ntlHook = ntlHooks.find((hook) => hook.type === GITHUB_HOOK_TYPE && hook.event === event)
 
   if (!ntlHook || ntlHook.disabled) {
@@ -148,7 +148,7 @@ const upsertHook = async ({ ntlHooks, event, api, siteId, token }) => {
   })
 }
 
-const addNotificationHooks = async ({ siteId, api, token }) => {
+const addNotificationHooks = async ({ api, siteId, token }) => {
   log(`Creating Netlify GitHub Notification Hooks...`)
 
   let ntlHooks
@@ -172,15 +172,15 @@ const addNotificationHooks = async ({ siteId, api, token }) => {
   log(`Netlify Notification Hooks configured!`)
 }
 
-module.exports = async function configGithub({ context, siteId, repoOwner, repoName }) {
+module.exports = async function configGithub({ context, repoName, repoOwner, siteId }) {
   const { netlify } = context
   const {
     api,
-    globalConfig,
+    cachedConfig: { configPath, env },
     config,
+    globalConfig,
     repositoryRoot,
     site: { root: siteRoot },
-    cachedConfig: { env, configPath },
   } = netlify
 
   const token = await getGitHubToken({ globalConfig })

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

@@ -1,8 +1,8 @@
 const inquirer = require('inquirer')
 
-const { log, exit } = require('../command-helpers')
+const { exit, log } = require('../command-helpers')
 
-const { getBuildSettings, saveNetlifyToml, createDeployKey, setupSite } = require('./utils')
+const { createDeployKey, getBuildSettings, saveNetlifyToml, setupSite } = require('./utils')
 
 const addDeployKey = async ({ deployKey }) => {
   log('\nGive this Netlify SSH public key access to your repository:\n')
@@ -51,14 +51,14 @@ const addDeployHook = async ({ deployHook }) => {
   return deployHookAdded
 }
 
-module.exports = async function configManual({ context, siteId, repoData }) {
+module.exports = async function configManual({ context, repoData, siteId }) {
   const { netlify } = context
   const {
     api,
+    cachedConfig: { configPath, env },
     config,
     repositoryRoot,
     site: { root: siteRoot },
-    cachedConfig: { env, configPath },
   } = netlify
 
   const { baseDir, buildCmd, buildDir, functionsDir, pluginsToInstall } = await getBuildSettings({

package/src/utils/init/config.js

@@ -18,7 +18,7 @@ const logSuccess = (repoData) => {
   `)
 }
 
-const configureRepo = async ({ context, siteId, repoData, manual }) => {
+const configureRepo = async ({ context, manual, repoData, siteId }) => {
   if (manual) {
     await configManual({ context, siteId, repoData })
   } else if (repoData.provider === 'github') {

package/src/utils/init/frameworks.js

@@ -6,8 +6,8 @@ const getFrameworkInfo = async ({ baseDirectory, nodeVersion }) => {
   if (frameworks.length !== 0) {
     const [
       {
+        build: { commands, directory },
         name,
-        build: { directory, commands },
         plugins,
       },
     ] = frameworks

package/src/utils/init/plugins.js

@@ -21,7 +21,7 @@ const isPluginInstalled = (configPlugins, plugin) =>
 const getRecommendPlugins = (frameworkPlugins, config) =>
   frameworkPlugins.filter((plugin) => !isPluginInstalled(config.plugins, plugin))
 
-const getPluginsToInstall = ({ plugins, installSinglePlugin, recommendedPlugins }) => {
+const getPluginsToInstall = ({ installSinglePlugin, plugins, recommendedPlugins }) => {
   if (Array.isArray(plugins)) {
     return plugins.map((plugin) => ({ package: plugin }))
   }

package/src/utils/init/utils.js

@@ -13,9 +13,9 @@ const { error: failAndExit, warn } = require('../command-helpers')
 
 const { getFrameworkInfo } = require('./frameworks')
 const { detectNodeVersion } = require('./node-version')
-const { getPluginsList, getPluginInfo, getRecommendPlugins, getPluginsToInstall, getUIPlugins } = require('./plugins')
+const { getPluginInfo, getPluginsList, getPluginsToInstall, getRecommendPlugins, getUIPlugins } = require('./plugins')
 
-const normalizeDir = ({ baseDirectory, dir, defaultValue }) => {
+const normalizeDir = ({ baseDirectory, defaultValue, dir }) => {
   if (dir === undefined) {
     return defaultValue
   }
@@ -24,19 +24,19 @@ const normalizeDir = ({ baseDirectory, dir, defaultValue }) => {
   return relativeDir || defaultValue
 }
 
-const getDefaultBase = ({ repositoryRoot, baseDirectory }) => {
+const getDefaultBase = ({ baseDirectory, repositoryRoot }) => {
   if (baseDirectory !== repositoryRoot && baseDirectory.startsWith(repositoryRoot)) {
     return path.relative(repositoryRoot, baseDirectory)
   }
 }
 
 const getDefaultSettings = ({
-  repositoryRoot,
-  config,
   baseDirectory,
-  frameworkPlugins,
+  config,
   frameworkBuildCommand,
   frameworkBuildDir,
+  frameworkPlugins,
+  repositoryRoot,
 }) => {
   const recommendedPlugins = getRecommendPlugins(frameworkPlugins, config)
   const {
@@ -55,12 +55,12 @@ const getDefaultSettings = ({
 }
 
 const getPromptInputs = async ({
+  defaultBaseDir,
   defaultBuildCmd,
   defaultBuildDir,
   defaultFunctionsDir,
-  defaultBaseDir,
-  recommendedPlugins,
   frameworkName,
+  recommendedPlugins,
 }) => {
   const inputs = [
     defaultBaseDir !== undefined && {
@@ -132,7 +132,7 @@ const getPromptInputs = async ({
 const getBaseDirectory = ({ repositoryRoot, siteRoot }) =>
   path.normalize(repositoryRoot) === path.normalize(siteRoot) ? process.cwd() : siteRoot
 
-const getBuildSettings = async ({ repositoryRoot, siteRoot, config, env }) => {
+const getBuildSettings = async ({ config, env, repositoryRoot, siteRoot }) => {
   const baseDirectory = getBaseDirectory({ repositoryRoot, siteRoot })
   const nodeVersion = await detectNodeVersion({ baseDirectory, env })
   const {
@@ -153,7 +153,7 @@ const getBuildSettings = async ({ repositoryRoot, siteRoot, config, env }) => {
       frameworkBuildDir,
       frameworkPlugins,
     })
-  const { baseDir, buildCmd, buildDir, functionsDir, plugins, installSinglePlugin } = await inquirer.prompt(
+  const { baseDir, buildCmd, buildDir, functionsDir, installSinglePlugin, plugins } = await inquirer.prompt(
     await getPromptInputs({
       defaultBuildCmd,
       defaultBuildDir,
@@ -176,8 +176,8 @@ const getBuildSettings = async ({ repositoryRoot, siteRoot, config, env }) => {
 
 const getNetlifyToml = ({
   command = '# no build command',
-  publish = '.',
   functions = 'functions',
+  publish = '.',
 }) => `# example netlify.toml
 [build]
   command = "${command}"
@@ -201,7 +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 }) => {
+const saveNetlifyToml = async ({ baseDir, buildCmd, buildDir, config, configPath, functionsDir, repositoryRoot }) => {
   const tomlPathParts = [repositoryRoot, baseDir, 'netlify.toml'].filter(Boolean)
   const tomlPath = path.join(...tomlPathParts)
   const exists = await fileExistsAsync(tomlPath)
@@ -233,7 +233,7 @@ const saveNetlifyToml = async ({ repositoryRoot, config, configPath, baseDir, bu
   }
 }
 
-const formatErrorMessage = ({ message, error }) => {
+const formatErrorMessage = ({ error, message }) => {
   const errorMessage = error.json ? `${error.message} - ${JSON.stringify(error.json)}` : error.message
   return `${message} with error: ${chalk.red(errorMessage)}`
 }
@@ -250,7 +250,7 @@ const createDeployKey = async ({ api }) => {
   }
 }
 
-const updateSite = async ({ siteId, api, options }) => {
+const updateSite = async ({ api, options, siteId }) => {
   try {
     const updatedSite = await api.updateSite({ siteId, body: options })
     return updatedSite
@@ -260,7 +260,7 @@ const updateSite = async ({ siteId, api, options }) => {
   }
 }
 
-const setupSite = async ({ api, siteId, repo, configPlugins, pluginsToInstall }) => {
+const setupSite = async ({ api, configPlugins, pluginsToInstall, repo, siteId }) => {
   const updatedSite = await updateSite({
     siteId,
     api,

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, error, exit } = require('../command-helpers')
+const { error, exit, log } = require('../command-helpers')
 const { getRepoData } = require('../get-repo-data')
 const { track } = require('../telemetry')
 

package/src/utils/live-tunnel.js

@@ -5,11 +5,11 @@ const execa = require('execa')
 const fetch = require('node-fetch')
 const pWaitFor = require('p-wait-for')
 
-const { shouldFetchLatestVersion, fetchLatestVersion } = require('../lib/exec-fetcher')
+const { fetchLatestVersion, shouldFetchLatestVersion } = require('../lib/exec-fetcher')
 const { getPathInHome } = require('../lib/settings')
 
 const { log } = require('./command-helpers')
-const { NETLIFYDEVLOG, NETLIFYDEVERR } = require('./logo')
+const { NETLIFYDEVERR, NETLIFYDEVLOG } = require('./logo')
 
 const PACKAGE_NAME = 'live-tunnel-client'
 const EXEC_NAME = PACKAGE_NAME
@@ -19,7 +19,7 @@ const TUNNEL_POLL_INTERVAL = 1e3
 // 5 minutes
 const TUNNEL_POLL_TIMEOUT = 3e5
 
-const createTunnel = async function ({ siteId, netlifyApiToken }) {
+const createTunnel = async function ({ netlifyApiToken, siteId }) {
   await installTunnelClient()
 
   if (!siteId) {
@@ -51,7 +51,7 @@ const createTunnel = async function ({ siteId, netlifyApiToken }) {
   return data
 }
 
-const connectTunnel = function ({ session, netlifyApiToken, localPort }) {
+const connectTunnel = function ({ localPort, netlifyApiToken, session }) {
   const execPath = getPathInHome(['tunnel', 'bin', EXEC_NAME])
   const args = ['connect', '-s', session.id, '-t', netlifyApiToken, '-l', localPort]
   if (process.env.DEBUG) {
@@ -88,7 +88,7 @@ const installTunnelClient = async function () {
   })
 }
 
-const startLiveTunnel = async ({ siteId, netlifyApiToken, localPort }) => {
+const startLiveTunnel = async ({ localPort, netlifyApiToken, siteId }) => {
   const session = await createTunnel({
     siteId,
     netlifyApiToken,

package/src/utils/lm/install.js

@@ -8,24 +8,24 @@ const hasbin = require('hasbin')
 const Listr = require('listr')
 const pathKey = require('path-key')
 
-const { shouldFetchLatestVersion, fetchLatestVersion } = require('../../lib/exec-fetcher')
+const { fetchLatestVersion, shouldFetchLatestVersion } = require('../../lib/exec-fetcher')
 const {
-  fileExistsAsync,
-  writeFileAsync,
-  readFileAsync,
   appendFileAsync,
   copyFileAsync,
+  fileExistsAsync,
+  readFileAsync,
   rmdirRecursiveAsync,
+  writeFileAsync,
 } = require('../../lib/fs')
 const { normalizeBackslash } = require('../../lib/path')
-const { getPathInHome, getLegacyPathInHome } = require('../../lib/settings')
+const { getLegacyPathInHome, getPathInHome } = require('../../lib/settings')
 
 const PACKAGE_NAME = 'netlify-credential-helper'
 const EXEC_NAME = 'git-credential-netlify'
 
 const GIT_CONFIG = '.gitconfig'
 
-const { checkGitVersionStep, checkGitLFSVersionStep, checkLFSFiltersStep } = require('./steps')
+const { checkGitLFSVersionStep, checkGitVersionStep, checkLFSFiltersStep } = require('./steps')
 
 const SUPPORTED_PLATFORMS = {
   linux: 'Linux',
@@ -145,7 +145,7 @@ const setupUnixPath = async () => {
     return true
   }
 
-  const { shell, incFilePath, configFile } = getShellInfo()
+  const { configFile, incFilePath, shell } = getShellInfo()
 
   if (configFile === undefined) {
     const error = `Unable to set credential helper in PATH. We don't how to set the path for ${shell} shell.

package/src/utils/lm/steps.js

@@ -1,6 +1,6 @@
 const chalk = require('chalk')
 
-const { checkGitVersion, checkLFSVersion, checkLFSFilters, checkHelperVersion } = require('./requirements')
+const { checkGitVersion, checkHelperVersion, checkLFSFilters, checkLFSVersion } = require('./requirements')
 
 const checkGitVersionStep = {
   title: 'Checking Git version',

package/src/utils/open-browser.js

@@ -6,7 +6,7 @@ const isDockerContainer = require('is-docker')
 
 const { log } = require('./command-helpers')
 
-const unableToOpenBrowserMessage = function ({ url, message }) {
+const unableToOpenBrowserMessage = function ({ message, url }) {
   log('---------------------------')
   log(chalk.redBright(`Error: Unable to open browser automatically: ${message}`))
   log(chalk.cyan('Please open your browser and open the URL below:'))
@@ -14,7 +14,7 @@ const unableToOpenBrowserMessage = function ({ url, message }) {
   log('---------------------------')
 }
 
-const openBrowser = async function ({ url, silentBrowserNoneError }) {
+const openBrowser = async function ({ silentBrowserNoneError, url }) {
   if (isDockerContainer()) {
     unableToOpenBrowserMessage({ url, message: 'Running inside a docker container' })
     return

package/src/utils/proxy.js

@@ -16,10 +16,10 @@ const pEvent = require('p-event')
 const pFilter = require('p-filter')
 const toReadableStream = require('to-readable-stream')
 
-const { readFileAsync, fileExistsAsync, isFileAsync } = require('../lib/fs')
+const { fileExistsAsync, isFileAsync, readFileAsync } = require('../lib/fs')
 
 const { createStreamPromise } = require('./create-stream-promise')
-const { parseHeaders, headersForPath } = require('./headers')
+const { headersForPath, parseHeaders } = require('./headers')
 const { NETLIFYDEVLOG, NETLIFYDEVWARN } = require('./logo')
 const { createRewriter } = require('./rules-proxy')
 const { onChanges } = require('./rules-proxy')
@@ -54,11 +54,11 @@ const isExternal = function (match) {
   return match.to && match.to.match(/^https?:\/\//)
 }
 
-const stripOrigin = function ({ pathname, search, hash }) {
+const stripOrigin = function ({ hash, pathname, search }) {
   return `${pathname}${search}${hash}`
 }
 
-const proxyToExternalUrl = function ({ req, res, dest, destURL }) {
+const proxyToExternalUrl = function ({ dest, destURL, req, res }) {
   console.log(`${NETLIFYDEVLOG} Proxying to ${dest}`)
   const handler = createProxyMiddleware({
     target: dest.origin,
@@ -69,7 +69,7 @@ const proxyToExternalUrl = function ({ req, res, dest, destURL }) {
   return handler(req, res, {})
 }
 
-const handleAddonUrl = function ({ req, res, addonUrl }) {
+const handleAddonUrl = function ({ addonUrl, req, res }) {
   const dest = new URL(addonUrl)
   const destURL = stripOrigin(dest)
 
@@ -114,7 +114,7 @@ const alternativePathsFor = function (url) {
   return paths
 }
 
-const serveRedirect = async function ({ req, res, proxy, match, options }) {
+const serveRedirect = async function ({ match, options, proxy, req, res }) {
   if (!match) return proxy.web(req, res, options)
 
   options = options || req.proxyOptions || {}
@@ -271,7 +271,7 @@ const reqToURL = function (req, pathname) {
 
 const MILLISEC_TO_SEC = 1e3
 
-const initializeProxy = async function ({ port, distDir, projectDir, configPath }) {
+const initializeProxy = async function ({ configPath, distDir, port, projectDir }) {
   const proxy = httpProxy.createProxyServer({
     selfHandleResponse: true,
     target: {
@@ -358,7 +358,7 @@ const initializeProxy = async function ({ port, distDir, projectDir, configPath
   return handlers
 }
 
-const onRequest = async ({ proxy, rewriter, settings, addonsUrls, functionsServer }, req, res) => {
+const onRequest = async ({ addonsUrls, functionsServer, proxy, rewriter, settings }, req, res) => {
   req.originalBody = ['GET', 'OPTIONS', 'HEAD'].includes(req.method)
     ? null
     : await createStreamPromise(req, BYTES_LIMIT)

package/src/utils/redirects.js

@@ -5,8 +5,8 @@ const { NETLIFYDEVERR } = require('./logo')
 
 // Parse, normalize and validate all redirects from `_redirects` files
 // and `netlify.toml`
-const parseRedirects = async function ({ redirectsFiles, configPath }) {
-  const { redirects, errors } = await parseAllRedirects({
+const parseRedirects = async function ({ configPath, redirectsFiles }) {
+  const { errors, redirects } = await parseAllRedirects({
     redirectsFiles,
     netlifyConfigPath: configPath,
     minimal: false,
@@ -33,9 +33,9 @@ const getErrorMessage = function ({ message }) {
 //  - `query` is called `params`
 //  - `conditions.role|country|language` are capitalized
 const normalizeRedirect = function ({
+  conditions: { country, language, role, ...conditions },
   from,
   query,
-  conditions: { role, country, language, ...conditions },
   ...redirect
 }) {
   return {

package/src/utils/rules-proxy.js

@@ -30,7 +30,7 @@ const getCountry = function () {
   return 'us'
 }
 
-const createRewriter = async function ({ distDir, projectDir, jwtSecret, jwtRoleClaim, configPath }) {
+const createRewriter = async function ({ configPath, distDir, jwtRoleClaim, jwtSecret, projectDir }) {
   let matcher = null
   const redirectsFiles = [...new Set([path.resolve(distDir, '_redirects'), path.resolve(projectDir, '_redirects')])]
   let redirects = await parseRedirects({ redirectsFiles, configPath })

package/src/utils/telemetry/index.js

@@ -93,7 +93,7 @@ const identify = async function (payload) {
   }
 
   const cliId = globalConfig.get('cliId')
-  const { userId, name, email } = payload
+  const { email, name, userId } = payload
 
   const defaultTraits = {
     name,

package/src/utils/telemetry/tracked-command.js

@@ -36,7 +36,7 @@ class TrackedCommand extends Command {
   }
 
   async finally(error) {
-    const { startTime, payload } = this.analytics
+    const { payload, startTime } = this.analytics
     const duration = getDuration(startTime)
     const status = getStatus(error)
     await track('command', {

package/src/utils/traffic-mesh.js

@@ -12,19 +12,19 @@ const { clearSpinner, startSpinner, stopSpinner } = require('../lib/spinner')
 
 const { log } = require('./command-helpers')
 const { createDeferred } = require('./deferred')
-const { NETLIFYDEVLOG, NETLIFYDEVERR, NETLIFYDEVWARN } = require('./logo')
+const { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN } = require('./logo')
 
 const EDGE_HANDLERS_BUNDLER_CLI_PATH = path.resolve(require.resolve('@netlify/plugin-edge-handlers'), '..', 'cli.js')
 
 const startForwardProxy = async ({
-  port,
+  debug,
   frameworkPort,
   functionsPort,
-  publishDir,
-  debug,
-  locationDb,
   jwtRolesPath,
   jwtSecret,
+  locationDb,
+  port,
+  publishDir,
 }) => {
   const args = [
     'run',
@@ -62,7 +62,7 @@ const startForwardProxy = async ({
   }
 
   const { subprocess } = runProcess({ args })
-  const { forwarder, firstBundleReady } = forwardMessagesToLog({ subprocess })
+  const { firstBundleReady, forwarder } = forwardMessagesToLog({ subprocess })
 
   subprocess.on('close', process.exit)
   subprocess.on('SIGINT', process.exit)