netlify-cli 17.5.2 → 17.6.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "netlify-cli",
   "description": "Netlify command line tool",
-  "version": "17.5.2",
+  "version": "17.6.0",
   "author": "Netlify Inc.",
   "type": "module",
   "engines": {
@@ -47,12 +47,12 @@
     "@bugsnag/js": "7.20.2",
     "@fastify/static": "6.10.2",
     "@netlify/blobs": "6.3.0",
-    "@netlify/build": "29.26.6",
+    "@netlify/build": "29.27.0",
     "@netlify/build-info": "7.11.1",
     "@netlify/config": "20.10.0",
     "@netlify/edge-bundler": "10.1.3",
     "@netlify/local-functions-proxy": "1.1.1",
-    "@netlify/zip-it-and-ship-it": "9.26.1",
+    "@netlify/zip-it-and-ship-it": "9.26.2",
     "@octokit/rest": "19.0.13",
     "ansi-escapes": "6.2.0",
     "ansi-styles": "6.2.1",

package/src/commands/logs/functions.mjs

@@ -1,17 +1,28 @@
-import { Argument } from 'commander';
+import { Argument, Option } from 'commander';
 import inquirer from 'inquirer';
 import { chalk, log } from '../../utils/command-helpers.mjs';
 import { getWebSocket } from '../../utils/websockets/index.mjs';
+// Source: Source: https://docs.aws.amazon.com/lambda/latest/dg/monitoring-cloudwatchlogs.html#monitoring-cloudwatchlogs-advanced
+export const LOG_LEVELS = {
+    TRACE: 'TRACE',
+    DEBUG: 'DEBUG',
+    INFO: 'INFO',
+    WARN: 'WARN',
+    ERROR: 'ERROR',
+    FATAL: 'FATAL',
+};
+const LOG_LEVELS_LIST = Object.values(LOG_LEVELS).map((level) => level.toLowerCase());
+const CLI_LOG_LEVEL_CHOICES_STRING = LOG_LEVELS_LIST.map((level) => ` ${level}`);
 function getLog(logData) {
     let logString = '';
     switch (logData.level) {
-        case 'INFO':
+        case LOG_LEVELS.INFO:
             logString += chalk.blueBright(logData.level);
             break;
-        case 'WARN':
+        case LOG_LEVELS.WARN:
             logString += chalk.yellowBright(logData.level);
             break;
-        case 'ERROR':
+        case LOG_LEVELS.ERROR:
             logString += chalk.redBright(logData.level);
             break;
         default:
@@ -24,6 +35,10 @@ const logsFunction = async (functionName, options, command) => {
     const client = command.netlify.api;
     const { site } = command.netlify;
     const { id: siteId } = site;
+    if (options.level && !options.level.every((level) => LOG_LEVELS_LIST.includes(level))) {
+        log(`Invalid log level. Choices are:${CLI_LOG_LEVEL_CHOICES_STRING}`);
+    }
+    const levelsToPrint = options.level || LOG_LEVELS_LIST;
     const { functions = [] } = await client.searchSiteFunctions({ siteId });
     if (functions.length === 0) {
         log(`No functions found for the site`);
@@ -58,6 +73,9 @@ const logsFunction = async (functionName, options, command) => {
     });
     ws.on('message', (data) => {
         const logData = JSON.parse(data);
+        if (!levelsToPrint.includes(logData.level.toLowerCase())) {
+            return;
+        }
         log(getLog(logData));
     });
     ws.on('close', () => {
@@ -71,7 +89,12 @@ const logsFunction = async (functionName, options, command) => {
 export const createLogsFunctionCommand = (program) => program
     .command('logs:function')
     .alias('logs:functions')
+    .addOption(new Option('-l, --level <levels...>', `Log levels to stream. Choices are:${CLI_LOG_LEVEL_CHOICES_STRING}`))
     .addArgument(new Argument('[functionName]', 'Name of the function to stream logs for'))
-    .addExamples(['netlify logs:function my-function', 'netlify logs:function'])
+    .addExamples([
+    'netlify logs:function',
+    'netlify logs:function my-function',
+    'netlify logs:function my-function -l info warn',
+])
     .description('(Beta) Stream netlify function logs to the console')
     .action(logsFunction);

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/proxy.mjs

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