netlify-cli 17.3.1 → 17.4.0

package/src/lib/http-agent.mjs

@@ -1,99 +1,96 @@
-// @ts-check
-import { readFile } from 'fs/promises'
-
-import HttpsProxyAgent from 'https-proxy-agent'
-import waitPort from 'wait-port'
-
-import { NETLIFYDEVERR, NETLIFYDEVWARN, exit, log } from '../utils/command-helpers.mjs'
-
+import { readFile } from 'fs/promises';
+import HttpsProxyAgent from 'https-proxy-agent';
+import waitPort from 'wait-port';
+import { NETLIFYDEVERR, NETLIFYDEVWARN, exit, log } from '../utils/command-helpers.mjs';
 // https://github.com/TooTallNate/node-https-proxy-agent/issues/89
 // Maybe replace with https://github.com/delvedor/hpagent
+// @ts-expect-error TS(2507) FIXME: Type 'typeof createHttpsProxyAgent' is not a const... Remove this comment to see the full error message
 class HttpsProxyAgentWithCA extends HttpsProxyAgent {
-  constructor(opts) {
-    super(opts)
-    this.ca = opts.ca
-  }
-
-  callback(req, opts) {
-    return super.callback(req, {
-      ...opts,
-      ...(this.ca && { ca: this.ca }),
-    })
-  }
+    // @ts-expect-error TS(7006) FIXME: Parameter 'opts' implicitly has an 'any' type.
+    constructor(opts) {
+        super(opts);
+        // @ts-expect-error TS(2339) FIXME: Property 'ca' does not exist on type 'HttpsProxyAg... Remove this comment to see the full error message
+        this.ca = opts.ca;
+    }
+    // @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
+    callback(req, opts) {
+        return super.callback(req, {
+            ...opts,
+            // @ts-expect-error TS(2339) FIXME: Property 'ca' does not exist on type 'HttpsProxyAg... Remove this comment to see the full error message
+            ...(this.ca && { ca: this.ca }),
+        });
+    }
 }
-
-const DEFAULT_HTTP_PORT = 80
-const DEFAULT_HTTPS_PORT = 443
+const DEFAULT_HTTP_PORT = 80;
+const DEFAULT_HTTPS_PORT = 443;
 // 50 seconds
-const AGENT_PORT_TIMEOUT = 50
-
+const AGENT_PORT_TIMEOUT = 50;
+// @ts-expect-error TS(7031) FIXME: Binding element 'certificateFile' implicitly has a... Remove this comment to see the full error message
 export const tryGetAgent = async ({ certificateFile, httpProxy }) => {
-  if (!httpProxy) {
-    return {}
-  }
-
-  let proxyUrl
-  try {
-    proxyUrl = new URL(httpProxy)
-  } catch {
-    return { error: `${httpProxy} is not a valid URL` }
-  }
-
-  const scheme = proxyUrl.protocol.slice(0, -1)
-  if (!['http', 'https'].includes(scheme)) {
-    return { error: `${httpProxy} must have a scheme of http or https` }
-  }
-
-  let port
-  try {
-    port = await waitPort({
-      port: Number.parseInt(proxyUrl.port) || (scheme === 'http' ? DEFAULT_HTTP_PORT : DEFAULT_HTTPS_PORT),
-      host: proxyUrl.hostname,
-      timeout: AGENT_PORT_TIMEOUT,
-      output: 'silent',
-    })
-  } catch (error) {
-    // unknown error
-    return { error: `${httpProxy} is not available.`, message: error.message }
-  }
-
-  if (!port.open) {
-    // timeout error
-    return { error: `Could not connect to '${httpProxy}'` }
-  }
-
-  let response = {}
-
-  let certificate
-  if (certificateFile) {
+    if (!httpProxy) {
+        return {};
+    }
+    let proxyUrl;
     try {
-      certificate = await readFile(certificateFile)
-    } catch (error) {
-      response = { warning: `Could not read certificate file '${certificateFile}'.`, message: error.message }
+        proxyUrl = new URL(httpProxy);
     }
-  }
-
-  const opts = {
-    port: proxyUrl.port,
-    host: proxyUrl.host,
-    hostname: proxyUrl.hostname,
-    protocol: proxyUrl.protocol,
-    ca: certificate,
-  }
-
-  const agent = new HttpsProxyAgentWithCA(opts)
-  response = { ...response, agent }
-  return response
-}
-
+    catch {
+        return { error: `${httpProxy} is not a valid URL` };
+    }
+    const scheme = proxyUrl.protocol.slice(0, -1);
+    if (!['http', 'https'].includes(scheme)) {
+        return { error: `${httpProxy} must have a scheme of http or https` };
+    }
+    let port;
+    try {
+        port = await waitPort({
+            port: Number.parseInt(proxyUrl.port) || (scheme === 'http' ? DEFAULT_HTTP_PORT : DEFAULT_HTTPS_PORT),
+            host: proxyUrl.hostname,
+            timeout: AGENT_PORT_TIMEOUT,
+            output: 'silent',
+        });
+    }
+    catch (error) {
+        // unknown error
+        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+        return { error: `${httpProxy} is not available.`, message: error.message };
+    }
+    if (!port.open) {
+        // timeout error
+        return { error: `Could not connect to '${httpProxy}'` };
+    }
+    let response = {};
+    let certificate;
+    if (certificateFile) {
+        try {
+            certificate = await readFile(certificateFile);
+        }
+        catch (error) {
+            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+            response = { warning: `Could not read certificate file '${certificateFile}'.`, message: error.message };
+        }
+    }
+    const opts = {
+        port: proxyUrl.port,
+        host: proxyUrl.host,
+        hostname: proxyUrl.hostname,
+        protocol: proxyUrl.protocol,
+        ca: certificate,
+    };
+    const agent = new HttpsProxyAgentWithCA(opts);
+    response = { ...response, agent };
+    return response;
+};
+// @ts-expect-error TS(7031) FIXME: Binding element 'certificateFile' implicitly has a... Remove this comment to see the full error message
 export const getAgent = async ({ certificateFile, httpProxy }) => {
-  const { agent, error, message, warning } = await tryGetAgent({ httpProxy, certificateFile })
-  if (error) {
-    log(NETLIFYDEVERR, error, message || '')
-    exit(1)
-  }
-  if (warning) {
-    log(NETLIFYDEVWARN, warning, message || '')
-  }
-  return agent
-}
+    // @ts-expect-error TS(2339) FIXME: Property 'agent' does not exist on type '{ error?:... Remove this comment to see the full error message
+    const { agent, error, message, warning } = await tryGetAgent({ httpProxy, certificateFile });
+    if (error) {
+        log(NETLIFYDEVERR, error, message || '');
+        exit(1);
+    }
+    if (warning) {
+        log(NETLIFYDEVWARN, warning, message || '');
+    }
+    return agent;
+};

