netlify-cli 19.1.5 → 19.1.6

package/dist/utils/init/utils.js

@@ -5,7 +5,7 @@ import inquirer from 'inquirer';
 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 { chalk, logAndThrowError, log, warn } from '../command-helpers.js';
 import { getRecommendPlugins, getUIPlugins } from './plugins.js';
 const formatTitle = (title) => chalk.cyan(title);
 /**
@@ -16,11 +16,8 @@ const formatTitle = (title) => chalk.cyan(title);
  * want them installed in the site settings. When installed
  * there our build will automatically install the latest without
  * user management of the versioning.
- * @param pluginsInstalled
- * @param pluginsRecommended
- * @returns
  */
-export const getPluginsToAutoInstall = (command, pluginsInstalled = [], pluginsRecommended = []) => {
+export const getPluginsToAutoInstall = (_command, pluginsInstalled = [], pluginsRecommended = []) => {
     const nextRuntime = '@netlify/plugin-nextjs';
     const pluginsToAlwaysInstall = new Set([nextRuntime]);
     return pluginsRecommended.reduce((acc, plugin) => pluginsInstalled.includes(plugin) && !pluginsToAlwaysInstall.has(plugin) ? acc : [...acc, plugin], []);
@@ -32,24 +29,13 @@ const normalizeSettings = (settings, config, command) => {
         defaultBaseDir: settings.baseDirectory ?? command.project.relativeBaseDirectory ?? '',
         defaultBuildCmd: config.build.command || settings.buildCommand,
         defaultBuildDir: settings.dist,
-        // @ts-expect-error types need to be fixed on @netlify/build
         defaultFunctionsDir: config.build.functions || 'netlify/functions',
         recommendedPlugins,
     };
 };
-/**
- *
- * @param {object} param0
- * @param {string} param0.defaultBaseDir
- * @param {string} param0.defaultBuildCmd
- * @param {string=} param0.defaultBuildDir
- * @returns
- */
-// @ts-expect-error TS(7031) FIXME: Binding element 'defaultBaseDir' implicitly has an... Remove this comment to see the full error message
-const getPromptInputs = ({ defaultBaseDir, defaultBuildCmd, defaultBuildDir }) => {
+const getPromptInputs = ({ defaultBaseDir, defaultBuildCmd, defaultBuildDir, }) => {
     const inputs = [
-        defaultBaseDir !== undefined &&
-            defaultBaseDir !== '' && {
+        defaultBaseDir !== '' && {
             type: 'input',
             name: 'baseDir',
             message: 'Base directory `(blank for current dir):',
@@ -59,7 +45,6 @@ const getPromptInputs = ({ defaultBaseDir, defaultBuildCmd, defaultBuildDir }) =
             type: 'input',
             name: 'buildCmd',
             message: 'Your build command (hugo build/yarn run build/etc):',
-            // @ts-expect-error TS(7006) FIXME: Parameter 'val' implicitly has an 'any' type.
             filter: (val) => (val === '' ? '# no build command' : val),
             default: defaultBuildCmd,
         },
@@ -72,21 +57,20 @@ const getPromptInputs = ({ defaultBaseDir, defaultBuildCmd, defaultBuildDir }) =
     ].filter(Boolean);
     return inputs.filter(Boolean);
 };
-export const getBuildSettings = async ({ command, config }) => {
+export const getBuildSettings = async ({ command, config, }) => {
     const settings = await detectBuildSettings(command);
     // TODO: add prompt for asking to choose the build command
     const setting = settings.length > 0 ? settings[0] : {};
-    const { defaultBaseDir, defaultBuildCmd, defaultBuildDir, defaultFunctionsDir, recommendedPlugins } = await normalizeSettings(setting, config, command);
+    const { defaultBaseDir, defaultBuildCmd, defaultBuildDir, defaultFunctionsDir, recommendedPlugins } = normalizeSettings(setting, config, command);
     if (recommendedPlugins.length !== 0 && setting.framework?.name) {
         log(`Configuring ${formatTitle(setting.framework.name)} runtime...`);
         log();
     }
-    const { baseDir, buildCmd, buildDir } = await inquirer.prompt(getPromptInputs({
+    const { baseDir, buildCmd, buildDir } = (await inquirer.prompt(getPromptInputs({
         defaultBaseDir,
         defaultBuildCmd,
         defaultBuildDir,
-    }));
-    // @ts-expect-error TS(7006) FIXME: Parameter 'plugin' implicitly has an 'any' type.
+    })));
     const pluginsToInstall = recommendedPlugins.map((plugin) => ({ package: plugin }));
     const normalizedBaseDir = baseDir ? normalizeBackslash(baseDir) : undefined;
     return { baseDir: normalizedBaseDir, buildCmd, buildDir, functionsDir: defaultFunctionsDir, pluginsToInstall };
@@ -113,22 +97,8 @@ const getNetlifyToml = ({ command = '# no build command', functions = 'functions
 
   ## more info on configuring this file: https://ntl.fyi/file-based-build-config
 `;
-export const saveNetlifyToml = async ({ 
-// @ts-expect-error TS(7031) FIXME: Binding element 'baseDir' implicitly has an 'any' ... Remove this comment to see the full error message
-baseDir, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'buildCmd' implicitly has an 'any'... Remove this comment to see the full error message
-buildCmd, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'buildDir' implicitly has an 'any'... Remove this comment to see the full error message
-buildDir, 
-// @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 'functionsDir' implicitly has an '... Remove this comment to see the full error message
-functionsDir, 
-// @ts-expect-error TS(7031) FIXME: Binding element 'repositoryRoot' implicitly has an... Remove this comment to see the full error message
-repositoryRoot, }) => {
-    const tomlPathParts = [repositoryRoot, baseDir, 'netlify.toml'].filter(Boolean);
+export const saveNetlifyToml = async ({ baseDir, buildCmd, buildDir, config, configPath, functionsDir, repositoryRoot, }) => {
+    const tomlPathParts = [repositoryRoot, baseDir, 'netlify.toml'].filter((part) => part != null && part.length > 0);
     const tomlPath = path.join(...tomlPathParts);
     if (await fileExistsAsync(tomlPath)) {
         return;
@@ -153,8 +123,7 @@ repositoryRoot, }) => {
             await writeFile(tomlPath, getNetlifyToml({ command: buildCmd, publish: buildDir, functions: functionsDir }), 'utf-8');
         }
         catch (error) {
-            // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-            warn(`Failed saving Netlify toml file: ${error.message}`);
+            warn(`Failed saving Netlify toml file: ${error instanceof Error ? error.message : error?.toString()}`);
         }
     }
 };
@@ -163,7 +132,6 @@ export const formatErrorMessage = ({ error, message }) => {
     const errorMessage = error.json ? `${error.message} - ${JSON.stringify(error.json)}` : error.message;
     return `${message} with error: ${chalk.red(errorMessage)}`;
 };
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
 export const createDeployKey = async ({ api }) => {
     try {
         const deployKey = await api.createDeployKey();
@@ -171,26 +139,25 @@ export const createDeployKey = async ({ api }) => {
     }
     catch (error) {
         const message = formatErrorMessage({ message: 'Failed creating deploy key', error });
-        failAndExit(message);
+        return logAndThrowError(message);
     }
 };
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-export const updateSite = async ({ api, options, siteId }) => {
+export const updateSite = async ({ api, options, siteId, }) => {
     try {
         const updatedSite = await api.updateSite({ siteId, body: options });
         return updatedSite;
     }
     catch (error) {
         const message = formatErrorMessage({ message: 'Failed updating site with repo information', error });
-        failAndExit(message);
+        return logAndThrowError(message);
     }
 };
-// @ts-expect-error TS(7031) FIXME: Binding element 'api' implicitly has an 'any' type... Remove this comment to see the full error message
-export const setupSite = async ({ api, configPlugins, pluginsToInstall, repo, siteId }) => {
+export const setupSite = async ({ api, configPlugins, pluginsToInstall, repo, siteId, }) => {
     const updatedSite = await updateSite({
         siteId,
         api,
         // merge existing plugins with new ones
+        // @ts-expect-error(serhalp) -- `plugins` is missing from `api.updateSite()` req body type
         options: { repo, plugins: [...getUIPlugins(configPlugins), ...pluginsToInstall] },
     });
     return updatedSite;

package/dist/utils/init/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/init/utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/utils/init/utils.ts"],"names":[],"mappings":"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"}

package/dist/utils/live-tunnel.d.ts

@@ -1,8 +1,9 @@
-export declare const startLiveTunnel: ({ localPort, netlifyApiToken, siteId, slug }: {
-    localPort: any;
-    netlifyApiToken: any;
-    siteId: any;
-    slug: any;
-}) => Promise<any>;
-export declare const getLiveTunnelSlug: (state: any, override: any) => any;
+import type CLIState from './cli-state.js';
+export declare const startLiveTunnel: ({ localPort, netlifyApiToken, siteId, slug, }: {
+    localPort: number;
+    netlifyApiToken?: string | null | undefined;
+    siteId?: string | undefined;
+    slug: string;
+}) => Promise<string>;
+export declare const getLiveTunnelSlug: (state: CLIState, override?: string) => string;
 //# sourceMappingURL=live-tunnel.d.ts.map

package/dist/utils/live-tunnel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"live-tunnel.d.ts","sourceRoot":"","sources":["../../src/utils/live-tunnel.ts"],"names":[],"mappings":"AA+FA,eAAO,MAAM,eAAe;;;;;kBAsC3B,CAAA;AAGD,eAAO,MAAM,iBAAiB,oCAqB7B,CAAA"}
+{"version":3,"file":"live-tunnel.d.ts","sourceRoot":"","sources":["../../src/utils/live-tunnel.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AA6F1C,eAAO,MAAM,eAAe,kDAKzB;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;IAC3C,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC3B,IAAI,EAAE,MAAM,CAAA;CACb,oBA8CA,CAAA;AAED,eAAO,MAAM,iBAAiB,UAAW,QAAQ,aAAa,MAAM,WAwBnE,CAAA"}

package/dist/utils/live-tunnel.js

@@ -13,13 +13,8 @@ const SLUG_LOCAL_STATE_KEY = 'liveTunnelSlug';
 const TUNNEL_POLL_INTERVAL = 1e3;
 // 5 minutes
 const TUNNEL_POLL_TIMEOUT = 3e5;
-// @ts-expect-error TS(7031) FIXME: Binding element 'netlifyApiToken' implicitly has a... Remove this comment to see the full error message
-const createTunnel = async function ({ netlifyApiToken, siteId, slug }) {
+const createTunnel = async function ({ netlifyApiToken, siteId, slug, }) {
     await installTunnelClient();
-    if (!siteId) {
-        console.error(`${NETLIFYDEVERR} Error: no siteId defined, did you forget to run ${chalk.yellow('netlify init')} or ${chalk.yellow('netlify link')}?`);
-        process.exit(1);
-    }
     const url = `https://api.netlify.com/api/v1/live_sessions?site_id=${siteId}&slug=${slug}`;
     const response = await fetch(url, {
         method: 'POST',
@@ -31,18 +26,17 @@ const createTunnel = async function ({ netlifyApiToken, siteId, slug }) {
     });
     const data = await response.json();
     if (response.status !== 201) {
-        // @ts-expect-error TS(18046) - 'data' is of type 'unknown'
+        // @ts-expect-error(serhalp) -- Use typed `netlify` API client?
         throw new Error(data.message);
     }
     return data;
 };
-// @ts-expect-error TS(7031) FIXME: Binding element 'localPort' implicitly has an 'any... Remove this comment to see the full error message
-const connectTunnel = function ({ localPort, netlifyApiToken, session }) {
+const connectTunnel = function ({ localPort, netlifyApiToken, session, }) {
     const execPath = getPathInHome(['tunnel', 'bin', EXEC_NAME]);
-    const args = ['connect', '-s', session.id, '-t', netlifyApiToken, '-l', localPort];
+    const args = ['connect', '-s', session.id, '-t', netlifyApiToken, '-l', localPort.toString()];
     if (process.env.DEBUG) {
         args.push('-v');
-        log(execPath, args);
+        log(execPath, args.toString());
     }
     const ps = execa(execPath, args, { stdio: 'inherit' });
     ps.on('close', (code) => process.exit(code));
@@ -51,7 +45,6 @@ const connectTunnel = function ({ localPort, netlifyApiToken, session }) {
 };
 const installTunnelClient = async function () {
     const binPath = getPathInHome(['tunnel', 'bin']);
-    // @ts-expect-error TS(2345) FIXME: Argument of type '{ binPath: string; packageName: ... Remove this comment to see the full error message
     const shouldFetch = await shouldFetchLatestVersion({
         binPath,
         packageName: PACKAGE_NAME,
@@ -63,7 +56,6 @@ const installTunnelClient = async function () {
         return;
     }
     log(`${NETLIFYDEVLOG} Installing Live Tunnel Client`);
-    // @ts-expect-error TS(2345) FIXME: Argument of type '{ packageName: string; execName:... Remove this comment to see the full error message
     await fetchLatestVersion({
         packageName: PACKAGE_NAME,
         execName: EXEC_NAME,
@@ -71,15 +63,18 @@ const installTunnelClient = async function () {
         extension: process.platform === 'win32' ? 'zip' : 'tar.gz',
     });
 };
-// @ts-expect-error TS(7031) FIXME: Binding element 'localPort' implicitly has an 'any... Remove this comment to see the full error message
-export const startLiveTunnel = async ({ localPort, netlifyApiToken, siteId, slug }) => {
+export const startLiveTunnel = async ({ localPort, netlifyApiToken, siteId, slug, }) => {
+    if (!siteId) {
+        console.error(`${NETLIFYDEVERR} Error: no siteId defined, did you forget to run ${chalk.yellow('netlify init')} or ${chalk.yellow('netlify link')}?`);
+        process.exit(1);
+    }
     const session = await createTunnel({
         siteId,
-        netlifyApiToken,
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- XXX(serhalp): removed in favor of runtime user feedback in stacked PR
+        netlifyApiToken: netlifyApiToken,
         slug,
     });
-    const isLiveTunnelReady = async function () {
-        // @ts-expect-error TS(18046) - 'session' is of type 'unknown'
+    const isLiveTunnelReady = async () => {
         const url = `https://api.netlify.com/api/v1/live_sessions/${session.id}`;
         const response = await fetch(url, {
             method: 'GET',
@@ -90,22 +85,20 @@ export const startLiveTunnel = async ({ localPort, netlifyApiToken, siteId, slug
         });
         const data = await response.json();
         if (response.status !== 200) {
-            // @ts-expect-error TS(18046) - 'session' is of type 'unknown'
+            // @ts-expect-error(serhalp) -- Use typed `netlify` API client?
             throw new Error(data.message);
         }
-        // @ts-expect-error TS(18046) - 'data' is of type 'unknown'
         return data.state === 'online';
     };
-    connectTunnel({ session, netlifyApiToken, localPort });
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- XXX(serhalp): removed in favor of runtime user feedback in stacked PR
+    connectTunnel({ session, netlifyApiToken: netlifyApiToken, localPort });
     // Waiting for the live session to have a state of `online`.
     await pWaitFor(isLiveTunnelReady, {
         interval: TUNNEL_POLL_INTERVAL,
         timeout: TUNNEL_POLL_TIMEOUT,
     });
-    // @ts-expect-error TS(18046) - 'session' is of type 'unknown'
     return session.session_url;
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'state' implicitly has an 'any' type.
 export const getLiveTunnelSlug = (state, override) => {
     if (override !== undefined) {
         return override;
@@ -119,8 +112,7 @@ export const getLiveTunnelSlug = (state, override) => {
         state.set(SLUG_LOCAL_STATE_KEY, newSlug);
     }
     catch (error) {
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-        log(`${NETLIFYDEVERR} Could not read or write local state file: ${error.message}`);
+        log(`${NETLIFYDEVERR} Could not read or write local state file: ${error instanceof Error ? error.message : error?.toString() ?? ''}`);
     }
     return newSlug;
 };

package/dist/utils/live-tunnel.js.map

@@ -1 +1 @@
-{"version":3,"file":"live-tunnel.js","sourceRoot":"","sources":["../../src/utils/live-tunnel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"live-tunnel.js","sourceRoot":"","sources":["../../src/utils/live-tunnel.ts"],"names":[],"mappings":"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"}

package/dist/utils/open-browser.d.ts

@@ -1,5 +1,5 @@
 type OpenBrowsrProps = {
-    silentBrowserNoneError: boolean;
+    silentBrowserNoneError?: boolean;
     url: string;
 };
 declare const openBrowser: ({ silentBrowserNoneError, url }: OpenBrowsrProps) => Promise<void>;

package/dist/utils/open-browser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"open-browser.d.ts","sourceRoot":"","sources":["../../src/utils/open-browser.ts"],"names":[],"mappings":"AAoBA,KAAK,eAAe,GAAG;IACrB,sBAAsB,EAAE,OAAO,CAAA;IAC/B,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,QAAA,MAAM,WAAW,oCAAoD,eAAe,kBAmBnF,CAAA;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"open-browser.d.ts","sourceRoot":"","sources":["../../src/utils/open-browser.ts"],"names":[],"mappings":"AAoBA,KAAK,eAAe,GAAG;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AAED,QAAA,MAAM,WAAW,oCAAoD,eAAe,kBAmBnF,CAAA;AAED,eAAe,WAAW,CAAA"}

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

@@ -1,9 +1,10 @@
-import BaseCommand from '../commands/base-command.js';
-import { $TSFixMe, NetlifyOptions } from '../commands/types.js';
-import { BlobsContextWithEdgeAccess } from '../lib/blobs/blobs.js';
-import { FunctionsRegistry } from '../lib/functions/registry.js';
-import type StateConfig from './state-config.js';
-import { ServerSettings } from './types.js';
+import type BaseCommand from '../commands/base-command.js';
+import type { $TSFixMe, NetlifyOptions } from '../commands/types.js';
+import type { BlobsContextWithEdgeAccess } from '../lib/blobs/blobs.js';
+import type { FunctionsRegistry } from '../lib/functions/registry.js';
+import { type NormalizedCachedConfigConfig } from './command-helpers.js';
+import type CLIState from './cli-state.js';
+import type { ServerSettings } from './types.js';
 interface InspectSettings {
     enabled: boolean;
     pause: boolean;
@@ -16,13 +17,13 @@ export declare const startProxyServer: ({ accountId, addonsUrls, api, blobsConte
     api?: NetlifyOptions["api"];
     blobsContext?: BlobsContextWithEdgeAccess;
     command: BaseCommand;
-    config: NetlifyOptions["config"];
+    config: NormalizedCachedConfigConfig;
     configPath?: string;
     debug: boolean;
     disableEdgeFunctions: boolean;
     env: NetlifyOptions["cachedConfig"]["env"];
     inspectSettings: InspectSettings;
-    getUpdatedConfig: () => Promise<object>;
+    getUpdatedConfig: () => Promise<NormalizedCachedConfigConfig>;
     geolocationMode: string;
     geoCountry: string;
     settings: ServerSettings;
@@ -31,7 +32,7 @@ export declare const startProxyServer: ({ accountId, addonsUrls, api, blobsConte
     siteInfo: $TSFixMe;
     projectDir: string;
     repositoryRoot?: string;
-    state: StateConfig;
+    state: CLIState;
     functionsRegistry?: FunctionsRegistry;
 }) => Promise<string>;
 export {};

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":"AAAA,OAAO,WAAW,MAAM,6BAA6B,CAAA;AACrD,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAA;AAClE,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,0QAuB1B;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,QAAQ,CAAA;IACpB,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,CAAA;IAC3B,YAAY,CAAC,EAAE,0BAA0B,CAAA;IACzC,OAAO,EAAE,WAAW,CAAA;IACpB,MAAM,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAA;IAEhC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,OAAO,CAAA;IACd,oBAAoB,EAAE,OAAO,CAAA;IAC7B,GAAG,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAA;IAC1C,eAAe,EAAE,eAAe,CAAA;IAChC,gBAAgB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;IACvC,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,cAAc,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,QAAQ,CAAA;IACd,QAAQ,EAAE,QAAQ,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,EAAE,WAAW,CAAA;IAClB,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CACtC,oBA8BA,CAAA"}
+{"version":3,"file":"proxy-server.d.ts","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,WAAW,MAAM,6BAA6B,CAAA;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACpE,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,uBAAuB,CAAA;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAA;AAErE,OAAO,EAA4B,KAAK,4BAA4B,EAAE,MAAM,sBAAsB,CAAA;AAElG,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,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,0QAuB1B;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,QAAQ,CAAA;IACpB,GAAG,CAAC,EAAE,cAAc,CAAC,KAAK,CAAC,CAAA;IAC3B,YAAY,CAAC,EAAE,0BAA0B,CAAA;IACzC,OAAO,EAAE,WAAW,CAAA;IACpB,MAAM,EAAE,4BAA4B,CAAA;IAEpC,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,OAAO,CAAA;IACd,oBAAoB,EAAE,OAAO,CAAA;IAC7B,GAAG,EAAE,cAAc,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAA;IAC1C,eAAe,EAAE,eAAe,CAAA;IAChC,gBAAgB,EAAE,MAAM,OAAO,CAAC,4BAA4B,CAAC,CAAA;IAC7D,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,cAAc,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;IAChB,IAAI,EAAE,QAAQ,CAAA;IACd,QAAQ,EAAE,QAAQ,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,KAAK,EAAE,QAAQ,CAAA;IACf,iBAAiB,CAAC,EAAE,iBAAiB,CAAA;CACtC,oBA8BA,CAAA"}

package/dist/utils/proxy-server.js.map

@@ -1 +1 @@
-{"version":3,"file":"proxy-server.js","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAavC,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,WAA6B,EAC7B,cAAgC,EACf,EAAE;IACnB,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,CAAA;IAC/D,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;IACrC,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAA;QAClE,CAAC;QACD,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAA;QACxE,CAAC;IACH,CAAC,CAAA;IAED,OAAO;QACL,OAAO;QACP,KAAK;QACL,OAAO,EAAE,UAAU,EAAE;KACtB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,EACrC,SAAS,EACT,UAAU,EACV,GAAG,EACH,YAAY,EACZ,OAAO,EACP,MAAM,EACN,UAAU,EACV,KAAK,EACL,oBAAoB,EACpB,GAAG,EACH,iBAAiB,EACjB,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,OAAO,EACP,UAAU,EACV,cAAc,EACd,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,KAAK,GAyBN,EAAE,EAAE;IACH,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC;QAC3B,UAAU;QACV,YAAY;QACZ,OAAO;QACP,MAAM;QACN,UAAU,EAAE,UAAU,IAAI,IAAI,CAAC,UAAU;QACzC,KAAK;QACL,oBAAoB;QACpB,GAAG;QACH,iBAAiB;QACjB,eAAe;QACf,UAAU;QACV,gBAAgB;QAChB,eAAe;QACf,OAAO;QACP,UAAU;QACV,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,SAAS;QACT,cAAc;QACd,GAAG;KACJ,CAAC,CAAA;IACF,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,GAAG,CAAC,aAAa,EAAE,yCAAyC,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAA;QAC7E,IAAI,CAAC,CAAC,CAAC,CAAA;IACT,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}
+{"version":3,"file":"proxy-server.js","sourceRoot":"","sources":["../../src/utils/proxy-server.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,EAAqC,MAAM,sBAAsB,CAAA;AAClG,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAavC,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,WAA6B,EAC7B,cAAgC,EACf,EAAE;IACnB,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,IAAI,OAAO,CAAC,cAAc,CAAC,CAAA;IAC/D,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC,CAAA;IACrC,MAAM,UAAU,GAAG,GAAG,EAAE;QACtB,IAAI,WAAW,EAAE,CAAC;YAChB,OAAO,OAAO,WAAW,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAA;QAClE,CAAC;QACD,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,CAAA;QACxE,CAAC;IACH,CAAC,CAAA;IAED,OAAO;QACL,OAAO;QACP,KAAK;QACL,OAAO,EAAE,UAAU,EAAE;KACtB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,KAAK,EAAE,EACrC,SAAS,EACT,UAAU,EACV,GAAG,EACH,YAAY,EACZ,OAAO,EACP,MAAM,EACN,UAAU,EACV,KAAK,EACL,oBAAoB,EACpB,GAAG,EACH,iBAAiB,EACjB,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,OAAO,EACP,UAAU,EACV,cAAc,EACd,QAAQ,EACR,IAAI,EACJ,QAAQ,EACR,KAAK,GAyBN,EAAE,EAAE;IACH,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC;QAC3B,UAAU;QACV,YAAY;QACZ,OAAO;QACP,MAAM;QACN,UAAU,EAAE,UAAU,IAAI,IAAI,CAAC,UAAU;QACzC,KAAK;QACL,oBAAoB;QACpB,GAAG;QACH,iBAAiB;QACjB,eAAe;QACf,UAAU;QACV,gBAAgB;QAChB,eAAe;QACf,OAAO;QACP,UAAU;QACV,QAAQ;QACR,KAAK;QACL,QAAQ;QACR,SAAS;QACT,cAAc;QACd,GAAG;KACJ,CAAC,CAAA;IACF,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,GAAG,CAAC,aAAa,EAAE,yCAAyC,QAAQ,CAAC,IAAI,GAAG,CAAC,CAAA;QAC7E,IAAI,CAAC,CAAC,CAAC,CAAA;IACT,CAAC;IAED,OAAO,GAAG,CAAA;AACZ,CAAC,CAAA"}

package/dist/utils/proxy.d.ts

@@ -1,10 +1,13 @@
-import { BaseCommand } from '../commands/index.js';
-import { $TSFixMe } from '../commands/types.js';
-import { ServerSettings } from './types.js';
+import type { BaseCommand } from '../commands/index.js';
+import type { $TSFixMe } from '../commands/types.js';
+import { type NormalizedCachedConfigConfig } from './command-helpers.js';
+import type { ServerSettings } from './types.js';
 export declare const getProxyUrl: (settings: Pick<ServerSettings, "https" | "port">) => string;
 export declare const startProxy: ({ accountId, addonsUrls, api, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }: {
     command: BaseCommand;
+    config: NormalizedCachedConfigConfig;
     settings: ServerSettings;
     disableEdgeFunctions: boolean;
+    getUpdatedConfig: () => Promise<NormalizedCachedConfigConfig>;
 } & Record<string, $TSFixMe>) => 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":"AA4BA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAClD,OAAO,EAAE,QAAQ,EAAkB,MAAM,sBAAsB,CAAA;AAkB/D,OAAO,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAk1B9D,eAAO,MAAM,WAAW,aAAuB,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAID,eAAO,MAAM,UAAU,oQAsBpB;IAAE,OAAO,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,cAAc,CAAC;IAAC,oBAAoB,EAAE,OAAO,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,oBA6G9G,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../src/utils/proxy.ts"],"names":[],"mappings":"AA4BA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAkB,MAAM,sBAAsB,CAAA;AAYpE,OAAO,EAAiC,KAAK,4BAA4B,EAAc,MAAM,sBAAsB,CAAA;AAMnH,OAAO,KAAK,EAAqB,cAAc,EAAE,MAAM,YAAY,CAAA;AAg1BnE,eAAO,MAAM,WAAW,aAAuB,IAAI,CAAC,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAID,eAAO,MAAM,UAAU,oQAsBpB;IACD,OAAO,EAAE,WAAW,CAAA;IACpB,MAAM,EAAE,4BAA4B,CAAA;IACpC,QAAQ,EAAE,cAAc,CAAA;IACxB,oBAAoB,EAAE,OAAO,CAAA;IAC7B,gBAAgB,EAAE,MAAM,OAAO,CAAC,4BAA4B,CAAC,CAAA;CAC9D,GAAG,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,oBA6G3B,CAAA"}

package/dist/utils/proxy.js

@@ -82,7 +82,6 @@ const injectHtml = async function (responseBody, proxyRes, htmlInjections) {
     }, decompressedBody.toString());
     return await compressResponseBody(bodyWithInjections, proxyRes.headers['content-encoding']);
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'errorBuffer' implicitly has an 'any' ty... Remove this comment to see the full error message
 const formatEdgeFunctionError = (errorBuffer, acceptsHtml) => {
     const { error: { message, name, stack }, } = JSON.parse(errorBuffer.toString());
     if (!acceptsHtml) {
@@ -123,11 +122,9 @@ const isEndpointExists = async function (endpoint, origin) {
         return false;
     }
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'match' implicitly has an 'any' type.
 const isExternal = function (match) {
-    return match.to && match.to.match(/^https?:\/\//);
+    return 'to' in match && /^https?:\/\//.exec(match.to) != null;
 };
-// @ts-expect-error TS(7031) FIXME: Binding element 'hash' implicitly has an 'any' typ... Remove this comment to see the full error message
 const stripOrigin = function ({ hash, pathname, search }) {
     return `${pathname}${search}${hash}`;
 };
@@ -149,11 +146,9 @@ const handleAddonUrl = function ({ addonUrl, req, res }) {
     const destURL = stripOrigin(dest);
     proxyToExternalUrl({ req, res, dest, destURL });
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'match' implicitly has an 'any' type.
 const isRedirect = function (match) {
-    return match.status && match.status >= 300 && match.status <= 400;
+    return 'status' in match && match.status != null && match.status >= 300 && match.status <= 400;
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'publicFolder' implicitly has an 'any' t... Remove this comment to see the full error message
 const render404 = async function (publicFolder) {
     const maybe404Page = path.resolve(publicFolder, '404.html');
     try {
@@ -162,8 +157,7 @@ const render404 = async function (publicFolder) {
             return await readFile(maybe404Page, 'utf-8');
     }
     catch (error) {
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-        console.warn(NETLIFYDEVWARN, 'Error while serving 404.html file', error.message);
+        console.warn(NETLIFYDEVWARN, 'Error while serving 404.html file', error instanceof Error ? error.message : error?.toString());
     }
     return 'Not Found';
 };
@@ -188,6 +182,8 @@ const alternativePathsFor = function (url) {
     return paths;
 };
 const notifyActivity = throttle((api, siteId, devServerId) => {
+    // @ts-expect-error(serhalp) -- It looks like the generated API types don't include "internal" methods
+    // (https://github.com/netlify/open-api/blob/66813d46e47f207443b7aebce2c22c4a4c8ca867/swagger.yml#L2642). Fix?
     api.markDevServerActivity({ siteId, devServerId }).catch((error) => {
         console.error(`${NETLIFYDEVWARN} Failed to notify activity`, error);
     });
@@ -512,10 +508,9 @@ const initializeProxy = async function ({ config, configPath, distDir, env, host
         // @ts-expect-error TS(2345) FIXME: Argument of type 'string | undefined' is not assig... Remove this comment to see the full error message
         const requestURL = new URL(req.url, `http://${req.headers.host || '127.0.0.1'}`);
         const headersRules = headersForPath(headers, requestURL.pathname);
-        const htmlInjections = config.dev?.processing?.html?.injections &&
-            config.dev.processing.html.injections.length !== 0 &&
-            proxyRes.headers?.['content-type']?.startsWith('text/html')
-            ? config.dev.processing.html.injections
+        const configInjections = config.dev?.processing?.html?.injections ?? [];
+        const htmlInjections = configInjections.length > 0 && proxyRes.headers?.['content-type']?.startsWith('text/html')
+            ? configInjections
             : undefined;
         // for streamed responses, we can't do etag generation nor error templates.
         // we'll just stream them through!
@@ -561,7 +556,7 @@ const initializeProxy = async function ({ config, configPath, distDir, env, host
             });
             const isUncaughtError = proxyRes.headers['x-nf-uncaught-error'] === '1';
             if (isEdgeFunctionsRequest(req) && isUncaughtError) {
-                const acceptsHtml = req.headers && req.headers.accept && req.headers.accept.includes('text/html');
+                const acceptsHtml = req.headers.accept?.includes('text/html') ?? false;
                 const decompressedBody = await decompressResponseBody(responseBody, proxyRes.headers['content-encoding']);
                 const formattedBody = formatEdgeFunctionError(decompressedBody, acceptsHtml);
                 const errorResponse = acceptsHtml
@@ -621,14 +616,11 @@ const onRequest = async ({ addonsUrls, api, edgeFunctionsProxy, env, functionsRe
     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.
-        /** @type {Record<string, string>} */
         const headers = {};
         if (functionMatch.func) {
-            // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
             headers[NFFunctionName] = functionMatch.func.name;
         }
         if (functionMatch.route) {
-            // @ts-expect-error TS(7053) FIXME: Element implicitly has an 'any' type because expre... Remove this comment to see the full error message
             headers[NFFunctionRoute] = functionMatch.route.pattern;
         }
         return proxy.web(req, res, { headers, target: functionsServer });
@@ -713,7 +705,7 @@ export const startProxy = async function ({ accountId, addonsUrls, api, blobsCon
             state,
         });
     }
-    const imageProxy = await initializeImageProxy({
+    const imageProxy = initializeImageProxy({
         config,
         settings,
     });
@@ -730,12 +722,12 @@ export const startProxy = async function ({ accountId, addonsUrls, api, blobsCon
     });
     const rewriter = await createRewriter({
         config,
+        configPath,
         distDir: settings.dist,
-        projectDir,
+        geoCountry,
         jwtSecret: settings.jwtSecret,
         jwtRoleClaim: settings.jwtRolePath,
-        configPath,
-        geoCountry,
+        projectDir,
     });
     const onRequestWithOptions = onRequest.bind(undefined, {
         proxy,