netlify-cli 17.5.1 → 17.5.3

package/src/lib/exec-fetcher.mjs

@@ -108,10 +108,10 @@ export const fetchLatestVersion = async ({ destination, execName, extension, lat
     };
     const options = getOptions();
     const fetch = latestVersion
-        // @ts-expect-error TS(2345) FIXME: Argument of type '{ headers: { Authorization: stri... Remove this comment to see the full error message
-        ? fetchVersion({ ...release, version: latestVersion }, options)
-        // @ts-expect-error TS(2345) FIXME: Argument of type '{ repository: string; package: s... Remove this comment to see the full error message
-        : fetchLatest(release, options);
+        ? // @ts-expect-error TS(2345) FIXME: Argument of type '{ headers: { Authorization: stri... Remove this comment to see the full error message
+            fetchVersion({ ...release, version: latestVersion }, options)
+        : // @ts-expect-error TS(2345) FIXME: Argument of type '{ repository: string; package: s... Remove this comment to see the full error message
+            fetchLatest(release, options);
     try {
         await fetch;
     }

package/src/lib/functions/form-submissions-handler.mjs

@@ -57,6 +57,7 @@ export const createFormSubmissionHandler = function ({ functionsRegistry, siteUr
         }
         else if (ct.type === 'multipart/form-data') {
             try {
+                ;
                 [fields, files] = await new Promise((resolve, reject) => {
                     const form = new multiparty.Form({ encoding: ct.parameters.charset || 'utf8' });
                     // @ts-expect-error TS(7006) FIXME: Parameter 'err' implicitly has an 'any' type.

package/src/lib/functions/registry.mjs

@@ -215,7 +215,6 @@ export class FunctionsRegistry {
         // we create a new watcher and watch them.
         if (srcFilesDiff.added.size !== 0) {
             const filesToWatch = [...srcFilesDiff.added, ...includedFiles];
-            // @ts-expect-error TS(2345) FIXME: Argument of type '{ onChange: () => void; }' is no... Remove this comment to see the full error message
             const newWatcher = await watchDebounced(filesToWatch, {
                 onChange: () => {
                     this.buildFunctionAndWatchFiles(func, false);

package/src/lib/images/proxy.mjs

@@ -1,15 +1,16 @@
 import express from 'express';
 import { createIPX, ipxFSStorage, ipxHttpStorage, createIPXNodeServer } from 'ipx';
 import { log, NETLIFYDEVERR } from '../../utils/command-helpers.mjs';
+import { getProxyUrl } from '../../utils/proxy.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 remoteDomains = [];
+    const errors = [];
     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);
@@ -17,21 +18,23 @@ export const parseAllDomains = function (config) {
                 remoteDomains.push(url.hostname);
             }
             else {
-                errors.push(`The URL '${patternString}' does not have a valid hostname.`);
+                errors.push({ message: `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}`);
+            if (error instanceof Error) {
+                errors.push({ message: `Invalid URL '${patternString}': ${error.message}` });
+            }
+            else {
+                errors.push({ message: `Invalid URL '${patternString}': An unknown error occurred` });
+            }
         }
     }
     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;
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'errors' implicitly has an 'any' type.
 export const handleImageDomainsErrors = async function (errors) {
     if (errors.length === 0) {
         return;
@@ -48,57 +51,57 @@ export const parseRemoteImageDomains = async function ({ 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);
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'query' implicitly has an 'any' type.
 export const transformImageParams = function (query) {
     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 }) {
+export const initializeProxy = async function ({ config, settings, }) {
     const remoteDomains = await parseRemoteImageDomains({ config });
+    const devServerUrl = getProxyUrl(settings);
     const ipx = createIPX({
         storage: ipxFSStorage({ dir: config?.build?.publish ?? './public' }),
-        httpStorage: ipxHttpStorage({ domains: remoteDomains }),
+        httpStorage: ipxHttpStorage({ domains: [...remoteDomains, devServerUrl] }),
     });
     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;
+        const sourceImagePath = url;
+        const modifiers = (await transformImageParams(query)) || `_`;
+        if (!sourceImagePath.startsWith('http://') && !sourceImagePath.startsWith('https://')) {
+            // Construct the full URL for relative paths to request from development server
+            const sourceImagePathWithLeadingSlash = sourceImagePath.startsWith('/') ? sourceImagePath : `/${sourceImagePath}`;
+            const fullImageUrl = `${devServerUrl}/${encodeURIComponent(sourceImagePathWithLeadingSlash)}`;
+            console.log(`fullImageUrl: ${fullImageUrl}`);
+            req.url = `/${modifiers}/${fullImageUrl}`;
+        }
+        else {
+            // If the image is remote, we can just pass the URL as is
+            req.url = `/${modifiers}/${encodeURIComponent(sourceImagePath)}`;
+        }
         handler(req, res);
     });
     return app;

package/src/utils/build-info.mjs

@@ -86,7 +86,7 @@ command = "${chosenSettings.devCommand}"
 export const detectBuildSettings = async (command) => {
     const { project, workspacePackage } = command;
     const buildSettings = await project.getBuildSettings(project.workspace ? workspacePackage : '');
-    return buildSettings
+    return (buildSettings
         // @ts-expect-error TS(7006) FIXME: Parameter 'setting' implicitly has an 'any' type.
         .filter((setting) => {
         if (project.workspace && project.relativeBaseDirectory && setting.packagePath) {
@@ -95,5 +95,5 @@ export const detectBuildSettings = async (command) => {
         return true;
     })
         // @ts-expect-error TS(7006) FIXME: Parameter 'setting' implicitly has an 'any' type.
-        .filter((setting) => setting.devCommand);
+        .filter((setting) => setting.devCommand));
 };

package/src/utils/command-helpers.mjs

@@ -209,41 +209,23 @@ export const normalizeConfig = (config) => {
 const DEBOUNCE_WAIT = 100;
 /**
  * Adds a file watcher to a path or set of paths and debounces the events.
- *
- * @param {string | string[]} target
- * @param {Object} opts
- * @param {number} [opts.depth]
- * @param {Array<string|RegExp>} [opts.ignored]
- * @param {(paths: string[]) => any} [opts.onAdd]
- * @param {(paths: string[]) => any} [opts.onChange]
- * @param {(paths: string[]) => any} [opts.onUnlink]
  */
-export const watchDebounced = async (
-// @ts-expect-error TS(7006) FIXME: Parameter 'target' implicitly has an 'any' type.
-target, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'depth' implicitly has an 'any' ty... Remove this comment to see the full error message
-{ depth, ignored = [], onAdd = () => { }, onChange = () => { }, onUnlink = () => { } }) => {
+export const watchDebounced = async (target, { depth, ignored = [], onAdd = noOp, onChange = noOp, onUnlink = noOp }) => {
     const baseIgnores = [/\/(node_modules|.git)\//];
     const watcher = chokidar.watch(target, { depth, ignored: [...baseIgnores, ...ignored], ignoreInitial: true });
     await once(watcher, 'ready');
-    // @ts-expect-error TS(7034) FIXME: Variable 'onChangeQueue' implicitly has type 'any[... Remove this comment to see the full error message
     let onChangeQueue = [];
-    // @ts-expect-error TS(7034) FIXME: Variable 'onAddQueue' implicitly has type 'any[]' ... Remove this comment to see the full error message
     let onAddQueue = [];
-    // @ts-expect-error TS(7034) FIXME: Variable 'onUnlinkQueue' implicitly has type 'any[... Remove this comment to see the full error message
     let onUnlinkQueue = [];
     const debouncedOnChange = debounce(() => {
-        // @ts-expect-error TS(2554) FIXME: Expected 0 arguments, but got 1.
         onChange(onChangeQueue);
         onChangeQueue = [];
     }, DEBOUNCE_WAIT);
     const debouncedOnAdd = debounce(() => {
-        // @ts-expect-error TS(2554) FIXME: Expected 0 arguments, but got 1.
         onAdd(onAddQueue);
         onAddQueue = [];
     }, DEBOUNCE_WAIT);
     const debouncedOnUnlink = debounce(() => {
-        // @ts-expect-error TS(2554) FIXME: Expected 0 arguments, but got 1.
         onUnlink(onUnlinkQueue);
         onUnlinkQueue = [];
     }, DEBOUNCE_WAIT);
@@ -271,3 +253,10 @@ target,
 // @ts-expect-error TS(7006) FIXME: Parameter 'text' implicitly has an 'any' type.
 export const getTerminalLink = (text, url) => terminalLink(text, url, { fallback: () => `${text} (${url})` });
 export const isNodeError = (err) => error instanceof Error;
+// FIXME: tsc is throwing the following error:
+// @ts-expect-error TS7060: This syntax is reserved in files with the .mts or .cts extension. Add a trailing comma or explicit constraint.
+// Adding a trailing comma to the generic type fixes the problem, but annoyingly Prettier is undoing that.
+export const nonNullable = (value) => value !== null && value !== undefined;
+export const noOp = () => {
+    // no-op
+};

package/src/utils/init/utils.mjs

@@ -21,7 +21,7 @@ const pluginsToAlwaysInstall = new Set(['@netlify/plugin-nextjs']);
  * @returns
  */
 export const getPluginsToAutoInstall = (pluginsInstalled = [], pluginsRecommended = []) => pluginsRecommended.reduce((acc, plugin) => pluginsInstalled.includes(plugin) && !pluginsToAlwaysInstall.has(plugin) ? acc : [...acc, plugin], 
-/** @type {string[]} */ ([]));
+/** @type {string[]} */ []);
 /**
  *
  * @param {Partial<import('@netlify/build-info').Settings>} settings

package/src/utils/proxy.mjs

@@ -701,6 +701,7 @@ state, }) {
     });
     const imageProxy = await initializeImageProxy({
         config,
+        settings,
     });
     const proxy = await initializeProxy({
         env,

package/src/utils/shell.mjs

@@ -95,8 +95,8 @@ export const runCommand = (command, options = {}) => {
         }
         else {
             const errorMessage = result.failed
-                // @ts-expect-error TS(2339) FIXME: Property 'shortMessage' does not exist on type 'Ex... Remove this comment to see the full error message
-                ? `${NETLIFYDEVERR} ${result.shortMessage}`
+                ? // @ts-expect-error TS(2339) FIXME: Property 'shortMessage' does not exist on type 'Ex... Remove this comment to see the full error message
+                    `${NETLIFYDEVERR} ${result.shortMessage}`
                 : `${NETLIFYDEVWARN} "${command}" exited with code ${result.exitCode}`;
             log(`${errorMessage}. Shutting down Netlify Dev server`);
         }

package/src/utils/telemetry/telemetry.mjs

@@ -19,7 +19,7 @@ function send(type, payload) {
         data: payload,
         type,
     });
-    const args = /** @type {const} */ ([process.execPath, [requestFile, options]]);
+    const args = /** @type {const} */ [process.execPath, [requestFile, options]];
     if (process.env.NETLIFY_TEST_TELEMETRY_WAIT === 'true') {
         // @ts-expect-error TS(7005) FIXME: Variable 'execa' implicitly has an 'any' type.
         return execa(...args, {