package/src/lib/images/proxy.mjs

@@ -1,97 +1,105 @@
-import express from 'express'
-import { createIPX, ipxFSStorage, ipxHttpStorage, createIPXNodeServer } from 'ipx'
-
-import { log, NETLIFYDEVERR } from '../../utils/command-helpers.mjs'
-
-export const IMAGE_URL_PATTERN = '/.netlify/images'
-
+import express from 'express';
+import { createIPX, ipxFSStorage, ipxHttpStorage, createIPXNodeServer } from 'ipx';
+import { log, NETLIFYDEVERR } from '../../utils/command-helpers.mjs';
+export const IMAGE_URL_PATTERN = '/.netlify/images';
+// @ts-expect-error TS(7006) FIXME: Parameter 'config' implicitly has an 'any' type.
 export const parseAllDomains = function (config) {
-  const domains = config?.images?.remote_images
-  if (!domains) {
-    return { errors: [], remoteDomains: [] }
-  }
-
-  const remoteDomains = []
-  const errors = []
-
-  for (const patternString of domains) {
-    try {
-      const url = new URL(patternString)
-      if (url.hostname) {
-        remoteDomains.push(url.hostname)
-      } else {
-        errors.push(`The URL '${patternString}' does not have a valid hostname.`)
-      }
-    } catch (error) {
-      errors.push(`Invalid URL '${patternString}': ${error.message}`)
+    const domains = config?.images?.remote_images;
+    if (!domains) {
+        return { errors: [], remoteDomains: [] };
     }
-  }
-
-  return { errors, remoteDomains }
-}
-
+    const remoteDomains = [];
+    const errors = [];
+    for (const patternString of domains) {
+        try {
+            const url = new URL(patternString);
+            if (url.hostname) {
+                remoteDomains.push(url.hostname);
+            }
+            else {
+                errors.push(`The URL '${patternString}' does not have a valid hostname.`);
+            }
+        }
+        catch (error) {
+            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
+            errors.push(`Invalid URL '${patternString}': ${error.message}`);
+        }
+    }
+    return { errors, remoteDomains };
+};
+// @ts-expect-error TS(7031) FIXME: Binding element 'message' implicitly has an 'any' ... Remove this comment to see the full error message
 const getErrorMessage = function ({ message }) {
-  return message
-}
-
+    return message;
+};
+// @ts-expect-error TS(7006) FIXME: Parameter 'errors' implicitly has an 'any' type.
 export const handleImageDomainsErrors = async function (errors) {
-  if (errors.length === 0) {
-    return
-  }
-
-  const errorMessage = await errors.map(getErrorMessage).join('\n\n')
-  log(NETLIFYDEVERR, `Image domains syntax errors:\n${errorMessage}`)
-}
-
+    if (errors.length === 0) {
+        return;
+    }
+    const errorMessage = await errors.map(getErrorMessage).join('\n\n');
+    log(NETLIFYDEVERR, `Image domains syntax errors:\n${errorMessage}`);
+};
+// @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
 export const parseRemoteImageDomains = async function ({ config }) {
-  if (!config) {
-    return []
-  }
-
-  const { errors, remoteDomains } = await parseAllDomains(config)
-  await handleImageDomainsErrors(errors)
-
-  return remoteDomains
-}
+    if (!config) {
+        return [];
+    }
+    const { errors, remoteDomains } = await parseAllDomains(config);
+    await handleImageDomainsErrors(errors);
+    return remoteDomains;
+};
+// @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
 export const isImageRequest = function (req) {
-  return req.url.startsWith(IMAGE_URL_PATTERN)
-}
-
+    return req.url.startsWith(IMAGE_URL_PATTERN);
+};
+// @ts-expect-error TS(7006) FIXME: Parameter 'query' implicitly has an 'any' type.
 export const transformImageParams = function (query) {
-  const params = {}
-  // eslint-disable-next-line id-length
-  params.w = query.w || query.width || null
-  // eslint-disable-next-line id-length
-  params.h = query.h || query.height || null
-  params.quality = query.q || query.quality || null
-  params.format = query.fm || null
-  params.fit = query.fit || null
-  params.position = query.position || null
-
-  return Object.entries(params)
-    .filter(([, value]) => value !== null)
-    .map(([key, value]) => `${key}_${value}`)
-    .join(',')
-}
-
+    const params = {};
+    const width = query.w || query.width || null;
+    const height = query.h || query.height || null;
+    if (width && height) {
+        // @ts-expect-error TS(2339) FIXME: Property 's' does not exist on type '{}'.
+        // eslint-disable-next-line id-length
+        params.s = `${width}x${height}`;
+    }
+    else {
+        // @ts-expect-error TS(2339) FIXME: Property 'w' does not exist on type '{}'.
+        // eslint-disable-next-line id-length
+        params.w = width;
+        // @ts-expect-error TS(2339) FIXME: Property 'j' does not exist on type '{}'.
+        // eslint-disable-next-line id-length
+        params.h = height;
+    }
+    // @ts-expect-error TS(2339) FIXME: Property 'quality' does not exist on type '{}'.
+    params.quality = query.q || query.quality || null;
+    // @ts-expect-error TS(2339) FIXME: Property 'format' does not exist on type '{}'.
+    params.format = query.fm || null;
+    const fit = query.fit || null;
+    // @ts-expect-error TS(2339) FIXME: Property 'fit' does not exist on type '{}'.
+    params.fit = fit === 'contain' ? 'inside' : fit;
+    // @ts-expect-error TS(2339) FIXME: Property 'position' does not exist on type '{}'.
+    params.position = query.position || null;
+    return Object.entries(params)
+        .filter(([, value]) => value !== null)
+        .map(([key, value]) => `${key}_${value}`)
+        .join(',');
+};
+// @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
 export const initializeProxy = async function ({ config }) {
-  const remoteDomains = await parseRemoteImageDomains({ config })
-
-  const ipx = createIPX({
-    storage: ipxFSStorage({ dir: config?.build?.publish ?? './public' }),
-    httpStorage: ipxHttpStorage({ domains: remoteDomains }),
-  })
-
-  const handler = createIPXNodeServer(ipx)
-  const app = express()
-
-  app.use(IMAGE_URL_PATTERN, async (req, res) => {
-    const { url, ...query } = req.query
-    const modifiers = await transformImageParams(query)
-    const path = `/${modifiers}/${encodeURIComponent(url)}`
-    req.url = path
-    handler(req, res)
-  })
-
-  return app
-}
+    const remoteDomains = await parseRemoteImageDomains({ config });
+    const ipx = createIPX({
+        storage: ipxFSStorage({ dir: config?.build?.publish ?? './public' }),
+        httpStorage: ipxHttpStorage({ domains: remoteDomains }),
+    });
+    const handler = createIPXNodeServer(ipx);
+    const app = express();
+    app.use(IMAGE_URL_PATTERN, async (req, res) => {
+        const { url, ...query } = req.query;
+        const modifiers = await transformImageParams(query);
+        // @ts-expect-error TS(2345) FIXME: Argument of type 'string | string[] | ParsedQs | P... Remove this comment to see the full error message
+        const path = `/${modifiers}/${encodeURIComponent(url)}`;
+        req.url = path;
+        handler(req, res);
+    });
+    return app;
+};

