netlify-cli 27.12.0 → 27.13.0

package/dist/commands/agents/agents-stop.js

@@ -38,8 +38,8 @@ export const agentsStop = async (id, options, command) => {
         }
         // Stop the agent task
         const stopSpinnerInstance = startSpinner({ text: 'Stopping agent task...' });
-        const response = await fetch(`${apiOpts.scheme ?? 'https'}://${apiOpts.host ?? api.host}/api/v1/agent_runners/${id}`, {
-            method: 'DELETE',
+        const response = await fetch(`${apiOpts.scheme ?? 'https'}://${apiOpts.host ?? api.host}/api/v1/agent_runners/${id}/stop`, {
+            method: 'POST',
             headers: {
                 Authorization: `Bearer ${api.accessToken ?? ''}`,
                 'User-Agent': apiOpts.userAgent,

package/dist/commands/base-command.js

@@ -234,6 +234,8 @@ export default class BaseCommand extends Command {
         const getCommands = (command) => {
             const parentCommand = this.name() === 'netlify' ? command : command.parent;
             return (parentCommand?.commands
+                // subcommands nested with `.command()` rather than named `parent:child`, e.g. `database connect`
+                .concat(this.name() === 'netlify' ? [] : command.commands)
                 .filter((cmd) => {
                 if (cmd._hidden)
                     return false;
@@ -242,11 +244,13 @@ export default class BaseCommand extends Command {
                     // don't include subcommands on the main page
                     return !cmd.name().includes(':');
                 }
-                return cmd.name().startsWith(`${command.name()}:`);
+                return cmd.name().startsWith(`${command.name()}:`) || cmd.parent === command;
             })
                 .sort((a, b) => a.name().localeCompare(b.name())) || []);
         };
-        help.longestSubcommandTermLength = (command) => getCommands(command).reduce((max, cmd) => Math.max(max, cmd.name().length), 0);
+        /** nested subcommands are shown by their full path, e.g. `database migrations apply` */
+        const getCommandTerm = (cmd) => cmd.parent && cmd.parent.name() !== 'netlify' ? `${getCommandTerm(cmd.parent)} ${cmd.name()}` : cmd.name();
+        help.longestSubcommandTermLength = (command) => getCommands(command).reduce((max, cmd) => Math.max(max, getCommandTerm(cmd).length), 0);
         /** override the longestOptionTermLength to react on hide options flag */
         help.longestOptionTermLength = (command, helper) => (!command.noBaseOptions &&
             helper.visibleOptions(command).reduce((max, option) => Math.max(max, helper.optionTerm(option).length), 0)) ||
@@ -313,7 +317,7 @@ export default class BaseCommand extends Command {
                     '',
                 ];
             }
-            const commandList = getCommands(command).map((cmd) => formatItem(cmd.name(), helper.subcommandDescription(cmd).split('\n')[0], true));
+            const commandList = getCommands(command).map((cmd) => formatItem(getCommandTerm(cmd), helper.subcommandDescription(cmd).split('\n')[0], true));
             if (commandList.length !== 0) {
                 output = [...output, chalk.bold('COMMANDS'), formatHelpList(commandList), ''];
             }

package/dist/commands/deploy/deploy.js

@@ -72,7 +72,7 @@ const getDeployFolder = async ({ command, config, options, site, siteData, }) =>
             ? resolve(command.jsWorkspaceRoot || site.root, options.dir)
             : resolve(command.workingDir, options.dir);
     }
-    else if (config?.build?.publish) {
+    else if (config.build.publish) {
         deployFolder = resolve(site.root, config.build.publish);
     }
     else if (siteData?.build_settings?.dir) {
@@ -166,13 +166,6 @@ const validateFolders = async ({ deployFolder, functionsFolder, }) => {
     const functionsFolderStat = await validateFunctionsFolder(functionsFolder);
     return { deployFolderStat, functionsFolderStat };
 };
-/**
- * @param {object} config
- * @param {string} config.deployFolder
- * @param {*} config.site
- * @returns
- */
-// @ts-expect-error TS(7031) FIXME: Binding element 'deployFolder' implicitly has an '... Remove this comment to see the full error message
 const getDeployFilesFilter = ({ deployFolder, site }) => {
     // site.root === deployFolder can happen when users run `netlify deploy --dir .`
     // in that specific case we don't want to publish the repo node_modules
@@ -258,11 +251,8 @@ const generateDeployCommand = (options, availableTeams, command) => {
     }
     return parts.join(' ');
 };
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-const prepareProductionDeploy = async ({ api, siteData, options, command }) => {
-    if (typeof siteData.published_deploy === 'object' &&
-        siteData.published_deploy !== null &&
-        siteData.published_deploy.locked) {
+const prepareProductionDeploy = async ({ api, siteData, options, command, }) => {
+    if (siteData.published_deploy?.locked) {
         log(`\n${NETLIFYDEVERR} Deployments are "locked" for production context of this project\n`);
         const overrideCommand = generateDeployCommand({ ...options, prodIfUnlocked: true, prod: false }, [], command);
         if (!isInteractive()) {
@@ -282,6 +272,19 @@ const prepareProductionDeploy = async ({ api, siteData, options, command }) => {
         log(`\n${NETLIFYDEVLOG} "Auto publishing" has been enabled for production context\n`);
     }
 };
+const createDeploy = async ({ alias, api, command, deployToProduction, options, siteData, siteId, }) => {
+    if (deployToProduction) {
+        await prepareProductionDeploy({ siteData, api, options, command });
+    }
+    const draft = options.draft || (!deployToProduction && !alias);
+    const createDeployBody = {
+        draft,
+        branch: alias,
+        include_upload_url: options.uploadSourceZip,
+        ...getDeploySourceFields(),
+    };
+    return (await api.createSiteDeploy({ siteId, title: options.message, body: createDeployBody }));
+};
 const hasErrorMessage = (actual, expected) => {
     if (typeof actual === 'string') {
         return actual.includes(expected);
@@ -337,6 +340,7 @@ const deployProgressCb = function () {
                 return;
             case 'stop':
             default: {
+                // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- FIXME: a `stop` event is assumed to follow a `start` event of the same type
                 spinnersByType[event.type].success(event.msg);
                 delete spinnersByType[event.type];
             }
@@ -357,7 +361,7 @@ const uploadDeployBlobs = async ({ cachedConfig, deployId, options, packagePath,
         // We log our own progress so we don't want this as well. Plus, this logs much of the same
         // information as the build that (likely) came before this as part of the deploy build.
         quiet: options.debug ?? true,
-        // @ts-expect-error(serhalp) -- Untyped in `@netlify/build`
+        // @ts-expect-error FIXME(@netlify/build): the `cachedConfig` flag is typed `Record<string, unknown>`, rejecting `CachedConfig`
         cachedConfig,
         packagePath,
         deployId,
@@ -378,37 +382,7 @@ const uploadDeployBlobs = async ({ cachedConfig, deployId, options, packagePath,
         phase: 'stop',
     });
 };
-const runDeploy = async ({ 
-// @ts-expect-error TS(7031) FIXME: Binding element 'alias' implicitly has an 'any' ty... Remove this comment to see the full error message
-alias, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-api, command, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
-config, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'deployFolder' implicitly has an '... Remove this comment to see the full error message
-deployFolder, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'deployTimeout' implicitly has an ... Remove this comment to see the full error message
-deployTimeout, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'deployToProduction' implicitly ha... Remove this comment to see the full error message
-deployToProduction, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'functionsConfig' implicitly has a... Remove this comment to see the full error message
-functionsConfig, functionsFolder, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'options' implicitly has an 'a... Remove this comment to see the full error message
-options, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'packagePath' implicitly has an 'a... Remove this comment to see the full error message
-packagePath, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'silent' implicitly has an 'any' t... Remove this comment to see the full error message
-silent, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'site' implicitly has an 'any' typ... Remove this comment to see the full error message
-site, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'siteData' implicitly has an 'any'... Remove this comment to see the full error message
-siteData, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'siteId' implicitly has an 'any' t... Remove this comment to see the full error message
-siteId, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'skipFunctionsCache' implicitly ha... Remove this comment to see the full error message
-skipFunctionsCache, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'title' implicitly has an 'any' ty... Remove this comment to see the full error message
-title, deployId: existingDeployId, }) => {
+const runDeploy = async ({ alias, api, command, config, deployFolder, deployTimeout, deployToProduction, functionsConfig, functionsFolder, options, packagePath, silent, site, siteData, siteId, skipFunctionsCache, deployId: existingDeployId, }) => {
     let results;
     let deployId = existingDeployId;
     let uploadSourceZipResult;
@@ -416,17 +390,15 @@ title, deployId: existingDeployId, }) => {
         // We won't have a deploy ID if we run the command with `--no-build`.
         // In this case, we must create the deploy.
         if (!deployId) {
-            if (deployToProduction) {
-                await prepareProductionDeploy({ siteData, api, options, command });
-            }
-            const draft = options.draft || (!deployToProduction && !alias);
-            const createDeployBody = {
-                draft,
-                branch: alias,
-                include_upload_url: options.uploadSourceZip,
-                ...getDeploySourceFields(),
-            };
-            const createDeployResponse = await api.createSiteDeploy({ siteId, title, body: createDeployBody });
+            const createDeployResponse = await createDeploy({
+                alias,
+                api,
+                command,
+                deployToProduction,
+                options,
+                siteData,
+                siteId,
+            });
             deployId = createDeployResponse.id;
             if (options.uploadSourceZip &&
                 createDeployResponse.source_zip_upload_url &&
@@ -449,17 +421,21 @@ title, deployId: existingDeployId, }) => {
             command.netlify.frameworksAPIPaths.functions.path,
             functionsFolder,
         ].filter((folder) => Boolean(folder));
-        const manifestPath = skipFunctionsCache ? null : await getFunctionsManifestPath({ base: site.root, packagePath });
+        const manifestPath = skipFunctionsCache
+            ? undefined
+            : await getFunctionsManifestPath({ base: site.root, packagePath });
         const serverManifestPath = await getServerManifestPath({ base: site.root, packagePath });
         const redirectsPath = `${deployFolder}/_redirects`;
         const headersPath = `${deployFolder}/_headers`;
         const { redirects } = await parseAllRedirects({
+            // @ts-expect-error FIXME(@netlify/redirect-parser): `configRedirects` is typed `string[]` but takes redirect objects
             configRedirects: config.redirects,
             redirectsFiles: [redirectsPath],
             minimal: true,
         });
         config.redirects = redirects;
         const { headers } = await parseAllHeaders({
+            // @ts-expect-error FIXME(@netlify/headers-parser): `MinimalHeader` rejects the array values `NetlifyConfig['headers']` allows
             configHeaders: config.headers,
             headersFiles: [headersPath],
             minimal: true,
@@ -474,7 +450,6 @@ title, deployId: existingDeployId, }) => {
             packagePath: command.workspacePackage,
         });
         results = await deploySite(command, api, siteId, deployFolder, {
-            // @ts-expect-error FIXME
             config,
             fnDir: functionDirectories,
             functionsConfig,
@@ -485,9 +460,9 @@ title, deployId: existingDeployId, }) => {
             deployId,
             filter: getDeployFilesFilter({ site, deployFolder }),
             workingDir: command.workingDir,
-            manifestPath,
+            manifestPath: manifestPath ?? undefined,
             packagePath,
-            serverEnabled: Boolean(siteData?.feature_flags?.netlify_build_server_standalone),
+            serverEnabled: Boolean(siteData.feature_flags?.netlify_build_server_standalone),
             serverManifestPath: serverManifestPath ?? undefined,
             skipFunctionsCache,
             siteRoot: site.root,
@@ -581,10 +556,8 @@ const bundleEdgeFunctions = async (options, command) => {
         // We log our own progress so we don't want this as well. Plus, this logs much of the same
         // information as the build that (likely) came before this as part of the deploy build.
         quiet: options.debug ?? true,
-        // (cachedConfig type error hides this one, but it still is valid) @ts-expect-error FIXME(serhalp): This is missing from the `runCoreSteps` type in @netlify/build
         edgeFunctionsBootstrapURL: await getBootstrapURL(),
-        // @ts-expect-error 'CachedConfig' is not assignable to type 'Record<string, unknown>'.
-        // Index signature for type 'string' is missing in type 'CachedConfig'.
+        // @ts-expect-error FIXME(@netlify/build): `cachedConfig` is typed `Record<string, unknown>` and `edgeFunctionsBootstrapURL` is missing from the flags
         cachedConfig: command.netlify.cachedConfig,
     });
     if (!success) {
@@ -722,7 +695,6 @@ const prepAndRunDeploy = async ({ api, command, config, deployToProduction, opti
         siteEnv,
     });
     const results = await runDeploy({
-        // @ts-expect-error FIXME
         alias,
         api,
         command,
@@ -735,12 +707,11 @@ const prepAndRunDeploy = async ({ api, command, config, deployToProduction, opti
         functionsFolder: functionsFolderStat && functionsFolder,
         options,
         packagePath: command.workspacePackage,
-        silent: options.json || options.silent,
+        silent: options.json || Boolean(options.silent),
         site,
         siteData,
         siteId,
         skipFunctionsCache: options.skipFunctionsCache,
-        title: options.message,
         deployId,
     });
     return results;
@@ -768,10 +739,11 @@ const createSiteWithFlags = async (options, command, site) => {
         throw new Error('Team must be specified to create a site');
     }
     try {
-        const siteData = await api.createSiteInTeam({
+        // FIXME(@netlify/api): the `site` response type makes every field optional, unlike `SiteInfo`
+        const siteData = (await api.createSiteInTeam({
             accountSlug: options.team,
             body,
-        });
+        }));
         site.id = siteData.id;
         return siteData;
     }
@@ -781,10 +753,11 @@ const createSiteWithFlags = async (options, command, site) => {
             const suffixedName = `${siteName.trim()}-${suffix}`;
             log(`Site name "${siteName}" is taken. Retrying with "${suffixedName}"...`);
             try {
-                const siteData = await api.createSiteInTeam({
+                // FIXME(@netlify/api): the `site` response type makes every field optional, unlike `SiteInfo`
+                const siteData = (await api.createSiteInTeam({
                     accountSlug: options.team,
                     body: { name: suffixedName },
-                });
+                }));
                 site.id = siteData.id;
                 return siteData;
             }
@@ -861,7 +834,7 @@ const anonymousDeploy = async (options, command) => {
         }
     };
     const checkForFunctions = async () => {
-        const functionsFolder = getFunctionsFolder({ config, options, site, siteData: {}, workingDir });
+        const functionsFolder = getFunctionsFolder({ config, options, site, workingDir });
         const internalFunctionsDir = await getInternalFunctionsDir({ base: site.root });
         const frameworksFunctionsDir = command.netlify.frameworksAPIPaths.functions.path;
         const hasFunctions = (await dirHasFiles(functionsFolder)) ||
@@ -891,17 +864,16 @@ const anonymousDeploy = async (options, command) => {
     }
     const deployFolder = await getDeployFolder({
         command,
-        config: command.netlify.config,
+        config,
         options,
         site,
-        siteData: {},
     });
     await validateDeployFolder(deployFolder);
     const edgeFunctionsDistPath = await getEdgeFunctionsDistPathIfExists(workingDir);
     const filter = getDeployFilesFilter({ site, deployFolder });
     const { files, filesShaMap } = await hashFiles({
         concurrentHash: DEFAULT_CONCURRENT_HASH,
-        directories: [deployFolder, edgeFunctionsDistPath].filter(Boolean),
+        directories: [deployFolder, edgeFunctionsDistPath].filter((dir) => Boolean(dir)),
         filter,
         normalizer: deployFileNormalizer.bind(null, workingDir),
         statusCb: options.json ? () => { } : deployProgressCb(),
@@ -941,7 +913,7 @@ const anonymousDeploy = async (options, command) => {
     }
     const deploy = await waitForDropDeploy(dropApiOptions, deployInfo.id, deployInfo.deploy_id, options.timeout ? options.timeout * 1000 : DEFAULT_DEPLOY_TIMEOUT);
     site.id = deployInfo.id;
-    const siteUrl = (deploy.ssl_url || deploy.url || `https://${deployInfo.subdomain}.netlify.app`);
+    const siteUrl = deploy.ssl_url || deploy.url || `https://${deployInfo.subdomain}.netlify.app`;
     const isPasswordProtected = !options.createdVia || options.createdVia === 'drop';
     const claimUrl = `https://app.netlify.com/drop/${deployInfo.subdomain}#drop_token=${dropToken}`;
     if (options.json) {
@@ -1013,23 +985,8 @@ export const deploy = async (options, command) => {
     const deployToProduction = !options.draft && (options.prod || (options.prodIfUnlocked && !(siteData.published_deploy?.locked ?? false)));
     let results = {};
     if (options.build) {
-        if (deployToProduction) {
-            await prepareProductionDeploy({ siteData, api, options, command });
-        }
-        const draft = options.draft || (!deployToProduction && !alias);
-        const createDeployBody = {
-            draft,
-            branch: alias,
-            include_upload_url: options.uploadSourceZip,
-            ...getDeploySourceFields(),
-        };
-        // TODO: Type this properly in `@netlify/api`.
-        const deployMetadata = (await api.createSiteDeploy({
-            siteId,
-            title: options.message,
-            body: createDeployBody,
-        }));
-        const deployId = deployMetadata.id || '';
+        const deployMetadata = await createDeploy({ alias, api, command, deployToProduction, options, siteData, siteId });
+        const deployId = deployMetadata.id;
         const skewProtectionToken = deployMetadata.skew_protection_token;
         let sourceZipFileName;
         if (options.uploadSourceZip &&
@@ -1058,7 +1015,7 @@ export const deploy = async (options, command) => {
                         options,
                         workingDir,
                         api,
-                        site,
+                        site: site,
                         config: netlifyConfig,
                         siteData,
                         siteId,
@@ -1087,7 +1044,7 @@ export const deploy = async (options, command) => {
             options,
             workingDir,
             api,
-            site,
+            site: site,
             config: command.netlify.config,
             siteData,
             siteId,

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

@@ -5,7 +5,7 @@ import { chalk, logAndThrowError, log, logJson, warn } from '../../utils/command
 import getRepoData from '../../utils/get-repo-data.js';
 import { configureRepo } from '../../utils/init/config.js';
 import { isInteractive } from '../../utils/scripted-commands.js';
-import { resolveTeamForNonInteractive } from '../../utils/team.js';
+import { requireTeams, resolveTeamForNonInteractive } from '../../utils/team.js';
 import { track } from '../../utils/telemetry/index.js';
 import { MAX_SITE_NAME_LENGTH } from '../../utils/validation.js';
 import { link } from '../link/link.js';
@@ -29,9 +29,10 @@ export const sitesCreate = async (options, command) => {
             log(`Using team: ${team.name}`);
         }
         else {
+            const teams = requireTeams(accounts);
             accountSlug = await select({
                 message: 'Team:',
-                choices: accounts.map((account) => ({
+                choices: teams.map((account) => ({
                     value: account.slug,
                     name: account.name,
                 })),

package/dist/lib/spinner.d.ts

@@ -8,9 +8,9 @@ export declare const startSpinner: ({ text }: {
 /**
  * Stops the spinner with the following text
  */
-export declare const stopSpinner: ({ error, spinner, text }: {
+export declare const stopSpinner: ({ error, spinner, text, }: {
     error?: boolean;
-    spinner: Spinner;
+    spinner: Spinner | undefined;
     text?: string;
 }) => void;
 /**

package/dist/lib/spinner.js

@@ -33,7 +33,7 @@ export const startSpinner = ({ text }) => {
 /**
  * Stops the spinner with the following text
  */
-export const stopSpinner = ({ error, spinner, text }) => {
+export const stopSpinner = ({ error, spinner, text, }) => {
     if (!spinner) {
         return;
     }

package/dist/utils/deploy/deploy-site.d.ts

@@ -1,26 +1,46 @@
-import BaseCommand from '../../commands/base-command.js';
-import { type $TSFixMe } from '../../commands/types.js';
-import type { DeployEvent } from './status-cb.js';
+import type { NetlifyAPI } from '@netlify/api';
+import type { Config as FunctionsConfig } from '@netlify/zip-it-and-ship-it';
+import type BaseCommand from '../../commands/base-command.js';
+import type { File } from './file.js';
+import type { DeployEvent, StatusCallback } from './status-cb.js';
+import type { DeployConfig } from './types.js';
 import type { DeployEnvironmentVariable } from '../env/deploy-env-vars.js';
 export type { DeployEvent };
-export declare const deploySite: (command: BaseCommand, api: $TSFixMe, siteId: any, dir: any, { assetType, branch, concurrentHash, concurrentUpload, config, deployId, deployTimeout, draft, environment, filter, fnDir, functionsConfig, hashAlgorithm, manifestPath, maxRetry, packagePath, serverEnabled, serverManifestPath, siteRoot, skipFunctionsCache, statusCb, syncFileLimit, tmpDir, workingDir, }: {
+export interface DeploySiteOptions {
+    assetType?: 'file' | undefined;
+    branch?: string;
     concurrentHash?: number;
     concurrentUpload?: number;
+    /** The site configuration, uploaded as the deploy's `netlify.toml` */
+    config: DeployConfig;
+    deployId: string;
     deployTimeout?: number;
     draft?: boolean;
     environment?: DeployEnvironmentVariable[];
+    filter: (filename: string) => boolean;
+    fnDir?: string[];
+    functionsConfig?: FunctionsConfig | undefined;
+    hashAlgorithm?: string;
+    manifestPath?: string | undefined;
     maxRetry?: number;
-    packagePath?: string;
+    packagePath?: string | undefined;
     serverEnabled?: boolean;
-    serverManifestPath?: string;
-    statusCb?: (status: DeployEvent) => void;
+    serverManifestPath?: string | undefined;
+    siteRoot?: string | undefined;
+    skipFunctionsCache?: boolean | undefined;
+    statusCb?: StatusCallback;
     syncFileLimit?: number;
     tmpDir?: string;
-    fnDir?: string[];
     workingDir: string;
-}) => Promise<{
-    deployId: any;
-    deploy: any;
-    uploadList: any[];
+}
+export declare const deploySite: (command: BaseCommand, api: NetlifyAPI, siteId: string, dir: string, { assetType, branch, concurrentHash, concurrentUpload, config, deployId, deployTimeout, draft, environment, filter, fnDir, functionsConfig, hashAlgorithm, manifestPath, maxRetry, packagePath, serverEnabled, serverManifestPath, siteRoot, skipFunctionsCache, statusCb, syncFileLimit, tmpDir, workingDir, }: DeploySiteOptions) => Promise<{
+    deployId: string;
+    deploy: import("./util.js").ReadyDeploy;
+    uploadList: (import("./upload-files.js").EdgeFunctionUploadFile | import("./upload-files.js").ServerUploadFile | File | (import("./upload-files.js").FunctionUploadFile & {
+        hash: string;
+        relname: string;
+    }) | (import("./upload-files.js").InlineUploadFile & {
+        hash: string;
+    }))[];
 }>;
 //# sourceMappingURL=deploy-site.d.ts.map

package/dist/utils/deploy/deploy-site.js

@@ -18,31 +18,7 @@ const buildStatsString = (possibleParts) => {
     }
     return `${parts.slice(0, -1).join(', ')} and ${parts[parts.length - 1]}`;
 };
-export const deploySite = async (command, api, 
-// @ts-expect-error TS(7006) FIXME: Parameter 'siteId' implicitly has an 'any' type.
-siteId, 
-// @ts-expect-error TS(7006) FIXME: Parameter 'dir' implicitly has an 'any' type.
-dir, { 
-// @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
-assetType, 
-// @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
-branch, concurrentHash = DEFAULT_CONCURRENT_HASH, concurrentUpload = DEFAULT_CONCURRENT_UPLOAD, 
-// @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
-config, 
-// @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
-deployId, deployTimeout = DEFAULT_DEPLOY_TIMEOUT, draft = false, environment, 
-// @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
-filter, fnDir = [], 
-// @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
-functionsConfig, 
-// @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
-hashAlgorithm, 
-// @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
-manifestPath, maxRetry = DEFAULT_MAX_RETRY, packagePath, serverEnabled, serverManifestPath, 
-// @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
-siteRoot, 
-// @ts-expect-error TS(2525) FIXME: Initializer provides no value for this binding ele... Remove this comment to see the full error message
-skipFunctionsCache, statusCb = () => {
+export const deploySite = async (command, api, siteId, dir, { assetType, branch, concurrentHash = DEFAULT_CONCURRENT_HASH, concurrentUpload = DEFAULT_CONCURRENT_UPLOAD, config, deployId, deployTimeout = DEFAULT_DEPLOY_TIMEOUT, draft = false, environment, filter, fnDir = [], functionsConfig, hashAlgorithm, manifestPath, maxRetry = DEFAULT_MAX_RETRY, packagePath, serverEnabled, serverManifestPath, siteRoot, skipFunctionsCache, statusCb = () => {
     /* default to noop */
 }, syncFileLimit = DEFAULT_SYNC_LIMIT, tmpDir = temporaryDirectory(), workingDir, }) => {
     statusCb({
@@ -57,7 +33,7 @@ skipFunctionsCache, statusCb = () => {
         hashFiles({
             assetType,
             concurrentHash,
-            directories: [dir, edgeFunctionsDistPath, deployConfigPath, dbMigrationsDistPath].filter(Boolean),
+            directories: [dir, edgeFunctionsDistPath, deployConfigPath, dbMigrationsDistPath].filter((d) => Boolean(d)),
             filter,
             hashAlgorithm,
             normalizer: deployFileNormalizer.bind(null, workingDir),
@@ -99,9 +75,7 @@ skipFunctionsCache, statusCb = () => {
         throw new Error('Nothing to deploy');
     }
     if (functionsWithNativeModules.length !== 0) {
-        const functionsWithNativeModulesMessage = functionsWithNativeModules
-            .map(({ name }) => `- ${name}`)
-            .join('\n');
+        const functionsWithNativeModulesMessage = functionsWithNativeModules.map(({ name }) => `- ${name}`).join('\n');
         warn(`Modules with native dependencies\n
     ${functionsWithNativeModulesMessage}
 
@@ -120,8 +94,7 @@ For more information, visit https://ntl.fyi/cli-native-modules.`);
     });
     const packageFrameworks = command.project.frameworks.get(command.workspacePackage ?? '');
     const primaryFramework = packageFrameworks?.[0];
-    // @ts-expect-error TS(2349) This expression is not callable
-    const cleanedParams = cleanDeep({
+    const params = {
         siteId,
         deploy_id: deployId,
         body: {
@@ -138,21 +111,27 @@ For more information, visit https://ntl.fyi/cli-native-modules.`);
             framework_version: primaryFramework?.detected.package?.version?.toString() ?? 'unknown',
             build_version: getNetlifyBuildVersion(),
         },
-    });
+    };
+    const cleanedParams = 
+    // @ts-expect-error FIXME(clean-deep): typings declare an ES `export default` but the package is CommonJS
+    cleanDeep(params);
     // cleanDeep deeply strips keys with empty strings, but empty strings are valid environment
     // variable values--a user can use an empty string to e.g. unset a variable only for a deploy.
     // This would result in payloads with a missing `value` key, which the API would reject.
     const deployParams = environment?.length
         ? { ...cleanedParams, body: { ...cleanedParams.body, environment } }
         : cleanedParams;
-    let deploy = await api.updateSiteDeploy(deployParams);
+    // FIXME(@netlify/api): `id` and `required` are optional on the updated deploy
+    let deploy = (await api.updateSiteDeploy(
+    // @ts-expect-error FIXME(@netlify/api): `functions_config` rejects zip-it-and-ship-it's `BuildData`, route `methods` and `traffic_rules` strings
+    deployParams));
     if (deployParams.body.async)
-        deploy = await waitForDiff(api, deploy.id, siteId, deployTimeout);
+        deploy = (await waitForDiff(api, deploy.id, siteId, deployTimeout));
     const { required: requiredFiles, required_functions: requiredFns, required_edge_functions: requiredEdgeFns, required_server: requiredServer, } = deploy;
     const newStats = buildStatsString([
         requiredFiles.length > 0 && pluralize(requiredFiles.length, 'file'),
-        (requiredFns?.length ?? 0) > 0 && pluralize(requiredFns.length, 'function'),
-        (requiredEdgeFns?.length ?? 0) > 0 && pluralize(requiredEdgeFns.length, 'edge function'),
+        requiredFns != null && requiredFns.length > 0 && pluralize(requiredFns.length, 'function'),
+        requiredEdgeFns != null && requiredEdgeFns.length > 0 && pluralize(requiredEdgeFns.length, 'edge function'),
         (requiredServer?.length ?? 0) > 0 && 'a server',
     ]);
     statusCb({
@@ -171,18 +150,17 @@ For more information, visit https://ntl.fyi/cli-native-modules.`);
         msg: 'Waiting for deploy to go live...',
         phase: 'start',
     });
-    deploy = await waitForDeploy(api, deployId, siteId, deployTimeout);
+    const readyDeploy = await waitForDeploy(api, deployId, siteId, deployTimeout);
     statusCb({
         type: 'wait-for-deploy',
         msg: draft ? 'Draft deploy is live!' : 'Deploy is live!',
         phase: 'stop',
     });
     await rm(tmpDir, { force: true, recursive: true });
-    const deployManifest = {
+    return {
         deployId,
-        deploy,
+        deploy: readyDeploy,
         uploadList,
     };
-    return deployManifest;
 };
 //# sourceMappingURL=deploy-site.js.map

package/dist/utils/deploy/drop-api.d.ts

@@ -18,7 +18,13 @@ export interface DropApiError extends Error {
 export declare const getDropToken: ({ apiBase, userAgent }: DropApiOptions) => Promise<string>;
 export declare const createDropDeploy: ({ apiBase, userAgent }: DropApiOptions, files: Record<string, string>, token: string, createdVia?: string) => Promise<DropDeployInfo>;
 export declare const uploadDropFile: ({ apiBase, userAgent }: DropApiOptions, deployId: string, filePath: string, body: fs.ReadStream | Buffer, token: string) => Promise<void>;
-export declare const waitForDropDeploy: ({ apiBase, userAgent }: DropApiOptions, siteId: string, deployId: string, timeout?: number) => Promise<Record<string, unknown>>;
+interface DropSiteDeploy {
+    state?: string;
+    error_message?: string;
+    ssl_url?: string;
+    url?: string;
+}
+export declare const waitForDropDeploy: ({ apiBase, userAgent }: DropApiOptions, siteId: string, deployId: string, timeout?: number) => Promise<DropSiteDeploy>;
 export declare const claimDropSite: ({ apiBase, userAgent }: DropApiOptions, siteId: string, dropToken: string, authToken: string) => Promise<void>;
 export interface UploadListItem {
     normalizedPath: string;

package/dist/utils/deploy/drop-api.js

@@ -44,8 +44,6 @@ export const createDropDeploy = async ({ apiBase, userAgent }, files, token, cre
 };
 // TODO: Migrate to @netlify/api when Drop endpoints are in the OpenAPI spec.
 export const uploadDropFile = async ({ apiBase, userAgent }, deployId, filePath, body, token) => {
-    // Node.js fetch needs `duplex: 'half'` for streaming bodies which isn't in standard RequestInit
-    /* eslint-disable @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-explicit-any */
     const normalizedFilePath = filePath.startsWith('/') ? filePath : `/${filePath}`;
     const response = await fetch(`${apiBase}/deploys/${deployId}/files${encodeURI(normalizedFilePath)}`, {
         method: 'PUT',
@@ -53,10 +51,10 @@ export const uploadDropFile = async ({ apiBase, userAgent }, deployId, filePath,
             'Content-Type': 'application/octet-stream',
             Authorization: `Bearer ${token}`,
         }),
-        body: body,
+        body,
+        // Node.js fetch requires this for streaming bodies
         duplex: 'half',
     });
-    /* eslint-enable @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-explicit-any */
     if (!response.ok) {
         const error = new Error(`Failed to upload file ${filePath}: ${String(response.status)} ${response.statusText}`);
         error.status = response.status;
@@ -79,6 +77,7 @@ export const waitForDropDeploy = async ({ apiBase, userAgent }, siteId, deployId
             return true;
         }
         if (data.state === 'error') {
+            // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing -- an empty error message falls back to the generic one
             throw new Error(data.error_message || `Deploy ${deployId} had an error`);
         }
         return false;