netlify-cli 17.6.0 → 17.8.0

package/src/utils/init/{config-manual.mjs → config-manual.js}

@@ -1,6 +1,6 @@
 import inquirer from 'inquirer';
-import { exit, log } from '../command-helpers.mjs';
-import { createDeployKey, getBuildSettings, saveNetlifyToml, setupSite } from './utils.mjs';
+import { exit, log } from '../command-helpers.js';
+import { createDeployKey, getBuildSettings, saveNetlifyToml, setupSite } from './utils.js';
 /**
  * Prompts for granting the netlify ssh public key access to your repo
  * @param {object} deployKey
@@ -24,7 +24,7 @@ const addDeployKey = async (deployKey) => {
 };
 /**
  * @param {object} config
- * @param {Awaited<ReturnType<import('../../utils/get-repo-data.mjs').default>>} config.repoData
+ * @param {Awaited<ReturnType<import('../../utils/get-repo-data.js').default>>} config.repoData
  * @returns {Promise<string>}
  */
 // @ts-expect-error TS(7031) FIXME: Binding element 'repoData' implicitly has an 'any'... Remove this comment to see the full error message
@@ -63,8 +63,8 @@ const addDeployHook = async (deployHook) => {
 };
 /**
  * @param {object} config
- * @param {import('../../commands/base-command.mjs').default} config.command
- * @param {Awaited<ReturnType<import('../../utils/get-repo-data.mjs').default>>} config.repoData
+ * @param {import('../../commands/base-command.js').default} config.command
+ * @param {Awaited<ReturnType<import('../../utils/get-repo-data.js').default>>} config.repoData
  * @param {string} config.siteId
  */
 // @ts-expect-error TS(7031) FIXME: Binding element 'command' implicitly has an 'any' ... Remove this comment to see the full error message

package/src/utils/init/{config.mjs → config.js}

