netlify-cli 12.2.9 → 12.2.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "12.2.9",
+  "version": "12.2.11",
   "author": "Netlify Inc.",
   "type": "module",
   "contributors": [
@@ -212,7 +212,6 @@
     "test:init:hugo-deps": "npm ci --prefix tests/integration/hugo-site --no-audit",
     "test:dev:ava": "ava --verbose",
     "test:dev:vitest": "vitest run",
-    "test:ci:ava:unit": "c8 -r json ava --no-worker-threads tests/unit/ tools/",
     "test:ci:ava:integration": "c8 -r json ava --concurrency 1 --no-worker-threads tests/integration/",
     "test:ci:vitest:unit": "vitest run --coverage tests/unit/",
     "test:ci:vitest:integration": "vitest run --coverage --no-threads tests/integration/",
@@ -231,9 +230,9 @@
     "prettier": "--ignore-path .gitignore --loglevel=warn \"{src,tools,scripts,site,tests,.github}/**/*.{mjs,cjs,js,md,yml,json,html}\" \"*.{mjs,cjs,js,yml,json,html}\" \".*.{mjs,cjs,js,yml,json,html}\" \"!CHANGELOG.md\" \"!npm-shrinkwrap.json\" \"!**/*/package-lock.json\" \"!.github/**/*.md\""
   },
   "dependencies": {
-    "@netlify/build": "^28.4.5",
+    "@netlify/build": "^29.1.1",
     "@netlify/config": "^20.0.2",
-    "@netlify/edge-bundler": "^5.3.1",
+    "@netlify/edge-bundler": "^6.0.0",
     "@netlify/framework-info": "^9.5.2",
     "@netlify/local-functions-proxy": "^1.1.1",
     "@netlify/zip-it-and-ship-it": "^8.1.0",
@@ -295,7 +294,6 @@
     "lodash": "^4.17.20",
     "log-symbols": "^4.0.0",
     "log-update": "^5.0.0",
-    "memoize-one": "^6.0.0",
     "minimist": "^1.2.5",
     "multiparty": "^4.2.1",
     "netlify": "^13.0.2",
@@ -305,7 +303,6 @@
     "netlify-redirector": "^0.3.1",
     "node-fetch": "^2.6.0",
     "node-version-alias": "^1.0.1",
-    "omit.js": "^2.0.2",
     "ora": "^5.0.0",
     "p-filter": "^2.1.0",
     "p-map": "^4.0.0",
@@ -357,7 +354,6 @@
     "serialize-javascript": "^6.0.0",
     "sinon": "^14.0.0",
     "strip-ansi": "^6.0.0",
-    "supertest": "^6.1.6",
     "temp-dir": "^2.0.0",
     "tomlify-j0.4": "^3.0.0",
     "tree-kill": "^1.2.2",

package/src/commands/addons/addons-auth.mjs

@@ -1,8 +1,7 @@
 // @ts-check
 import { ADDON_VALIDATION, prepareAddonCommand } from '../../utils/addons/prepare.mjs'
-import utils from '../../utils/index.cjs'
-
-const { exit, log, openBrowser } = utils
+import { exit, log } from '../../utils/command-helpers.mjs'
+import openBrowser from '../../utils/open-browser.mjs'
 
 /**
  * The addons:auth command

package/src/commands/addons/addons-config.mjs

@@ -8,9 +8,8 @@ import { ADDON_VALIDATION, prepareAddonCommand } from '../../utils/addons/prepar
 import generatePrompts from '../../utils/addons/prompts.mjs'
 import { renderConfigValues } from '../../utils/addons/render.mjs'
 import { missingConfigValues, requiredConfigValues, updateConfigValues } from '../../utils/addons/validation.mjs'
-import utils from '../../utils/index.cjs'
-
-const { chalk, error, log, parseRawFlags } = utils
+import { chalk, error, log } from '../../utils/command-helpers.mjs'
+import { parseRawFlags } from '../../utils/parse-raw-flags.mjs'
 
 const update = async function ({ addonName, api, currentConfig, instanceId, newConfig, siteId }) {
   const codeDiff = diffValues(currentConfig, newConfig)

package/src/commands/addons/addons-create.mjs

@@ -6,9 +6,8 @@ import { ADDON_VALIDATION, prepareAddonCommand } from '../../utils/addons/prepar
 import generatePrompts from '../../utils/addons/prompts.mjs'
 import { renderConfigValues, renderMissingValues } from '../../utils/addons/render.mjs'
 import { missingConfigValues, requiredConfigValues, updateConfigValues } from '../../utils/addons/validation.mjs'
-import utils from '../../utils/index.cjs'
-
-const { chalk, error, log, parseRawFlags } = utils
+import { chalk, error, log } from '../../utils/command-helpers.mjs'
+import { parseRawFlags } from '../../utils/parse-raw-flags.mjs'
 
 const createAddon = async ({ addonName, api, config, siteData, siteId }) => {
   try {

package/src/commands/addons/addons-delete.mjs

@@ -2,9 +2,7 @@
 import inquirer from 'inquirer'
 
 import { ADDON_VALIDATION, prepareAddonCommand } from '../../utils/addons/prepare.mjs'
-import utils from '../../utils/index.cjs'
-
-const { error, exit, log } = utils
+import { error, exit, log } from '../../utils/command-helpers.mjs'
 
 /**
  * The addons:delete command

package/src/commands/addons/addons-list.mjs

@@ -2,9 +2,7 @@
 import AsciiTable from 'ascii-table'
 
 import { prepareAddonCommand } from '../../utils/addons/prepare.mjs'
-import utils from '../../utils/index.cjs'
-
-const { log, logJson } = utils
+import { log, logJson } from '../../utils/command-helpers.mjs'
 
 /**
  * The addons:list command

package/src/commands/api/api.mjs

@@ -2,9 +2,7 @@
 import AsciiTable from 'ascii-table'
 import { methods } from 'netlify'
 
-import utils from '../../utils/index.cjs'
-
-const { chalk, error, exit, log, logJson } = utils
+import { chalk, error, exit, log, logJson } from '../../utils/command-helpers.mjs'
 
 /**
  * The api command

package/src/commands/base-command.mjs

@@ -22,9 +22,9 @@ import {
   pollForToken,
   sortOptions,
   warn,
-} from '../utils/command-helpers.cjs'
-import getGlobalConfig from '../utils/get-global-config.cjs'
-import { openBrowser } from '../utils/open-browser.cjs'
+} from '../utils/command-helpers.mjs'
+import getGlobalConfig from '../utils/get-global-config.mjs'
+import openBrowser from '../utils/open-browser.mjs'
 import StateConfig from '../utils/state-config.mjs'
 import { identify, track } from '../utils/telemetry/index.mjs'
 

package/src/commands/build/build.mjs

@@ -2,9 +2,9 @@
 import process from 'process'
 
 import { getBuildOptions, runBuild } from '../../lib/build.mjs'
-import utils from '../../utils/index.cjs'
-
-const { error, exit, generateNetlifyGraphJWT, getEnvelopeEnv, getToken, normalizeContext } = utils
+import { error, exit, getToken } from '../../utils/command-helpers.mjs'
+import { generateNetlifyGraphJWT } from '../../utils/dev.mjs'
+import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.mjs'
 
 /**
  * @param {import('../../lib/build.mjs').BuildConfig} options

package/src/commands/deploy/deploy.mjs

@@ -12,30 +12,27 @@ import prettyjson from 'prettyjson'
 
 import { cancelDeploy } from '../../lib/api.mjs'
 import { getBuildOptions, runBuild } from '../../lib/build.mjs'
-import { normalizeFunctionsConfig } from '../../lib/functions/config.cjs'
-import { getLogMessage } from '../../lib/log.cjs'
+import { normalizeFunctionsConfig } from '../../lib/functions/config.mjs'
+import { getLogMessage } from '../../lib/log.mjs'
 import { startSpinner, stopSpinner } from '../../lib/spinner.cjs'
-import { getFunctionsManifestPath, getInternalFunctionsDir } from '../../utils/functions/index.mjs'
-import utils from '../../utils/index.cjs'
-import { link } from '../link/index.mjs'
-import { sitesCreate } from '../sites/index.mjs'
-
-const {
-  NETLIFYDEV,
-  NETLIFYDEVERR,
-  NETLIFYDEVLOG,
+import {
   chalk,
-  deploySite,
   error,
   exit,
   getToken,
   log,
   logJson,
-  openBrowser,
+  NETLIFYDEV,
+  NETLIFYDEVERR,
+  NETLIFYDEVLOG,
   warn,
-} = utils
-
-const DEFAULT_DEPLOY_TIMEOUT = 1.2e6
+} from '../../utils/command-helpers.mjs'
+import { DEFAULT_DEPLOY_TIMEOUT } from '../../utils/deploy/constants.mjs'
+import { deploySite } from '../../utils/deploy/deploy-site.mjs'
+import { getFunctionsManifestPath, getInternalFunctionsDir } from '../../utils/functions/index.mjs'
+import openBrowser from '../../utils/open-browser.mjs'
+import { link } from '../link/index.mjs'
+import { sitesCreate } from '../sites/index.mjs'
 
 const triggerDeploy = async ({ api, options, siteData, siteId }) => {
   try {

package/src/commands/dev/dev-exec.mjs

@@ -1,8 +1,7 @@
 import execa from 'execa'
 
-import utils from '../../utils/index.cjs'
-
-const { getEnvelopeEnv, injectEnvVariables, normalizeContext } = utils
+import { injectEnvVariables } from '../../utils/dev.mjs'
+import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.mjs'
 
 /**
  * The dev:exec command

package/src/commands/dev/dev.mjs

@@ -27,36 +27,30 @@ import {
   readGraphQLOperationsSourceFile,
 } from '../../lib/one-graph/cli-netlify-graph.mjs'
 import { startSpinner, stopSpinner } from '../../lib/spinner.cjs'
-import detectServerSettings from '../../utils/detect-server-settings.mjs'
-import { ensureNetlifyIgnore } from '../../utils/gitignore.mjs'
-import utils from '../../utils/index.cjs'
-import { startLiveTunnel } from '../../utils/live-tunnel.mjs'
-import { startProxy } from '../../utils/proxy.mjs'
-
-import { createDevExecCommand } from './dev-exec.mjs'
-
-const {
+import {
   BANG,
-  NETLIFYDEV,
-  NETLIFYDEVERR,
-  NETLIFYDEVLOG,
-  NETLIFYDEVWARN,
   chalk,
   error,
   exit,
-  generateNetlifyGraphJWT,
-  getEnvelopeEnv,
-  getSiteInformation,
   getToken,
-  injectEnvVariables,
   log,
+  NETLIFYDEV,
+  NETLIFYDEVERR,
+  NETLIFYDEVLOG,
+  NETLIFYDEVWARN,
   normalizeConfig,
-  normalizeContext,
-  openBrowser,
-  processOnExit,
   warn,
   watchDebounced,
-} = utils
+} from '../../utils/command-helpers.mjs'
+import detectServerSettings from '../../utils/detect-server-settings.mjs'
+import { generateNetlifyGraphJWT, getSiteInformation, injectEnvVariables, processOnExit } from '../../utils/dev.mjs'
+import { getEnvelopeEnv, normalizeContext } from '../../utils/env/index.mjs'
+import { ensureNetlifyIgnore } from '../../utils/gitignore.mjs'
+import { startLiveTunnel } from '../../utils/live-tunnel.mjs'
+import openBrowser from '../../utils/open-browser.mjs'
+import { startProxy } from '../../utils/proxy.mjs'
+
+import { createDevExecCommand } from './dev-exec.mjs'
 
 const netlifyBuildPromise = import('@netlify/build')
 

package/src/commands/env/env-clone.mjs

@@ -1,7 +1,6 @@
 // @ts-check
-import utils from '../../utils/index.cjs'
-
-const { chalk, error: logError, log, translateFromEnvelopeToMongo, translateFromMongoToEnvelope } = utils
+import { chalk, error as logError, log } from '../../utils/command-helpers.mjs'
+import { translateFromEnvelopeToMongo, translateFromMongoToEnvelope } from '../../utils/env/index.mjs'
 
 const safeGetSite = async (api, siteId) => {
   try {

package/src/commands/env/env-get.mjs

@@ -1,9 +1,8 @@
 // @ts-check
 import { Option } from 'commander'
 
-import utils from '../../utils/index.cjs'
-
-const { AVAILABLE_CONTEXTS, chalk, error, getEnvelopeEnv, log, logJson, normalizeContext } = utils
+import { chalk, error, log, logJson } from '../../utils/command-helpers.mjs'
+import { AVAILABLE_CONTEXTS, getEnvelopeEnv, normalizeContext } from '../../utils/env/index.mjs'
 
 /**
  * The env:get command

package/src/commands/env/env-import.mjs

@@ -4,9 +4,8 @@ import { readFile } from 'fs/promises'
 import AsciiTable from 'ascii-table'
 import dotenv from 'dotenv'
 
-import utils from '../../utils/index.cjs'
-
-const { exit, log, logJson, translateFromEnvelopeToMongo, translateFromMongoToEnvelope } = utils
+import { exit, log, logJson } from '../../utils/command-helpers.mjs'
+import { translateFromEnvelopeToMongo, translateFromMongoToEnvelope } from '../../utils/env/index.mjs'
 
 /**
  * The env:import command

package/src/commands/env/env-list.mjs

@@ -6,10 +6,8 @@ import { Option } from 'commander'
 import inquirer from 'inquirer'
 import logUpdate from 'log-update'
 
-import utils from '../../utils/index.cjs'
-
-const { AVAILABLE_CONTEXTS, chalk, error, getEnvelopeEnv, getHumanReadableScopes, log, logJson, normalizeContext } =
-  utils
+import { chalk, error, log, logJson } from '../../utils/command-helpers.mjs'
+import { AVAILABLE_CONTEXTS, getEnvelopeEnv, getHumanReadableScopes, normalizeContext } from '../../utils/env/index.mjs'
 
 const MASK_LENGTH = 50
 const MASK = '*'.repeat(MASK_LENGTH)

package/src/commands/env/env-set.mjs

@@ -1,18 +1,13 @@
 // @ts-check
 import { Option } from 'commander'
 
-import utils from '../../utils/index.cjs'
-
-const {
+import { chalk, error, log, logJson } from '../../utils/command-helpers.mjs'
+import {
   AVAILABLE_CONTEXTS,
   AVAILABLE_SCOPES,
-  chalk,
-  error,
-  log,
-  logJson,
   normalizeContext,
   translateFromEnvelopeToMongo,
-} = utils
+} from '../../utils/env/index.mjs'
 
 /**
  * The env:set command

package/src/commands/env/env-unset.mjs

@@ -1,7 +1,6 @@
 // @ts-check
-import utils from '../../utils/index.cjs'
-
-const { AVAILABLE_CONTEXTS, chalk, error, log, logJson, normalizeContext, translateFromEnvelopeToMongo } = utils
+import { chalk, error, log, logJson } from '../../utils/command-helpers.mjs'
+import { AVAILABLE_CONTEXTS, normalizeContext, translateFromEnvelopeToMongo } from '../../utils/env/index.mjs'
 
 /**
  * The env:unset command

package/src/commands/functions/functions-build.mjs

@@ -1,10 +1,8 @@
 // @ts-check
 import { mkdir } from 'fs/promises'
 
+import { NETLIFYDEVERR, NETLIFYDEVLOG, exit, log } from '../../utils/command-helpers.mjs'
 import { getFunctionsDir } from '../../utils/functions/index.mjs'
-import utils from '../../utils/index.cjs'
-
-const { NETLIFYDEVERR, NETLIFYDEVLOG, exit, log } = utils
 
 /**
  * The functions:build command

package/src/commands/functions/functions-create.mjs

@@ -17,13 +17,13 @@ import fetch from 'node-fetch'
 import ora from 'ora'
 
 import { getAddons, getCurrentAddon, getSiteData } from '../../utils/addons/prepare.mjs'
-import utils from '../../utils/index.cjs'
+import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, log } from '../../utils/command-helpers.mjs'
+import { injectEnvVariables } from '../../utils/dev.mjs'
+import execa from '../../utils/execa.mjs'
 import { readRepoURL, validateRepoURL } from '../../utils/read-repo-url.mjs'
 
 const copyTemplateDir = promisify(copyTemplateDirOriginal)
 
-const { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, execa, injectEnvVariables, log } = utils
-
 const require = createRequire(import.meta.url)
 
 const templatesDir = path.resolve(dirname(fileURLToPath(import.meta.url)), '../../functions-templates')

package/src/commands/functions/functions-invoke.mjs

@@ -7,10 +7,8 @@ import process from 'process'
 import inquirer from 'inquirer'
 import fetch from 'node-fetch'
 
+import { NETLIFYDEVWARN, chalk, error, exit } from '../../utils/command-helpers.mjs'
 import { BACKGROUND, CLOCKWORK_USERAGENT, getFunctions } from '../../utils/functions/index.mjs'
-import utils from '../../utils/index.cjs'
-
-const { NETLIFYDEVWARN, chalk, error, exit } = utils
 
 const require = createRequire(import.meta.url)
 

package/src/commands/functions/functions-list.mjs

@@ -1,10 +1,8 @@
 // @ts-check
 import AsciiTable from 'ascii-table'
 
+import { error, exit, log, logJson, warn } from '../../utils/command-helpers.mjs'
 import { getFunctions, getFunctionsDir } from '../../utils/functions/index.mjs'
-import utils from '../../utils/index.cjs'
-
-const { error, exit, log, logJson, warn } = utils
 
 const normalizeFunction = function (deployedFunctions, { name, urlPath: url }) {
   const isDeployed = deployedFunctions.some((deployedFunction) => deployedFunction.n === name)

package/src/commands/functions/functions-serve.mjs

@@ -2,10 +2,9 @@
 import { join } from 'path'
 
 import { startFunctionsServer } from '../../lib/functions/server.mjs'
+import { acquirePort, getSiteInformation, injectEnvVariables } from '../../utils/dev.mjs'
 import { getFunctionsDir } from '../../utils/functions/index.mjs'
-import utils from '../../utils/index.cjs'
 
-const { acquirePort, getSiteInformation, injectEnvVariables } = utils
 const DEFAULT_PORT = 9999
 
 /**

package/src/commands/functions/functions.mjs

@@ -1,5 +1,5 @@
 // @ts-check
-import { chalk } from '../../utils/command-helpers.cjs'
+import { chalk } from '../../utils/command-helpers.mjs'
 
 import { createFunctionsBuildCommand } from './functions-build.mjs'
 import { createFunctionsCreateCommand } from './functions-create.mjs'

package/src/commands/graph/graph-config-write.mjs

@@ -4,9 +4,7 @@ import path from 'path'
 import process from 'process'
 
 import { getNetlifyGraphConfig } from '../../lib/one-graph/cli-netlify-graph.mjs'
-import utils from '../../utils/index.cjs'
-
-const { NETLIFYDEVERR, chalk, error, log } = utils
+import { NETLIFYDEVERR, chalk, error, log } from '../../utils/command-helpers.mjs'
 
 /**
  * Creates the `netlify graph:config:write` command

package/src/commands/graph/graph-edit.mjs

@@ -8,10 +8,9 @@ import {
   getNetlifyGraphConfig,
   readGraphQLOperationsSourceFile,
 } from '../../lib/one-graph/cli-netlify-graph.mjs'
-import utils from '../../utils/index.cjs'
-import { openBrowser } from '../../utils/open-browser.cjs'
+import { NETLIFYDEVERR, chalk, error, log } from '../../utils/command-helpers.mjs'
+import openBrowser from '../../utils/open-browser.mjs'
 
-const { NETLIFYDEVERR, chalk, error, log } = utils
 const { ensureAppForSite, executeCreatePersistedQueryMutation } = OneGraphCliClient
 
 /**

package/src/commands/graph/graph-handler.mjs

@@ -11,9 +11,7 @@ import {
   getNetlifyGraphConfig,
   readGraphQLSchemaFile,
 } from '../../lib/one-graph/cli-netlify-graph.mjs'
-import utils from '../../utils/index.cjs'
-
-const { error, log } = utils
+import { error, log } from '../../utils/command-helpers.mjs'
 
 /**
  * Creates the `netlify graph:handler` command

package/src/commands/graph/graph-init.mjs

@@ -7,9 +7,8 @@ import { v4 as uuidv4 } from 'uuid'
 
 import { OneGraphCliClient, ensureCLISession } from '../../lib/one-graph/cli-client.mjs'
 import { getNetlifyGraphConfig } from '../../lib/one-graph/cli-netlify-graph.mjs'
-import utils from '../../utils/index.cjs'
-
-const { NETLIFYDEVERR, chalk, error, exit, getToken, log, translateFromEnvelopeToMongo } = utils
+import { NETLIFYDEVERR, chalk, error, exit, getToken, log } from '../../utils/command-helpers.mjs'
+import { translateFromEnvelopeToMongo } from '../../utils/env/index.mjs'
 
 const { ensureAppForSite, executeCreateApiTokenMutation } = OneGraphCliClient
 

package/src/commands/graph/graph-library.mjs

@@ -12,9 +12,7 @@ import {
   readGraphQLOperationsSourceFile,
   readGraphQLSchemaFile,
 } from '../../lib/one-graph/cli-netlify-graph.mjs'
-import utils from '../../utils/index.cjs'
-
-const { NETLIFYDEVERR, chalk, error, log } = utils
+import { NETLIFYDEVERR, chalk, error, log } from '../../utils/command-helpers.mjs'
 
 /**
  * Creates the `netlify graph:library` command

package/src/commands/graph/graph-operations.mjs

@@ -7,9 +7,7 @@ import {
   getNetlifyGraphConfig,
   readGraphQLOperationsSourceFile,
 } from '../../lib/one-graph/cli-netlify-graph.mjs'
-import utils from '../../utils/index.cjs'
-
-const { log } = utils
+import { log } from '../../utils/command-helpers.mjs'
 
 const { parse } = GraphQL
 

package/src/commands/graph/graph-pull.mjs

@@ -13,9 +13,7 @@ import {
   refetchAndGenerateFromOneGraph,
 } from '../../lib/one-graph/cli-client.mjs'
 import { buildSchema, getNetlifyGraphConfig, readGraphQLSchemaFile } from '../../lib/one-graph/cli-netlify-graph.mjs'
-import utils from '../../utils/index.cjs'
-
-const { NETLIFYDEVERR, chalk, error, log, warn } = utils
+import { NETLIFYDEVERR, chalk, error, log, warn } from '../../utils/command-helpers.mjs'
 
 /**
  * Creates the `netlify graph:pull` command

package/src/commands/init/init.mjs

@@ -3,16 +3,14 @@ import dotProp from 'dot-prop'
 import inquirer from 'inquirer'
 import isEmpty from 'lodash/isEmpty.js'
 
+import { chalk, exit, log } from '../../utils/command-helpers.mjs'
 import getRepoData from '../../utils/get-repo-data.mjs'
 import { ensureNetlifyIgnore } from '../../utils/gitignore.mjs'
-import utils from '../../utils/index.cjs'
-import { configureRepo } from '../../utils/init/config.cjs'
+import { configureRepo } from '../../utils/init/config.mjs'
 import { track } from '../../utils/telemetry/index.mjs'
 import { link } from '../link/index.mjs'
 import { sitesCreate } from '../sites/index.mjs'
 
-const { chalk, exit, log } = utils
-
 const persistState = ({ siteInfo, state }) => {
   // Save to .netlify/state.json file
   state.set('siteId', siteInfo.id)

package/src/commands/link/link.mjs

@@ -2,13 +2,11 @@
 import inquirer from 'inquirer'
 
 import { listSites } from '../../lib/api.mjs'
+import { chalk, error, exit, log } from '../../utils/command-helpers.mjs'
 import getRepoData from '../../utils/get-repo-data.mjs'
 import { ensureNetlifyIgnore } from '../../utils/gitignore.mjs'
-import utils from '../../utils/index.cjs'
 import { track } from '../../utils/telemetry/index.mjs'
 
-const { chalk, error, exit, log } = utils
-
 /**
  *
  * @param {import('../base-command.mjs').NetlifyOptions} netlify

package/src/commands/lm/lm-setup.mjs

@@ -1,13 +1,12 @@
 // @ts-check
 import Listr from 'listr'
 
-import utils from '../../utils/index.cjs'
+import { error } from '../../utils/command-helpers.mjs'
+import execa from '../../utils/execa.mjs'
 import { installPlatform } from '../../utils/lm/install.mjs'
 import { checkHelperVersion } from '../../utils/lm/requirements.mjs'
 import { printBanner } from '../../utils/lm/ui.mjs'
 
-const { error, execa } = utils
-
 const installHelperIfMissing = async function ({ force }) {
   let installHelper = false
   try {

package/src/commands/login/login.mjs

@@ -1,7 +1,5 @@
 // @ts-check
-import utils from '../../utils/index.cjs'
-
-const { chalk, exit, getToken, log } = utils
+import { chalk, exit, getToken, log } from '../../utils/command-helpers.mjs'
 
 const msg = function (location) {
   switch (location) {

package/src/commands/logout/logout.mjs

@@ -1,9 +1,7 @@
 // @ts-check
-import utils from '../../utils/index.cjs'
+import { exit, getToken, log } from '../../utils/command-helpers.mjs'
 import { track } from '../../utils/telemetry/index.mjs'
 
-const { exit, getToken, log } = utils
-
 /**
  * The logout command
  * @param {import('commander').OptionValues} options

package/src/commands/main.mjs

@@ -5,8 +5,10 @@ import { Option } from 'commander'
 import inquirer from 'inquirer'
 import { findBestMatch } from 'string-similarity'
 
+import { BANG, chalk, error, exit, log, NETLIFY_CYAN, USER_AGENT, warn } from '../utils/command-helpers.mjs'
+import execa from '../utils/execa.mjs'
+import getGlobalConfig from '../utils/get-global-config.mjs'
 import getPackageJson from '../utils/get-package-json.mjs'
-import utils from '../utils/index.cjs'
 import { track } from '../utils/telemetry/index.mjs'
 
 import { createAddonsCommand } from './addons/index.mjs'
@@ -32,8 +34,6 @@ import { createSwitchCommand } from './switch/index.mjs'
 import { createUnlinkCommand } from './unlink/index.mjs'
 import { createWatchCommand } from './watch/index.mjs'
 
-const { BANG, NETLIFY_CYAN, USER_AGENT, chalk, error, execa, exit, getGlobalConfig, log, warn } = utils
-
 const SUGGESTION_TIMEOUT = 1e4
 
 const getVersionPage = async () => {

package/src/commands/open/open-admin.mjs

@@ -1,6 +1,5 @@
-import utils from '../../utils/index.cjs'
-
-const { error, exit, log, openBrowser, warn } = utils
+import { error, exit, log, warn } from '../../utils/command-helpers.mjs'
+import openBrowser from '../../utils/open-browser.mjs'
 
 /**
  * The open:admin command

package/src/commands/open/open-site.mjs

@@ -1,6 +1,5 @@
-import utils from '../../utils/index.cjs'
-
-const { error, exit, log, openBrowser, warn } = utils
+import { error, exit, log, warn } from '../../utils/command-helpers.mjs'
+import openBrowser from '../../utils/open-browser.mjs'
 
 /**
  * The open:site command