package/src/lib/log.mjs

@@ -1,18 +1,15 @@
-import { chalk } from '../utils/command-helpers.mjs'
-
-const RED_BACKGROUND = chalk.red('-background')
-const [PRO, BUSINESS, ENTERPRISE] = ['Pro', 'Business', 'Enterprise'].map((plan) => chalk.magenta(plan))
+import { chalk } from '../utils/command-helpers.mjs';
+const RED_BACKGROUND = chalk.red('-background');
+const [PRO, BUSINESS, ENTERPRISE] = ['Pro', 'Business', 'Enterprise'].map((plan) => chalk.magenta(plan));
 export const BACKGROUND_FUNCTIONS_WARNING = `A serverless function ending in \`${RED_BACKGROUND}\` was detected.
 Your team’s current plan doesn’t support Background Functions, which have names ending in \`${RED_BACKGROUND}\`.
 To be able to deploy this function successfully either:
   - change the function name to remove \`${RED_BACKGROUND}\` and execute it synchronously
   - upgrade your team plan to a level that supports Background Functions (${PRO}, ${BUSINESS}, or ${ENTERPRISE})
-`
-export const MISSING_AWS_SDK_WARNING = `A function has thrown an error due to a missing dependency: ${chalk.yellow(
-  'aws-sdk',
-)}.
+`;
+export const MISSING_AWS_SDK_WARNING = `A function has thrown an error due to a missing dependency: ${chalk.yellow('aws-sdk')}.
 You should add this module to the project's dependencies, using your package manager of choice:
 
 ${chalk.yellow('npm install aws-sdk --save')} or ${chalk.yellow('yarn add aws-sdk')}
 
-For more information, see https://ntl.fyi/cli-aws-sdk.`
+For more information, see https://ntl.fyi/cli-aws-sdk.`;

