netlify-cli 17.19.5 → 17.20.0

package/dist/utils/create-stream-promise.d.ts

@@ -1,3 +1,5 @@
-declare const createStreamPromise: (stream: any, timeoutSeconds: any, bytesLimit?: number) => Promise<unknown>;
+import { Buffer } from 'buffer';
+import { IncomingMessage } from 'http';
+declare const createStreamPromise: (stream: IncomingMessage, timeoutSeconds: number, bytesLimit?: number) => Promise<Buffer>;
 export default createStreamPromise;
 //# sourceMappingURL=create-stream-promise.d.ts.map

package/dist/utils/create-stream-promise.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-stream-promise.d.ts","sourceRoot":"","sources":["../../src/utils/create-stream-promise.ts"],"names":[],"mappings":"AAQA,QAAA,MAAM,mBAAmB,6EAmDxB,CAAA;AAED,eAAe,mBAAmB,CAAA"}
+{"version":3,"file":"create-stream-promise.d.ts","sourceRoot":"","sources":["../../src/utils/create-stream-promise.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAOtC,QAAA,MAAM,mBAAmB,WACf,eAAe,kBACP,MAAM,0BAErB,QAAQ,MAAM,CAyChB,CAAA;AAED,eAAe,mBAAmB,CAAA"}

package/dist/utils/create-stream-promise.js

@@ -2,31 +2,25 @@ import { Buffer } from 'buffer';
 const SEC_TO_MILLISEC = 1e3;
 // 6 MiB
 const DEFAULT_BYTES_LIMIT = 6e6;
-// @ts-expect-error TS(7006) FIXME: Parameter 'stream' implicitly has an 'any' type.
 const createStreamPromise = function (stream, timeoutSeconds, bytesLimit = DEFAULT_BYTES_LIMIT) {
     return new Promise(function streamPromiseFunc(resolve, reject) {
-        // @ts-expect-error TS(7034) FIXME: Variable 'data' implicitly has type 'any[]' in som... Remove this comment to see the full error message
         let data = [];
         let dataLength = 0;
         // @ts-expect-error TS(7034) FIXME: Variable 'timeoutId' implicitly has type 'any' in ... Remove this comment to see the full error message
         let timeoutId = null;
         if (timeoutSeconds != null && Number.isFinite(timeoutSeconds)) {
             timeoutId = setTimeout(() => {
-                // @ts-expect-error TS(2322) FIXME: Type 'null' is not assignable to type 'any[]'.
                 data = null;
                 reject(new Error('Request timed out waiting for body'));
             }, timeoutSeconds * SEC_TO_MILLISEC);
         }
-        // @ts-expect-error TS(7006) FIXME: Parameter 'chunk' implicitly has an 'any' type.
         stream.on('data', function onData(chunk) {
-            // @ts-expect-error TS(7005) FIXME: Variable 'data' implicitly has an 'any[]' type.
             if (!Array.isArray(data)) {
                 // Stream harvesting closed
                 return;
             }
             dataLength += chunk.length;
             if (dataLength > bytesLimit) {
-                // @ts-expect-error TS(2322) FIXME: Type 'null' is not assignable to type 'any[]'.
                 data = null;
                 reject(new Error('Stream body too big'));
             }
@@ -34,18 +28,13 @@ const createStreamPromise = function (stream, timeoutSeconds, bytesLimit = DEFAU
                 data.push(chunk);
             }
         });
-        // @ts-expect-error TS(7006) FIXME: Parameter 'error' implicitly has an 'any' type.
         stream.on('error', function onError(error) {
-            // @ts-expect-error TS(2322) FIXME: Type 'null' is not assignable to type 'any[]'.
             data = null;
             reject(error);
-            // @ts-expect-error TS(7005) FIXME: Variable 'timeoutId' implicitly has an 'any' type.
             clearTimeout(timeoutId);
         });
         stream.on('end', function onEnd() {
-            // @ts-expect-error TS(7005) FIXME: Variable 'timeoutId' implicitly has an 'any' type.
             clearTimeout(timeoutId);
-            // @ts-expect-error TS(7005) FIXME: Variable 'data' implicitly has an 'any[]' type.
             if (data) {
                 // @ts-expect-error TS(7005) FIXME: Variable 'data' implicitly has an 'any[]' type.
                 resolve(Buffer.concat(data));

package/dist/utils/proxy-server.d.ts

@@ -1,63 +1,36 @@
-/**
- * @typedef {Object} InspectSettings
- * @property {boolean} enabled - Inspect enabled
- * @property {boolean} pause - Pause on breakpoints
- * @property {string|undefined} address - Host/port override (optional)
- */
-/**
- * @param {boolean|string} edgeInspect
- * @param {boolean|string} edgeInspectBrk
- * @returns {InspectSettings}
- */
-export declare const generateInspectSettings: (edgeInspect: any, edgeInspectBrk: any) => {
+import BaseCommand from '../commands/base-command.js';
+import { $TSFixMe, NetlifyOptions } from '../commands/types.js';
+import { BlobsContext } from '../lib/blobs/blobs.js';
+import { FunctionsRegistry } from '../lib/functions/registry.js';
+import type StateConfig from './state-config.js';
+import { ServerSettings } from './types.js';
+interface InspectSettings {
     enabled: boolean;
     pause: boolean;
-    address: string | undefined;
-};
-/**
- *
- * @param {object} params
- * @param {string=} params.accountId
- * @param {*} params.addonsUrls
- * @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
- * @param {import('../commands/types.js').NetlifyOptions["cachedConfig"]['env']} params.env
- * @param {InspectSettings} params.inspectSettings
- * @param {() => Promise<object>} params.getUpdatedConfig
- * @param {string} params.geolocationMode
- * @param {string} params.geoCountry
- * @param {*} params.settings
- * @param {boolean} params.offline
- * @param {object} params.site
- * @param {*} params.siteInfo
- * @param {string} params.projectDir
- * @param {string} params.repositoryRoot
- * @param {import('./state-config.js').default} params.state
- * @param {import('../lib/functions/registry.js').FunctionsRegistry=} params.functionsRegistry
- * @returns
- */
+    address?: string;
+}
+export declare const generateInspectSettings: (edgeInspect: boolean | string, edgeInspectBrk: boolean | string) => InspectSettings;
 export declare const startProxyServer: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }: {
-    accountId: any;
-    addonsUrls: any;
-    blobsContext: any;
-    command: any;
-    config: any;
-    configPath: any;
-    debug: any;
-    env: any;
-    functionsRegistry: any;
-    geoCountry: any;
-    geolocationMode: any;
-    getUpdatedConfig: any;
-    inspectSettings: any;
-    offline: any;
-    projectDir: any;
-    repositoryRoot: any;
-    settings: any;
-    site: any;
-    siteInfo: any;
-    state: any;
+    accountId: string;
+    addonsUrls: $TSFixMe;
+    blobsContext?: BlobsContext | undefined;
+    command: BaseCommand;
+    config: NetlifyOptions['config'];
+    configPath?: string | undefined;
+    debug: boolean;
+    env: NetlifyOptions['cachedConfig']['env'];
+    inspectSettings: InspectSettings;
+    getUpdatedConfig: () => Promise<object>;
+    geolocationMode: string;
+    geoCountry: string;
+    settings: ServerSettings;
+    offline: boolean;
+    site: $TSFixMe;
+    siteInfo: $TSFixMe;
+    projectDir: string;
+    repositoryRoot?: string | undefined;
+    state: StateConfig;
+    functionsRegistry?: FunctionsRegistry | undefined;
 }) => Promise<string>;
+export {};
 //# sourceMappingURL=proxy-server.d.ts.map

package/dist/utils/proxy-server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AAEH;;;;GAIG;AAEH,eAAO,MAAM,uBAAuB;;;;CAiBnC,CAAA;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;qBAqE5B,CAAA"}
+{"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAIhE,OAAO,KAAK,WAAW,MAAM,mBAAmB,CAAA;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAE3C,UAAU,eAAe;IAEvB,OAAO,EAAE,OAAO,CAAA;IAEhB,KAAK,EAAE,OAAO,CAAA;IAEd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,eAAO,MAAM,uBAAuB,gBACrB,OAAO,GAAG,MAAM,kBACb,OAAO,GAAG,MAAM,KAC/B,eAiBF,CAAA;AAED,eAAO,MAAM,gBAAgB;eAsBhB,MAAM;gBACL,QAAQ;;aAEX,WAAW;YACZ,cAAc,CAAC,QAAQ,CAAC;;WAGzB,OAAO;SACT,cAAc,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC;qBACzB,eAAe;sBACd,MAAM,QAAQ,MAAM,CAAC;qBACtB,MAAM;gBACX,MAAM;cACR,cAAc;aACf,OAAO;UACV,QAAQ;cACJ,QAAQ;gBACN,MAAM;;WAEX,WAAW;;qBA8BnB,CAAA"}

package/dist/utils/proxy-server.js

@@ -1,17 +1,5 @@
 import { exit, log, NETLIFYDEVERR } from './command-helpers.js';
 import { startProxy } from './proxy.js';
-/**
- * @typedef {Object} InspectSettings
- * @property {boolean} enabled - Inspect enabled
- * @property {boolean} pause - Pause on breakpoints
- * @property {string|undefined} address - Host/port override (optional)
- */
-/**
- * @param {boolean|string} edgeInspect
- * @param {boolean|string} edgeInspectBrk
- * @returns {InspectSettings}
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'edgeInspect' implicitly has an 'any' ty... Remove this comment to see the full error message
 export const generateInspectSettings = (edgeInspect, edgeInspectBrk) => {
     const enabled = Boolean(edgeInspect) || Boolean(edgeInspectBrk);
     const pause = Boolean(edgeInspectBrk);
@@ -29,71 +17,7 @@ export const generateInspectSettings = (edgeInspect, edgeInspectBrk) => {
         address: getAddress(),
     };
 };
-/**
- *
- * @param {object} params
- * @param {string=} params.accountId
- * @param {*} params.addonsUrls
- * @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
- * @param {import('../commands/types.js').NetlifyOptions["cachedConfig"]['env']} params.env
- * @param {InspectSettings} params.inspectSettings
- * @param {() => Promise<object>} params.getUpdatedConfig
- * @param {string} params.geolocationMode
- * @param {string} params.geoCountry
- * @param {*} params.settings
- * @param {boolean} params.offline
- * @param {object} params.site
- * @param {*} params.siteInfo
- * @param {string} params.projectDir
- * @param {string} params.repositoryRoot
- * @param {import('./state-config.js').default} params.state
- * @param {import('../lib/functions/registry.js').FunctionsRegistry=} params.functionsRegistry
- * @returns
- */
-export const startProxyServer = async ({ 
-// @ts-expect-error TS(7031) FIXME: Binding element 'accountId' implicitly has an 'any... Remove this comment to see the full error message
-accountId, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'addonsUrls' implicitly has an 'an... Remove this comment to see the full error message
-addonsUrls, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'blobsContext' implicitly has an '... Remove this comment to see the full error message
-blobsContext, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'accountId' implicitly has an 'any... Remove this comment to see the full error message
-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 'configPath' implicitly has an 'an... Remove this comment to see the full error message
-configPath, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'debug' implicitly has an 'any' ty... Remove this comment to see the full error message
-debug, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'env' implicitly has an 'any' type... Remove this comment to see the full error message
-env, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'functionsRegistry' implicitly has... Remove this comment to see the full error message
-functionsRegistry, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'geoCountry' implicitly has an 'an... Remove this comment to see the full error message
-geoCountry, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'geolocationMode' implicitly has a... Remove this comment to see the full error message
-geolocationMode, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'getUpdatedConfig' implicitly has ... Remove this comment to see the full error message
-getUpdatedConfig, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'inspectSettings' implicitly has a... Remove this comment to see the full error message
-inspectSettings, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'offline' implicitly has an 'any' ... Remove this comment to see the full error message
-offline, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'projectDir' implicitly has an 'an... Remove this comment to see the full error message
-projectDir, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'repositoryRoot' implicitly has an... Remove this comment to see the full error message
-repositoryRoot, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'settings' implicitly has an 'any'... Remove this comment to see the full error message
-settings, 
-// @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 'siteInfo' implicitly has an 'any'... Remove this comment to see the full error message
-siteInfo, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'state' implicitly has an 'any' ty... Remove this comment to see the full error message
-state, }) => {
+export const startProxyServer = async ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }) => {
     const url = await startProxy({
         addonsUrls,
         blobsContext,

package/dist/utils/proxy.d.ts

@@ -1,27 +1,9 @@
-/**
- * @param {Pick<import('./types.js').ServerSettings, "https" | "port">} settings
- * @returns
- */
-export declare const getProxyUrl: (settings: any) => string;
+import { BaseCommand } from '../commands/index.js';
+import { $TSFixMe } from '../commands/types.js';
+import { ServerSettings } from './types.js';
+export declare const getProxyUrl: (settings: Pick<ServerSettings, 'https' | 'port'>) => string;
 export declare const startProxy: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }: {
-    accountId: any;
-    addonsUrls: any;
-    blobsContext: any;
-    command: any;
-    config: any;
-    configPath: any;
-    debug: any;
-    env: any;
-    functionsRegistry: any;
-    geoCountry: any;
-    geolocationMode: any;
-    getUpdatedConfig: any;
-    inspectSettings: any;
-    offline: any;
-    projectDir: any;
-    repositoryRoot: any;
-    settings: any;
-    siteInfo: any;
-    state: any;
-}) => Promise<string>;
+    command: BaseCommand;
+    settings: ServerSettings;
+} & Record<string, any>) => Promise<string>;
 //# sourceMappingURL=proxy.d.ts.map

package/dist/utils/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AAiwBA;;;GAGG;AAEH,eAAO,MAAM,WAAW,2BAGvB,CAAA;AAED,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;qBAmItB,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAkB/C,OAAO,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAutB9D,eAAO,MAAM,WAAW,aAAuB,KAAK,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAED,eAAO,MAAM,UAAU;aAoBT,WAAW;cAAY,cAAc;2CA2FlD,CAAA"}

package/dist/utils/proxy.js

@@ -62,7 +62,7 @@ const formatEdgeFunctionError = (errorBuffer, acceptsHtml) => {
     });
 };
 function isInternal(url) {
-    return url.startsWith('/.netlify/');
+    return url?.startsWith('/.netlify/') ?? false;
 }
 function isFunction(functionsPort, url) {
     return functionsPort && url.match(DEFAULT_FUNCTION_URL_EXPRESSION);
@@ -88,15 +88,16 @@ const isExternal = function (match) {
 const stripOrigin = function ({ hash, pathname, search }) {
     return `${pathname}${search}${hash}`;
 };
-// @ts-expect-error TS(7031) FIXME: Binding element 'dest' implicitly has an 'any' typ... Remove this comment to see the full error message
-const proxyToExternalUrl = function ({ dest, destURL, req, res }) {
-    console.log(`${NETLIFYDEVLOG} Proxying to ${dest}`);
+const proxyToExternalUrl = function ({ dest, destURL, req, res, }) {
     const handler = createProxyMiddleware({
         target: dest.origin,
         changeOrigin: true,
         pathRewrite: () => destURL,
+        // hide logging
+        logLevel: 'warn',
         ...(Buffer.isBuffer(req.originalBody) && { buffer: toReadableStream(req.originalBody) }),
     });
+    // @ts-expect-error TS(2345) FIXME: Argument of type 'Request' is not assignable to parameter of type 'Request<ParamsDictionary, any, any, ParsedQs, Record<string, any>>'.
     return handler(req, res, () => { });
 };
 // @ts-expect-error TS(7031) FIXME: Binding element 'addonUrl' implicitly has an 'any'... Remove this comment to see the full error message
@@ -143,29 +144,16 @@ const alternativePathsFor = function (url) {
     }
     return paths;
 };
-const serveRedirect = async function ({ 
-// @ts-expect-error TS(7031) FIXME: Binding element 'env' implicitly has an 'any' type... Remove this comment to see the full error message
-env, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'functionsRegistry' implicitly has... Remove this comment to see the full error message
-functionsRegistry, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'imageProxy' implicitly has an 'an... Remove this comment to see the full error message
-imageProxy, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'match' implicitly has an 'any' ty... Remove this comment to see the full error message
-match, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'options' implicitly has an 'any' ... Remove this comment to see the full error message
-options, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'proxy' implicitly has an 'any' ty... Remove this comment to see the full error message
-proxy, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'req' implicitly has an 'any' type... Remove this comment to see the full error message
-req, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'res' implicitly has an 'any' type... Remove this comment to see the full error message
-res, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'siteInfo' implicitly has an 'any'... Remove this comment to see the full error message
-siteInfo, }) {
+const serveRedirect = async function ({ env, functionsRegistry, imageProxy, match, options, proxy, req, res, siteInfo, }) {
     if (!match)
         return proxy.web(req, res, options);
     options = options || req.proxyOptions || {};
     options.match = null;
+    if (match.force404) {
+        res.writeHead(404);
+        res.end(await render404(options.publicFolder));
+        return;
+    }
     if (match.proxyHeaders && Object.keys(match.proxyHeaders).length >= 0) {
         Object.entries(match.proxyHeaders).forEach(([key, value]) => {
             req.headers[key] = value;
@@ -195,9 +183,7 @@ siteInfo, }) {
     const originalURL = req.url;
     if (match.exceptions && match.exceptions.JWT) {
         // Some values of JWT can start with :, so, make sure to normalize them
-        const expectedRoles = new Set(
-        // @ts-expect-error TS(7006) FIXME: Parameter 'value' implicitly has an 'any' type.
-        match.exceptions.JWT.split(',').map((value) => (value.startsWith(':') ? value.slice(1) : value)));
+        const expectedRoles = new Set(match.exceptions.JWT.split(',').map((value) => (value.startsWith(':') ? value.slice(1) : value)));
         const cookieValues = cookie.parse(req.headers.cookie || '');
         const token = cookieValues.nf_jwt;
         // Serve not found by default
@@ -243,11 +229,6 @@ siteInfo, }) {
             return proxy.web(req, res, { ...options, staticFile });
         }
     }
-    if (match.force404) {
-        res.writeHead(404);
-        res.end(await render404(options.publicFolder));
-        return;
-    }
     if (match.force || !staticFile || !options.framework || req.method === 'POST') {
         // construct destination URL from redirect rule match
         const dest = new URL(match.to, `${reqUrl.protocol}//${reqUrl.host}`);
@@ -269,6 +250,11 @@ siteInfo, }) {
                 destURL = `${dest}`;
             }
             else {
+                const isHiddenProxy = match.proxyHeaders &&
+                    Object.entries(match.proxyHeaders).some(([key, val]) => key.toLowerCase() === 'x-nf-hidden-proxy' && val === 'true');
+                if (!isHiddenProxy) {
+                    console.log(`${NETLIFYDEVLOG} Proxying to ${dest}`);
+                }
                 return proxyToExternalUrl({ req, res, dest, destURL });
             }
         }
@@ -539,34 +525,9 @@ siteInfo, }) {
     };
     return handlers;
 };
