netlify-cli 17.3.1 → 17.4.0

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

@@ -1,178 +1,166 @@
-// @ts-check
-import { InvalidArgumentError } from 'commander'
-import inquirer from 'inquirer'
-import pick from 'lodash/pick.js'
-import prettyjson from 'prettyjson'
-
-import { chalk, error, log, logJson, warn } from '../../utils/command-helpers.mjs'
-import getRepoData from '../../utils/get-repo-data.mjs'
-import { configureRepo } from '../../utils/init/config.mjs'
-import { track } from '../../utils/telemetry/index.mjs'
-import { link } from '../link/index.mjs'
-
+import { InvalidArgumentError } from 'commander';
+import inquirer from 'inquirer';
+import pick from 'lodash/pick.js';
+import prettyjson from 'prettyjson';
+import { chalk, error, log, logJson, warn } from '../../utils/command-helpers.mjs';
+import getRepoData from '../../utils/get-repo-data.mjs';
+import { configureRepo } from '../../utils/init/config.mjs';
+import { track } from '../../utils/telemetry/index.mjs';
+import { link } from '../link/index.mjs';
+// @ts-expect-error TS(7006) FIXME: Parameter 'name' implicitly has an 'any' type.
 export const getSiteNameInput = async (name) => {
-  if (!name) {
-    const { name: nameInput } = await inquirer.prompt([
-      {
-        type: 'input',
-        name: 'name',
-        message: 'Site name (leave blank for a random name; you can change it later):',
-        validate: (input) =>
-          /^[a-zA-Z\d-]+$/.test(input || undefined) || 'Only alphanumeric characters and hyphens are allowed',
-      },
-    ])
-    name = nameInput || ''
-  }
-
-  return { name }
-}
-
+    if (!name) {
+        const { name: nameInput } = await inquirer.prompt([
+            {
+                type: 'input',
+                name: 'name',
+                message: 'Site name (leave blank for a random name; you can change it later):',
+                validate: (input) => /^[a-zA-Z\d-]+$/.test(input || undefined) || 'Only alphanumeric characters and hyphens are allowed',
+            },
+        ]);
+        name = nameInput || '';
+    }
+    return { name };
+};
 /**
  * The sites:create command
  * @param {import('commander').OptionValues} options
  * @param {import('../base-command.mjs').default} command
  */