package/src/lib/path.mjs

@@ -1 +1,2 @@
-export const normalizeBackslash = (path) => path.replace(/\\/g, '/')
+// @ts-expect-error TS(7006) FIXME: Parameter 'path' implicitly has an 'any' type.
+export const normalizeBackslash = (path) => path.replace(/\\/g, '/');

package/src/lib/render-error-template.mjs

@@ -1,21 +1,20 @@
-import { readFile } from 'fs/promises'
-import { dirname, join } from 'path'
-import { fileURLToPath } from 'url'
-
-let errorTemplateFile
-const dir = dirname(fileURLToPath(import.meta.url))
-
+import { readFile } from 'fs/promises';
+import { dirname, join } from 'path';
+import { fileURLToPath } from 'url';
+// @ts-expect-error TS(7034) FIXME: Variable 'errorTemplateFile' implicitly has type '... Remove this comment to see the full error message
+let errorTemplateFile;
+const dir = dirname(fileURLToPath(import.meta.url));
+// @ts-expect-error TS(7006) FIXME: Parameter 'errString' implicitly has an 'any' type... Remove this comment to see the full error message
 const renderErrorTemplate = async (errString, templatePath, functionType) => {
-  const errorDetailsRegex = /<!--@ERROR-DETAILS-->/g
-  const functionTypeRegex = /<!--@FUNCTION-TYPE-->/g
-
-  try {
-    errorTemplateFile = errorTemplateFile || (await readFile(join(dir, templatePath), 'utf-8'))
-
-    return errorTemplateFile.replace(errorDetailsRegex, errString).replace(functionTypeRegex, functionType)
-  } catch {
-    return errString
-  }
-}
-
-export default renderErrorTemplate
+    const errorDetailsRegex = /<!--@ERROR-DETAILS-->/g;
+    const functionTypeRegex = /<!--@FUNCTION-TYPE-->/g;
+    try {
+        // @ts-expect-error TS(7005) FIXME: Variable 'errorTemplateFile' implicitly has an 'an... Remove this comment to see the full error message
+        errorTemplateFile = errorTemplateFile || (await readFile(join(dir, templatePath), 'utf-8'));
+        return errorTemplateFile.replace(errorDetailsRegex, errString).replace(functionTypeRegex, functionType);
+    }
+    catch {
+        return errString;
+    }
+};
+export default renderErrorTemplate;

