netlify-cli 12.2.7 → 12.2.8

package/src/commands/dev/{dev.cjs → dev.mjs}

@@ -1,32 +1,40 @@
 // @ts-check
-const events = require('events')
-const path = require('path')
-const process = require('process')
-const { promisify } = require('util')
-
-const boxen = require('boxen')
-const { Option } = require('commander')
-const execa = require('execa')
-const StaticServer = require('static-server')
-const stripAnsiCc = require('strip-ansi-control-characters')
-const waitPort = require('wait-port')
-
-const { promptEditorHelper } = require('../../lib/edge-functions/index.cjs')
-const { startFunctionsServer } = require('../../lib/functions/server.cjs')
-const {
+import events from 'events'
+import path from 'path'
+import process from 'process'
+import { promisify } from 'util'
+
+import boxen from 'boxen'
+import { Option } from 'commander'
+import execa from 'execa'
+import StaticServer from 'static-server'
+import stripAnsiCc from 'strip-ansi-control-characters'
+import waitPort from 'wait-port'
+
+import { promptEditorHelper } from '../../lib/edge-functions/editor-helper.mjs'
+import { startFunctionsServer } from '../../lib/functions/server.mjs'
+import {
   OneGraphCliClient,
   loadCLISession,
   markCliSessionInactive,
   persistNewOperationsDocForSession,
   startOneGraphCLISession,
-} = require('../../lib/one-graph/cli-client.cjs')
-const {
+} from '../../lib/one-graph/cli-client.mjs'
+import {
   defaultExampleOperationsDoc,
   getGraphEditUrlBySiteId,
   getNetlifyGraphConfig,
   readGraphQLOperationsSourceFile,
-} = require('../../lib/one-graph/cli-netlify-graph.cjs')
-const { startSpinner, stopSpinner } = require('../../lib/spinner.cjs')
+} 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 {
   BANG,
   NETLIFYDEV,
@@ -34,8 +42,6 @@ const {
   NETLIFYDEVLOG,
   NETLIFYDEVWARN,
   chalk,
-  detectServerSettings,
-  ensureNetlifyIgnore,
   error,
   exit,
   generateNetlifyGraphJWT,
@@ -48,13 +54,9 @@ const {
   normalizeContext,
   openBrowser,
   processOnExit,
-  startLiveTunnel,
-  startProxy,
   warn,
   watchDebounced,
-} = require('../../utils/index.cjs')
-
-const { createDevExecCommand } = require('./dev-exec.cjs')
+} = utils
 
 const netlifyBuildPromise = import('@netlify/build')
 
@@ -247,8 +249,8 @@ const FRAMEWORK_PORT_TIMEOUT = 6e5
  *
  * @param {object} params
  * @param {*} params.addonsUrls
- * @param {import('../base-command').NetlifyOptions["config"]} params.config
- * @param {import('../base-command').NetlifyOptions["cachedConfig"]['env']} params.env
+ * @param {import('../base-command.mjs').NetlifyOptions["config"]} params.config
+ * @param {import('../base-command.mjs').NetlifyOptions["cachedConfig"]['env']} params.env
  * @param {InspectSettings} params.inspectSettings
  * @param {() => Promise<object>} params.getUpdatedConfig
  * @param {string} params.geolocationMode
@@ -257,7 +259,7 @@ const FRAMEWORK_PORT_TIMEOUT = 6e5
  * @param {boolean} params.offline
  * @param {*} params.site
  * @param {*} params.siteInfo
- * @param {import('../../utils/state-config').StateConfig} params.state
+ * @param {import('../../utils/state-config.mjs').default} params.state
  * @returns
  */
 const startProxyServer = async ({
@@ -690,7 +692,7 @@ const getBuildOptions = ({ cachedConfig, options: { context, cwd = process.cwd()
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createDevCommand = (program) => {
+export const createDevCommand = (program) => {
   createDevExecCommand(program)
 
   return program
@@ -765,5 +767,3 @@ const createDevCommand = (program) => {
     ])
     .action(dev)
 }
-
-module.exports = { createDevCommand }

package/src/commands/dev/index.mjs

@@ -0,0 +1 @@
+export { createDevCommand } from './dev.mjs'

package/src/commands/env/{env-clone.cjs → env-clone.mjs}

@@ -1,14 +1,7 @@
 // @ts-check
+import utils from '../../utils/index.cjs'
 
-const { isEmpty } = require('lodash')
-
-const {
-  chalk,
-  error: logError,
-  log,
-  translateFromEnvelopeToMongo,
-  translateFromMongoToEnvelope,
-} = require('../../utils/index.cjs')
+const { chalk, error: logError, log, translateFromEnvelopeToMongo, translateFromMongoToEnvelope } = utils
 
 const safeGetSite = async (api, siteId) => {
   try {
@@ -93,7 +86,7 @@ const mongoToMongo = async ({ api, siteFrom, siteTo }) => {
     },
   ] = [siteFrom, siteTo]
 
-  if (isEmpty(envFrom)) {
+  if (Object.keys(envFrom).length === 0) {
     log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
@@ -125,7 +118,7 @@ const mongoToEnvelope = async ({ api, siteFrom, siteTo }) => {
   const envFrom = siteFrom.build_settings.env || {}
   const keysFrom = Object.keys(envFrom)
 
-  if (isEmpty(envFrom)) {
+  if (Object.keys(envFrom).length === 0) {
     log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
@@ -158,7 +151,7 @@ const envelopeToMongo = async ({ api, siteFrom, siteTo }) => {
   const envelopeVariables = await api.getEnvVars({ accountId: siteFrom.account_slug, siteId: siteFrom.id })
   const envFrom = translateFromEnvelopeToMongo(envelopeVariables)
 
-  if (isEmpty(envFrom)) {
+  if (Object.keys(envFrom).length === 0) {
     log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
@@ -196,7 +189,7 @@ const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
 
   const keysFrom = envelopeFrom.map(({ key }) => key)
 
-  if (isEmpty(keysFrom)) {
+  if (keysFrom.length === 0) {
     log(`${chalk.green(siteFrom.name)} has no environment variables, nothing to clone`)
     return false
   }
@@ -222,7 +215,7 @@ const envelopeToEnvelope = async ({ api, siteFrom, siteTo }) => {
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createEnvCloneCommand = (program) =>
+export const createEnvCloneCommand = (program) =>
   program
     .command('env:clone')
     .alias('env:migrate')
@@ -231,5 +224,3 @@ const createEnvCloneCommand = (program) =>
     .description(`Clone environment variables from one site to another`)
     .addExamples(['netlify env:clone --to <to-site-id>', 'netlify env:clone --to <to-site-id> --from <from-site-id>'])
     .action(envClone)
-
-module.exports = { createEnvCloneCommand }

package/src/commands/env/{env-get.cjs → env-get.mjs}

@@ -1,15 +1,9 @@
 // @ts-check
-const { Option } = require('commander')
+import { Option } from 'commander'
 
-const {
-  AVAILABLE_CONTEXTS,
-  chalk,
-  error,
-  getEnvelopeEnv,
-  log,
-  logJson,
-  normalizeContext,
-} = require('../../utils/index.cjs')
+import utils from '../../utils/index.cjs'
+
+const { AVAILABLE_CONTEXTS, chalk, error, getEnvelopeEnv, log, logJson, normalizeContext } = utils
 
 /**
  * The env:get command
@@ -65,7 +59,7 @@ const envGet = async (name, options, command) => {
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createEnvGetCommand = (program) =>
+export const createEnvGetCommand = (program) =>
   program
     .command('env:get')
     .argument('<name>', 'Environment variable name')
@@ -90,5 +84,3 @@ const createEnvGetCommand = (program) =>
     .action(async (name, options, command) => {
       await envGet(name, options, command)
     })
-
-module.exports = { createEnvGetCommand }

package/src/commands/env/{env-import.cjs → env-import.mjs}

@@ -1,17 +1,12 @@
 // @ts-check
-const { readFile } = require('fs').promises
+import { readFile } from 'fs/promises'
 
-const AsciiTable = require('ascii-table')
-const dotenv = require('dotenv')
-const isEmpty = require('lodash/isEmpty')
+import AsciiTable from 'ascii-table'
+import dotenv from 'dotenv'
 
-const {
-  exit,
-  log,
-  logJson,
-  translateFromEnvelopeToMongo,
-  translateFromMongoToEnvelope,
-} = require('../../utils/index.cjs')
+import utils from '../../utils/index.cjs'
+
+const { exit, log, logJson, translateFromEnvelopeToMongo, translateFromMongoToEnvelope } = utils
 
 /**
  * The env:import command
@@ -38,7 +33,7 @@ const envImport = async (fileName, options, command) => {
     exit(1)
   }
 
-  if (isEmpty(importedEnv)) {
+  if (Object.keys(importedEnv).length === 0) {
     log(`No environment variables found in file ${fileName} to import`)
     return false
   }
@@ -128,7 +123,7 @@ const importIntoEnvelope = async ({ api, importedEnv, options, siteInfo }) => {
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createEnvImportCommand = (program) =>
+export const createEnvImportCommand = (program) =>
   program
     .command('env:import')
     .argument('<fileName>', '.env file to import')
@@ -141,5 +136,3 @@ const createEnvImportCommand = (program) =>
     .action(async (fileName, options, command) => {
       await envImport(fileName, options, command)
     })
-
-module.exports = { createEnvImportCommand }

package/src/commands/env/{env-list.cjs → env-list.mjs}

@@ -1,22 +1,15 @@
 // @ts-check
-const AsciiTable = require('ascii-table')
-const { isCI } = require('ci-info')
-const { Option } = require('commander')
-const inquirer = require('inquirer')
-const isEmpty = require('lodash/isEmpty')
-
-const {
-  AVAILABLE_CONTEXTS,
-  chalk,
-  error,
-  getEnvelopeEnv,
-  getHumanReadableScopes,
-  log,
-  logJson,
-  normalizeContext,
-} = require('../../utils/index.cjs')
-
-const [logUpdatePromise, ansiEscapesPromise] = [import('log-update'), import('ansi-escapes')]
+import ansiEscapes from 'ansi-escapes'
+import AsciiTable from 'ascii-table'
+import { isCI } from 'ci-info'
+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
 
 const MASK_LENGTH = 50
 const MASK = '*'.repeat(MASK_LENGTH)
@@ -89,7 +82,7 @@ const envList = async (options, command) => {
   const contextType = AVAILABLE_CONTEXTS.includes(context) ? 'context' : 'branch'
   const withContext = isUsingEnvelope ? `in the ${chalk.magenta(options.context)} ${contextType}` : ''
   const withScope = isUsingEnvelope && scope !== 'any' ? `and ${chalk.yellow(options.scope)} scope` : ''
-  if (isEmpty(environment)) {
+  if (Object.keys(environment).length === 0) {
     log(`No environment variables set ${forSite} ${withContext} ${withScope}`)
     return false
   }
@@ -103,8 +96,6 @@ const envList = async (options, command) => {
     return false
   }
 
-  const { default: logUpdate } = await logUpdatePromise
-
   logUpdate(getTable({ environment, hideValues: true, scopesColumn: isUsingEnvelope }))
   const { showValues } = await inquirer.prompt([
     {
@@ -116,7 +107,6 @@ const envList = async (options, command) => {
   ])
 
   if (showValues) {
-    const { default: ansiEscapes } = await ansiEscapesPromise
     // since inquirer adds a prompt, we need to account for it when printing the table again
     log(ansiEscapes.eraseLines(3))
     logUpdate(getTable({ environment, hideValues: false, scopesColumn: isUsingEnvelope }))
@@ -129,7 +119,7 @@ const envList = async (options, command) => {
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createEnvListCommand = (program) =>
+export const createEnvListCommand = (program) =>
   program
     .command('env:list')
     .option(
@@ -153,5 +143,3 @@ const createEnvListCommand = (program) =>
     .action(async (options, command) => {
       await envList(options, command)
     })
-
-module.exports = { createEnvListCommand }

package/src/commands/env/{env-set.cjs → env-set.mjs}

@@ -1,5 +1,7 @@
 // @ts-check
-const { Option } = require('commander')
+import { Option } from 'commander'
+
+import utils from '../../utils/index.cjs'
 
 const {
   AVAILABLE_CONTEXTS,
@@ -10,7 +12,7 @@ const {
   logJson,
   normalizeContext,
   translateFromEnvelopeToMongo,
-} = require('../../utils/index.cjs')
+} = utils
 
 /**
  * The env:set command
@@ -150,7 +152,7 @@ const setInEnvelope = async ({ api, context, key, scope, siteInfo, value }) => {
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createEnvSetCommand = (program) =>
+export const createEnvSetCommand = (program) =>
   program
     .command('env:set')
     .argument('<key>', 'Environment variable key')
@@ -180,5 +182,3 @@ const createEnvSetCommand = (program) =>
     .action(async (key, value, options, command) => {
       await envSet(key, value, options, command)
     })
-
-module.exports = { createEnvSetCommand }

package/src/commands/env/{env-unset.cjs → env-unset.mjs}

@@ -1,13 +1,7 @@
 // @ts-check
-const {
-  AVAILABLE_CONTEXTS,
-  chalk,
-  error,
-  log,
-  logJson,
-  normalizeContext,
-  translateFromEnvelopeToMongo,
-} = require('../../utils/index.cjs')
+import utils from '../../utils/index.cjs'
+
+const { AVAILABLE_CONTEXTS, chalk, error, log, logJson, normalizeContext, translateFromEnvelopeToMongo } = utils
 
 /**
  * The env:unset command
@@ -138,7 +132,7 @@ const unsetInEnvelope = async ({ api, context, key, siteInfo }) => {
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createEnvUnsetCommand = (program) =>
+export const createEnvUnsetCommand = (program) =>
   program
     .command('env:unset')
     .aliases(['env:delete', 'env:remove'])
@@ -158,5 +152,3 @@ const createEnvUnsetCommand = (program) =>
     .action(async (key, options, command) => {
       await envUnset(key, options, command)
     })
-
-module.exports = { createEnvUnsetCommand }

package/src/commands/env/{env.cjs → env.mjs}

@@ -1,10 +1,10 @@
 // @ts-check
-const { createEnvCloneCommand } = require('./env-clone.cjs')
-const { createEnvGetCommand } = require('./env-get.cjs')
-const { createEnvImportCommand } = require('./env-import.cjs')
-const { createEnvListCommand } = require('./env-list.cjs')
-const { createEnvSetCommand } = require('./env-set.cjs')
-const { createEnvUnsetCommand } = require('./env-unset.cjs')
+import { createEnvCloneCommand } from './env-clone.mjs'
+import { createEnvGetCommand } from './env-get.mjs'
+import { createEnvImportCommand } from './env-import.mjs'
+import { createEnvListCommand } from './env-list.mjs'
+import { createEnvSetCommand } from './env-set.mjs'
+import { createEnvUnsetCommand } from './env-unset.mjs'
 
 /**
  * The env command
@@ -20,7 +20,7 @@ const env = (options, command) => {
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createEnvCommand = (program) => {
+export const createEnvCommand = (program) => {
   createEnvGetCommand(program)
   createEnvImportCommand(program)
   createEnvListCommand(program)
@@ -41,5 +41,3 @@ const createEnvCommand = (program) => {
     ])
     .action(env)
 }
-
-module.exports = { createEnvCommand }

package/src/commands/env/index.mjs

@@ -0,0 +1 @@
+export { createEnvCommand } from './env.mjs'

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

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

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

@@ -18,21 +18,11 @@ import ora from 'ora'
 
 import { getAddons, getCurrentAddon, getSiteData } from '../../utils/addons/prepare.mjs'
 import utils from '../../utils/index.cjs'
+import { readRepoURL, validateRepoURL } from '../../utils/read-repo-url.mjs'
 
 const copyTemplateDir = promisify(copyTemplateDirOriginal)
 
-const {
-  NETLIFYDEVERR,
-  NETLIFYDEVLOG,
-  NETLIFYDEVWARN,
-  chalk,
-  error,
-  execa,
-  injectEnvVariables,
-  log,
-  readRepoURL,
-  validateRepoURL,
-} = utils
+const { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, error, execa, injectEnvVariables, log } = utils
 
 const require = createRequire(import.meta.url)
 

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

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

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

@@ -1,9 +1,10 @@
 // @ts-check
 import AsciiTable from 'ascii-table'
 
+import { getFunctions, getFunctionsDir } from '../../utils/functions/index.mjs'
 import utils from '../../utils/index.cjs'
 
-const { error, exit, getFunctions, getFunctionsDir, log, logJson, warn } = utils
+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

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

package/src/commands/graph/{graph-config-write.cjs → graph-config-write.mjs}

@@ -1,10 +1,12 @@
 // @ts-check
-const fs = require('fs')
-const path = require('path')
-const process = require('process')
+import fs from 'fs'
+import path from 'path'
+import process from 'process'
 
-const { getNetlifyGraphConfig } = require('../../lib/one-graph/cli-netlify-graph.cjs')
-const { NETLIFYDEVERR, chalk, error, log } = require('../../utils/index.cjs')
+import { getNetlifyGraphConfig } from '../../lib/one-graph/cli-netlify-graph.mjs'
+import utils from '../../utils/index.cjs'
+
+const { NETLIFYDEVERR, chalk, error, log } = utils
 
 /**
  * Creates the `netlify graph:config:write` command
@@ -45,7 +47,7 @@ const graphConfigWrite = async (options, command) => {
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createGraphConfigWriteCommand = (program) =>
+export const createGraphConfigWriteCommand = (program) =>
   program
     .command('graph:config:write')
     .description(
@@ -54,5 +56,3 @@ const createGraphConfigWriteCommand = (program) =>
     .action(async (options, command) => {
       await graphConfigWrite(options, command)
     })
-
-module.exports = { createGraphConfigWriteCommand }

package/src/commands/graph/{graph-edit.cjs → graph-edit.mjs}

@@ -1,20 +1,17 @@
 // @ts-check
-const gitRepoInfo = require('git-repo-info')
-
-const {
-  OneGraphCliClient,
-  ensureCLISession,
-  upsertMergeCLISessionMetadata,
-} = require('../../lib/one-graph/cli-client.cjs')
-const {
+import gitRepoInfo from 'git-repo-info'
+
+import { OneGraphCliClient, ensureCLISession, upsertMergeCLISessionMetadata } from '../../lib/one-graph/cli-client.mjs'
+import {
   defaultExampleOperationsDoc,
   getGraphEditUrlBySiteId,
   getNetlifyGraphConfig,
   readGraphQLOperationsSourceFile,
-} = require('../../lib/one-graph/cli-netlify-graph.cjs')
-const { NETLIFYDEVERR, chalk, error, log } = require('../../utils/index.cjs')
-const { openBrowser } = require('../../utils/open-browser.cjs')
+} from '../../lib/one-graph/cli-netlify-graph.mjs'
+import utils from '../../utils/index.cjs'
+import { openBrowser } from '../../utils/open-browser.cjs'
 
+const { NETLIFYDEVERR, chalk, error, log } = utils
 const { ensureAppForSite, executeCreatePersistedQueryMutation } = OneGraphCliClient
 
 /**
@@ -99,12 +96,10 @@ const graphEdit = async (options, command) => {
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createGraphEditCommand = (program) =>
+export const createGraphEditCommand = (program) =>
   program
     .command('graph:edit')
     .description('Launch the browser to edit your local graph functions from Netlify')
     .action(async (options, command) => {
       await graphEdit(options, command)
     })
-
-module.exports = { createGraphEditCommand }

package/src/commands/graph/{graph-handler.cjs → graph-handler.mjs}

@@ -1,7 +1,7 @@
 /* eslint-disable eslint-comments/disable-enable-pair */
 // @ts-check
 
-const {
+import {
   autocompleteCodegenModules,
   autocompleteOperationNames,
   buildSchema,
@@ -10,8 +10,10 @@ const {
   getCodegenModule,
   getNetlifyGraphConfig,
   readGraphQLSchemaFile,
-} = require('../../lib/one-graph/cli-netlify-graph.cjs')
-const { error, log } = require('../../utils/index.cjs')
+} from '../../lib/one-graph/cli-netlify-graph.mjs'
+import utils from '../../utils/index.cjs'
+
+const { error, log } = utils
 
 /**
  * Creates the `netlify graph:handler` command
@@ -88,7 +90,7 @@ const graphHandler = async (args, options, command) => {
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createGraphHandlerCommand = (program) =>
+export const createGraphHandlerCommand = (program) =>
   program
     .command('graph:handler')
     .argument('[name...]', 'Operation name(s)')
@@ -100,5 +102,3 @@ const createGraphHandlerCommand = (program) =>
     .action(async (operationNames, options, command) => {
       await graphHandler({ operationNames }, options, command)
     })
-
-module.exports = { createGraphHandlerCommand }