+// @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
 export const sitesCreate = async (options, command) => {
-  const { api } = command.netlify
-
-  await command.authenticate()
-
-  const accounts = await api.listAccountsForUser()
-
-  let { accountSlug } = options
-  if (!accountSlug) {
-    const { accountSlug: accountSlugInput } = await inquirer.prompt([
-      {
-        type: 'list',
-        name: 'accountSlug',
-        message: 'Team:',
-        choices: accounts.map((account) => ({
-          value: account.slug,
-          name: account.name,
-        })),
-      },
-    ])
-    accountSlug = accountSlugInput
-  }
-
-  let site
-
-  // Allow the user to reenter site name if selected one isn't available
-  const inputSiteName = async (name) => {
-    const { name: siteName } = await getSiteNameInput(name)
-
-    const body = {}
-    if (typeof siteName === 'string') {
-      body.name = siteName.trim()
+    const { api } = command.netlify;
+    await command.authenticate();
+    const accounts = await api.listAccountsForUser();
+    let { accountSlug } = options;
+    if (!accountSlug) {
+        const { accountSlug: accountSlugInput } = await inquirer.prompt([
+            {
+                type: 'list',
+                name: 'accountSlug',
+                message: 'Team:',
+                // @ts-expect-error TS(7006) FIXME: Parameter 'account' implicitly has an 'any' type.
+                choices: accounts.map((account) => ({
+                    value: account.slug,
+                    name: account.name,
+                })),
+            },
+        ]);
+        accountSlug = accountSlugInput;
+    }
+    let site;
+    // Allow the user to reenter site name if selected one isn't available
+    // @ts-expect-error TS(7006) FIXME: Parameter 'name' implicitly has an 'any' type.
+    const inputSiteName = async (name) => {
+        const { name: siteName } = await getSiteNameInput(name);
+        const body = {};
+        if (typeof siteName === 'string') {
+            // @ts-expect-error TS(2339) FIXME: Property 'name' does not exist on type '{}'.
+            body.name = siteName.trim();
+        }
+        try {
+            site = await api.createSiteInTeam({
+                accountSlug,
+                body,
+            });
+        }
+        catch (error_) {
+            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+            if (error_.status === 422) {
+                warn(`${siteName}.netlify.app already exists. Please try a different slug.`);
+                // @ts-expect-error TS(2554) FIXME: Expected 1 arguments, but got 0.
+                await inputSiteName();
+            }
+            else {
+                // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+                error(`createSiteInTeam error: ${error_.status}: ${error_.message}`);
+            }
+        }
+    };
+    await inputSiteName(options.name);
+    log();
+    log(chalk.greenBright.bold.underline(`Site Created`));
+    log();
+    // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
+    const siteUrl = site.ssl_url || site.url;
+    log(prettyjson.render({
+        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
+        'Admin URL': site.admin_url,
+        URL: siteUrl,
+        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
+        'Site ID': site.id,
+    }));
+    track('sites_created', {
+        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
+        siteId: site.id,
+        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
+        adminUrl: site.admin_url,
+        siteUrl,
+    });
+    if (options.withCi) {
+        log('Configuring CI');
+        // @ts-expect-error TS(2345) FIXME: Argument of type '{ workingDir: any; }' is not ass... Remove this comment to see the full error message
+        const repoData = await getRepoData({ workingDir: command.workingDir });
+        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
+        await configureRepo({ command, siteId: site.id, repoData, manual: options.manual });
     }
-    try {
-      site = await api.createSiteInTeam({
-        accountSlug,
-        body,
-      })
-    } catch (error_) {
-      if (error_.status === 422) {
-        warn(`${siteName}.netlify.app already exists. Please try a different slug.`)
-        await inputSiteName()
-      } else {
-        error(`createSiteInTeam error: ${error_.status}: ${error_.message}`)
-      }
+    if (options.json) {
+        logJson(pick(site, [
+            'id',
+            'state',
+            'plan',
+            'name',
+            'custom_domain',
+            'domain_aliases',
+            'url',
+            'ssl_url',
+            'admin_url',
+            'screenshot_url',
+            'created_at',
+            'updated_at',
+            'user_id',
+            'ssl',
+            'force_ssl',
+            'managed_dns',
+            'deploy_url',
+            'account_name',
+            'account_slug',
+            'git_provider',
+            'deploy_hook',
+            'capabilities',
+            'id_domain',
+        ]));
     }
-  }
-  await inputSiteName(options.name)
-
-  log()
-  log(chalk.greenBright.bold.underline(`Site Created`))
-  log()
-
-  const siteUrl = site.ssl_url || site.url
-  log(
-    prettyjson.render({
-      'Admin URL': site.admin_url,
-      URL: siteUrl,
-      'Site ID': site.id,
-    }),
-  )
-
-  track('sites_created', {
-    siteId: site.id,
-    adminUrl: site.admin_url,
-    siteUrl,
-  })
-
-  if (options.withCi) {
-    log('Configuring CI')
-    const repoData = await getRepoData({ workingDir: command.workingDir })
-    await configureRepo({ command, siteId: site.id, repoData, manual: options.manual })
-  }
-
-  if (options.json) {
-    logJson(
-      pick(site, [
-        'id',
-        'state',
-        'plan',
-        'name',
-        'custom_domain',
-        'domain_aliases',
-        'url',
-        'ssl_url',
-        'admin_url',
-        'screenshot_url',
-        'created_at',
-        'updated_at',
-        'user_id',
-        'ssl',
-        'force_ssl',
-        'managed_dns',
-        'deploy_url',
-        'account_name',
-        'account_slug',
-        'git_provider',
-        'deploy_hook',
-        'capabilities',
-        'id_domain',
-      ]),
-    )
-  }
-
-  if (!options.disableLinking) {
-    log()
-    await link({ id: site.id }, command)
-  }
-
-  return site
-}
-
-const MAX_SITE_NAME_LENGTH = 63
+    if (!options.disableLinking) {
+        log();
+        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
+        await link({ id: site.id }, command);
+    }
+    return site;
+};
+const MAX_SITE_NAME_LENGTH = 63;
+// @ts-expect-error TS(7006) FIXME: Parameter 'value' implicitly has an 'any' type.
 const validateName = function (value) {
-  // netlify sites:create --name <A string of more than 63 words>
-  if (typeof value === 'string' && value.length > MAX_SITE_NAME_LENGTH) {
-    throw new InvalidArgumentError(`--name should be less than 64 characters, input length: ${value.length}`)
-  }
-
-  return value
-}
-
+    // netlify sites:create --name <A string of more than 63 words>
+    if (typeof value === 'string' && value.length > MAX_SITE_NAME_LENGTH) {
+        throw new InvalidArgumentError(`--name should be less than 64 characters, input length: ${value.length}`);
+    }
+    return value;
+};
 /**
  * Creates the `netlify sites:create` command
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-export const createSitesCreateCommand = (program) =>
-  program
+// @ts-expect-error TS(7006) FIXME: Parameter 'program' implicitly has an 'any' type.
+export const createSitesCreateCommand = (program) => program
     .command('sites:create')
-    .description(
-      `Create an empty site (advanced)
-Create a blank site that isn't associated with any git remote. Will link the site to the current working directory.`,
-    )
+    .description(`Create an empty site (advanced)
+Create a blank site that isn't associated with any git remote. Will link the site to the current working directory.`)
     .option('-n, --name <name>', 'name of site', validateName)
     .option('-a, --account-slug <slug>', 'account slug to create the site under')
     .option('-c, --with-ci', 'initialize CI hooks during site creation')
     .option('-m, --manual', 'force manual CI setup.  Used --with-ci flag')
     .option('--disable-linking', 'create the site without linking it to current directory')
-    .addHelpText(
-      'after',
-      `Create a blank site that isn't associated with any git remote. Will link the site to the current working directory.`,
-    )
-    .action(sitesCreate)
+    .addHelpText('after', `Create a blank site that isn't associated with any git remote. Will link the site to the current working directory.`)
+    .action(sitesCreate);

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

@@ -1,102 +1,96 @@
-// @ts-check
-import inquirer from 'inquirer'
-
-import { chalk, error, exit, log } from '../../utils/command-helpers.mjs'
-
+import inquirer from 'inquirer';
+import { chalk, error, exit, log } from '../../utils/command-helpers.mjs';
 /**
  * The sites:delete command
  * @param {string} siteId
  * @param {import('commander').OptionValues} options
  * @param {import('../base-command.mjs').default} command
  */