package/src/lib/settings.mjs

@@ -1,38 +1,36 @@
-import os from 'os'
-import path from 'path'
-
-import envPaths from 'env-paths'
-
-const OSBasedPaths = envPaths('netlify', { suffix: '' })
-const NETLIFY_HOME = '.netlify'
-
+import os from 'os';
+import path from 'path';
+import envPaths from 'env-paths';
+const OSBasedPaths = envPaths('netlify', { suffix: '' });
+const NETLIFY_HOME = '.netlify';
 /**
  * Deprecated method to get netlify's home config - ~/.netlify/...
  * @deprecated
  * @param {string[]} paths
  * @returns {string}
  */
+// @ts-expect-error TS(7006) FIXME: Parameter 'paths' implicitly has an 'any' type.
 export const getLegacyPathInHome = (paths) => {
-  const pathInHome = path.join(os.homedir(), NETLIFY_HOME, ...paths)
-  return pathInHome
-}
-
+    const pathInHome = path.join(os.homedir(), NETLIFY_HOME, ...paths);
+    return pathInHome;
+};
 /**
  * get a global path on the os base path
  * @param {string[]} paths
  * @returns {string}
  */
+// @ts-expect-error TS(7006) FIXME: Parameter 'paths' implicitly has an 'any' type.
 export const getPathInHome = (paths) => {
-  const pathInHome = path.join(OSBasedPaths.config, ...paths)
-  return pathInHome
-}
-
+    const pathInHome = path.join(OSBasedPaths.config, ...paths);
+    return pathInHome;
+};
 /**
  * get a path inside the project folder
  * @param {string[]} paths
  * @returns {string}
  */
+// @ts-expect-error TS(7006) FIXME: Parameter 'paths' implicitly has an 'any' type.
 export const getPathInProject = (paths) => {
-  const pathInProject = path.join(NETLIFY_HOME, ...paths)
-  return pathInProject
-}
+    const pathInProject = path.join(NETLIFY_HOME, ...paths);
+    return pathInProject;
+};

package/src/lib/spinner.mjs

@@ -1,18 +1,15 @@
-// @ts-check
-import logSymbols from 'log-symbols'
-import ora from 'ora'
-
+import logSymbols from 'log-symbols';
+import ora from 'ora';
 /**
  * Creates a spinner with the following text
  * @param {object} config
  * @param {string} config.text
  * @returns {ora.Ora}
  */
-export const startSpinner = ({ text }) =>
-  ora({
+// @ts-expect-error TS(7031) FIXME: Binding element 'text' implicitly has an 'any' typ... Remove this comment to see the full error message
+export const startSpinner = ({ text }) => ora({
     text,
-  }).start()
-
+}).start();
 /**
  * Stops the spinner with the following text
  * @param {object} config
@@ -21,26 +18,27 @@ export const startSpinner = ({ text }) =>
  * @param {string} [config.text]
  * @returns {void}
  */
+// @ts-expect-error TS(7031) FIXME: Binding element 'error' implicitly has an 'any' ty... Remove this comment to see the full error message
 export const stopSpinner = ({ error, spinner, text }) => {
-  if (!spinner) {
-    return
-  }
-  // TODO: refactor no package needed `log-symbols` for that
-  const symbol = error ? logSymbols.error : logSymbols.success
-  spinner.stopAndPersist({
-    text,
-    symbol,
-  })
-}
-
+    if (!spinner) {
+        return;
+    }
+    // TODO: refactor no package needed `log-symbols` for that
+    const symbol = error ? logSymbols.error : logSymbols.success;
+    spinner.stopAndPersist({
+        text,
+        symbol,
+    });
+};
 /**
  * Clears the spinner
  * @param {object} config
  * @param {ora.Ora} config.spinner
  * @returns {void}
  */
+// @ts-expect-error TS(7031) FIXME: Binding element 'spinner' implicitly has an 'any' ... Remove this comment to see the full error message
 export const clearSpinner = ({ spinner }) => {
-  if (spinner) {
-    spinner.stop()
-  }
-}
+    if (spinner) {
+        spinner.stop();
+    }
+};

package/src/lib/string.mjs

@@ -1,3 +1,5 @@
+// @ts-expect-error TS(7006) FIXME: Parameter 't' implicitly has an 'any' type.
 export const capitalize = function (t) {
-  return t.replace(/(^\w|\s\w)/g, (string) => string.toUpperCase())
-}
+    // @ts-expect-error TS(7006) FIXME: Parameter 'string' implicitly has an 'any' type.
+    return t.replace(/(^\w|\s\w)/g, (string) => string.toUpperCase());
+};