netlify-cli 12.2.3 → 12.2.5

package/src/commands/sites/{sites-delete.cjs → sites-delete.mjs}

@@ -1,13 +1,15 @@
 // @ts-check
-const inquirer = require('inquirer')
+import inquirer from 'inquirer'
 
-const { chalk, error, exit, log } = require('../../utils/index.cjs')
+import utils from '../../utils/index.cjs'
+
+const { chalk, error, exit, log } = utils
 
 /**
  * The sites:delete command
  * @param {string} siteId
  * @param {import('commander').OptionValues} options
- * @param {import('../base-command').BaseCommand} command
+ * @param {import('../base-command.mjs').default} command
  */
 const sitesDelete = async (siteId, options, command) => {
   command.setAnalyticsPayload({ force: options.force })
@@ -89,10 +91,10 @@ const sitesDelete = async (siteId, options, command) => {
 
 /**
  * Creates the `netlify sites:delete` command
- * @param {import('../base-command').BaseCommand} program
+ * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createSitesDeleteCommand = (program) =>
+export const createSitesDeleteCommand = (program) =>
   program
     .command('sites:delete')
     .description('Delete a site\nThis command will permanently delete the site on Netlify. Use with caution.')
@@ -100,5 +102,3 @@ const createSitesDeleteCommand = (program) =>
     .option('-f, --force', 'delete without prompting (useful for CI)')
     .addExamples(['netlify sites:delete 1234-3262-1211'])
     .action(sitesDelete)
-
-module.exports = { createSitesDeleteCommand }

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

@@ -1,13 +1,14 @@
 // @ts-check
+import { listSites } from '../../lib/api.cjs'
+import { startSpinner, stopSpinner } from '../../lib/spinner.cjs'
+import utils from '../../utils/index.cjs'
 
-const { listSites } = require('../../lib/api.cjs')
-const { startSpinner, stopSpinner } = require('../../lib/spinner.cjs')
-const { chalk, log, logJson } = require('../../utils/index.cjs')
+const { chalk, log, logJson } = utils
 
 /**
  * The sites:list command
  * @param {import('commander').OptionValues} options
- * @param {import('../base-command').BaseCommand} command
+ * @param {import('../base-command.mjs').default} command
  * @returns {Promise<{ id: any; name: any; ssl_url: any; account_name: any; }|boolean>}
  */
 const sitesList = async (options, command) => {
@@ -76,9 +77,9 @@ Count: ${logSites.length}
 
 /**
  * Creates the `netlify sites:list` command
- * @param {import('../base-command').BaseCommand} program
+ * @param {import('../base-command.mjs').default} program
  */
-const createSitesListCommand = (program) =>
+export const createSitesListCommand = (program) =>
   program
     .command('sites:list')
     .description('List all sites you have access to')
@@ -86,5 +87,3 @@ const createSitesListCommand = (program) =>
     .action(async (options, command) => {
       await sitesList(options, command)
     })
-
-module.exports = { createSitesListCommand }

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

@@ -1,13 +1,13 @@
 // @ts-check
-const { createSitesFromTemplateCommand } = require('./sites-create-template.cjs')
-const { createSitesCreateCommand } = require('./sites-create.cjs')
-const { createSitesDeleteCommand } = require('./sites-delete.cjs')
-const { createSitesListCommand } = require('./sites-list.cjs')
+import { createSitesFromTemplateCommand } from './sites-create-template.mjs'
+import { createSitesCreateCommand } from './sites-create.mjs'
+import { createSitesDeleteCommand } from './sites-delete.mjs'
+import { createSitesListCommand } from './sites-list.mjs'
 
 /**
  * The sites command
  * @param {import('commander').OptionValues} options
- * @param {import('../base-command').BaseCommand} command
+ * @param {import('../base-command.mjs').default} command
  */
 const sites = (options, command) => {
   command.help()
@@ -15,10 +15,10 @@ const sites = (options, command) => {
 
 /**
  * Creates the `netlify sites` command
- * @param {import('../base-command').BaseCommand} program
+ * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createSitesCommand = (program) => {
+export const createSitesCommand = (program) => {
   createSitesCreateCommand(program)
   createSitesFromTemplateCommand(program)
   createSitesListCommand(program)
@@ -30,5 +30,3 @@ const createSitesCommand = (program) => {
     .addExamples(['netlify sites:create --name my-new-site', 'netlify sites:list'])
     .action(sites)
 }
-
-module.exports = { createSitesCommand }

package/src/commands/status/index.mjs

@@ -0,0 +1 @@
+export { createStatusCommand } from './status.mjs'

package/src/commands/status/{status-hooks.cjs → status-hooks.mjs}

@@ -1,13 +1,15 @@
 // @ts-check
-const { get } = require('dot-prop')
-const prettyjson = require('prettyjson')
+import { get } from 'dot-prop'
+import prettyjson from 'prettyjson'
 
-const { error, log, warn } = require('../../utils/index.cjs')
+import utils from '../../utils/index.cjs'
+
+const { error, log, warn } = utils
 
 /**
  * The status:hooks command
  * @param {import('commander').OptionValues} options
- * @param {import('../base-command').BaseCommand} command
+ * @param {import('../base-command.mjs').default} command
  */
 const statusHooks = async (options, command) => {
   const { api, site } = command.netlify
@@ -60,10 +62,8 @@ Site Hook Status │
 
 /**
  * Creates the `netlify status:hooks` command
- * @param {import('../base-command').BaseCommand} program
+ * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createStatusHooksCommand = (program) =>
+export const createStatusHooksCommand = (program) =>
   program.command('status:hooks').description('Print hook information of the linked site').action(statusHooks)
-
-module.exports = { createStatusHooksCommand }

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

@@ -1,15 +1,17 @@
 // @ts-check
-const clean = require('clean-deep')
-const prettyjson = require('prettyjson')
+import clean from 'clean-deep'
+import prettyjson from 'prettyjson'
 
-const { chalk, error, exit, getToken, log, logJson, warn } = require('../../utils/index.cjs')
+import utils from '../../utils/index.cjs'
 
-const { createStatusHooksCommand } = require('./status-hooks.cjs')
+import { createStatusHooksCommand } from './status-hooks.mjs'
+
+const { chalk, error, exit, getToken, log, logJson, warn } = utils
 
 /**
  * The status command
  * @param {import('commander').OptionValues} options
- * @param {import('../base-command').BaseCommand} command
+ * @param {import('../base-command.mjs').default} command
  */
 const status = async (options, command) => {
   const { api, globalConfig, site } = command.netlify
@@ -109,10 +111,10 @@ const status = async (options, command) => {
 
 /**
  * Creates the `netlify status` command
- * @param {import('../base-command').BaseCommand} program
+ * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createStatusCommand = (program) => {
+export const createStatusCommand = (program) => {
   createStatusHooksCommand(program)
 
   return program
@@ -121,4 +123,3 @@ const createStatusCommand = (program) => {
     .option('--verbose', 'Output system info')
     .action(status)
 }
-module.exports = { createStatusCommand }

package/src/commands/switch/index.mjs

@@ -0,0 +1 @@
+export { createSwitchCommand } from './switch.mjs'

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

@@ -1,15 +1,17 @@
 // @ts-check
-const inquirer = require('inquirer')
+import inquirer from 'inquirer'
 
-const { chalk, log } = require('../../utils/index.cjs')
-const { login } = require('../login/index.cjs')
+import utils from '../../utils/index.cjs'
+import { login } from '../login/index.mjs'
+
+const { chalk, log } = utils
 
 const LOGIN_NEW = 'I would like to login to a new account'
 
 /**
  * The switch command
  * @param {import('commander').OptionValues} options
- * @param {import('../base-command').BaseCommand} command
+ * @param {import('../base-command.mjs').default} command
  */
 const switchCommand = async (options, command) => {
   const availableUsersChoices = Object.values(command.netlify.globalConfig.get('users') || {}).reduce(
@@ -41,10 +43,8 @@ const switchCommand = async (options, command) => {
 
 /**
  * Creates the `netlify switch` command
- * @param {import('../base-command').BaseCommand} program
+ * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createSwitchCommand = (program) =>
+export const createSwitchCommand = (program) =>
   program.command('switch').description('Switch your active Netlify account').action(switchCommand)
-
-module.exports = { createSwitchCommand }

package/src/commands/unlink/index.mjs

@@ -0,0 +1 @@
+export { createUnlinkCommand } from './unlink.mjs'

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

@@ -1,11 +1,12 @@
 // @ts-check
+import utils from '../../utils/index.cjs'
 
-const { exit, log, track } = require('../../utils/index.cjs')
+const { exit, log, track } = utils
 
 /**
  * The unlink command
  * @param {import('commander').OptionValues} options
- * @param {import('../base-command').BaseCommand} command
+ * @param {import('../base-command.mjs').default} command
  */
 const unlink = async (options, command) => {
   const { site, state } = command.netlify
@@ -39,10 +40,8 @@ const unlink = async (options, command) => {
 
 /**
  * Creates the `netlify unlink` command
- * @param {import('../base-command').BaseCommand} program
+ * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createUnlinkCommand = (program) =>
+export const createUnlinkCommand = (program) =>
   program.command('unlink').description('Unlink a local folder from a Netlify site').action(unlink)
-
-module.exports = { createUnlinkCommand }

package/src/commands/watch/index.mjs

@@ -0,0 +1 @@
+export { createWatchCommand } from './watch.mjs'

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

@@ -1,10 +1,12 @@
 // @ts-check
-const pWaitFor = require('p-wait-for')
-const prettyjson = require('prettyjson')
+import pWaitFor from 'p-wait-for'
+import prettyjson from 'prettyjson'
 
-const { startSpinner, stopSpinner } = require('../../lib/spinner.cjs')
-const { chalk, error, log } = require('../../utils/index.cjs')
-const { init } = require('../init/index.cjs')
+import { startSpinner, stopSpinner } from '../../lib/spinner.cjs'
+import utils from '../../utils/index.cjs'
+import { init } from '../init/index.mjs'
+
+const { chalk, error, log } = utils
 
 // 1 second
 const INIT_WAIT = 1e3
@@ -53,7 +55,7 @@ const waitForBuildFinish = async function (api, siteId, spinner) {
 /**
  * The watch command
  * @param {import('commander').OptionValues} options
- * @param {import('../base-command').BaseCommand} command
+ * @param {import('../base-command.mjs').default} command
  */
 const watch = async (options, command) => {
   await command.authenticate()
@@ -118,14 +120,12 @@ const watch = async (options, command) => {
 
 /**
  * Creates the `netlify watch` command
- * @param {import('../base-command').BaseCommand} program
+ * @param {import('../base-command.mjs').default} program
  * @returns
  */
-const createWatchCommand = (program) =>
+export const createWatchCommand = (program) =>
   program
     .command('watch')
     .description('Watch for site deploy to finish')
     .addExamples([`netlify watch`, `git push && netlify watch`])
     .action(watch)
-
-module.exports = { createWatchCommand }

package/src/functions-templates/rust/hello-world/Cargo.toml

@@ -8,7 +8,7 @@ version = "0.1.0"
 [dependencies]
 aws_lambda_events = "0.7.2"
 http = "0.2.8"
-lambda_runtime = "0.7.0"
+lambda_runtime = "0.7.1"
 log = "0.4.17"
 simple_logger = "1.16.0"
 tokio = "1.21.2"

package/src/lib/completion/generate-autocompletion.cjs

@@ -8,7 +8,7 @@ const { AUTOCOMPLETION_FILE } = require('./constants.cjs')
 
 /**
  * Create or updates the autocompletion information for the CLI
- * @param {import('../../commands/base-command').BaseCommand} program
+ * @param {import('../../commands/base-command.mjs').default} program
  * @returns {void}
  */
 const createAutocompletion = (program) => {

package/src/lib/one-graph/cli-netlify-graph.cjs

@@ -204,7 +204,7 @@ const defaultFrameworkLookup = {
 /**
  * Return a full NetlifyGraph config with any defaults overridden by netlify.toml
  * @param {object} input
- * @param {import('../../commands/base-command').BaseCommand} input.command
+ * @param {import('../../commands/base-command.mjs').default} input.command
  * @param {import('commander').CommandOptions} input.options
  * @param {Partial<import('../../utils/types').ServerSettings>=} input.settings
  * @return {Promise<NetlifyGraph.NetlifyGraphConfig>} NetlifyGraphConfig

package/src/utils/addons/{compare.cjs → compare.mjs}

@@ -1,6 +1,6 @@
-const isEqual = require('lodash/isEqual')
+import isEqual from 'lodash/isEqual.js'
 
-module.exports = function compare(oldValues, newValues) {
+export default function compare(oldValues, newValues) {
   const initialData = {
     // default everything is equal
     isEqual: true,

package/src/utils/addons/diffs/{index.cjs → index.mjs}

@@ -1,14 +1,14 @@
 // @ts-check
-const concordance = require('concordance')
+import concordance from 'concordance'
 
-const { concordanceDiffOptions, concordanceOptions } = require('./options.cjs')
+import { concordanceDiffOptions, concordanceOptions } from './options.mjs'
 
 const formatDescriptorDiff = function (actualDescriptor, expectedDescriptor, options) {
   const diffOptions = { ...options, ...concordanceDiffOptions }
   return concordance.diffDescriptors(actualDescriptor, expectedDescriptor, diffOptions)
 }
 
-module.exports = function diffValues(actual, expected) {
+export default function diffValues(actual, expected) {
   const result = concordance.compare(actual, expected, concordanceOptions)
   if (result.pass) {
     return null

package/src/utils/addons/diffs/{options.cjs → options.mjs}

@@ -1,7 +1,7 @@
 // @ts-check
-const ansiStyles = require('ansi-styles')
+import ansiStyles from 'ansi-styles'
 
-const { chalk } = require('../../command-helpers.cjs')
+import { chalk } from '../../command-helpers.cjs'
 
 const forceColor = new chalk.Instance({ level: 1 })
 
@@ -104,10 +104,5 @@ const colorTheme = {
 const plugins = []
 const theme = colorTheme
 
-const concordanceOptions = { maxDepth: 3, plugins, theme }
-const concordanceDiffOptions = { maxDepth: 1, plugins, theme }
-
-module.exports = {
-  concordanceOptions,
-  concordanceDiffOptions,
-}
+export const concordanceOptions = { maxDepth: 3, plugins, theme }
+export const concordanceDiffOptions = { maxDepth: 1, plugins, theme }

package/src/utils/addons/{prepare.cjs → prepare.mjs}

@@ -1,7 +1,7 @@
 // @ts-check
-const { chalk, error, exit, log, warn } = require('../command-helpers.cjs')
+import { chalk, error, exit, log, warn } from '../command-helpers.cjs'
 
-const ADDON_VALIDATION = {
+export const ADDON_VALIDATION = {
   EXISTS: 'EXISTS',
   NOT_EXISTS: 'NOT_EXISTS',
 }
@@ -27,7 +27,7 @@ const validateNotExists = ({ addon, addonName, siteData }) => {
   }
 }
 
-const getCurrentAddon = ({ addonName, addons }) => addons.find((addon) => addon.service_slug === addonName)
+export const getCurrentAddon = ({ addonName, addons }) => addons.find((addon) => addon.service_slug === addonName)
 
 const validateCurrentAddon = ({ addon, addonName, siteData, validation }) => {
   switch (validation) {
@@ -46,7 +46,7 @@ const validateCurrentAddon = ({ addon, addonName, siteData, validation }) => {
   }
 }
 
-const getAddonManifest = async ({ addonName, api }) => {
+export const getAddonManifest = async ({ addonName, api }) => {
   let manifest
   try {
     manifest = await api.showServiceManifest({ addonName })
@@ -60,7 +60,7 @@ const getAddonManifest = async ({ addonName, api }) => {
   return manifest
 }
 
-const getSiteData = async ({ api, siteId }) => {
+export const getSiteData = async ({ api, siteId }) => {
   let siteData
   try {
     siteData = await api.getSite({ siteId })
@@ -70,7 +70,7 @@ const getSiteData = async ({ api, siteId }) => {
   return siteData
 }
 
-const getAddons = async ({ api, siteId }) => {
+export const getAddons = async ({ api, siteId }) => {
   let addons
   try {
     addons = await api.listServiceInstancesForSite({ siteId })
@@ -83,11 +83,11 @@ const getAddons = async ({ api, siteId }) => {
 /**
  *
  * @param {object} config
- * @param {import('../../commands/base-command').BaseCommand} config.command
+ * @param {import('../../commands/base-command.mjs').default} config.command
  * @param {string} [config.addonName]
  * @param {keyof ADDON_VALIDATION} [config.validation]
  */
-const prepareAddonCommand = async ({ addonName, command, validation }) => {
+export const prepareAddonCommand = async ({ addonName, command, validation }) => {
   const { netlify } = command
   const { api, site } = netlify
   const siteId = site.id
@@ -112,5 +112,3 @@ const prepareAddonCommand = async ({ addonName, command, validation }) => {
 
   return { manifest, addons, addon, siteData }
 }
-
-module.exports = { ADDON_VALIDATION, prepareAddonCommand, getAddonManifest, getSiteData, getAddons, getCurrentAddon }

package/src/utils/addons/{prompts.cjs → prompts.mjs}

@@ -1,8 +1,8 @@
 // @ts-check
-const { chalk } = require('../command-helpers.cjs')
+import { chalk } from '../command-helpers.cjs'
 
 /* programmatically generate CLI prompts */
-module.exports = function generatePrompts(settings) {
+export default function generatePrompts(settings) {
   const { config, configValues } = settings
   const configItems = Object.keys(config)
 

package/src/utils/addons/{render.cjs → render.mjs}

@@ -1,9 +1,9 @@
 // @ts-check
-const AsciiTable = require('ascii-table')
+import AsciiTable from 'ascii-table'
 
-const { chalk } = require('../command-helpers.cjs')
+import { chalk } from '../command-helpers.cjs'
 
-const missingValues = function (values, manifest) {
+export const renderMissingValues = function (values, manifest) {
   const display = values
     .map((item) => {
       const itemDisplay = chalk.redBright.bold(`${item}`)
@@ -14,7 +14,7 @@ const missingValues = function (values, manifest) {
   console.log(display)
 }
 
-const configValues = function (addonName, values, currentValue) {
+export const renderConfigValues = function (addonName, values, currentValue) {
   const table = new AsciiTable(`${addonName} add-on settings`)
 
   const tableHeader = currentValue
@@ -37,8 +37,3 @@ const configValues = function (addonName, values, currentValue) {
   })
   console.log(table.toString())
 }
-
-module.exports = {
-  missingValues,
-  configValues,
-}

package/src/utils/addons/{validation.cjs → validation.mjs}

@@ -1,12 +1,12 @@
-const requiredConfigValues = function (config) {
+export const requiredConfigValues = function (config) {
   return Object.keys(config).filter((key) => config[key].required)
 }
 
-const missingConfigValues = function (requiredConfig, providedConfig) {
+export const missingConfigValues = function (requiredConfig, providedConfig) {
   return requiredConfig.filter((key) => !providedConfig[key])
 }
 
-const updateConfigValues = function (allowedConfig, currentConfig, newConfig) {
+export const updateConfigValues = function (allowedConfig, currentConfig, newConfig) {
   return Object.keys(allowedConfig).reduce((acc, key) => {
     if (newConfig[key]) {
       acc[key] = newConfig[key]
@@ -16,9 +16,3 @@ const updateConfigValues = function (allowedConfig, currentConfig, newConfig) {
     return acc
   }, {})
 }
-
-module.exports = {
-  requiredConfigValues,
-  missingConfigValues,
-  updateConfigValues,
-}

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

@@ -198,7 +198,7 @@ const addNotificationHooks = async ({ api, siteId, token }) => {
 
 /**
  * @param {object} config
- * @param {import('../../commands/base-command').BaseCommand} config.command
+ * @param {import('../../commands/base-command.mjs').default} config.command
  * @param {string} config.repoName
  * @param {string} config.repoOwner
  * @param {string} config.siteId

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

@@ -54,7 +54,7 @@ const addDeployHook = async ({ deployHook }) => {
 
 /**
  * @param {object} config
- * @param {import('../../commands/base-command').BaseCommand} config.command
+ * @param {import('../../commands/base-command.mjs').default} config.command
  * @param {*} config.repoData
  * @param {string} config.siteId
  */

package/src/utils/init/config.cjs

@@ -19,7 +19,7 @@ const logSuccess = (repoData) => {
 
 /**
  * @param {object} config
- * @param {import('../../commands/base-command').BaseCommand} config.command
+ * @param {import('../../commands/base-command.mjs').default} config.command
  * @param {boolean} config.manual
  * @param {*} config.repoData
  * @param {string} config.siteId

package/src/commands/addons/index.cjs

@@ -1,5 +0,0 @@
-const { createAddonsCommand } = require('./addons.cjs')
-
-module.exports = {
-  createAddonsCommand,
-}

package/src/commands/api/index.cjs

@@ -1,5 +0,0 @@
-const { createApiCommand } = require('./api.cjs')
-
-module.exports = {
-  createApiCommand,
-}

package/src/commands/build/index.cjs

@@ -1,5 +0,0 @@
-const { createBuildCommand } = require('./build.cjs')
-
-module.exports = {
-  createBuildCommand,
-}

package/src/commands/completion/index.cjs

@@ -1,5 +0,0 @@
-const { createCompletionCommand } = require('./completion.cjs')
-
-module.exports = {
-  createCompletionCommand,
-}

package/src/commands/deploy/index.cjs

@@ -1,5 +0,0 @@
-const { createDeployCommand } = require('./deploy.cjs')
-
-module.exports = {
-  createDeployCommand,
-}

package/src/commands/functions/index.cjs

@@ -1,5 +0,0 @@
-const { createFunctionsCommand } = require('./functions.cjs')
-
-module.exports = {
-  createFunctionsCommand,
-}

package/src/commands/init/index.cjs

@@ -1,6 +0,0 @@
-const { createInitCommand, init } = require('./init.cjs')
-
-module.exports = {
-  createInitCommand,
-  init,
-}

package/src/commands/login/index.cjs

@@ -1,6 +0,0 @@
-const { createLoginCommand, login } = require('./login.cjs')
-
-module.exports = {
-  createLoginCommand,
-  login,
-}

package/src/commands/logout/index.cjs

@@ -1,5 +0,0 @@
-const { createLogoutCommand } = require('./logout.cjs')
-
-module.exports = {
-  createLogoutCommand,
-}

package/src/commands/open/index.cjs

@@ -1,5 +0,0 @@
-const { createOpenCommand } = require('./open.cjs')
-
-module.exports = {
-  createOpenCommand,
-}

package/src/commands/sites/index.cjs

@@ -1,7 +0,0 @@
-const { sitesCreate } = require('./sites-create.cjs')
-const { createSitesCommand } = require('./sites.cjs')
-
-module.exports = {
-  createSitesCommand,
-  sitesCreate,
-}

package/src/commands/status/index.cjs

@@ -1,5 +0,0 @@
-const { createStatusCommand } = require('./status.cjs')
-
-module.exports = {
-  createStatusCommand,
-}