+// @ts-expect-error TS(7006) FIXME: Parameter 'siteId' implicitly has an 'any' type.
 const sitesDelete = async (siteId, options, command) => {
-  command.setAnalyticsPayload({ force: options.force })
-
-  const { api, site } = command.netlify
-  const cwdSiteId = site.id
-
-  // 1. Prompt user for verification
-  await command.authenticate(options.auth)
-
-  let siteData
-  try {
-    siteData = await api.getSite({ siteId })
-  } catch (error_) {
-    if (error_.status === 404) {
-      error(`No site with id ${siteId} found. Please verify the siteId & try again.`)
+    command.setAnalyticsPayload({ force: options.force });
+    const { api, site } = command.netlify;
+    const cwdSiteId = site.id;
+    // 1. Prompt user for verification
+    await command.authenticate(options.auth);
+    let siteData;
+    try {
+        siteData = await api.getSite({ siteId });
     }
-  }
-
-  if (!siteData) {
-    error(`Unable to process site`)
-  }
-
-  const noForce = options.force !== true
-
-  /* Verify the user wants to delete the site */
-  if (noForce) {
-    log(`${chalk.redBright('Warning')}: You are about to permanently delete "${chalk.bold(siteData.name)}"`)
-    log(`         Verify this siteID "${siteId}" supplied is correct and proceed.`)
-    log('         To skip this prompt, pass a --force flag to the delete command')
-    log()
-    log(`${chalk.bold('Be careful here. There is no undo!')}`)
-    log()
-    const { wantsToDelete } = await inquirer.prompt({
-      type: 'confirm',
-      name: 'wantsToDelete',
-      message: `WARNING: Are you sure you want to delete the "${siteData.name}" site?`,
-      default: false,
-    })
-    log()
-    if (!wantsToDelete) {
-      exit()
+    catch (error_) {
+        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+        if (error_.status === 404) {
+            error(`No site with id ${siteId} found. Please verify the siteId & try again.`);
+        }
     }
-  }
-
-  /* Validation logic if siteId passed in does not match current site ID */
-  if (noForce && cwdSiteId && cwdSiteId !== siteId) {
-    log(`${chalk.redBright('Warning')}: The siteId supplied does not match the current working directory siteId`)
-    log()
-    log(`Supplied:       "${siteId}"`)
-    log(`Current Site:   "${cwdSiteId}"`)
-    log()
-    log(`Verify this siteID "${siteId}" supplied is correct and proceed.`)
-    log('To skip this prompt, pass a --force flag to the delete command')
-    const { wantsToDelete } = await inquirer.prompt({
-      type: 'confirm',
-      name: 'wantsToDelete',
-      message: `Verify & Proceed with deletion of site "${siteId}"?`,
-      default: false,
-    })
-    if (!wantsToDelete) {
-      exit()
+    if (!siteData) {
+        error(`Unable to process site`);
     }
-  }
-
-  log(`Deleting site "${siteId}"...`)
-
-  try {
-    await api.deleteSite({ site_id: siteId })
-  } catch (error_) {
-    if (error_.status === 404) {
-      error(`No site with id ${siteId} found. Please verify the siteId & try again.`)
-    } else {
-      error(`Delete Site error: ${error_.status}: ${error_.message}`)
+    const noForce = options.force !== true;
+    /* Verify the user wants to delete the site */
+    if (noForce) {
+        log(`${chalk.redBright('Warning')}: You are about to permanently delete "${chalk.bold(siteData.name)}"`);
+        log(`         Verify this siteID "${siteId}" supplied is correct and proceed.`);
+        log('         To skip this prompt, pass a --force flag to the delete command');
+        log();
+        log(`${chalk.bold('Be careful here. There is no undo!')}`);
+        log();
+        const { wantsToDelete } = await inquirer.prompt({
+            type: 'confirm',
+            name: 'wantsToDelete',
+            message: `WARNING: Are you sure you want to delete the "${siteData.name}" site?`,
+            default: false,
+        });
+        log();
+        if (!wantsToDelete) {
+            exit();
+        }
     }
-  }
-  log(`Site "${siteId}" successfully deleted!`)
-}
-
+    /* Validation logic if siteId passed in does not match current site ID */
+    if (noForce && cwdSiteId && cwdSiteId !== siteId) {
+        log(`${chalk.redBright('Warning')}: The siteId supplied does not match the current working directory siteId`);
+        log();
+        log(`Supplied:       "${siteId}"`);
+        log(`Current Site:   "${cwdSiteId}"`);
+        log();
+        log(`Verify this siteID "${siteId}" supplied is correct and proceed.`);
+        log('To skip this prompt, pass a --force flag to the delete command');
+        const { wantsToDelete } = await inquirer.prompt({
+            type: 'confirm',
+            name: 'wantsToDelete',
+            message: `Verify & Proceed with deletion of site "${siteId}"?`,
+            default: false,
+        });
+        if (!wantsToDelete) {
+            exit();
+        }
+    }
+    log(`Deleting site "${siteId}"...`);
+    try {
+        await api.deleteSite({ site_id: siteId });
+    }
+    catch (error_) {
+        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+        if (error_.status === 404) {
+            error(`No site with id ${siteId} found. Please verify the siteId & try again.`);
+        }
+        else {
+            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+            error(`Delete Site error: ${error_.status}: ${error_.message}`);
+        }
+    }
+    log(`Site "${siteId}" successfully deleted!`);
+};
 /**
  * Creates the `netlify sites:delete` command
  * @param {import('../base-command.mjs').default} program
  * @returns
  */
-export const createSitesDeleteCommand = (program) =>
-  program
+// @ts-expect-error TS(7006) FIXME: Parameter 'program' implicitly has an 'any' type.
+export const createSitesDeleteCommand = (program) => program
     .command('sites:delete')
     .description('Delete a site\nThis command will permanently delete the site on Netlify. Use with caution.')
     .argument('<siteId>', 'Site ID to delete.')
     .option('-f, --force', 'delete without prompting (useful for CI)')
     .addExamples(['netlify sites:delete 1234-3262-1211'])
-    .action(sitesDelete)
+    .action(sitesDelete);

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

@@ -1,87 +1,84 @@
-// @ts-check
-import { listSites } from '../../lib/api.mjs'
-import { startSpinner, stopSpinner } from '../../lib/spinner.mjs'
-import { chalk, log, logJson } from '../../utils/command-helpers.mjs'
-
+import { listSites } from '../../lib/api.mjs';
+import { startSpinner, stopSpinner } from '../../lib/spinner.mjs';
+import { chalk, log, logJson } from '../../utils/command-helpers.mjs';
 /**
  * The sites:list command
  * @param {import('commander').OptionValues} options
  * @param {import('../base-command.mjs').default} command
  * @returns {Promise<{ id: any; name: any; ssl_url: any; account_name: any; }|boolean>}
  */
+// @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
 const sitesList = async (options, command) => {
-  const { api } = command.netlify
-  /** @type {import('ora').Ora} */
-  let spinner
-  if (!options.json) {
-    spinner = startSpinner({ text: 'Loading your sites' })
-  }
-  await command.authenticate()
-
-  const sites = await listSites({ api, options: { filter: 'all' } })
-  if (!options.json) {
-    stopSpinner({ spinner })
-  }
-
-  if (sites && sites.length !== 0) {
-    const logSites = sites.map((site) => {
-      const siteInfo = {
-        id: site.id,
-        name: site.name,
-        ssl_url: site.ssl_url,
-        account_name: site.account_name,
-      }
-
-      if (site.build_settings && site.build_settings.repo_url) {
-        siteInfo.repo_url = site.build_settings.repo_url
-      }
-
-      return siteInfo
-    })
-
-    // Json response for piping commands
-    if (options.json) {
-      const redactedSites = sites.map((site) => {
-        if (site && site.build_settings) {
-          delete site.build_settings.env
-        }
-        return site
-      })
-      logJson(redactedSites)
-      return false
+    const { api } = command.netlify;
+    /** @type {import('ora').Ora} */
+    let spinner;
+    if (!options.json) {
+        spinner = startSpinner({ text: 'Loading your sites' });
     }
-
-    log(`
+    await command.authenticate();
+    const sites = await listSites({ api, options: { filter: 'all' } });
+    if (!options.json) {
+        // @ts-expect-error TS(2345) FIXME: Argument of type '{ spinner: Ora | undefined; }' i... Remove this comment to see the full error message
+        stopSpinner({ spinner });
+    }
+    if (sites && sites.length !== 0) {
+        // @ts-expect-error TS(7006) FIXME: Parameter 'site' implicitly has an 'any' type.
+        const logSites = sites.map((site) => {
+            const siteInfo = {
+                id: site.id,
+                name: site.name,
+                ssl_url: site.ssl_url,
+                account_name: site.account_name,
+            };
+            if (site.build_settings && site.build_settings.repo_url) {
+                // @ts-expect-error TS(2339) FIXME: Property 'repo_url' does not exist on type '{ id: ... Remove this comment to see the full error message
+                siteInfo.repo_url = site.build_settings.repo_url;
+            }
+            return siteInfo;
+        });
+        // Json response for piping commands
+        if (options.json) {
+            // @ts-expect-error TS(7006) FIXME: Parameter 'site' implicitly has an 'any' type.
+            const redactedSites = sites.map((site) => {
+                if (site && site.build_settings) {
+                    delete site.build_settings.env;
+                }
+                return site;
+            });
+            logJson(redactedSites);
+            return false;
+        }
+        log(`
 ────────────────────────────┐
  Current Netlify Sites    │
 ────────────────────────────┘
 
 Count: ${logSites.length}
-`)
-
-    logSites.forEach((logSite) => {
-      log(`${chalk.greenBright(logSite.name)} - ${logSite.id}`)
-      log(`  ${chalk.whiteBright.bold('url:')}  ${chalk.yellowBright(logSite.ssl_url)}`)
-      if (logSite.repo_url) {
-        log(`  ${chalk.whiteBright.bold('repo:')} ${chalk.white(logSite.repo_url)}`)
-      }
-      if (logSite.account_name) {
-        log(`  ${chalk.whiteBright.bold('account:')} ${chalk.white(logSite.account_name)}`)
-      }
-      log(`─────────────────────────────────────────────────`)
-    })
-  }
-}
-
+`);
+        // @ts-expect-error TS(7006) FIXME: Parameter 'logSite' implicitly has an 'any' type.
+        logSites.forEach((logSite) => {
+            log(`${chalk.greenBright(logSite.name)} - ${logSite.id}`);
+            log(`  ${chalk.whiteBright.bold('url:')}  ${chalk.yellowBright(logSite.ssl_url)}`);
+            if (logSite.repo_url) {
+                log(`  ${chalk.whiteBright.bold('repo:')} ${chalk.white(logSite.repo_url)}`);
+            }
+            if (logSite.account_name) {
+                log(`  ${chalk.whiteBright.bold('account:')} ${chalk.white(logSite.account_name)}`);
+            }
+            log(`─────────────────────────────────────────────────`);
+        });
+    }
+};
 /**
  * Creates the `netlify sites:list` command
  * @param {import('../base-command.mjs').default} program
  */
-export const createSitesListCommand = (program) =>
-  program
+// @ts-expect-error TS(7006) FIXME: Parameter 'program' implicitly has an 'any' type.
+export const createSitesListCommand = (program) => program
     .command('sites:list')
     .description('List all sites you have access to')
     .option('--json', 'Output site data as JSON')
+    // @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
     .action(async (options, command) => {
-      await sitesList(options, command)
-    })
+    await sitesList(options, command);
+});