-const onRequest = async ({ 
-// @ts-expect-error TS(7031) FIXME: Binding element 'addonsUrls' implicitly has an 'an... Remove this comment to see the full error message
-addonsUrls, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'edgeFunctionsProxy' implicitly ha... Remove this comment to see the full error message
-edgeFunctionsProxy, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'env' implicitly has an 'any' type... Remove this comment to see the full error message
-env, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'functionsRegistry' implicitly has... Remove this comment to see the full error message
-functionsRegistry, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'functionsServer' implicitly has a... Remove this comment to see the full error message
-functionsServer, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'imageProxy' implicitly has an 'an... Remove this comment to see the full error message
-imageProxy, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'proxy' implicitly has an 'any' ty... Remove this comment to see the full error message
-proxy, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'rewriter' implicitly has an 'any'... Remove this comment to see the full error message
-rewriter, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'settings' implicitly has an 'any'... Remove this comment to see the full error message
-settings, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'siteInfo' implicitly has an 'any'... Remove this comment to see the full error message
-siteInfo, }, 
-// @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
-req, 
-// @ts-expect-error TS(7006) FIXME: Parameter 'res' implicitly has an 'any' type.
-res) => {
-    req.originalBody = ['GET', 'OPTIONS', 'HEAD'].includes(req.method)
-        ? null
-        : await createStreamPromise(req, BYTES_LIMIT);
+const onRequest = async ({ addonsUrls, edgeFunctionsProxy, env, functionsRegistry, functionsServer, imageProxy, proxy, rewriter, settings, siteInfo, }, req, res) => {
+    req.originalBody =
+        req.method && ['GET', 'OPTIONS', 'HEAD'].includes(req.method) ? null : await createStreamPromise(req, BYTES_LIMIT);
     if (isImageRequest(req)) {
         return imageProxy(req, res);
     }
@@ -575,7 +536,7 @@ res) => {
         return proxy.web(req, res, { target: edgeFunctionsProxyURL });
     }
     const functionMatch = functionsRegistry &&
-        (await functionsRegistry.getFunctionForURLPath(req.url, req.method, () => getStatic(decodeURIComponent(reqToURL(req, req.url).pathname), settings.dist)));
+        (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.
@@ -599,7 +560,7 @@ res) => {
     const options = {
         match,
         addonsUrls,
-        target: `http://${isIPv6(settings.frameworkHost) ? `[${settings.frameworkHost}]` : settings.frameworkHost}:${settings.frameworkPort}`,
+        target: `http://${settings.frameworkHost && isIPv6(settings.frameworkHost) ? `[${settings.frameworkHost}]` : settings.frameworkHost}:${settings.frameworkPort}`,
         publicFolder: settings.dist,
         functionsServer,
         functionsPort: settings.functionsPort,
@@ -628,54 +589,11 @@ res) => {
     }
     proxy.web(req, res, options);
 };
-/**
- * @param {Pick<import('./types.js').ServerSettings, "https" | "port">} settings
- * @returns
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'settings' implicitly has an 'any' type.
 export const getProxyUrl = function (settings) {
     const scheme = settings.https ? 'https' : 'http';
     return `${scheme}://localhost:${settings.port}`;
 };
-export const startProxy = async function ({ 
-// @ts-expect-error TS(7031) FIXME: Binding element 'accountId' implicitly has an 'any... Remove this comment to see the full error message
-accountId, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'addonsUrls' implicitly has an 'an... Remove this comment to see the full error message
-addonsUrls, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'blobsContext' implicitly has an '... Remove this comment to see the full error message
-blobsContext, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'accountId' implicitly has an 'any... Remove this comment to see the full error message
-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 'configPath' implicitly has an 'an... Remove this comment to see the full error message
-configPath, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'debug' implicitly has an 'any' ty... Remove this comment to see the full error message
-debug, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'env' implicitly has an 'any' type... Remove this comment to see the full error message
-env, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'functionsRegistry' implicitly has... Remove this comment to see the full error message
-functionsRegistry, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'geoCountry' implicitly has an 'an... Remove this comment to see the full error message
-geoCountry, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'geolocationMode' implicitly has a... Remove this comment to see the full error message
-geolocationMode, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'getUpdatedConfig' implicitly has ... Remove this comment to see the full error message
-getUpdatedConfig, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'inspectSettings' implicitly has a... Remove this comment to see the full error message
-inspectSettings, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'offline' implicitly has an 'any' ... Remove this comment to see the full error message
-offline, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'projectDir' implicitly has an 'an... Remove this comment to see the full error message
-projectDir, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'repositoryRoot' implicitly has an... Remove this comment to see the full error message
-repositoryRoot, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'settings' implicitly has an 'any'... Remove this comment to see the full error message
-settings, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'siteInfo' implicitly has an 'any'... Remove this comment to see the full error message
-siteInfo, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'state' implicitly has an 'any' ty... Remove this comment to see the full error message
-state, }) {
+export const startProxy = async function ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }) {
     const secondaryServerPort = settings.https ? await getAvailablePort() : null;
     const functionsServer = settings.functionsPort ? `http://127.0.0.1:${settings.functionsPort}` : null;
     const edgeFunctionsProxy = await initializeEdgeFunctionsProxy({
@@ -738,7 +656,6 @@ state, }) {
     const primaryServer = settings.https
         ? https.createServer({ cert: settings.https.cert, key: settings.https.key }, onRequestWithOptions)
         : http.createServer(onRequestWithOptions);
-    // @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
     const onUpgrade = function onUpgrade(req, socket, head) {
         proxy.ws(req, socket, head);
     };

package/dist/utils/rules-proxy.d.ts

@@ -1,3 +1,4 @@
+import { Rewriter } from './types.js';
 export declare const onChanges: (files: any, listener: any) => void;
 export declare const getWatchers: () => any[];
 export declare const getLanguage: (headers: any) => any;
@@ -9,5 +10,5 @@ export declare const createRewriter: ({ config, configPath, distDir, geoCountry,
     jwtRoleClaim: any;
     jwtSecret: any;
     projectDir: any;
-}) => Promise<(req: any) => Promise<any>>;
+}) => Promise<Rewriter>;
 //# sourceMappingURL=rules-proxy.d.ts.map

package/dist/utils/rules-proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rules-proxy.d.ts","sourceRoot":"","sources":["../../src/utils/rules-proxy.ts"],"names":[],"mappings":"AAkBA,eAAO,MAAM,SAAS,qCAQrB,CAAA;AAED,eAAO,MAAM,WAAW,aAGvB,CAAA;AAGD,eAAO,MAAM,WAAW,uBAKvB,CAAA;AAED,eAAO,MAAM,cAAc;;;;;;;;yCAiF1B,CAAA"}
+{"version":3,"file":"rules-proxy.d.ts","sourceRoot":"","sources":["../../src/utils/rules-proxy.ts"],"names":[],"mappings":"AAaA,OAAO,EAAW,QAAQ,EAAE,MAAM,YAAY,CAAA;AAM9C,eAAO,MAAM,SAAS,qCAQrB,CAAA;AAED,eAAO,MAAM,WAAW,aAGvB,CAAA;AAGD,eAAO,MAAM,WAAW,uBAKvB,CAAA;AAED,eAAO,MAAM,cAAc;;;;;;;;MAevB,QAAQ,QAAQ,CAoEnB,CAAA"}

package/dist/utils/rules-proxy.js

@@ -2,7 +2,6 @@ import path from 'path';
 import chokidar from 'chokidar';
 // @ts-expect-error TS(7016) FIXME: Could not find a declaration file for module 'cook... Remove this comment to see the full error message
 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.js';
@@ -46,7 +45,6 @@ jwtRoleClaim,
 jwtSecret, 
 // @ts-expect-error TS(7031) FIXME: Binding element 'projectDir' implicitly has an 'an... Remove this comment to see the full error message
 projectDir, }) {
-    // @ts-expect-error TS(7034) FIXME: Variable 'matcher' implicitly has type 'any' in so... Remove this comment to see the full error message
     let matcher = null;
     const redirectsFiles = [...new Set([path.resolve(distDir, '_redirects'), path.resolve(projectDir, '_redirects')])];
     let redirects = await parseRedirects({ config, redirectsFiles, configPath });
@@ -58,7 +56,6 @@ projectDir, }) {
         matcher = null;
     });
     const getMatcher = async () => {
-        // @ts-expect-error TS(7005) FIXME: Variable 'matcher' implicitly has an 'any' type.
         if (matcher)
             return matcher;
         if (redirects.length !== 0) {
@@ -76,7 +73,7 @@ projectDir, }) {
     // @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
     return async function rewriter(req) {
         const matcherFunc = await getMatcher();
-        const reqUrl = new URL(req.url, `${req.protocol || (req.headers.scheme && `${req.headers.scheme}:`) || 'http:'}//${req.hostname || req.headers.host}`);
+        const reqUrl = new URL(req.url ?? '', `${req.protocol || (req.headers.scheme && `${req.headers.scheme}:`) || 'http:'}//${req.hostname || req.headers.host}`);
         const cookieValues = cookie.parse(req.headers.cookie || '');
         const headers = {
             'x-language': cookieValues.nf_lang || getLanguage(req.headers),
@@ -91,9 +88,13 @@ projectDir, }) {
             query: reqUrl.search.slice(1),
             headers,
             cookieValues,
-            // @ts-expect-error TS(7006) FIXME: Parameter 'name' implicitly has an 'any' type.
-            getHeader: (name) => headers[name.toLowerCase()] || '',
-            // @ts-expect-error TS(7006) FIXME: Parameter 'key' implicitly has an 'any' type.
+            getHeader: (name) => {
+                const val = headers[name.toLowerCase()];
+                if (Array.isArray(val)) {
+                    return val[0];
+                }
+                return val || '';
+            },
             getCookie: (key) => cookieValues[key] || '',
         };
         const match = matcherFunc.match(matchReq);

package/dist/utils/run-build.d.ts

@@ -1,19 +1,17 @@
-/**
- * @param {object} params
- * @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]
- * @param {'build' | 'dev'} [params.timeline]
- * @returns
- */
-export declare const runNetlifyBuild: ({ command, env, options, settings, timeline }: {
-    command: any;
-    env?: {} | undefined;
-    options: any;
-    settings: any;
-    timeline?: string | undefined;
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+import BaseCommand from '../commands/base-command.js';
+import { $TSFixMe } from '../commands/types.js';
+import { ServerSettings } from './types.js';
+export declare const runNetlifyBuild: ({ command, env, options, settings, timeline, }: {
+    command: BaseCommand;
+    options: $TSFixMe;
+    settings: ServerSettings;
+    env: NodeJS.ProcessEnv;
+    timeline: 'build' | 'dev';
 }) => Promise<{
     configPath?: undefined;
     configMutations?: undefined;
@@ -24,10 +22,7 @@ export declare const runNetlifyBuild: ({ command, env, options, settings, timeli
     configMutations: any;
     configPath?: undefined;
 }>;
-/**
- * @param {Omit<Parameters<typeof runNetlifyBuild>[0], 'timeline'>} options
- */
-export declare const runDevTimeline: (options: any) => Promise<{
+export declare const runDevTimeline: (options: Omit<Parameters<typeof runNetlifyBuild>[0], 'timeline'>) => Promise<{
     configPath?: undefined;
     configMutations?: undefined;
 } | {

package/dist/utils/run-build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"run-build.d.ts","sourceRoot":"","sources":["../../src/utils/run-build.ts"],"names":[],"mappings":"AA+CA;;;;;;;;;GASG;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;EAoG3B,CAAA;AAED;;GAEG;AAEH,eAAO,MAAM,cAAc;;;;;;;;;EAAgE,CAAA;AAE3F;;GAEG;AAEH,eAAO,MAAM,gBAAgB;;;;;;;;;EAAkE,CAAA"}
+{"version":3,"file":"run-build.d.ts","sourceRoot":"","sources":["../../src/utils/run-build.ts"],"names":[],"mappings":";;;;;AAGA,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAS/C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAqC3C,eAAO,MAAM,eAAe;aAOjB,WAAW;aAEX,QAAQ;cACP,cAAc;SACnB,OAAO,UAAU;cACZ,OAAO,GAAG,KAAK;;;;;;;;;;EAqG1B,CAAA;AAED,eAAO,MAAM,cAAc,YAAa,KAAK,WAAW,sBAAsB,CAAC,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC;;;;;;;;;EAC7C,CAAA;AAElD;;GAEG;AAEH,eAAO,MAAM,gBAAgB;;;;;;;;;EAAkE,CAAA"}