netlify-cli 19.1.4 → 19.1.6

package/dist/commands/status/status.js

@@ -1,6 +1,6 @@
 import clean from 'clean-deep';
 import prettyjson from 'prettyjson';
-import { chalk, error, exit, getToken, log, logJson, warn } from '../../utils/command-helpers.js';
+import { chalk, logAndThrowError, exit, getToken, log, logJson, warn } from '../../utils/command-helpers.js';
 export const status = async (options, command) => {
     const { accounts, api, globalConfig, site, siteInfo } = command.netlify;
     const current = globalConfig.get('userId');
@@ -21,16 +21,16 @@ export const status = async (options, command) => {
     }
     catch (error_) {
         if (error_.status === 401) {
-            error('Your session has expired. Please try to re-authenticate by running `netlify logout` and `netlify login`.');
+            return logAndThrowError('Your session has expired. Please try to re-authenticate by running `netlify logout` and `netlify login`.');
         }
         else {
-            error(error_);
+            return logAndThrowError(error_);
         }
     }
     const ghuser = command.netlify.globalConfig.get(`users.${current}.auth.github.user`);
     const accountData = {
-        Name: user?.full_name,
-        Email: user?.email,
+        Name: user.full_name,
+        Email: user.email,
         GitHub: ghuser,
     };
     const teamsData = {};
@@ -45,17 +45,18 @@ export const status = async (options, command) => {
     log(prettyjson.render(cleanAccountData));
     if (!siteId) {
         warn('Did you run `netlify link` yet?');
-        error(`You don't appear to be in a folder that is linked to a site`);
+        return logAndThrowError(`You don't appear to be in a folder that is linked to a site`);
     }
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- XXX(serhalp): fixed in stacked PR.
     if (!siteInfo) {
-        error(`No site info found for site ${siteId}`);
+        return logAndThrowError(`No site info found for site ${siteId}`);
     }
     // Json only logs out if --json flag is passed
     if (options.json) {
         logJson({
             account: cleanAccountData,
             siteData: {
-                'site-name': `${siteInfo.name}`,
+                'site-name': siteInfo.name,
                 'config-path': site.configPath,
                 'admin-url': siteInfo.admin_url,
                 'site-url': siteInfo.ssl_url || siteInfo.url,
@@ -67,7 +68,7 @@ export const status = async (options, command) => {
  Netlify Site Info  │
 ────────────────────┘`);
     log(prettyjson.render({
-        'Current site': `${siteInfo.name}`,
+        'Current site': siteInfo.name,
         'Netlify TOML': site.configPath,
         'Admin URL': chalk.magentaBright(siteInfo.admin_url),
         'Site URL': chalk.cyanBright(siteInfo.ssl_url || siteInfo.url),

package/dist/commands/status/status.js.map

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

package/dist/commands/watch/watch.d.ts

@@ -1,4 +1,3 @@
-import { OptionValues } from 'commander';
-import BaseCommand from '../base-command.js';
-export declare const watch: (options: OptionValues, command: BaseCommand) => Promise<void>;
+import type BaseCommand from '../base-command.js';
+export declare const watch: (_options: unknown, command: BaseCommand) => Promise<undefined>;
 //# sourceMappingURL=watch.d.ts.map

package/dist/commands/watch/watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../src/commands/watch/watch.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAOxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA0C5C,eAAO,MAAM,KAAK,YAAmB,YAAY,WAAW,WAAW,kBA4DtE,CAAA"}
+{"version":3,"file":"watch.d.ts","sourceRoot":"","sources":["../../../src/commands/watch/watch.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AA0CjD,eAAO,MAAM,KAAK,aAAoB,OAAO,WAAW,WAAW,uBA6DlE,CAAA"}

package/dist/commands/watch/watch.js

@@ -1,7 +1,7 @@
 import pWaitFor from 'p-wait-for';
 import prettyjson from 'prettyjson';
 import { startSpinner, stopSpinner } from '../../lib/spinner.js';
-import { chalk, error, log } from '../../utils/command-helpers.js';
+import { chalk, logAndThrowError, log } from '../../utils/command-helpers.js';
 import { init } from '../init/init.js';
 // 1 second
 const INIT_WAIT = 1e3;
@@ -34,7 +34,7 @@ const waitForBuildFinish = async function (api, siteId, spinner) {
     // return only when build done or timeout happens
     return firstPass;
 };
-export const watch = async (options, command) => {
+export const watch = async (_options, command) => {
     await command.authenticate();
     const client = command.netlify.api;
     let siteId = command.netlify.site.id;
@@ -46,8 +46,9 @@ export const watch = async (options, command) => {
     // wait for 1 sec for everything to kickoff
     console.time('Deploy time');
     await new Promise((resolve) => {
-        // @ts-expect-error TS(2794) FIXME: Expected 1 arguments, but got 0. Did you forget to... Remove this comment to see the full error message
-        setTimeout(() => resolve(), INIT_WAIT);
+        setTimeout(() => {
+            resolve(undefined);
+        }, INIT_WAIT);
     });
     // Get latest commit and look for that
     // git rev-parse HEAD
@@ -84,7 +85,7 @@ export const watch = async (options, command) => {
         console.timeEnd('Deploy time');
     }
     catch (error_) {
-        error(error_);
+        return logAndThrowError(error_);
     }
 };
 //# sourceMappingURL=watch.js.map

package/dist/commands/watch/watch.js.map

@@ -1 +1 @@
-{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../../src/commands/watch/watch.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,YAAY,CAAA;AACjC,OAAO,UAAU,MAAM,YAAY,CAAA;AAGnC,OAAO,EAAgB,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,MAAM,gCAAgC,CAAA;AAElE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,WAAW;AACX,MAAM,SAAS,GAAG,GAAG,CAAA;AAErB,WAAW;AACX,MAAM,qBAAqB,GAAG,GAAG,CAAA;AACjC,aAAa;AACb,MAAM,oBAAoB,GAAG,IAAI,CAAA;AAEjC,MAAM,kBAAkB,GAAG,KAAK,WAAW,GAAe,EAAE,MAAc,EAAE,OAAgB;IAC1F,IAAI,SAAS,GAAG,IAAI,CAAA;IAEpB,MAAM,oBAAoB,GAAG,KAAK;QAChC,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QACnD,cAAc;QACd,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;QAE3D,iBAAiB;QACjB,iDAAiD;QAEjD,IAAI,CAAC,aAAa,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACjD,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC,CAAA;YACxB,OAAO,IAAI,CAAA;QACb,CAAC;QACD,SAAS,GAAG,KAAK,CAAA;QACjB,OAAO,KAAK,CAAA;IACd,CAAC,CAAA;IAED,MAAM,QAAQ,CAAC,oBAAoB,EAAE;QACnC,QAAQ,EAAE,qBAAqB;QAC/B,OAAO,EAAE;YACP,YAAY,EAAE,oBAAoB;YAClC,OAAO,EAAE,4CAA4C;SACtD;KACF,CAAC,CAAA;IAEF,iDAAiD;IACjD,OAAO,SAAS,CAAA;AAClB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EAAE,OAAqB,EAAE,OAAoB,EAAE,EAAE;IACzE,MAAM,OAAO,CAAC,YAAY,EAAE,CAAA;IAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,GAAG,CAAA;IAClC,IAAI,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;IAEpC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,2BAA2B;QAC3B,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAA;QACxC,MAAM,GAAG,QAAQ,CAAC,EAAY,CAAA;IAChC,CAAC;IAED,2CAA2C;IAC3C,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;IAC3B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC5B,2IAA2I;QAC3I,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAA;IACxC,CAAC,CAAC,CAAA;IAEF,sCAAsC;IACtC,qBAAqB;IAErB,6CAA6C;IAC7C,EAAE;IACF,IAAI;IACJ,wCAAwC;IACxC,+CAA+C;IAC/C,4BAA4B;IAC5B,iBAAiB;IACjB,qBAAqB;IACrB,qBAAqB;IACrB,+CAA+C;IAC/C,IAAI;IACJ,EAAE;IACF,MAAM,OAAO,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,6CAA6C,EAAE,CAAC,CAAA;IACrF,IAAI,CAAC;QACH,oBAAoB;QACpB,uDAAuD;QACvD,EAAE;QACF,0CAA0C;QAC1C,mDAAmD;QACnD,uBAAuB;QACvB,KAAK;QAEL,MAAM,cAAc,GAAG,MAAM,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAExE,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,CAAA;QAEjD,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAA;QAClG,GAAG,EAAE,CAAA;QACL,GAAG,CAAC,OAAO,CAAC,CAAA;QACZ,GAAG,CACD,UAAU,CAAC,MAAM,CAAC;YAChB,GAAG,EAAE,QAAQ,CAAC,OAAO,IAAI,QAAQ,CAAC,GAAG;YACrC,KAAK,EAAE,QAAQ,CAAC,SAAS;SAC1B,CAAC,CACH,CAAA;QACD,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;IAChC,CAAC;IAAC,OAAO,MAAM,EAAE,CAAC;QAChB,KAAK,CAAC,MAAM,CAAC,CAAA;IACf,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"watch.js","sourceRoot":"","sources":["../../../src/commands/watch/watch.ts"],"names":[],"mappings":"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"}

package/dist/lib/api.d.ts

@@ -1,10 +1,14 @@
-import { SiteInfo } from '../utils/types.js';
+import type { NetlifyAPI } from 'netlify';
+import type { SiteInfo } from '../utils/types.js';
 export declare const cancelDeploy: ({ api, deployId }: {
-    api: any;
-    deployId: any;
+    api: NetlifyAPI;
+    deployId: string;
 }) => Promise<void>;
-export declare const listSites: ({ api, options }: {
-    api: any;
-    options: any;
+export declare const listSites: ({ api, options, }: {
+    api: NetlifyAPI;
+    options: Parameters<typeof api.listSites>[0] & {
+        page?: number;
+        maxPages?: number;
+    };
 }) => Promise<SiteInfo[]>;
 //# sourceMappingURL=api.d.ts.map

package/dist/lib/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/lib/api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAG5C,eAAO,MAAM,YAAY;;;mBAOxB,CAAA;AAOD,eAAO,MAAM,SAAS;;;MAA6B,OAAO,CAAC,QAAQ,EAAE,CAQpE,CAAA"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/lib/api.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAGzC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,eAAO,MAAM,YAAY,sBAA6B;IAAE,GAAG,EAAE,UAAU,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,KAAG,OAAO,CAAC,IAAI,CAUzG,CAAA;AAMD,eAAO,MAAM,SAAS,sBAGnB;IACD,GAAG,EAAE,UAAU,CAAA;IAEf,OAAO,EAAE,UAAU,CAAC,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CACpF,KAAG,OAAO,CAAC,QAAQ,EAAE,CAarB,CAAA"}

package/dist/lib/api.js

@@ -1,25 +1,27 @@
 import { warn } from '../utils/command-helpers.js';
-// @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 cancelDeploy = async ({ api, deployId }) => {
     try {
         await api.cancelSiteDeploy({ deploy_id: deployId });
     }
     catch (error) {
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-        warn(`Failed canceling deploy with id ${deployId}: ${error.message}`);
+        warn(`Failed canceling deploy with id ${deployId}: ${error instanceof Error ? error.message : error?.toString() ?? ''}`);
     }
 };
 const FIRST_PAGE = 1;
 const MAX_PAGES = 10;
 const MAX_PER_PAGE = 100;
-// @ts-expect-error TS(7023) FIXME: 'listSites' implicitly has return type 'any' becau... Remove this comment to see the full error message
-export const listSites = async ({ api, options }) => {
+export const listSites = async ({ api, options, }) => {
     const { maxPages = MAX_PAGES, page = FIRST_PAGE, ...rest } = options;
     const sites = await api.listSites({ page, per_page: MAX_PER_PAGE, ...rest });
     // TODO: use pagination headers when js-client returns them
     if (sites.length === MAX_PER_PAGE && page + 1 <= maxPages) {
-        return [...sites, ...(await listSites({ api, options: { page: page + 1, maxPages, ...rest } }))];
+        // FIXME(serhalp): `id` and `name` should be required in `netlify` package type
+        return [
+            ...sites,
+            ...(await listSites({ api, options: { page: page + 1, maxPages, ...rest } })),
+        ];
     }
+    // FIXME(serhalp): See above
     return sites;
 };
 //# sourceMappingURL=api.js.map

package/dist/lib/api.js.map

@@ -1 +1 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/lib/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAGlD,2IAA2I;AAC3I,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE;IACtD,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAA;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,gEAAgE;QAChE,IAAI,CAAC,mCAAmC,QAAQ,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IACvE,CAAC;AACH,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,CAAA;AACpB,MAAM,SAAS,GAAG,EAAE,CAAA;AACpB,MAAM,YAAY,GAAG,GAAG,CAAA;AAExB,2IAA2I;AAC3I,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,EAAuB,EAAE;IACvE,MAAM,EAAE,QAAQ,GAAG,SAAS,EAAE,IAAI,GAAG,UAAU,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAA;IACpE,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,CAAC,CAAA;IAC5E,2DAA2D;IAC3D,IAAI,KAAK,CAAC,MAAM,KAAK,YAAY,IAAI,IAAI,GAAG,CAAC,IAAI,QAAQ,EAAE,CAAC;QAC1D,OAAO,CAAC,GAAG,KAAK,EAAE,GAAG,CAAC,MAAM,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;IAClG,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAA"}
+{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/lib/api.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAA;AAGlD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAyC,EAAiB,EAAE;IAC5G,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,gBAAgB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAA;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CACF,mCAAmC,QAAQ,KACzC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,IAAI,EAChE,EAAE,CACH,CAAA;IACH,CAAC;AACH,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,CAAA;AACpB,MAAM,SAAS,GAAG,EAAE,CAAA;AACpB,MAAM,YAAY,GAAG,GAAG,CAAA;AAExB,MAAM,CAAC,MAAM,SAAS,GAAG,KAAK,EAAE,EAC9B,GAAG,EACH,OAAO,GAKR,EAAuB,EAAE;IACxB,MAAM,EAAE,QAAQ,GAAG,SAAS,EAAE,IAAI,GAAG,UAAU,EAAE,GAAG,IAAI,EAAE,GAAG,OAAO,CAAA;IACpE,MAAM,KAAK,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,GAAG,IAAI,EAAE,CAAC,CAAA;IAC5E,2DAA2D;IAC3D,IAAI,KAAK,CAAC,MAAM,KAAK,YAAY,IAAI,IAAI,GAAG,CAAC,IAAI,QAAQ,EAAE,CAAC;QAC1D,+EAA+E;QAC/E,OAAO;YACL,GAAG,KAAK;YACR,GAAG,CAAC,MAAM,SAAS,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,EAAE,QAAQ,EAAE,GAAG,IAAI,EAAE,EAAE,CAAC,CAAC;SACnD,CAAA;IAC9B,CAAC;IACD,4BAA4B;IAC5B,OAAO,KAAgC,CAAA;AACzC,CAAC,CAAA"}

package/dist/lib/build.d.ts

@@ -1,22 +1,91 @@
-import build, { type OnPostBuild } from '@netlify/build';
+import build, { type NetlifyConfig, type OnPostBuild } from '@netlify/build';
+import type { MinimalHeader } from '@netlify/headers-parser';
 import type { OptionValues } from 'commander';
-import type { EnvironmentVariables } from '../utils/types.js';
+import type { Account, EnvironmentVariables, Plugin, SiteInfo } from '../utils/types.js';
+import type { EdgeFunctionDeclaration } from './edge-functions/proxy.js';
 export interface CachedConfig {
+    accounts: Account[];
+    buildDir: string;
     env: EnvironmentVariables;
-    siteInfo: {
-        id?: string;
-        account_id?: string;
-        feature_flags?: Record<string, boolean | boolean | number>;
+    repositoryRoot: string;
+    siteInfo: SiteInfo;
+    addons?: unknown;
+    api?: unknown;
+    branch?: unknown;
+    config: {
+        build: {
+            base: string;
+            command?: string | undefined;
+            functions?: string | undefined;
+            functionsSource?: string | undefined;
+            edge_functions?: string | undefined;
+            environment: Record<string, unknown>;
+            processing: {
+                css: Record<string, unknown>;
+                html: Record<string, unknown>;
+                images: Record<string, unknown>;
+                js: Record<string, unknown>;
+            };
+            publish: string;
+            publishOrigin: string;
+            services: Record<string, unknown>;
+        };
+        dev?: undefined | {
+            command?: string | undefined;
+            functions?: string | undefined;
+            functionsPort?: number | undefined;
+            https?: {
+                certFile: string;
+                keyFile: string;
+            } | undefined;
+            processing: {
+                html?: {
+                    injections?: {
+                        /**
+                         * The location at which the `html` will be injected.
+                         * Defaults to `before_closing_head_tag` which will inject the HTML before the </head> tag.
+                         */
+                        location?: 'before_closing_head_tag' | 'before_closing_body_tag';
+                        /**
+                         * The injected HTML code.
+                         */
+                        html: string;
+                    }[];
+                };
+            };
+        };
+        edge_functions?: EdgeFunctionDeclaration[];
+        functions?: NetlifyConfig['functions'];
+        functionsDirectory?: undefined | string;
+        headers: MinimalHeader[];
+        images: {
+            remote_images: string[];
+        };
+        plugins?: Plugin[];
+        redirects: undefined | NetlifyConfig['redirects'];
     };
-    [k: string]: unknown;
+    configPath?: undefined | string;
+    context: string;
+    headersPath?: unknown;
+    logs?: unknown;
+    redirectsPath?: unknown;
+    token?: unknown;
 }
-interface DefaultConfig {
-    [k: string]: unknown;
+export interface DefaultConfig {
+    build: {
+        command?: string | undefined;
+        commandOrigin?: 'default' | undefined;
+        publish?: string | undefined;
+        publishOrigin?: 'default' | undefined;
+    };
+    plugins?: {
+        package: unknown;
+        origin: 'default';
+    }[];
 }
-export type BuildConfig = Parameters<typeof build>[0] & {
+export type RunBuildOptions = Omit<NonNullable<Parameters<typeof build>[0]>, 'cachedConfig'> & {
     cachedConfig: CachedConfig;
-    defaultConfig: DefaultConfig;
-    accountId?: string;
+    defaultConfig: DefaultConfig | Record<never, never>;
     edgeFunctionsBootstrapURL: string;
 };
 interface HandlerResult {
@@ -25,16 +94,16 @@ interface HandlerResult {
     status?: string;
 }
 type PatchedHandlerType<T extends (opts: any) => void | Promise<void>> = (opts: Parameters<T>[0]) => HandlerResult | Promise<HandlerResult>;
-export declare const getBuildOptions: ({ cachedConfig, currentDir, defaultConfig, deployHandler, options: { context, cwd, debug, dry, json, offline, silent }, packagePath, token, }: {
+export declare const getRunBuildOptions: ({ cachedConfig, currentDir, defaultConfig, deployHandler, options: { context, cwd, debug, dry, json, offline, silent }, packagePath, token, }: {
     cachedConfig: CachedConfig;
     currentDir: string;
-    defaultConfig?: DefaultConfig;
+    defaultConfig?: undefined | DefaultConfig;
     deployHandler?: PatchedHandlerType<OnPostBuild>;
     options: OptionValues;
     packagePath?: string;
     token?: null | string;
-}) => Promise<BuildConfig>;
-export declare const runBuild: (options: BuildConfig) => Promise<{
+}) => Promise<RunBuildOptions>;
+export declare const runBuild: (options: RunBuildOptions) => Promise<{
     exitCode: number;
     newConfig: any;
     configMutations: any;

package/dist/lib/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/lib/build.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,EAAc,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAEpE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAG7C,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAK7D,MAAM,WAAW,YAAY;IAC3B,GAAG,EAAE,oBAAoB,CAAA;IACzB,QAAQ,EAAE;QACR,EAAE,CAAC,EAAE,MAAM,CAAA;QACX,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,GAAG,MAAM,CAAC,CAAA;KAC3D,CAAA;IAED,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,UAAU,aAAa;IAErB,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAGD,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG;IACtD,YAAY,EAAE,YAAY,CAAA;IAC1B,aAAa,EAAE,aAAa,CAAA;IAE5B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,yBAAyB,EAAE,MAAM,CAAA;CAClC,CAAA;AAED,UAAU,aAAa;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxC,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,KAAK,kBAAkB,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CACvE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KACnB,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAU3C,eAAO,MAAM,eAAe,kJAQzB;IACD,YAAY,EAAE,YAAY,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,aAAa,CAAA;IAC7B,aAAa,CAAC,EAAE,kBAAkB,CAAC,WAAW,CAAC,CAAA;IAC/C,OAAO,EAAE,YAAY,CAAA;IACrB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,CAAA;CACtB,KAAG,OAAO,CAAC,WAAW,CAiDtB,CAAA;AAED,eAAO,MAAM,QAAQ,YAAmB,WAAW;;;;EAgBlD,CAAA"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/lib/build.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,EAAE,KAAK,aAAa,EAAc,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAA;AACxF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAE5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAG7C,OAAO,KAAK,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAIxF,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAA;AAExE,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,OAAO,EAAE,CAAA;IACnB,QAAQ,EAAE,MAAM,CAAA;IAChB,GAAG,EAAE,oBAAoB,CAAA;IACzB,cAAc,EAAE,MAAM,CAAA;IACtB,QAAQ,EAAE,QAAQ,CAAA;IAGlB,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,GAAG,CAAC,EAAE,OAAO,CAAA;IACb,MAAM,CAAC,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE;QACN,KAAK,EAAE;YACL,IAAI,EAAE,MAAM,CAAA;YACZ,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;YAC5B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;YAE9B,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;YACpC,cAAc,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;YACnC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;YACpC,UAAU,EAAE;gBACV,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;gBAC5B,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;gBAC7B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;gBAC/B,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;aAC5B,CAAA;YACD,OAAO,EAAE,MAAM,CAAA;YACf,aAAa,EAAE,MAAM,CAAA;YACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;SAClC,CAAA;QAGD,GAAG,CAAC,EACA,SAAS,GACT;YACE,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;YAC5B,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;YAC9B,aAAa,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;YAClC,KAAK,CAAC,EACF;gBACE,QAAQ,EAAE,MAAM,CAAA;gBAChB,OAAO,EAAE,MAAM,CAAA;aAChB,GACD,SAAS,CAAA;YAGb,UAAU,EAAE;gBACV,IAAI,CAAC,EAAE;oBACL,UAAU,CAAC,EAAE;wBACX;;;2BAGG;wBACH,QAAQ,CAAC,EAAE,yBAAyB,GAAG,yBAAyB,CAAA;wBAChE;;2BAEG;wBACH,IAAI,EAAE,MAAM,CAAA;qBACb,EAAE,CAAA;iBACJ,CAAA;aACF,CAAA;SACF,CAAA;QACL,cAAc,CAAC,EAAE,uBAAuB,EAAE,CAAA;QAC1C,SAAS,CAAC,EAAE,aAAa,CAAC,WAAW,CAAC,CAAA;QACtC,kBAAkB,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;QACvC,OAAO,EAAE,aAAa,EAAE,CAAA;QACxB,MAAM,EAAE;YACN,aAAa,EAAE,MAAM,EAAE,CAAA;SACxB,CAAA;QACD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;QAClB,SAAS,EAAE,SAAS,GAAG,aAAa,CAAC,WAAW,CAAC,CAAA;KAClD,CAAA;IACD,UAAU,CAAC,EAAE,SAAS,GAAG,MAAM,CAAA;IAC/B,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE;QACL,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC5B,aAAa,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;QACrC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;QAC5B,aAAa,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;KACtC,CAAA;IACD,OAAO,CAAC,EAAE;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,SAAS,CAAA;KAAE,EAAE,CAAA;CACpD;AAGD,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,GAAG;IAC7F,YAAY,EAAE,YAAY,CAAA;IAC1B,aAAa,EAAE,aAAa,GAAG,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAA;IACnD,yBAAyB,EAAE,MAAM,CAAA;CAClC,CAAA;AAED,UAAU,aAAa;IACrB,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxC,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,KAAK,kBAAkB,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,GAAG,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CACvE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KACnB,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC,CAAA;AAU3C,eAAO,MAAM,kBAAkB,kJAQ5B;IACD,YAAY,EAAE,YAAY,CAAA;IAC1B,UAAU,EAAE,MAAM,CAAA;IAClB,aAAa,CAAC,EAAE,SAAS,GAAG,aAAa,CAAA;IACzC,aAAa,CAAC,EAAE,kBAAkB,CAAC,WAAW,CAAC,CAAA;IAC/C,OAAO,EAAE,YAAY,CAAA;IACrB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,IAAI,GAAG,MAAM,CAAA;CACtB,KAAG,OAAO,CAAC,eAAe,CAiD1B,CAAA;AAED,eAAO,MAAM,QAAQ,YAAmB,eAAe;;;;EAqBtD,CAAA"}

package/dist/lib/build.js

@@ -8,7 +8,7 @@ import { featureFlags as edgeFunctionsFeatureFlags } from './edge-functions/cons
 // We have already resolved the configuration using `@netlify/config`
 // This is stored as `netlify.cachedConfig` and can be passed to
 // `@netlify/build --cachedConfig`.
-export const getBuildOptions = async ({ cachedConfig, currentDir, defaultConfig, deployHandler, options: { context, cwd, debug, dry, json, offline, silent }, packagePath, token, }) => {
+export const getRunBuildOptions = async ({ cachedConfig, currentDir, defaultConfig, deployHandler, options: { context, cwd, debug, dry, json, offline, silent }, packagePath, token, }) => {
     const eventHandlers = {
         onEnd: {
             handler: ({ netlifyConfig }) => {
@@ -49,7 +49,7 @@ export const getBuildOptions = async ({ cachedConfig, currentDir, defaultConfig,
             ...getFeatureFlagsFromSiteInfo(cachedConfig.siteInfo),
             functionsBundlingManifest: true,
         },
-        // @ts-expect-error(serhalp) -- TODO(serhalp) Upstream the type fixes above into @netlify/build
+        // @ts-expect-error(serhalp) -- TODO(serhalp): Upstream the type fixes above into @netlify/build
         eventHandlers,
         edgeFunctionsBootstrapURL: await getBootstrapURL(),
     };
@@ -64,10 +64,12 @@ export const runBuild = async (options) => {
             host: apiUrl.host,
         };
         // @ts-expect-error(serhalp) -- I don't know what's going on here and I can't convince myself it even works as
-        // intended. TODO(serhalp) Investigate and fix types.
+        // intended. TODO(serhalp): Investigate and fix types.
         options = { ...options, testOpts };
     }
-    const { configMutations, netlifyConfig: newConfig, severityCode: exitCode } = await build(options);
+    const { configMutations, netlifyConfig: newConfig, severityCode: exitCode,
+    // TODO(serhalp): Upstream the type fixes above into @netlify/build and remove this type assertion
+     } = await build(options);
     return { exitCode, newConfig, configMutations };
 };
 //# sourceMappingURL=build.js.map

package/dist/lib/build.js.map

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

package/dist/lib/edge-functions/bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/bootstrap.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,sBAAsB,yDAAyD,CAAA;AAE5F,eAAO,MAAM,eAAe,uBAe3B,CAAA"}
+{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/bootstrap.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,sBAAsB,yDAAyD,CAAA;AAE5F,eAAO,MAAM,eAAe,uBAmB3B,CAAA"}

package/dist/lib/edge-functions/bootstrap.js

@@ -10,7 +10,7 @@ export const getBootstrapURL = async () => {
         return await getURL();
     }
     catch (error) {
-        warn(`Could not load latest version of Edge Functions environment: ${error?.message}`);
+        warn(`Could not load latest version of Edge Functions environment: ${error?.message ?? ''}`);
         // If there was an error getting the bootstrap URL from the module, let's
         // use the latest version of the bootstrap. This is not ideal, but better
         // than failing to serve requests with edge functions.

package/dist/lib/edge-functions/bootstrap.js.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/lib/edge-functions/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAA;AAExD,OAAO,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAA;AAErD,MAAM,CAAC,MAAM,sBAAsB,GAAG,sDAAsD,CAAA;AAE5F,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;IACxC,IAAI,GAAG,CAAC,sBAAsB,EAAE,CAAC;QAC/B,OAAO,GAAG,CAAC,sBAAsB,CAAA;IACnC,CAAC;IAED,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,EAAE,CAAA;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,gEAAiE,KAA+B,EAAE,OAAO,EAAE,CAAC,CAAA;QAEjH,yEAAyE;QACzE,yEAAyE;QACzE,sDAAsD;QACtD,OAAO,sBAAsB,CAAA;IAC/B,CAAC;AACH,CAAC,CAAA"}
+{"version":3,"file":"bootstrap.js","sourceRoot":"","sources":["../../../src/lib/edge-functions/bootstrap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAA;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,iCAAiC,CAAA;AAExD,OAAO,EAAE,IAAI,EAAE,MAAM,gCAAgC,CAAA;AAErD,MAAM,CAAC,MAAM,sBAAsB,GAAG,sDAAsD,CAAA;AAE5F,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,IAAI,EAAE;IACxC,IAAI,GAAG,CAAC,sBAAsB,EAAE,CAAC;QAC/B,OAAO,GAAG,CAAC,sBAAsB,CAAA;IACnC,CAAC;IAED,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,EAAE,CAAA;IACvB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CACF,gEACG,KAA2C,EAAE,OAAO,IAAI,EAC3D,EAAE,CACH,CAAA;QAED,yEAAyE;QACzE,yEAAyE;QACzE,sDAAsD;QACtD,OAAO,sBAAsB,CAAA;IAC/B,CAAC;AACH,CAAC,CAAA"}

package/dist/lib/edge-functions/proxy.d.ts

@@ -1,39 +1,38 @@
-import type { IncomingMessage } from 'http';
-import BaseCommand from '../../commands/base-command.js';
-import { $TSFixMe } from '../../commands/types.js';
+import type { IncomingMessage, ClientRequest } from 'http';
+import * as bundler from '@netlify/edge-bundler';
+import type BaseCommand from '../../commands/base-command.js';
+import type { $TSFixMe } from '../../commands/types.js';
+import { type NormalizedCachedConfigConfig } from '../../utils/command-helpers.js';
 import { BlobsContextWithEdgeAccess } from '../blobs/blobs.js';
+import type { CLIState, ServerSettings, SiteInfo } from '../../utils/types.js';
+export type EdgeFunctionDeclaration = bundler.Declaration;
 declare const headersSymbol: unique symbol;
-export declare const handleProxyRequest: (req: any, proxyReq: any) => void;
-interface SiteInfo {
-    id: string;
-    name: string;
-    url: string;
-}
+type ExtendedIncomingMessage = IncomingMessage & {
+    [headersSymbol]: Record<string, string>;
+};
+export declare const handleProxyRequest: (req: ExtendedIncomingMessage, proxyReq: ClientRequest) => void;
 export declare const createSiteInfoHeader: (siteInfo: SiteInfo, localURL: string) => string;
-export declare const createAccountInfoHeader: (accountInfo?: {}) => string;
 export declare const initializeProxy: ({ accountId, blobsContext, command, config, configPath, debug, env: configEnv, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, mainPort, offline, passthroughPort, projectDir, repositoryRoot, settings, siteInfo, state, }: {
     accountId: string;
     blobsContext: BlobsContextWithEdgeAccess;
     command: BaseCommand;
-    config: $TSFixMe;
+    config: NormalizedCachedConfigConfig;
     configPath: string;
     debug: boolean;
     env: $TSFixMe;
     offline: $TSFixMe;
     geoCountry: $TSFixMe;
     geolocationMode: $TSFixMe;
-    getUpdatedConfig: $TSFixMe;
+    getUpdatedConfig: () => Promise<NormalizedCachedConfigConfig>;
     inspectSettings: $TSFixMe;
     mainPort: $TSFixMe;
     passthroughPort: $TSFixMe;
     projectDir: string;
     repositoryRoot?: string;
-    settings: $TSFixMe;
+    settings: ServerSettings;
     siteInfo: $TSFixMe;
-    state: $TSFixMe;
-}) => Promise<(req: IncomingMessage & {
-    [headersSymbol]: Record<string, string>;
-}) => Promise<string | undefined>>;
-export declare const isEdgeFunctionsRequest: (req: any) => boolean;
+    state: CLIState;
+}) => Promise<(req: ExtendedIncomingMessage) => Promise<string | undefined>>;
+export declare const isEdgeFunctionsRequest: (req: IncomingMessage) => req is ExtendedIncomingMessage;
 export {};
 //# sourceMappingURL=proxy.d.ts.map

package/dist/lib/edge-functions/proxy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/proxy.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAM3C,OAAO,WAAW,MAAM,gCAAgC,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAGlD,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAU9D,QAAA,MAAM,aAAa,eAAmC,CAAA;AAsBtD,eAAO,MAAM,kBAAkB,mCAI9B,CAAA;AAKD,UAAU,QAAQ;IAChB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,eAAO,MAAM,oBAAoB,aAAc,QAAQ,YAAY,MAAM,WAKxE,CAAA;AAED,eAAO,MAAM,uBAAuB,8BAMnC,CAAA;AAED,eAAO,MAAM,eAAe,gPAoBzB;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,0BAA0B,CAAA;IACxC,OAAO,EAAE,WAAW,CAAA;IACpB,MAAM,EAAE,QAAQ,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,OAAO,CAAA;IACd,GAAG,EAAE,QAAQ,CAAA;IACb,OAAO,EAAE,QAAQ,CAAA;IACjB,UAAU,EAAE,QAAQ,CAAA;IACpB,eAAe,EAAE,QAAQ,CAAA;IACzB,gBAAgB,EAAE,QAAQ,CAAA;IAC1B,eAAe,EAAE,QAAQ,CAAA;IACzB,QAAQ,EAAE,QAAQ,CAAA;IAClB,eAAe,EAAE,QAAQ,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,EAAE,QAAQ,CAAA;IAClB,QAAQ,EAAE,QAAQ,CAAA;IAClB,KAAK,EAAE,QAAQ,CAAA;CAChB,mBAwBoB,eAAe,GAAG;IAAE,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,iCAmDjF,CAAA;AAGD,eAAO,MAAM,sBAAsB,uBAA4C,CAAA"}
+{"version":3,"file":"proxy.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/proxy.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,MAAM,CAAA;AAG1D,OAAO,KAAK,OAAO,MAAM,uBAAuB,CAAA;AAGhD,OAAO,KAAK,WAAW,MAAM,gCAAgC,CAAA;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAEL,KAAK,4BAA4B,EAGlC,MAAM,gCAAgC,CAAA;AAEvC,OAAO,EAAE,0BAA0B,EAAE,MAAM,mBAAmB,CAAA;AAI9D,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAO9E,MAAM,MAAM,uBAAuB,GAAG,OAAO,CAAC,WAAW,CAAA;AAEzD,QAAA,MAAM,aAAa,eAAmC,CAAA;AAItD,KAAK,uBAAuB,GAAG,eAAe,GAAG;IAAE,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,CAAA;AAmB5F,eAAO,MAAM,kBAAkB,QAAS,uBAAuB,YAAY,aAAa,SAIvF,CAAA;AAED,eAAO,MAAM,oBAAoB,aAAc,QAAQ,YAAY,MAAM,WAKxE,CAAA;AAQD,eAAO,MAAM,eAAe,gPAoBzB;IACD,SAAS,EAAE,MAAM,CAAA;IACjB,YAAY,EAAE,0BAA0B,CAAA;IACxC,OAAO,EAAE,WAAW,CAAA;IACpB,MAAM,EAAE,4BAA4B,CAAA;IACpC,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,OAAO,CAAA;IACd,GAAG,EAAE,QAAQ,CAAA;IACb,OAAO,EAAE,QAAQ,CAAA;IACjB,UAAU,EAAE,QAAQ,CAAA;IACpB,eAAe,EAAE,QAAQ,CAAA;IACzB,gBAAgB,EAAE,MAAM,OAAO,CAAC,4BAA4B,CAAC,CAAA;IAC7D,eAAe,EAAE,QAAQ,CAAA;IACzB,QAAQ,EAAE,QAAQ,CAAA;IAClB,eAAe,EAAE,QAAQ,CAAA;IACzB,UAAU,EAAE,MAAM,CAAA;IAClB,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,QAAQ,EAAE,cAAc,CAAA;IACxB,QAAQ,EAAE,QAAQ,CAAA;IAClB,KAAK,EAAE,QAAQ,CAAA;CAChB,mBAwBoB,uBAAuB,iCAmD3C,CAAA;AAED,eAAO,MAAM,sBAAsB,QAAS,eAAe,KAAG,GAAG,IAAI,uBAClC,CAAA"}

package/dist/lib/edge-functions/proxy.js

@@ -3,7 +3,7 @@ import { rm } from 'fs/promises';
 import { join, resolve } from 'path';
 import * as bundler from '@netlify/edge-bundler';
 import getAvailablePort from 'get-port';
-import { NETLIFYDEVERR, chalk, error as printError } from '../../utils/command-helpers.js';
+import { NETLIFYDEVERR, chalk, logAndThrowError, } from '../../utils/command-helpers.js';
 import { getFeatureFlagsFromSiteInfo } from '../../utils/feature-flags.js';
 import { getGeoLocation } from '../geo-location.js';
 import { getPathInProject } from '../settings.js';
@@ -27,7 +27,6 @@ const getDownloadUpdateFunctions = () => {
         onBeforeDownload,
     };
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
 export const handleProxyRequest = (req, proxyReq) => {
     Object.entries(req[headersSymbol]).forEach(([header, value]) => {
         proxyReq.setHeader(header, value);
@@ -39,9 +38,7 @@ export const createSiteInfoHeader = (siteInfo, localURL) => {
     const siteString = JSON.stringify(site);
     return Buffer.from(siteString).toString('base64');
 };
-export const createAccountInfoHeader = (accountInfo = {}) => {
-    // @ts-expect-error TS(2339) FIXME: Property 'id' does not exist on type '{}'.
-    const { id } = accountInfo;
+const createAccountInfoHeader = ({ id }) => {
     const account = { id };
     const accountString = JSON.stringify(account);
     return Buffer.from(accountString).toString('base64');
@@ -110,8 +107,7 @@ export const initializeProxy = async ({ accountId, blobsContext, command, config
         return `http://${LOCAL_HOST}:${isolatePort}`;
     };
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
-export const isEdgeFunctionsRequest = (req) => req[headersSymbol] !== undefined;
+export const isEdgeFunctionsRequest = (req) => Object.hasOwn(req, headersSymbol);
 const prepareServer = async ({ command, config, configPath, debug, directory, env: configEnv, featureFlags, getUpdatedConfig, inspectSettings, port, projectDir, repositoryRoot, }) => {
     try {
         const distImportMapPath = getPathInProject([DIST_IMPORT_MAP_PATH]);
@@ -137,11 +133,11 @@ const prepareServer = async ({ command, config, configPath, debug, directory, en
             config,
             configPath,
             debug,
-            directories: [directory].filter(Boolean),
+            directories: directory ? [directory] : [],
             env: configEnv,
             featureFlags,
             getUpdatedConfig,
-            importMapFromTOML: config.functions['*'].deno_import_map,
+            importMapFromTOML: config.functions?.['*'].deno_import_map,
             projectDir,
             runIsolate,
             servePath,
@@ -149,8 +145,7 @@ const prepareServer = async ({ command, config, configPath, debug, directory, en
         return registry;
     }
     catch (error) {
-        // @ts-expect-error TS(2571) FIXME: Object is of type 'unknown'.
-        printError(error.message, { exit: false });
+        return logAndThrowError(error instanceof Error ? error.message : error?.toString());
     }
 };
 //# sourceMappingURL=proxy.js.map

package/dist/lib/edge-functions/proxy.js.map

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

package/dist/lib/edge-functions/registry.d.ts

@@ -1,15 +1,11 @@
-import type { Declaration } from '@netlify/edge-bundler';
 import BaseCommand from '../../commands/base-command.js';
+import { type NormalizedCachedConfigConfig } from '../../utils/command-helpers.js';
 import type { FeatureFlags } from '../../utils/feature-flags.js';
-export interface Config {
-    edge_functions?: Declaration[];
-    [key: string]: unknown;
-}
 type RunIsolate = Awaited<ReturnType<typeof import('@netlify/edge-bundler').serve>>;
 interface EdgeFunctionsRegistryOptions {
     command: BaseCommand;
     bundler: typeof import('@netlify/edge-bundler');
-    config: Config;
+    config: NormalizedCachedConfigConfig;
     configPath: string;
     debug: boolean;
     directories: string[];
@@ -18,7 +14,7 @@ interface EdgeFunctionsRegistryOptions {
         value: string;
     }>;
     featureFlags: FeatureFlags;
-    getUpdatedConfig: () => Promise<Config>;
+    getUpdatedConfig: () => Promise<NormalizedCachedConfigConfig>;
     projectDir: string;
     runIsolate: RunIsolate;
     servePath: string;