netlify 27.16.2 → 27.16.3

package/dist/commands/base-command.d.ts

@@ -66,7 +66,7 @@ export default class BaseCommand extends Command {
     /** Will be called on the end of an action to track the metrics */
     onEnd(error_?: unknown): Promise<undefined>;
     authenticate(tokenFromFlag?: string): Promise<string>;
-    private refreshAccounts;
+    refreshAccounts(): Promise<void>;
     expensivelyAuthenticate(): Promise<string>;
     /** Adds some data to the analytics payload */
     setAnalyticsPayload(payload: Record<string, unknown>): void;

package/dist/commands/init/init.js

@@ -1,6 +1,6 @@
 import { confirm, select } from '@inquirer/prompts';
 import { isEmpty } from '../../utils/object-utilities.js';
-import { chalk, exit, log, netlifyCommand } from '../../utils/command-helpers.js';
+import { chalk, exit, log, logAndThrowError, netlifyCommand, warn } from '../../utils/command-helpers.js';
 import getRepoData from '../../utils/get-repo-data.js';
 import { ensureNetlifyIgnore } from '../../utils/gitignore.js';
 import { configureRepo } from '../../utils/init/config.js';
@@ -30,6 +30,71 @@ const logExistingAndExit = ({ siteInfo }) => {
     log(`2. Then run ${chalk.cyanBright.bold(`${netlifyCommand()} init`)} again`);
     return exit();
 };
+const logLinkedWithoutGitAndExit = ({ siteInfo, repoError, }) => {
+    if (repoError.reason !== 'no-remote') {
+        warn(`Could not read the git remote: ${repoError.error}`);
+        log(`Fix the git remote, then run ${chalk.cyanBright.bold(`${netlifyCommand()} init`)} again to connect it.`);
+    }
+    log();
+    log(`This folder is already linked to the Netlify project ${chalk.cyan(siteInfo.name)}`);
+    log();
+    log(`Project Url:   ${chalk.cyan(siteInfo.ssl_url || siteInfo.url)}`);
+    log();
+    log(`To deploy to this project, run ${chalk.cyanBright.bold(`${netlifyCommand()} deploy`)}.`);
+    log(`To link this folder to a different project, run ${chalk.cyanBright.bold(`${netlifyCommand()} unlink`)}, then ${chalk.cyanBright.bold(`${netlifyCommand()} init`)}.`);
+    return exit();
+};
+const ignoreLinkedSiteForThisRun = (command) => {
+    const { site } = command.netlify;
+    command.siteId = undefined;
+    command.netlify.siteInfo = {};
+    command.netlify.site = {
+        root: site.root,
+        configPath: site.configPath,
+        get id() {
+            return command.siteId;
+        },
+        set id(id) {
+            site.id = id;
+        },
+    };
+};
+const getLinkedSiteInfo = async (command) => {
+    const { api, siteInfo } = command.netlify;
+    if (isEmpty(siteInfo)) {
+        return undefined;
+    }
+    if (siteInfo.name) {
+        return siteInfo;
+    }
+    try {
+        return (await api.getSite({ siteId: siteInfo.id }));
+    }
+    catch (error_) {
+        const { status, message } = error_;
+        const unusableLinks = {
+            403: {
+                reason: 'forbidden',
+                warning: `You don't have access to the Netlify project ${siteInfo.id} linked to this folder. Continuing without it.`,
+            },
+            404: {
+                reason: 'not_found',
+                warning: `The Netlify project ${siteInfo.id} linked to this folder no longer exists. Continuing without it.`,
+            },
+        };
+        const unusableLink = unusableLinks[status];
+        if (unusableLink === undefined) {
+            return logAndThrowError(`Could not load the Netlify project ${siteInfo.id} linked to this folder (${status ? `status ${status.toString()}` : message}). Try again, or run ${chalk.cyanBright.bold(`${netlifyCommand()} unlink`)} to start over.`);
+        }
+        warn(unusableLink.warning);
+        await track('sites_unlinked', { siteId: siteInfo.id, kind: 'init', reason: unusableLink.reason });
+        ignoreLinkedSiteForThisRun(command);
+        if (command.netlify.accounts.length === 0) {
+            await command.refreshAccounts();
+        }
+        return undefined;
+    }
+};
 /**
  * Creates and new site and exits the process
  */
@@ -167,7 +232,6 @@ export const init = async (options, command, { customizeExitMessage, exitAfterCo
         resetContext: options.resetContext,
     });
     const { repositoryRoot, state } = command.netlify;
-    const { siteInfo: existingSiteInfo } = command.netlify;
     // Check logged in status
     await command.authenticate();
     // Add .netlify to .gitignore file
@@ -175,13 +239,16 @@ export const init = async (options, command, { customizeExitMessage, exitAfterCo
     if (shouldSetupAgentSkills) {
         await installAgentSkills(command, resetContext);
     }
-    const repoUrl = getRepoUrl(existingSiteInfo);
-    if (repoUrl && !options.force) {
-        logExistingAndExit({ siteInfo: existingSiteInfo });
+    const linkedSiteInfo = await getLinkedSiteInfo(command);
+    if (linkedSiteInfo && getRepoUrl(linkedSiteInfo) && !options.force) {
+        logExistingAndExit({ siteInfo: linkedSiteInfo });
     }
     // Look for local repo
     const repoData = await getRepoData({ workingDir: command.workingDir, remoteName: options.gitRemoteName });
     if ('error' in repoData) {
+        if (linkedSiteInfo) {
+            return logLinkedWithoutGitAndExit({ siteInfo: linkedSiteInfo, repoError: repoData });
+        }
         // TODO(ndhoule): Custom error messaage here
         return await handleNoGitRemoteAndExit({
             command,
@@ -191,7 +258,7 @@ export const init = async (options, command, { customizeExitMessage, exitAfterCo
             customizeExitMessage,
         });
     }
-    const siteInfo = isEmpty(existingSiteInfo) ? await createOrLinkSiteToRepo(command) : existingSiteInfo;
+    const siteInfo = linkedSiteInfo ?? (await createOrLinkSiteToRepo(command));
     log();
     // Check for existing CI setup
     const remoteBuildRepo = getRepoUrl(siteInfo);

package/dist/utils/get-repo-data.d.ts

@@ -7,11 +7,14 @@ export interface RepoData {
     provider: string | null;
     httpsUrl: string;
 }
+export type RepoDataErrorReason = 'no-remote' | 'unknown-remote' | 'invalid-url' | 'unreadable';
+export interface RepoDataError {
+    error: string;
+    reason: RepoDataErrorReason;
+}
 declare const getRepoData: ({ remoteName, workingDir, }: {
     remoteName?: string;
     workingDir: string;
-}) => Promise<RepoData | {
-    error: string;
-}>;
+}) => Promise<RepoData | RepoDataError>;
 export default getRepoData;
 //# sourceMappingURL=get-repo-data.d.ts.map

package/dist/utils/get-repo-data.js

@@ -5,14 +5,23 @@ import gitRepoInfo from 'git-repo-info';
 import gitconfiglocal from 'gitconfiglocal';
 import parseGithubUrl from 'parse-github-url';
 import { log } from './command-helpers.js';
+class RepoDataLookupError extends Error {
+    reason;
+    constructor(message, reason) {
+        super(message);
+        this.reason = reason;
+    }
+}
+const redactCredentials = (url) => url.replace(/\/\/[^/@]*@/, '//***@');
 const getRepoData = async ({ remoteName, workingDir, }) => {
     try {
-        const [gitConfig, gitDirectory] = await Promise.all([
-            util.promisify(gitconfiglocal)(workingDir),
-            findUp('.git', { cwd: workingDir, type: 'directory' }),
-        ]);
-        if (!gitDirectory || !gitConfig?.remote || Object.keys(gitConfig.remote).length === 0) {
-            throw new Error('No Git remote found');
+        const gitDirectory = await findUp('.git', { cwd: workingDir, type: 'directory' });
+        if (!gitDirectory) {
+            throw new RepoDataLookupError('No Git remote found', 'no-remote');
+        }
+        const gitConfig = await util.promisify(gitconfiglocal)(workingDir);
+        if (!gitConfig?.remote || Object.keys(gitConfig.remote).length === 0) {
+            throw new RepoDataLookupError('No Git remote found', 'no-remote');
         }
         const baseGitPath = dirname(gitDirectory);
         if (workingDir !== baseGitPath) {
@@ -25,13 +34,13 @@ const getRepoData = async ({ remoteName, workingDir, }) => {
         if (!Object.prototype.hasOwnProperty.call(gitConfig.remote, remoteName) ||
             !gitConfig.remote[remoteName] ||
             Object.keys(gitConfig.remote[remoteName]).length === 0) {
-            throw new Error(`The specified remote "${remoteName}" is not defined in Git repo. Please use --git-remote-name flag to specify a remote.`);
+            throw new RepoDataLookupError(`The specified remote "${remoteName}" is not defined in Git repo. Please use --git-remote-name flag to specify a remote.`, 'unknown-remote');
         }
         const { url } = gitConfig.remote[remoteName];
         const parsedUrl = parseGithubUrl(url);
         // TODO(serhalp): Validate more aggressively? We should probably require `owner`, `repo`, `host`?
         if (parsedUrl == null) {
-            throw new Error(`The specified Git remote ${remoteName} is not a valid URL: ${url}`);
+            throw new RepoDataLookupError(`The specified Git remote ${remoteName} is not a valid URL: ${redactCredentials(String(url))}`, 'invalid-url');
         }
         const { host, name, owner, repo } = parsedUrl;
         const { branch } = gitRepoInfo();
@@ -48,6 +57,7 @@ const getRepoData = async ({ remoteName, workingDir, }) => {
     catch (error) {
         return {
             error: error instanceof Error ? error.message : (error?.toString() ?? 'Failed to get repo data'),
+            reason: error instanceof RepoDataLookupError ? error.reason : 'unreadable',
         };
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "netlify",
-  "version": "27.16.2",
+  "version": "27.16.3",
   "description": "Netlify command line tool",
   "keywords": [
     "api",
@@ -54,11 +54,11 @@
     "@fastify/static": "^10.0.0",
     "@inquirer/prompts": "^8.7.2",
     "@netlify/ai": "^1.0.2",
-    "@netlify/api": "^15.1.5",
+    "@netlify/api": "^15.1.6",
     "@netlify/blobs": "^11.1.7",
-    "@netlify/build": "^37.7.2",
+    "@netlify/build": "^37.7.6",
     "@netlify/build-info": "^11.3.1",
-    "@netlify/config": "^25.5.1",
+    "@netlify/config": "^25.6.2",
     "@netlify/dev": "^5.1.12",
     "@netlify/dev-utils": "^6.0.4",
     "@netlify/edge-bundler": "^16.2.0",