@@ -1,6 +1,6 @@
-import { chalk, log } from '../command-helpers.mjs';
-import { configGithub } from './config-github.mjs';
-import configManual from './config-manual.mjs';
+import { chalk, log } from '../command-helpers.js';
+import { configGithub } from './config-github.js';
+import configManual from './config-manual.js';
 // @ts-expect-error TS(7006) FIXME: Parameter 'repoData' implicitly has an 'any' type.
 const logSuccess = (repoData) => {
     log();
@@ -16,7 +16,7 @@ const logSuccess = (repoData) => {
 };
 /**
  * @param {object} config
- * @param {import('../../commands/base-command.mjs').default} config.command
+ * @param {import('../../commands/base-command.js').default} config.command
  * @param {boolean} config.manual
  * @param {*} config.repoData
  * @param {string} config.siteId

package/src/utils/init/{node-version.mjs → node-version.js}

@@ -1,7 +1,7 @@
 import { readFile } from 'fs/promises';
 import { locatePath } from 'locate-path';
 import nodeVersionAlias from 'node-version-alias';
-import { warn } from '../command-helpers.mjs';
+import { warn } from '../command-helpers.js';
 const DEFAULT_NODE_VERSION = '12.18.0';
 const NVM_FLAG_PREFIX = '--';
 // to support NODE_VERSION=--lts, etc.

package/src/utils/init/{utils.mjs → utils.js}

@@ -2,11 +2,11 @@ import { writeFile } from 'fs/promises';
 import path from 'path';
 import cleanDeep from 'clean-deep';
 import inquirer from 'inquirer';
-import { fileExistsAsync } from '../../lib/fs.mjs';
-import { normalizeBackslash } from '../../lib/path.mjs';
-import { detectBuildSettings } from '../build-info.mjs';
-import { chalk, error as failAndExit, log, warn } from '../command-helpers.mjs';
-import { getRecommendPlugins, getUIPlugins } from './plugins.mjs';
+import { fileExistsAsync } from '../../lib/fs.js';
+import { normalizeBackslash } from '../../lib/path.js';
+import { detectBuildSettings } from '../build-info.js';
+import { chalk, error as failAndExit, log, warn } from '../command-helpers.js';
+import { getRecommendPlugins, getUIPlugins } from './plugins.js';
 // these plugins represent runtimes that are
 // expected to be "automatically" installed. Even though
 // they can be installed on package/toml, we always
@@ -26,7 +26,7 @@ export const getPluginsToAutoInstall = (pluginsInstalled = [], pluginsRecommende
  *
  * @param {Partial<import('@netlify/build-info').Settings>} settings
  * @param {*} config
- * @param {import('../../commands/base-command.mjs').default} command
+ * @param {import('../../commands/base-command.js').default} command
  */
 // @ts-expect-error TS(7006) FIXME: Parameter 'settings' implicitly has an 'any' type.
 const normalizeSettings = (settings, config, command) => {
@@ -78,7 +78,7 @@ const getPromptInputs = ({ defaultBaseDir, defaultBuildCmd, defaultBuildDir }) =
 /**
  * @param {object} param0
  * @param {*} param0.config
- * @param {import('../../commands/base-command.mjs').default} param0.command
+ * @param {import('../../commands/base-command.js').default} param0.command
  */
 // @ts-expect-error TS(7031) FIXME: Binding element 'command' implicitly has an 'any' ... Remove this comment to see the full error message
 export const getBuildSettings = async ({ command, config }) => {

package/src/utils/{live-tunnel.mjs → live-tunnel.js}

@@ -3,11 +3,11 @@ import process from 'process';
 import fetch from 'node-fetch';
 import pWaitFor from 'p-wait-for';
 import { v4 as uuidv4 } from 'uuid';
-import { fetchLatestVersion, shouldFetchLatestVersion } from '../lib/exec-fetcher.mjs';
-import { getPathInHome } from '../lib/settings.mjs';
-import { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log } from './command-helpers.mjs';
+import { fetchLatestVersion, shouldFetchLatestVersion } from '../lib/exec-fetcher.js';
+import { getPathInHome } from '../lib/settings.js';
+import { NETLIFYDEVERR, NETLIFYDEVLOG, chalk, log } from './command-helpers.js';
 // @ts-expect-error TS(7034) FIXME: Variable 'execa' implicitly has type 'any' in some... Remove this comment to see the full error message
-import execa from './execa.mjs';
+import execa from './execa.js';
 const PACKAGE_NAME = 'live-tunnel-client';
 const EXEC_NAME = PACKAGE_NAME;
 const SLUG_LOCAL_STATE_KEY = 'liveTunnelSlug';

package/src/utils/lm/{install.mjs → install.js}

@@ -8,12 +8,12 @@ import execa from 'execa';
 import hasbin from 'hasbin';
 import { Listr } from 'listr2';
 import pathKey from 'path-key';
-import { fetchLatestVersion, shouldFetchLatestVersion } from '../../lib/exec-fetcher.mjs';
-import { fileExistsAsync } from '../../lib/fs.mjs';
-import { normalizeBackslash } from '../../lib/path.mjs';
-import { getLegacyPathInHome, getPathInHome } from '../../lib/settings.mjs';
-import { chalk } from '../command-helpers.mjs';
-import { checkGitLFSVersionStep, checkGitVersionStep, checkLFSFiltersStep } from './steps.mjs';
+import { fetchLatestVersion, shouldFetchLatestVersion } from '../../lib/exec-fetcher.js';
+import { fileExistsAsync } from '../../lib/fs.js';
+import { normalizeBackslash } from '../../lib/path.js';
+import { getLegacyPathInHome, getPathInHome } from '../../lib/settings.js';
+import { chalk } from '../command-helpers.js';
+import { checkGitLFSVersionStep, checkGitVersionStep, checkLFSFiltersStep } from './steps.js';
 const PACKAGE_NAME = 'netlify-credential-helper';
 const EXEC_NAME = 'git-credential-netlify';
 const GIT_CONFIG = '.gitconfig';

package/src/utils/lm/{requirements.mjs → requirements.js}

@@ -1,6 +1,6 @@
 import semver from 'semver';
 // @ts-expect-error TS(7034) FIXME: Variable 'execa' implicitly has type 'any' in some... Remove this comment to see the full error message
-import execa from '../execa.mjs';
+import execa from '../execa.js';
 export const checkLFSFilters = async function () {
     try {
         // @ts-expect-error TS(7005) FIXME: Variable 'execa' implicitly has an 'any' type.

package/src/utils/lm/{steps.mjs → steps.js}

@@ -1,5 +1,5 @@
-import { chalk } from '../command-helpers.mjs';
-import { checkGitVersion, checkHelperVersion, checkLFSFilters, checkLFSVersion } from './requirements.mjs';
+import { chalk } from '../command-helpers.js';
+import { checkGitVersion, checkHelperVersion, checkLFSFilters, checkLFSVersion } from './requirements.js';
 export const checkGitVersionStep = {
     title: 'Checking Git version',
     // @ts-expect-error TS(7006) FIXME: Parameter 'ctx' implicitly has an 'any' type.

package/src/utils/lm/{ui.mjs → ui.js}

@@ -1,7 +1,7 @@
 import os from 'os';
 import boxen from 'boxen';
-import { chalk, log } from '../command-helpers.mjs';
-import { getShellInfo, isBinInPath } from './install.mjs';
+import { chalk, log } from '../command-helpers.js';
+import { getShellInfo, isBinInPath } from './install.js';
 /**
  * @param {boolean} force
  */

package/src/utils/{open-browser.mjs → open-browser.js}

@@ -2,7 +2,7 @@ import process from 'process';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'bett... Remove this comment to see the full error message
 import open from 'better-opn';
 import isDockerContainer from 'is-docker';
-import { chalk, log } from './command-helpers.mjs';
+import { chalk, log } from './command-helpers.js';
 // @ts-expect-error TS(7031) FIXME: Binding element 'message' implicitly has an 'any' ... Remove this comment to see the full error message
 const unableToOpenBrowserMessage = function ({ message, url }) {
     log('---------------------------');

package/src/utils/{proxy-server.mjs → proxy-server.js}

@@ -1,5 +1,5 @@
-import { exit, log, NETLIFYDEVERR } from './command-helpers.mjs';
-import { startProxy } from './proxy.mjs';
+import { exit, log, NETLIFYDEVERR } from './command-helpers.js';
+import { startProxy } from './proxy.js';
 /**
  * @typedef {Object} InspectSettings
  * @property {boolean} enabled - Inspect enabled
@@ -34,7 +34,7 @@ export const generateInspectSettings = (edgeInspect, edgeInspectBrk) => {
  * @param {object} params
  * @param {string=} params.accountId
  * @param {*} params.addonsUrls
- * @param {import("../lib/blobs/blobs.mjs").BlobsContext} blobsContext
+ * @param {import("../lib/blobs/blobs.js").BlobsContext} blobsContext
  * @param {import('../commands/types.js').NetlifyOptions["config"]} params.config
  * @param {string} [params.configPath] An override for the Netlify config path
  * @param {boolean} params.debug
@@ -49,8 +49,8 @@ export const generateInspectSettings = (edgeInspect, edgeInspectBrk) => {
  * @param {*} params.siteInfo
  * @param {string} params.projectDir
  * @param {string} params.repositoryRoot
- * @param {import('./state-config.mjs').default} params.state
- * @param {import('../lib/functions/registry.mjs').FunctionsRegistry=} params.functionsRegistry
+ * @param {import('./state-config.js').default} params.state
+ * @param {import('../lib/functions/registry.js').FunctionsRegistry=} params.functionsRegistry
  * @returns
  */
 export const startProxyServer = async ({ 

package/src/utils/{proxy.mjs → proxy.js}

@@ -21,17 +21,17 @@ import jwtDecode from 'jwt-decode';
 import { locatePath } from 'locate-path';
 import pFilter from 'p-filter';
 import toReadableStream from 'to-readable-stream';
-import { handleProxyRequest, initializeProxy as initializeEdgeFunctionsProxy, isEdgeFunctionsRequest, } from '../lib/edge-functions/proxy.mjs';
-import { fileExistsAsync, isFileAsync } from '../lib/fs.mjs';
-import { DEFAULT_FUNCTION_URL_EXPRESSION } from '../lib/functions/registry.mjs';
-import { initializeProxy as initializeImageProxy, isImageRequest } from '../lib/images/proxy.mjs';
-import renderErrorTemplate from '../lib/render-error-template.mjs';
-import { NETLIFYDEVLOG, NETLIFYDEVWARN, log, chalk } from './command-helpers.mjs';
-import createStreamPromise from './create-stream-promise.mjs';
-import { headersForPath, parseHeaders, NFFunctionName, NFRequestID, NFFunctionRoute } from './headers.mjs';
-import { generateRequestID } from './request-id.mjs';
-import { createRewriter, onChanges } from './rules-proxy.mjs';
-import { signRedirect } from './sign-redirect.mjs';
+import { handleProxyRequest, initializeProxy as initializeEdgeFunctionsProxy, isEdgeFunctionsRequest, } from '../lib/edge-functions/proxy.js';
+import { fileExistsAsync, isFileAsync } from '../lib/fs.js';
+import { DEFAULT_FUNCTION_URL_EXPRESSION } from '../lib/functions/registry.js';
+import { initializeProxy as initializeImageProxy, isImageRequest } from '../lib/images/proxy.js';
+import renderErrorTemplate from '../lib/render-error-template.js';
+import { NETLIFYDEVLOG, NETLIFYDEVWARN, log, chalk } from './command-helpers.js';
+import createStreamPromise from './create-stream-promise.js';
+import { headersForPath, parseHeaders, NFFunctionName, NFRequestID, NFFunctionRoute } from './headers.js';
+import { generateRequestID } from './request-id.js';
+import { createRewriter, onChanges } from './rules-proxy.js';
+import { signRedirect } from './sign-redirect.js';
 const gunzip = util.promisify(zlib.gunzip);
 const brotliDecompress = util.promisify(zlib.brotliDecompress);
 const deflate = util.promisify(zlib.deflate);
@@ -312,8 +312,9 @@ siteInfo, }) {
             (ct.endsWith('/x-www-form-urlencoded') || ct === 'multipart/form-data')) {
             return proxy.web(req, res, { target: options.functionsServer });
         }
-        const matchingFunction = functionsRegistry && (await functionsRegistry.getFunctionForURLPath(destURL, req.method));
         const destStaticFile = await getStatic(dest.pathname, options.publicFolder);
+        const matchingFunction = functionsRegistry &&
+            (await functionsRegistry.getFunctionForURLPath(destURL, req.method, () => Boolean(destStaticFile)));
         let statusValue;
         if (match.force ||
             (!staticFile && ((!options.framework && destStaticFile) || isInternal(destURL) || matchingFunction))) {
@@ -573,11 +574,15 @@ res) => {
     req.originalBody = ['GET', 'OPTIONS', 'HEAD'].includes(req.method)
         ? null
         : await createStreamPromise(req, BYTES_LIMIT);
+    if (isImageRequest(req)) {
+        return imageProxy(req, res);
+    }
     const edgeFunctionsProxyURL = await edgeFunctionsProxy(req, res);
     if (edgeFunctionsProxyURL !== undefined) {
         return proxy.web(req, res, { target: edgeFunctionsProxyURL });
     }
-    const functionMatch = functionsRegistry && (await functionsRegistry.getFunctionForURLPath(req.url, req.method));
+    const functionMatch = functionsRegistry &&
+        (await functionsRegistry.getFunctionForURLPath(req.url, req.method, () => getStatic(decodeURIComponent(reqToURL(req, req.url).pathname), settings.dist)));
     if (functionMatch) {
         // Setting an internal header with the function name so that we don't
         // have to match the URL again in the functions server.
@@ -626,9 +631,6 @@ res) => {
         (ct.endsWith('/x-www-form-urlencoded') || ct === 'multipart/form-data')) {
         return proxy.web(req, res, { target: functionsServer });
     }
-    if (isImageRequest(req)) {
-        return imageProxy(req, res);
-    }
     proxy.web(req, res, options);
 };
 /**

package/src/utils/{redirects.mjs → redirects.js}

@@ -1,5 +1,5 @@
 import { parseAllRedirects } from 'netlify-redirect-parser';
-import { NETLIFYDEVERR, log } from './command-helpers.mjs';
+import { NETLIFYDEVERR, log } from './command-helpers.js';
 // Parse, normalize and validate all redirects from `_redirects` files
 // and `netlify.toml`
 // @ts-expect-error TS(7031) FIXME: Binding element 'configPath' implicitly has an 'an... Remove this comment to see the full error message

package/src/utils/{rules-proxy.mjs → rules-proxy.js}

@@ -5,9 +5,9 @@ import cookie from 'cookie';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'netl... Remove this comment to see the full error message
 import redirector from 'netlify-redirector';
 import pFilter from 'p-filter';
-import { fileExistsAsync } from '../lib/fs.mjs';
-import { NETLIFYDEVLOG } from './command-helpers.mjs';
-import { parseRedirects } from './redirects.mjs';
+import { fileExistsAsync } from '../lib/fs.js';
+import { NETLIFYDEVLOG } from './command-helpers.js';
+import { parseRedirects } from './redirects.js';
 // @ts-expect-error TS(7034) FIXME: Variable 'watchers' implicitly has type 'any[]' in... Remove this comment to see the full error message
 const watchers = [];
 // @ts-expect-error TS(7006) FIXME: Parameter 'files' implicitly has an 'any' type.

package/src/utils/{run-build.mjs → run-build.js}

@@ -1,11 +1,11 @@
 import { promises as fs } from 'fs';
 import path, { join } from 'path';
-import { getBootstrapURL } from '../lib/edge-functions/bootstrap.mjs';
-import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from '../lib/edge-functions/consts.mjs';
-import { getPathInProject } from '../lib/settings.mjs';
-import { error } from './command-helpers.mjs';
-import { startFrameworkServer } from './framework-server.mjs';
-import { INTERNAL_FUNCTIONS_FOLDER } from './functions/index.mjs';
+import { getBootstrapURL } from '../lib/edge-functions/bootstrap.js';
+import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from '../lib/edge-functions/consts.js';
+import { getPathInProject } from '../lib/settings.js';
+import { error } from './command-helpers.js';
+import { startFrameworkServer } from './framework-server.js';
+import { INTERNAL_FUNCTIONS_FOLDER } from './functions/index.js';
 const netlifyBuildPromise = import('@netlify/build');
 /**
  * Copies `netlify.toml`, if one is defined, into the `.netlify` internal
@@ -37,8 +37,8 @@ const cleanInternalDirectory = async (basePath) => {
 };
 /**
  * @param {object} params
- * @param {import('../commands/base-command.mjs').default} params.command
- * @param {import('../commands/base-command.mjs').default} params.command
+ * @param {import('../commands/base-command.js').default} params.command
+ * @param {import('../commands/base-command.js').default} params.command
  * @param {*} params.options The flags of the command
  * @param {import('./types.js').ServerSettings} params.settings
  * @param {NodeJS.ProcessEnv} [params.env]

package/src/utils/{shell.mjs → shell.js}

@@ -2,8 +2,8 @@ import process from 'process';
 import execa from 'execa';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'stri... Remove this comment to see the full error message
 import stripAnsiCc from 'strip-ansi-control-characters';
-import { chalk, log, NETLIFYDEVERR, NETLIFYDEVWARN } from './command-helpers.mjs';
-import { processOnExit } from './dev.mjs';
+import { chalk, log, NETLIFYDEVERR, NETLIFYDEVWARN } from './command-helpers.js';
+import { processOnExit } from './dev.js';
 /**
  * @type {(() => Promise<void>)[]} - array of functions to run before the process exits
  */

package/src/utils/{state-config.mjs → state-config.js}

@@ -5,7 +5,7 @@ import { deleteProperty, getProperty, hasProperty, setProperty } from 'dot-prop'
 import { findUpSync } from 'find-up';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'writ... Remove this comment to see the full error message
 import writeFileAtomic from 'write-file-atomic';
-import { getPathInProject } from '../lib/settings.mjs';
+import { getPathInProject } from '../lib/settings.js';
 const STATE_PATH = getPathInProject(['state.json']);
 const permissionError = "You don't have access to this file.";
 /**

package/src/utils/{static-server.mjs → static-server.js}

@@ -1,7 +1,7 @@
 import path from 'path';
 import fastifyStatic from '@fastify/static';
 import Fastify from 'fastify';
-import { log, NETLIFYDEVLOG } from './command-helpers.mjs';
+import { log, NETLIFYDEVLOG } from './command-helpers.js';
 /**
  * @param {object} config
  * @param {import('./types.js').ServerSettings} config.settings

package/src/utils/telemetry/index.js

@@ -0,0 +1,2 @@
+export { track, identify } from './telemetry.js';
+export { reportError } from './report-error.js';

package/src/utils/telemetry/{report-error.mjs → report-error.js}

@@ -4,9 +4,9 @@ import process, { version as nodejsVersion } from 'process';
 import { fileURLToPath } from 'url';
 import { isCI } from 'ci-info';
 // @ts-expect-error TS(7034) FIXME: Variable 'execa' implicitly has type 'any' in some... Remove this comment to see the full error message
-import execa from '../execa.mjs';
-import getGlobalConfig from '../get-global-config.mjs';
-import { cliVersion } from './utils.mjs';
+import execa from '../execa.js';
+import getGlobalConfig from '../get-global-config.js';
+import { cliVersion } from './utils.js';
 const dirPath = dirname(fileURLToPath(import.meta.url));
 /**
  *
@@ -47,7 +47,7 @@ export const reportError = async function (error, config = {}) {
     // spawn detached child process to handle send and wait for the http request to finish
     // otherwise it can get canceled
     // @ts-expect-error TS(7005) FIXME: Variable 'execa' implicitly has an 'any' type.
-    await execa(process.execPath, [join(dirPath, 'request.mjs'), options], {
+    await execa(process.execPath, [join(dirPath, 'request.js'), options], {
         detached: true,
         stdio: 'ignore',
     });

package/src/utils/telemetry/{request.mjs → request.js}

@@ -3,7 +3,7 @@
 import process from 'process';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'node... Remove this comment to see the full error message
 import fetch from 'node-fetch';
-import getPackageJson from '../get-package-json.mjs';
+import getPackageJson from '../get-package-json.js';
 const { name, version } = await getPackageJson();
 const options = JSON.parse(process.argv[2]);
 const CLIENT_ID = 'NETLIFY_CLI';

package/src/utils/telemetry/{telemetry.mjs → telemetry.js}

@@ -3,10 +3,10 @@ import process, { version as nodejsVersion } from 'process';
 import { fileURLToPath } from 'url';
 import { isCI } from 'ci-info';
 // @ts-expect-error TS(7034) FIXME: Variable 'execa' implicitly has type 'any' in some... Remove this comment to see the full error message
-import execa from '../execa.mjs';
-import getGlobalConfig from '../get-global-config.mjs';
-import { isTelemetryDisabled, cliVersion } from './utils.mjs';
-import isValidEventName from './validation.mjs';
+import execa from '../execa.js';
+import getGlobalConfig from '../get-global-config.js';
+import { isTelemetryDisabled, cliVersion } from './utils.js';
+import isValidEventName from './validation.js';
 const dirPath = dirname(fileURLToPath(import.meta.url));
 /**
  * @param {'track' | 'identify'} type
@@ -14,7 +14,7 @@ const dirPath = dirname(fileURLToPath(import.meta.url));
  */
 // @ts-expect-error TS(7006) FIXME: Parameter 'type' implicitly has an 'any' type.
 function send(type, payload) {
-    const requestFile = join(dirPath, 'request.mjs');
+    const requestFile = join(dirPath, 'request.js');
     const options = JSON.stringify({
         data: payload,
         type,

package/src/utils/telemetry/{utils.mjs → utils.js}

@@ -1,4 +1,4 @@
-import getPackageJson from '../get-package-json.mjs';
+import getPackageJson from '../get-package-json.js';
 export const { version: cliVersion } = await getPackageJson();
 // @ts-expect-error TS(7006) FIXME: Parameter 'config' implicitly has an 'any' type.
 export const isTelemetryDisabled = function (config) {

package/src/utils/telemetry/{validation.mjs → validation.js}

@@ -1,7 +1,7 @@
 /**
  * Utility to validating analytic event names for clean data
  */
-import { log } from '../command-helpers.mjs';
+import { log } from '../command-helpers.js';
 // @ts-expect-error TS(7006) FIXME: Parameter 'eventName' implicitly has an 'any' type... Remove this comment to see the full error message
 export default function isValidEventName(eventName, config) {
     const validProject = [config.projectName];

package/src/utils/{validation.mjs → validation.js}

@@ -1,4 +1,4 @@
-import { BANG, chalk } from './command-helpers.mjs';
+import { BANG, chalk } from './command-helpers.js';
 /**
  * @param {string} exampleCommand
  * @returns {(value:string, previous: unknown) => unknown}

package/src/commands/addons/addons-auth.mjs

@@ -1,45 +0,0 @@
-import { ADDON_VALIDATION, prepareAddonCommand } from '../../utils/addons/prepare.mjs';
-import { exit, log } from '../../utils/command-helpers.mjs';
-import openBrowser from '../../utils/open-browser.mjs';
-/**
- * The addons:auth command
- * @param {string} addonName
- * @param {import('commander').OptionValues} options
- * @param {import('../base-command.mjs').default} command
- * @returns {Promise<boolean>}
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'addonName' implicitly has an 'any' type... Remove this comment to see the full error message
-const addonsAuth = async (addonName, options, command) => {
-    const { addon } = await prepareAddonCommand({
-        command,
-        addonName,
-        validation: ADDON_VALIDATION.EXISTS,
-    });
-    if (!addon.auth_url) {
-        log(`No Admin URL found for the "${addonName} add-on"`);
-        return false;
-    }
-    log();
-    log(`Opening ${addonName} add-on admin URL:`);
-    log();
-    log(addon.auth_url);
-    log();
-    // @ts-expect-error TS(2345) FIXME: Argument of type '{ url: any; }' is not assignable... Remove this comment to see the full error message
-    await openBrowser({ url: addon.auth_url });
-    exit();
-};
-/**
- * Creates the `netlify addons:auth` command
- * @param {import('../base-command.mjs').default} program
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'program' implicitly has an 'any' type.
-export const createAddonsAuthCommand = (program) => program
-    .command('addons:auth', { hidden: true })
-    .alias('addon:auth')
-    .argument('<name>', 'Add-on slug')
-    .description('Login to add-on provider')
-    // @ts-expect-error TS(7006) FIXME: Parameter 'addonName' implicitly has an 'any' type... Remove this comment to see the full error message
-    .action(async (addonName, options, command) => {
-    await addonsAuth(addonName, options, command);
-});

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

@@ -1,53 +0,0 @@
-import inquirer from 'inquirer';
-import { ADDON_VALIDATION, prepareAddonCommand } from '../../utils/addons/prepare.mjs';
-import { error, exit, log } from '../../utils/command-helpers.mjs';
-/**
- * The addons:delete command
- * @param {string} addonName
- * @param {import('commander').OptionValues} options
- * @param {import('../base-command.mjs').default} command
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'addonName' implicitly has an 'any' type... Remove this comment to see the full error message
-const addonsDelete = async (addonName, options, command) => {
-    const { addon } = await prepareAddonCommand({
-        command,
-        addonName,
-        validation: ADDON_VALIDATION.EXISTS,
-    });
-    if (!options.force && !options.f) {
-        const { wantsToDelete } = await inquirer.prompt({
-            type: 'confirm',
-            name: 'wantsToDelete',
-            message: `Are you sure you want to delete the ${addonName} add-on? (to skip this prompt, pass a --force flag)`,
-            default: false,
-        });
-        if (!wantsToDelete) {
-            exit();
-        }
-    }
-    try {
-        await command.netlify.api.deleteServiceInstance({
-            siteId: command.netlify.site.id,
-            addon: addonName,
-            instanceId: addon.id,
-        });
-        log(`Addon "${addonName}" deleted`);
-    }
-    catch (error_) {
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-        error(error_.message);
-    }
-};
-/**
- * Creates the `netlify addons:delete` command
- * @param {import('../base-command.mjs').default} program
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'program' implicitly has an 'any' type.
-export const createAddonsDeleteCommand = (program) => program
-    .command('addons:delete', { hidden: true })
-    .alias('addon:delete')
-    .argument('<name>', 'Add-on namespace')
-    .description(`Remove an add-on extension to your site\nAdd-ons are a way to extend the functionality of your Netlify site`)
-    .option('-f, --force', 'delete without prompting (useful for CI)')
-    .action(addonsDelete);

package/src/commands/addons/addons.mjs

@@ -1,39 +0,0 @@
-import { createAddonsAuthCommand } from './addons-auth.mjs';
-import { createAddonsConfigCommand } from './addons-config.mjs';
-import { createAddonsCreateCommand } from './addons-create.mjs';
-import { createAddonsDeleteCommand } from './addons-delete.mjs';
-import { createAddonsListCommand } from './addons-list.mjs';
-/**
- * The addons 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.
-const addons = (options, command) => {
-    command.help();
-};
-/**
- * Creates the `netlify addons` command
- * @param {import('../base-command.mjs').default} program
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'program' implicitly has an 'any' type.
-export const createAddonsCommand = (program) => {
-    createAddonsAuthCommand(program);
-    createAddonsConfigCommand(program);
-    createAddonsCreateCommand(program);
-    createAddonsDeleteCommand(program);
-    createAddonsListCommand(program);
-    return program
-        .command('addons', { hidden: true })
-        .alias('addon')
-        .description('[Deprecated and will be removed from future versions] Manage Netlify Add-ons')
-        .addExamples([
-        'netlify addons:create addon-xyz',
-        'netlify addons:list',
-        'netlify addons:config addon-xyz',
-        'netlify addons:delete addon-xyz',
-        'netlify addons:auth addon-xyz',
-    ])
-        .action(addons);
-};

package/src/commands/addons/index.mjs

@@ -1 +0,0 @@
-export { createAddonsCommand } from './addons.mjs';

package/src/commands/api/index.mjs

@@ -1 +0,0 @@
-export { createApiCommand } from './api.mjs';

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

@@ -1,35 +0,0 @@
-import { getStore } from '@netlify/blobs';
-import { chalk, error as printError } from '../../utils/command-helpers.mjs';
-import requiresSiteInfo from '../../utils/hooks/requires-site-info.mjs';
-/**
- * The blobs:delete command
- */
-const blobsDelete = async (storeName, key, _options, command) => {
-    const { api, siteInfo } = command.netlify;
-    const store = getStore({
-        apiURL: `${api.scheme}://${api.host}`,
-        name: storeName,
-        siteID: siteInfo.id ?? '',
-        token: api.accessToken ?? '',
-    });
-    try {
-        await store.delete(key);
-    }
-    catch {
-        return printError(`Could not delete blob ${chalk.yellow(key)} from store ${chalk.yellow(storeName)}`);
-    }
-};
-/**
- * Creates the `netlify blobs:delete` command
- * @param {import('../base-command.mjs').default} program
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'program' implicitly has an 'any' type.
-export const createBlobsDeleteCommand = (program) => program
-    .command('blobs:delete')
-    .description(`(Beta) Deletes an object with a given key, if it exists, from a Netlify Blobs store`)
-    .argument('<store>', 'Name of the store')
-    .argument('<key>', 'Object key')
-    .alias('blob:delete')
-    .hook('preAction', requiresSiteInfo)
-    .action(blobsDelete);