netlify-cli 17.37.2 → 17.38.1

package/dist/commands/sites/sites-create-template.js

@@ -1,53 +1,18 @@
 import inquirer from 'inquirer';
 import pick from 'lodash/pick.js';
-// @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'pars... Remove this comment to see the full error message
-import parseGitHubUrl from 'parse-github-url';
 import { render } from 'prettyjson';
-import { chalk, error, getTerminalLink, log, logJson, warn } from '../../utils/command-helpers.js';
+import { v4 as uuid } from 'uuid';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { chalk, error, getTerminalLink, log, logJson, warn, GitHubAPIError, } from '../../utils/command-helpers.js';
 import execa from '../../utils/execa.js';
 import getRepoData from '../../utils/get-repo-data.js';
 import { getGitHubToken } from '../../utils/init/config-github.js';
 import { configureRepo } from '../../utils/init/config.js';
-import { createRepo, getTemplatesFromGitHub, validateTemplate } from '../../utils/sites/utils.js';
+import { deployedSiteExists, getGitHubLink, getTemplateName } from '../../utils/sites/create-template.js';
+import { callLinkSite, createRepo, validateTemplate } from '../../utils/sites/utils.js';
 import { track } from '../../utils/telemetry/index.js';
 import { getSiteNameInput } from './sites-create.js';
