netlify-cli 17.21.2 → 17.22.0

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

@@ -1 +1 @@
-{"version":3,"file":"framework-server.d.ts","sourceRoot":"","sources":["../../src/utils/framework-server.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAK3C,UAAU,iBAAiB;IACzB,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;CAClB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB;SAI1B,MAAM;cACD,cAAc;MACtB,QAAQ,iBAAiB,CAqD5B,CAAA"}
+{"version":3,"file":"framework-server.d.ts","sourceRoot":"","sources":["../../src/utils/framework-server.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAA;AAK3C,UAAU,iBAAiB;IACzB,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAA;CAClB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB;SAI1B,MAAM;cACD,cAAc;MACtB,QAAQ,iBAAiB,CAmD5B,CAAA"}

package/dist/utils/framework-server.js

@@ -43,11 +43,9 @@ export const startFrameworkServer = async function ({ cwd, settings, }) {
                 throw new Error(`Timed out waiting for port '${settings.frameworkPort}' to be open`);
             }
         }
-        // @ts-expect-error TS(2345) FIXME: Argument of type '{ error: boolean; spinner: Ora; ... Remove this comment to see the full error message
         stopSpinner({ error: false, spinner });
     }
     catch (error_) {
-        // @ts-expect-error TS(2345) FIXME: Argument of type '{ error: boolean; spinner: Ora; ... Remove this comment to see the full error message
         stopSpinner({ error: true, spinner });
         log(NETLIFYDEVERR, `Netlify Dev could not start or connect to localhost:${settings.frameworkPort}.`);
         log(NETLIFYDEVERR, `Please make sure your framework server is running on port ${settings.frameworkPort}`);

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

@@ -10,7 +10,7 @@ interface InspectSettings {
     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, }: {
+export declare const startProxyServer: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }: {
     accountId: string;
     addonsUrls: $TSFixMe;
     blobsContext?: BlobsContext | undefined;
@@ -18,6 +18,7 @@ export declare const startProxyServer: ({ accountId, addonsUrls, blobsContext, c
     config: NetlifyOptions['config'];
     configPath?: string | undefined;
     debug: boolean;
+    disableEdgeFunctions: boolean;
     env: NetlifyOptions['cachedConfig']['env'];
     inspectSettings: InspectSettings;
     getUpdatedConfig: () => Promise<object>;

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,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"}
+{"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;eAuBhB,MAAM;gBACL,QAAQ;;aAEX,WAAW;YACZ,cAAc,CAAC,QAAQ,CAAC;;WAGzB,OAAO;0BACQ,OAAO;SACxB,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;;qBA+BnB,CAAA"}

package/dist/utils/proxy-server.js

@@ -17,7 +17,7 @@ export const generateInspectSettings = (edgeInspect, edgeInspectBrk) => {
         address: getAddress(),
     };
 };
-export const startProxyServer = async ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }) => {
+export const startProxyServer = async ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, site, siteInfo, state, }) => {
     const url = await startProxy({
         addonsUrls,
         blobsContext,
@@ -25,6 +25,7 @@ export const startProxyServer = async ({ accountId, addonsUrls, blobsContext, co
         config,
         configPath: configPath || site.configPath,
         debug,
+        disableEdgeFunctions,
         env,
         functionsRegistry,
         geolocationMode,

package/dist/utils/proxy.d.ts

@@ -2,8 +2,9 @@ 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, }: {
+export declare const startProxy: ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }: {
     command: BaseCommand;
     settings: ServerSettings;
+    disableEdgeFunctions: boolean;
 } & 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":"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"}
+{"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;AA0tB9D,eAAO,MAAM,WAAW,aAAuB,KAAK,cAAc,EAAE,OAAO,GAAG,MAAM,CAAC,WAGpF,CAAA;AAID,eAAO,MAAM,UAAU;aAqBT,WAAW;cAAY,cAAc;0BAAwB,OAAO;2CAoGjF,CAAA"}

package/dist/utils/proxy.js

@@ -531,7 +531,7 @@ const onRequest = async ({ addonsUrls, edgeFunctionsProxy, env, functionsRegistr
     if (isImageRequest(req)) {
         return imageProxy(req, res);
     }
-    const edgeFunctionsProxyURL = await edgeFunctionsProxy(req, res);
+    const edgeFunctionsProxyURL = await edgeFunctionsProxy?.(req);
     if (edgeFunctionsProxyURL !== undefined) {
         return proxy.web(req, res, { target: edgeFunctionsProxyURL });
     }
@@ -593,30 +593,36 @@ export const getProxyUrl = function (settings) {
     const scheme = settings.https ? 'https' : 'http';
     return `${scheme}://localhost:${settings.port}`;
 };
-export const startProxy = async function ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, env, functionsRegistry, geoCountry, geolocationMode, getUpdatedConfig, inspectSettings, offline, projectDir, repositoryRoot, settings, siteInfo, state, }) {
+export const startProxy = async function ({ accountId, addonsUrls, blobsContext, command, config, configPath, debug, disableEdgeFunctions, 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({
-        command,
-        blobsContext,
-        config,
-        configPath,
-        debug,
-        env,
-        geolocationMode,
-        geoCountry,
-        getUpdatedConfig,
-        inspectSettings,
-        mainPort: settings.port,
-        offline,
-        passthroughPort: secondaryServerPort || settings.port,
-        settings,
-        projectDir,
-        repositoryRoot,
-        siteInfo,
-        accountId,
-        state,
-    });
+    let edgeFunctionsProxy;
+    if (disableEdgeFunctions) {
+        log(NETLIFYDEVWARN, 'Edge functions are disabled. Run without the --internal-disable-edge-functions flag to enable them.');
+    }
+    else {
+        edgeFunctionsProxy = await initializeEdgeFunctionsProxy({
+            command,
+            blobsContext,
+            config,
+            configPath,
+            debug,
+            env,
+            geolocationMode,
+            geoCountry,
+            getUpdatedConfig,
+            inspectSettings,
+            mainPort: settings.port,
+            offline,
+            passthroughPort: secondaryServerPort || settings.port,
+            settings,
+            projectDir,
+            repositoryRoot,
+            siteInfo,
+            accountId,
+            state,
+        });
+    }
     const imageProxy = await initializeImageProxy({
         config,
         settings,

package/dist/utils/run-build.js

@@ -57,7 +57,7 @@ export const runNetlifyBuild = async ({ command, env = {}, options, settings, ti
         cwd: cachedConfig.buildDir,
         quiet: options.quiet,
         saveConfig: options.saveConfig,
-        edgeFunctionsBootstrapURL: getBootstrapURL(),
+        edgeFunctionsBootstrapURL: await getBootstrapURL(),
     };
     const devCommand = async (settingsOverrides = {}) => {
         let cwd = command.workingDir;