-export const fetchTemplates = async (token) => {
-    const templatesFromGithubOrg = await getTemplatesFromGitHub(token);
-    return templatesFromGithubOrg
-        .filter((repo) => !repo.archived && !repo.disabled)
-        .map((template) => ({
-        name: template.name,
-        sourceCodeUrl: template.html_url,
-        slug: template.full_name,
-    }));
-};
-// @ts-expect-error TS(7031) FIXME: Binding element 'ghToken' implicitly has an 'any' ... Remove this comment to see the full error message
-const getTemplateName = async ({ ghToken, options, repository }) => {
-    if (repository) {
-        const { repo } = parseGitHubUrl(repository);
-        return repo || `netlify-templates/${repository}`;
-    }
-    if (options.url) {
-        const urlFromOptions = new URL(options.url);
-        return urlFromOptions.pathname.slice(1);
-    }
-    const templates = await fetchTemplates(ghToken);
-    log(`Choose one of our starter templates. Netlify will create a new repo for this template in your GitHub account.`);
-    const { templateName } = await inquirer.prompt([
-        {
-            type: 'list',
-            name: 'templateName',
-            message: 'Template:',
-            choices: templates.map((template) => ({
-                value: template.slug,
-                name: template.name,
-            })),
-        },
-    ]);
-    return templateName;
-};
-// @ts-expect-error TS(7031) FIXME: Binding element 'options' implicitly has an 'any' ... Remove this comment to see the full error message
-const getGitHubLink = ({ options, templateName }) => options.url || `https://github.com/${templateName}`;
 export const sitesCreateTemplate = async (repository, options, command) => {
     const { api } = command.netlify;
     await command.authenticate();
@@ -73,7 +38,6 @@ export const sitesCreateTemplate = async (repository, options, command) => {
                 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,
@@ -86,95 +50,152 @@ export const sitesCreateTemplate = async (repository, options, command) => {
     let site;
     let repoResp;
     // 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 inputSiteName = async (name, hasExistingRepo) => {
         const { name: inputName } = await getSiteNameInput(name);
+        const siteName = inputName.trim();
+        if (siteName && (await deployedSiteExists(siteName))) {
+            log('A site with that name already exists');
+            return inputSiteName();
+        }
         try {
-            const siteName = inputName.trim();
-            // Create new repo from template
-            repoResp = await createRepo(templateName, ghToken, siteName || templateName);
-            // @ts-expect-error TS(18046) - 'repoResp' if of type 'unknown'
-            if (repoResp.errors) {
-                // @ts-expect-error TS(18046) - 'repoResp' if of type 'unknown'
-                if (repoResp.errors[0].includes('Name already exists on this account')) {
-                    warn(`Oh no! We found already a repository with this name. It seems you have already created a template with the name ${templateName}. Please try to run the command again and provide a different name.`);
-                    // @ts-expect-error TS(2554) FIXME: Expected 1 arguments, but got 0.
-                    await inputSiteName();
+            const sites = await api.listSites({ name: siteName, filter: 'all' });
+            const siteFoundByName = sites.find((filteredSite) => filteredSite.name === siteName);
+            if (siteFoundByName) {
+                log('A site with that name already exists on your account');
+                return inputSiteName();
+            }
+        }
+        catch (error_) {
+            error(error_);
+        }
+        if (!hasExistingRepo) {
+            try {
+                // Create new repo from template
+                let gitHubInputName = siteName || templateName;
+                repoResp = await createRepo(templateName, ghToken, gitHubInputName);
+                if (repoResp.errors && repoResp.errors[0].includes('Name already exists on this account')) {
+                    if (gitHubInputName === templateName) {
+                        gitHubInputName += `-${uuid().split('-')[0]}`;
+                        repoResp = await createRepo(templateName, ghToken, gitHubInputName);
+                    }
+                    else {
+                        warn(`It seems you have already created a repository with the name ${gitHubInputName}.`);
+                        return inputSiteName();
+                    }
+                }
+                if (!repoResp.id) {
+                    throw new GitHubAPIError(repoResp.status, repoResp.message);
+                }
+                hasExistingRepo = true;
+            }
+            catch (error_) {
+                if (error_.status === '404') {
+                    error(`Could not create repository: ${error_.message}. Ensure that your GitHub personal access token grants permission to create repositories`);
                 }
                 else {
-                    throw new Error(
-                    // @ts-expect-error TS(18046) - 'repoResp' if of type 'unknown'
-                    `Oops! Seems like something went wrong trying to create the repository. We're getting the following error: '${repoResp.errors[0]}'. You can try to re-run this command again or open an issue in our repository: https://github.com/netlify/cli/issues`);
+                    error(`Something went wrong trying to create the repository. We're getting the following error: '${error_.message}'. You can try to re-run this command again or open an issue in our repository: https://github.com/netlify/cli/issues`);
                 }
             }
-            else {
-                site = await api.createSiteInTeam({
-                    accountSlug,
-                    body: {
-                        repo: {
-                            provider: 'github',
-                            // @ts-expect-error TS(18046) - 'repoResp' if of type 'unknown'
-                            repo: repoResp.full_name,
-                            // @ts-expect-error TS(18046) - 'repoResp' if of type 'unknown'
-                            private: repoResp.private,
-                            // @ts-expect-error TS(18046) - 'repoResp' if of type 'unknown'
-                            branch: repoResp.default_branch,
-                        },
-                        name: siteName,
+        }
+        try {
+            site = await api.createSiteInTeam({
+                accountSlug,
+                body: {
+                    repo: {
+                        provider: 'github',
+                        repo: repoResp.full_name,
+                        private: repoResp.private,
+                        branch: repoResp.default_branch,
                     },
-                });
-            }
+                    name: siteName,
+                },
+            });
         }
         catch (error_) {
-            if (error_.status === 422 || error_.message === 'Duplicate repo') {
-                warn(`${name}.netlify.app already exists or a repository named ${name} already exists on this account. Please try a different slug.`);
-                // @ts-expect-error TS(2554) FIXME: Expected 1 arguments, but got 0.
-                await inputSiteName();
-            }
-            else {
-                error(`createSiteInTeam error: ${error_.status}: ${error_.message}`);
+            if (error_.status === 422) {
+                log(`createSiteInTeam error: ${error_.status}: ${error_.message}`);
+                log('Cannot create a site with that name. Site name may already exist. Please try a new name.');
+                return inputSiteName(undefined, hasExistingRepo);
             }
+            error(`createSiteInTeam error: ${error_.status}: ${error_.message}`);
         }
+        return [site, repoResp];
     };
-    await inputSiteName(nameFlag);
+    [site, repoResp] = await inputSiteName(nameFlag);
     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(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,
-        // @ts-expect-error TS(2532) FIXME: Object is possibly 'undefined'.
         'Repo URL': site.build_settings.repo_url,
     }));
     track('sites_createdFromTemplate', {
-        // @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,
     });
     const { cloneConfirm } = await inquirer.prompt({
         type: 'confirm',
         name: 'cloneConfirm',
-        message: `Do you want to clone the repository?`,
+        message: `Do you want to clone the repository to your local machine?`,
         default: true,
     });
     if (cloneConfirm) {
         log();
-        // @ts-expect-error TS(18046) - 'repoResp' if of type 'unknown'
-        await execa('git', ['clone', repoResp.clone_url, `${repoResp.name}`]);
-        // @ts-expect-error TS(18046) - 'repoResp' if of type 'unknown'
+        if (repoResp.clone_url) {
+            await execa('git', ['clone', repoResp.clone_url, `${repoResp.name}`]);
+        }
         log(`🚀 Repository cloned successfully. You can find it under the ${chalk.magenta(repoResp.name)} folder`);
+        const { linkConfirm } = await inquirer.prompt({
+            type: 'confirm',
+            name: 'linkConfirm',
+            message: `Do you want to link the cloned directory to the site?`,
+            default: true,
+        });
+        if (linkConfirm) {
+            const __dirname = path.dirname(fileURLToPath(import.meta.url));
+            const cliPath = path.resolve(__dirname, '../../../bin/run.js');
+            let stdout;
+            if (repoResp.name) {
+                stdout = await callLinkSite(cliPath, repoResp.name, '\n');
+            }
+            else {
+                error();
+                return;
+            }
+            const linkedSiteUrlRegex = /Site url:\s+(\S+)/;
+            const lineMatch = linkedSiteUrlRegex.exec(stdout);
+            const urlMatch = lineMatch ? lineMatch[1] : undefined;
+            if (urlMatch) {
+                log(`\nDirectory ${chalk.cyanBright(repoResp.name)} linked to site ${chalk.cyanBright(urlMatch)}\n`);
+                log(`${chalk.cyanBright.bold('cd', repoResp.name)} to use other netlify cli commands in the cloned directory.\n`);
+            }
+            else {
+                const linkedSiteMatch = /Site already linked to\s+(\S+)/.exec(stdout);
+                const linkedSiteNameMatch = linkedSiteMatch ? linkedSiteMatch[1] : undefined;
+                if (linkedSiteNameMatch) {
+                    log(`\nThis directory appears to be linked to ${chalk.cyanBright(linkedSiteNameMatch)}`);
+                    log('This can happen if you cloned the template into a subdirectory of an existing Netlify project.');
+                    log(`You may need to move the ${chalk.cyanBright(repoResp.name)} directory out of its parent directory and then re-run the ${chalk.cyanBright('link')} command manually\n`);
+                }
+                else {
+                    log('A problem occurred linking the site');
+                    log('You can try again manually by running:');
+                    log(chalk.cyanBright(`cd ${repoResp.name} && netlify link\n`));
+                }
+            }
+        }
+        else {
+            log('To link the cloned directory manually, run:');
+            log(chalk.cyanBright(`cd ${repoResp.name} && netlify link\n`));
+        }
     }
     if (options.withCi) {
         log('Configuring CI');
         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 });
     }
     if (options.json) {

package/dist/commands/sites/sites-create.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sites-create.d.ts","sourceRoot":"","sources":["../../../src/commands/sites/sites-create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AASxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAI5C,eAAO,MAAM,gBAAgB,SAAgB,MAAM,GAAG,SAAS;UAAmB,MAAM;EAevF,CAAA;AAED,eAAO,MAAM,WAAW,YAAmB,YAAY,WAAW,WAAW,uBAuH5E,CAAA"}
+{"version":3,"file":"sites-create.d.ts","sourceRoot":"","sources":["../../../src/commands/sites/sites-create.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAUxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAG5C,eAAO,MAAM,gBAAgB,SAAgB,MAAM,GAAG,SAAS;UAAmB,MAAM;EAevF,CAAA;AAED,eAAO,MAAM,WAAW,YAAmB,YAAY,WAAW,WAAW,uBAuH5E,CAAA"}

package/dist/commands/sites/sites.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sites.d.ts","sourceRoot":"","sources":["../../../src/commands/sites/sites.ts"],"names":[],"mappings":"AAEA,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAkB5C,eAAO,MAAM,8BAA8B,YAAa,WAAW,SAsBlE,CAAA;AAED,eAAO,MAAM,wBAAwB,YAAa,WAAW,SAoB5D,CAAA;AAED,eAAO,MAAM,kBAAkB,YAAa,WAAW,gBA6BtD,CAAA"}
+{"version":3,"file":"sites.d.ts","sourceRoot":"","sources":["../../../src/commands/sites/sites.ts"],"names":[],"mappings":"AAEA,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAkB5C,eAAO,MAAM,8BAA8B,YAAa,WAAW,SAsBlE,CAAA;AAED,eAAO,MAAM,wBAAwB,YAAa,WAAW,SAoB5D,CAAA;AAED,eAAO,MAAM,kBAAkB,YAAa,WAAW,gBA4BtD,CAAA"}

package/dist/commands/sites/sites.js

@@ -63,7 +63,6 @@ export const createSitesCommand = (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(async (siteId, options, command) => {
         const { sitesDelete } = await import('./sites-delete.js');