netlify-cli 17.14.1 → 17.15.1

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

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/dev.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAU,MAAM,WAAW,CAAA;AA0BhD,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA4D5C,eAAO,MAAM,GAAG,YAAmB,YAAY,WAAW,WAAW,kBAgJpE,CAAA;AAED,eAAO,MAAM,gBAAgB,YAAa,WAAW,gBAuGpD,CAAA"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../../src/commands/dev/dev.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAU,MAAM,WAAW,CAAA;AA0BhD,OAAO,WAAW,MAAM,oBAAoB,CAAA;AA4D5C,eAAO,MAAM,GAAG,YAAmB,YAAY,WAAW,WAAW,kBA+IpE,CAAA;AAED,eAAO,MAAM,gBAAgB,YAAa,WAAW,gBAuGpD,CAAA"}

package/dist/commands/dev/dev.js

@@ -124,7 +124,6 @@ export const dev = async (options, command) => {
         },
     });
     const functionsRegistry = await startFunctionsServer({
-        api,
         blobsContext,
         command,
         config,

package/dist/commands/functions/functions-serve.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"functions-serve.d.ts","sourceRoot":"","sources":["../../../src/commands/functions/functions-serve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAOxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAI5C,eAAO,MAAM,cAAc,YAAmB,YAAY,WAAW,WAAW,kBA8C/E,CAAA"}
+{"version":3,"file":"functions-serve.d.ts","sourceRoot":"","sources":["../../../src/commands/functions/functions-serve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAcxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAI5C,eAAO,MAAM,cAAc,YAAmB,YAAY,WAAW,WAAW,kBAkD/E,CAAA"}

package/dist/commands/functions/functions-serve.js

@@ -1,7 +1,8 @@
 import { join } from 'path';
+import { getBlobsContext } from '../../lib/blobs/blobs.js';
 import { startFunctionsServer } from '../../lib/functions/server.js';
 import { printBanner } from '../../utils/banner.js';
-import { acquirePort, getDotEnvVariables, getSiteInformation, injectEnvVariables } from '../../utils/dev.js';
+import { UNLINKED_SITE_MOCK_ID, acquirePort, getDotEnvVariables, getSiteInformation, injectEnvVariables, } from '../../utils/dev.js';
 import { getFunctionsDir } from '../../utils/functions/index.js';
 import { getProxyUrl } from '../../utils/proxy.js';
 const DEFAULT_PORT = 9999;
@@ -23,19 +24,22 @@ export const functionsServe = async (options, command) => {
         defaultPort: DEFAULT_PORT,
         errorMessage: 'Could not acquire configured functions port',
     });
+    const blobsContext = await getBlobsContext({
+        debug: options.debug,
+        projectRoot: command.workingDir,
+        siteID: site.id ?? UNLINKED_SITE_MOCK_ID,
+    });
     await startFunctionsServer({
+        blobsContext,
         config,
         debug: options.debug,
         command,
-        api,
         settings: { functions: functionsDir, functionsPort },
         site,
         siteInfo,
         siteUrl,
         capabilities,
         timeouts,
-        functionsPrefix: '/.netlify/functions/',
-        buildersPrefix: '/.netlify/builders/',
         geolocationMode: options.geo,
         geoCountry: options.country,
         offline: options.offline,

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

@@ -1 +1 @@
-{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serve.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAwBxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAG5C,eAAO,MAAM,KAAK,YAAmB,YAAY,WAAW,WAAW,uBA4ItE,CAAA"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serve.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAwBxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAG5C,eAAO,MAAM,KAAK,YAAmB,YAAY,WAAW,WAAW,uBA2ItE,CAAA"}

package/dist/commands/serve/serve.js

@@ -72,7 +72,6 @@ export const serve = async (options, command) => {
         options,
     });
     const functionsRegistry = await startFunctionsServer({
-        api,
         blobsContext,
         command,
         config,

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;AAgB3C,QAAA,MAAM,aAAa,eAAmC,CAAA;AA4BtD,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;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;oBA8DP,eAAe,GAAG;IAAE,eAAe,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,iCAkDjF,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,MAAM,MAAM,CAAA;AAiB3C,QAAA,MAAM,aAAa,eAAmC,CAAA;AA4BtD,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;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;oBA4DP,eAAe,GAAG;IAAE,eAAe,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,iCAkDjF,CAAA;AAGD,eAAO,MAAM,sBAAsB,uBAA4C,CAAA"}

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

@@ -4,6 +4,7 @@ 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 { getFeatureFlagsFromSiteInfo } from '../../utils/feature-flags.js';
 import { getGeoLocation } from '../geo-location.js';
 import { getPathInProject } from '../settings.js';
 import { startSpinner, stopSpinner } from '../spinner.js';
@@ -112,11 +113,9 @@ siteInfo,
 state, }) => {
     const userFunctionsPath = config.build.edge_functions;
     const isolatePort = await getAvailablePort();
-    const buildFeatureFlags = {
-        edge_functions_npm_modules: true,
-    };
     const runtimeFeatureFlags = ['edge_functions_bootstrap_failure_mode', 'edge_functions_bootstrap_populate_environment'];
     const protocol = settings.https ? 'https' : 'http';
+    const buildFeatureFlags = { ...getFeatureFlagsFromSiteInfo(siteInfo), edge_functions_npm_modules: true };
     // Initializes the server, bootstrapping the Deno CLI and downloading it from
     // the network if needed. We don't want to wait for that to be completed, or
     // the command will be left hanging.
@@ -223,6 +222,7 @@ repositoryRoot, }) => {
             debug,
             directories: [directory].filter(Boolean),
             env: configEnv,
+            featureFlags,
             getUpdatedConfig,
             importMapFromTOML: config.functions['*'].deno_import_map,
             projectDir,

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

@@ -1,4 +1,5 @@
 import type { Declaration } from '@netlify/edge-bundler';
+import type { FeatureFlags } from '../../utils/feature-flags.js';
 interface Config {
     edge_functions?: Declaration[];
     [key: string]: unknown;
@@ -14,6 +15,7 @@ interface EdgeFunctionsRegistryOptions {
         sources: string[];
         value: string;
     }>;
+    featureFlags: FeatureFlags;
     getUpdatedConfig: () => Promise<Config>;
     projectDir: string;
     runIsolate: RunIsolate;
@@ -21,10 +23,10 @@ interface EdgeFunctionsRegistryOptions {
     importMapFromTOML?: string;
 }
 export declare class EdgeFunctionsRegistry {
+    importMapFromDeployConfig?: string;
     private buildError;
     private bundler;
     private configPath;
-    importMapFromDeployConfig?: string;
     private importMapFromTOML?;
     private declarationsFromDeployConfig;
     private declarationsFromTOML;
@@ -32,6 +34,7 @@ export declare class EdgeFunctionsRegistry {
     private directories;
     private directoryWatchers;
     private env;
+    private featureFlags;
     private userFunctions;
     private internalFunctions;
     private functionPaths;
@@ -42,7 +45,7 @@ export declare class EdgeFunctionsRegistry {
     private runIsolate;
     private servePath;
     private projectDir;
-    constructor({ bundler, config, configPath, directories, env, getUpdatedConfig, importMapFromTOML, projectDir, runIsolate, servePath, }: EdgeFunctionsRegistryOptions);
+    constructor({ bundler, config, configPath, directories, env, featureFlags, getUpdatedConfig, importMapFromTOML, projectDir, runIsolate, servePath, }: EdgeFunctionsRegistryOptions);
     private doInitialScan;
     private get functions();
     private build;

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

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/registry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAuD,MAAM,uBAAuB,CAAA;AAmB7G,UAAU,MAAM;IACd,cAAc,CAAC,EAAE,WAAW,EAAE,CAAA;IAC9B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAGD,KAAK,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,uBAAuB,EAAE,KAAK,CAAC,CAAC,CAAA;AAMnF,UAAU,4BAA4B;IACpC,OAAO,EAAE,cAAc,uBAAuB,CAAC,CAAA;IAC/C,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACzD,gBAAgB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;IACvC,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAkCD,qBAAa,qBAAqB;IAChC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,OAAO,CAAwC;IACvD,OAAO,CAAC,UAAU,CAAQ;IACnB,yBAAyB,CAAC,EAAE,MAAM,CAAA;IACzC,OAAO,CAAC,iBAAiB,CAAC,CAAQ;IAClC,OAAO,CAAC,4BAA4B,CAAoB;IACxD,OAAO,CAAC,oBAAoB,CAAe;IAG3C,OAAO,CAAC,eAAe,CAAiC;IAExD,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,iBAAiB,CAAkD;IAC3E,OAAO,CAAC,GAAG,CAAwB;IAEnC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,iBAAiB,CAAqB;IAK9C,OAAO,CAAC,aAAa,CAA4B;IAEjD,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,UAAU,CAAQ;gBAEd,EACV,OAAO,EACP,MAAM,EACN,UAAU,EACV,WAAW,EACX,GAAG,EACH,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,SAAS,GACV,EAAE,4BAA4B;YAkBjB,aAAa;IAc3B,OAAO,KAAK,SAAS,GAEpB;YAEa,KAAK;IAmEnB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;YA0BL,+BAA+B;IAsB7C,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAMtC,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,MAAM,CAAC,uBAAuB;YAoBxB,gBAAgB;IAoCxB,UAAU;IAIhB;;OAEG;IACH,OAAO,CAAC,QAAQ;IA2ChB;;;OAGG;IACH,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;;;;;;;IAuC5C;;;OAGG;IACH,OAAO,CAAC,YAAY;IA0CpB;;;OAGG;YACW,QAAQ;IAqBtB,OAAO,KAAK,iBAAiB,GAE5B;YAEa,gBAAgB;YAShB,mBAAmB;YAgBnB,gBAAgB;YA+BhB,aAAa;YAwBb,wBAAwB;CAWvC"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/lib/edge-functions/registry.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAuD,MAAM,uBAAuB,CAAA;AAa7G,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AAOhE,UAAU,MAAM;IACd,cAAc,CAAC,EAAE,WAAW,EAAE,CAAA;IAC9B,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CACvB;AAGD,KAAK,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,cAAc,uBAAuB,EAAE,KAAK,CAAC,CAAC,CAAA;AAInF,UAAU,4BAA4B;IACpC,OAAO,EAAE,cAAc,uBAAuB,CAAC,CAAA;IAC/C,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,MAAM,CAAA;IAClB,KAAK,EAAE,OAAO,CAAA;IACd,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC,CAAA;IACzD,YAAY,EAAE,YAAY,CAAA;IAC1B,gBAAgB,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAA;IACvC,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,UAAU,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B;AAkCD,qBAAa,qBAAqB;IACzB,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAEzC,OAAO,CAAC,UAAU,CAAqB;IACvC,OAAO,CAAC,OAAO,CAAwC;IACvD,OAAO,CAAC,UAAU,CAAQ;IAC1B,OAAO,CAAC,iBAAiB,CAAC,CAAQ;IAClC,OAAO,CAAC,4BAA4B,CAAoB;IACxD,OAAO,CAAC,oBAAoB,CAAe;IAG3C,OAAO,CAAC,eAAe,CAAiC;IAExD,OAAO,CAAC,WAAW,CAAU;IAC7B,OAAO,CAAC,iBAAiB,CAAkD;IAC3E,OAAO,CAAC,GAAG,CAAwB;IACnC,OAAO,CAAC,YAAY,CAAc;IAElC,OAAO,CAAC,aAAa,CAAqB;IAC1C,OAAO,CAAC,iBAAiB,CAAqB;IAK9C,OAAO,CAAC,aAAa,CAA4B;IAEjD,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,WAAW,CAAe;IAClC,OAAO,CAAC,QAAQ,CAAwB;IACxC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,UAAU,CAAY;IAC9B,OAAO,CAAC,SAAS,CAAQ;IACzB,OAAO,CAAC,UAAU,CAAQ;gBAEd,EACV,OAAO,EACP,MAAM,EACN,UAAU,EACV,WAAW,EACX,GAAG,EACH,YAAY,EACZ,gBAAgB,EAChB,iBAAiB,EACjB,UAAU,EACV,UAAU,EACV,SAAS,GACV,EAAE,4BAA4B;YAmBjB,aAAa;IAc3B,OAAO,KAAK,SAAS,GAEpB;YAEa,KAAK;IAmEnB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;YA0BL,+BAA+B;IAsB7C,OAAO,CAAC,MAAM,CAAC,uBAAuB;IAMtC,OAAO,CAAC,cAAc;IAMtB,OAAO,CAAC,MAAM,CAAC,uBAAuB;YAoBxB,gBAAgB;IAoCxB,UAAU;IAIhB;;OAEG;IACH,OAAO,CAAC,QAAQ;IA2ChB;;;OAGG;IACH,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;;;;;;;;;;;;IAuC5C;;;OAGG;IACH,OAAO,CAAC,YAAY;IA0CpB;;;OAGG;YACW,QAAQ;IAqBtB,OAAO,KAAK,iBAAiB,GAE5B;YAEa,gBAAgB;YAShB,mBAAmB;YAgBnB,gBAAgB;YA+BhB,aAAa;YAwBb,wBAAwB;CAWvC"}

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

@@ -5,7 +5,6 @@ import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, nonNullable, chalk, log,
 import { MultiMap } from '../../utils/multimap.js';
 import { getPathInProject } from '../settings.js';
 import { INTERNAL_EDGE_FUNCTIONS_FOLDER } from './consts.js';
-const featureFlags = { edge_functions_correct_order: true };
 /**
  * Helper method which, given a edge bundler graph module and an index of modules by path, traverses its dependency tree
  * and returns an array of all of ist local dependencies
@@ -31,7 +30,7 @@ function traverseLocalDependencies({ dependencies = [] }, modulesByPath) {
     });
 }
 export class EdgeFunctionsRegistry {
-    constructor({ bundler, config, configPath, directories, env, getUpdatedConfig, importMapFromTOML, projectDir, runIsolate, servePath, }) {
+    constructor({ bundler, config, configPath, directories, env, featureFlags, getUpdatedConfig, importMapFromTOML, projectDir, runIsolate, servePath, }) {
         this.buildError = null;
         this.declarationsFromDeployConfig = [];
         // Mapping file URLs to names of functions that use them as dependencies.
@@ -48,6 +47,7 @@ export class EdgeFunctionsRegistry {
         this.bundler = bundler;
         this.configPath = configPath;
         this.directories = directories;
+        this.featureFlags = featureFlags;
         this.getUpdatedConfig = getUpdatedConfig;
         this.runIsolate = runIsolate;
         this.servePath = servePath;
@@ -124,13 +124,13 @@ export class EdgeFunctionsRegistry {
      * found in both internal and user functions.
      */
     buildRoutes(internalFunctionConfigs, userFunctionConfigs) {
-        const declarations = this.bundler.mergeDeclarations(this.declarationsFromTOML, userFunctionConfigs, internalFunctionConfigs, this.declarationsFromDeployConfig, featureFlags);
+        const declarations = this.bundler.mergeDeclarations(this.declarationsFromTOML, userFunctionConfigs, internalFunctionConfigs, this.declarationsFromDeployConfig, this.featureFlags);
         const { declarationsWithoutFunction, manifest, unroutedFunctions } = this.bundler.generateManifest({
             declarations,
             userFunctionConfig: userFunctionConfigs,
             internalFunctionConfig: internalFunctionConfigs,
             functions: this.functions,
-            featureFlags,
+            featureFlags: this.featureFlags,
         });
         const routes = [...manifest.routes, ...manifest.post_cache_routes].map((route) => ({
             ...route,

package/dist/lib/functions/form-submissions-handler.d.ts

@@ -1,5 +1,7 @@
-export declare const createFormSubmissionHandler: ({ functionsRegistry, siteUrl }: {
-    functionsRegistry: any;
-    siteUrl: any;
-}) => (req: any, res: any, next: any) => Promise<any>;
+import type { RequestHandler } from 'express';
+import type { FunctionsRegistry } from './registry.js';
+export declare const createFormSubmissionHandler: ({ functionsRegistry, siteUrl, }: {
+    functionsRegistry: FunctionsRegistry;
+    siteUrl: string;
+}) => RequestHandler;
 //# sourceMappingURL=form-submissions-handler.d.ts.map

package/dist/lib/functions/form-submissions-handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"form-submissions-handler.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/form-submissions-handler.ts"],"names":[],"mappings":"AAgCA,eAAO,MAAM,2BAA2B;;;qDAyIvC,CAAA"}
+{"version":3,"file":"form-submissions-handler.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/form-submissions-handler.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAS7C,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAqBtD,eAAO,MAAM,2BAA2B;uBAInB,iBAAiB;aAC3B,MAAM;MACb,cAwIH,CAAA"}

package/dist/lib/functions/form-submissions-handler.js

@@ -22,13 +22,11 @@ const getFormHandler = function ({ functionsRegistry }) {
     }
     return handlers[0];
 };
-// @ts-expect-error TS(7031) FIXME: Binding element 'functionsRegistry' implicitly has... Remove this comment to see the full error message
-export const createFormSubmissionHandler = function ({ functionsRegistry, siteUrl }) {
-    // @ts-expect-error TS(7006) FIXME: Parameter 'req' implicitly has an 'any' type.
+export const createFormSubmissionHandler = function ({ functionsRegistry, siteUrl, }) {
     return async function formSubmissionHandler(req, res, next) {
         if (req.url.startsWith('/.netlify/') ||
             req.method !== 'POST' ||
-            (await functionsRegistry.getFunctionForURLPath(req.url, req.method)))
+            (await functionsRegistry.getFunctionForURLPath(req.url, req.method, () => Promise.resolve(false))))
             return next();
         const fakeRequest = new Readable({
             read() {
@@ -137,7 +135,7 @@ export const createFormSubmissionHandler = function ({ functionsRegistry, siteUr
         req.body = data;
         req.headers = {
             ...req.headers,
-            'content-length': data.length,
+            'content-length': String(data.length),
             'content-type': 'application/json',
             'x-netlify-original-pathname': originalUrl.pathname,
             'x-netlify-original-search': originalUrl.search,

package/dist/lib/functions/netlify-function.d.ts

@@ -9,7 +9,7 @@ export default class NetlifyFunction {
     private readonly blobsContext;
     private readonly timeoutBackground;
     private readonly timeoutSynchronous;
-    private readonly isBackground;
+    readonly isBackground: boolean;
     private buildQueue?;
     private buildData?;
     buildError: Error | null;

package/dist/lib/functions/netlify-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"netlify-function.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/netlify-function.ts"],"names":[],"mappings":"AA2BA,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,SAAgB,IAAI,EAAE,MAAM,CAAA;IAC5B,SAAgB,QAAQ,EAAE,MAAM,CAAA;IAChC,SAAgB,WAAW,EAAE,MAAM,CAAA;IACnC,SAAgB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjC,SAAgB,OAAO,EAAE,MAAM,CAAA;IAE/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAI3C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IAEtC,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,OAAO,CAAC,SAAS,CAAC,CAAQ;IACnB,UAAU,EAAE,KAAK,GAAG,IAAI,CAAO;IAItC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;gBAEjC,EAEV,YAAY,EAEZ,MAAM,EAEN,SAAS,EAET,WAAW,EAEX,QAAQ,EAER,IAAI,EAEJ,WAAW,EAEX,OAAO,EAEP,QAAQ,EAER,iBAAiB,EAEjB,kBAAkB,GACnB;;;;;;;;;;;;KAAA;IAuBD,IAAI,QAAQ,kBAMX;IAED,uBAAuB;IAqBvB,YAAY;IAMN,WAAW;IAMjB,WAAW;IAIX,YAAY;IAQN,UAAU;IAeV,KAAK,CAAC,EAAE,KAAK,EAAE;;KAAA;;;;;;;;;;;;IA2Cf,YAAY;IAQlB,eAAe,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC;;;;IAWlC,MAAM,CAAC,KAAK,KAAK,EAAE,OAAO,KAAK;;;;;;;IAmCrC;;;OAGG;IACG,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC;IAoCzF,IAAI,iBAAiB,QAEpB;IAED,IAAI,GAAG,WAWN;CACF"}
+{"version":3,"file":"netlify-function.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/netlify-function.ts"],"names":[],"mappings":"AA2BA,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,SAAgB,IAAI,EAAE,MAAM,CAAA;IAC5B,SAAgB,QAAQ,EAAE,MAAM,CAAA;IAChC,SAAgB,WAAW,EAAE,MAAM,CAAA;IACnC,SAAgB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjC,SAAgB,OAAO,EAAE,MAAM,CAAA;IAE/B,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAQ;IACpC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAc;IAC3C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAQ;IAC1C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAQ;IAI3C,SAAgB,YAAY,EAAE,OAAO,CAAA;IAErC,OAAO,CAAC,UAAU,CAAC,CAAiB;IACpC,OAAO,CAAC,SAAS,CAAC,CAAQ;IACnB,UAAU,EAAE,KAAK,GAAG,IAAI,CAAO;IAItC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAoB;gBAEjC,EAEV,YAAY,EAEZ,MAAM,EAEN,SAAS,EAET,WAAW,EAEX,QAAQ,EAER,IAAI,EAEJ,WAAW,EAEX,OAAO,EAEP,QAAQ,EAER,iBAAiB,EAEjB,kBAAkB,GACnB;;;;;;;;;;;;KAAA;IAuBD,IAAI,QAAQ,kBAMX;IAED,uBAAuB;IAqBvB,YAAY;IAMN,WAAW;IAMjB,WAAW;IAIX,YAAY;IAQN,UAAU;IAeV,KAAK,CAAC,EAAE,KAAK,EAAE;;KAAA;;;;;;;;;;;;IA2Cf,YAAY;IAQlB,eAAe,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,CAAC;;;;IAWlC,MAAM,CAAC,KAAK,KAAK,EAAE,OAAO,KAAK;;;;;;;IAmCrC;;;OAGG;IACG,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC;IAoCzF,IAAI,iBAAiB,QAEpB;IAED,IAAI,GAAG,WAWN;CACF"}

package/dist/lib/functions/netlify-function.js

@@ -200,7 +200,7 @@ export default class NetlifyFunction {
         await this.buildQueue;
         let path = rawPath !== '/' && rawPath.endsWith('/') ? rawPath.slice(0, -1) : rawPath;
         path = path.toLowerCase();
-        const { routes = [] } = this.buildData;
+        const { routes = [] } = this.buildData ?? {};
         // @ts-expect-error TS(7031) FIXME: Binding element 'expression' implicitly has an 'an... Remove this comment to see the full error message
         const route = routes.find(({ expression, literal, methods }) => {
             if (methods.length !== 0 && !methods.includes(method)) {

package/dist/lib/functions/registry.js

@@ -212,7 +212,7 @@ export class FunctionsRegistry {
             if (!func) {
                 return { func: null, route: null };
             }
-            const { routes = [] } = await func.getBuildData();
+            const { routes = [] } = (await func.getBuildData()) ?? {};
             if (routes.length !== 0) {
                 // @ts-expect-error TS(7006) FIXME: Parameter 'route' implicitly has an 'any' type.
                 const paths = routes.map((route) => chalk.underline(route.pattern)).join(', ');

package/dist/lib/functions/runtimes/js/index.js

@@ -44,7 +44,7 @@ export const getBuildFunction = async ({ config, directory, errorExit, func, pro
 const workerURL = new URL('worker.js', import.meta.url);
 // @ts-expect-error TS(7031) FIXME: Binding element 'context' implicitly has an 'any' ... Remove this comment to see the full error message
 export const invokeFunction = async ({ context, environment, event, func, timeout }) => {
-    if (func.buildData.runtimeAPIVersion !== 2) {
+    if (func.buildData?.runtimeAPIVersion !== 2) {
         return await invokeFunctionDirectly({ context, event, func, timeout });
     }
     const workerData = {

package/dist/lib/functions/server.d.ts

@@ -1,20 +1,31 @@
+import { type RequestHandler } from 'express';
+import type BaseCommand from '../../commands/base-command.js';
+import type { $TSFixMe } from '../../commands/types.js';
+import type { BlobsContext } from '../blobs/blobs.js';
 import { FunctionsRegistry } from './registry.js';
-export declare const createHandler: (options: any) => (request: any, response: any) => Promise<void>;
-/**
- *
- * @param {object} options
- * @param {import("../blobs/blobs.js").BlobsContext} options.blobsContext
- * @param {import('../../commands/base-command.js').default} options.command
- * @param {*} options.capabilities
- * @param {*} options.config
- * @param {boolean} options.debug
- * @param {*} options.loadDistFunctions
- * @param {*} options.settings
- * @param {*} options.site
- * @param {*} options.siteInfo
- * @param {string} options.siteUrl
- * @param {*} options.timeouts
- * @returns {Promise<import('./registry.js').FunctionsRegistry | undefined>}
- */
-export declare const startFunctionsServer: (options: any) => Promise<FunctionsRegistry | undefined>;
+export declare const createHandler: (options: GetFunctionsServerOptions) => RequestHandler;
+interface GetFunctionsServerOptions {
+    functionsRegistry: FunctionsRegistry;
+    siteUrl: string;
+    siteInfo?: $TSFixMe;
+    accountId: string;
+    geoCountry: string;
+    offline: boolean;
+    state: $TSFixMe;
+    config: $TSFixMe;
+    geolocationMode: 'cache' | 'update' | 'mock';
+}
+export declare const startFunctionsServer: (options: {
+    blobsContext: BlobsContext;
+    command: BaseCommand;
+    config: $TSFixMe;
+    capabilities: $TSFixMe;
+    debug: boolean;
+    loadDistFunctions?: boolean;
+    settings: $TSFixMe;
+    site: $TSFixMe;
+    siteInfo: $TSFixMe;
+    timeouts: $TSFixMe;
+} & Omit<GetFunctionsServerOptions, 'functionsRegistry'>) => Promise<FunctionsRegistry | undefined>;
+export {};
 //# sourceMappingURL=server.d.ts.map

package/dist/lib/functions/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/server.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AA0DjD,eAAO,MAAM,aAAa,kEA0JzB,CAAA;AA8BD;;;;;;;;;;;;;;;GAeG;AAEH,eAAO,MAAM,oBAAoB,0DAiFhC,CAAA"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/server.ts"],"names":[],"mappings":"AAIA,OAAgB,EAAE,KAAK,cAAc,EAAE,MAAM,SAAS,CAAA;AAKtD,OAAO,KAAK,WAAW,MAAM,gCAAgC,CAAA;AAC7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAUvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAMrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAyDjD,eAAO,MAAM,aAAa,YAAsB,yBAAyB,KAAG,cA8J3E,CAAA;AAED,UAAU,yBAAyB;IACjC,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,CAAC,EAAE,QAAQ,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,UAAU,EAAE,MAAM,CAAA;IAClB,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,EAAE,QAAQ,CAAA;IACf,MAAM,EAAE,QAAQ,CAAA;IAChB,eAAe,EAAE,OAAO,GAAG,QAAQ,GAAG,MAAM,CAAA;CAC7C;AA4BD,eAAO,MAAM,oBAAoB,YACtB;IACP,YAAY,EAAE,YAAY,CAAA;IAC1B,OAAO,EAAE,WAAW,CAAA;IACpB,MAAM,EAAE,QAAQ,CAAA;IAChB,YAAY,EAAE,QAAQ,CAAA;IACtB,KAAK,EAAE,OAAO,CAAA;IACd,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,QAAQ,EAAE,QAAQ,CAAA;IAClB,IAAI,EAAE,QAAQ,CAAA;IACd,QAAQ,EAAE,QAAQ,CAAA;IAClB,QAAQ,EAAE,QAAQ,CAAA;CACnB,GAAG,KAAK,yBAAyB,EAAE,mBAAmB,CAAC,KACvD,QAAQ,iBAAiB,GAAG,SAAS,CAiFvC,CAAA"}

package/dist/lib/functions/server.js

@@ -64,10 +64,8 @@ const hasBody = (req) =>
 (req.header('transfer-encoding') !== undefined || !isNaN(req.header('content-length'))) &&
     // we expect a string or a buffer, because we use the two bodyParsers(text, raw) from express
     (typeof req.body === 'string' || Buffer.isBuffer(req.body));
-// @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
 export const createHandler = function (options) {
     const { functionsRegistry } = options;
-    // @ts-expect-error TS(7006) FIXME: Parameter 'request' implicitly has an 'any' type.
     return async function handler(request, response) {
         // If these headers are set, it means we've already matched a function and we
         // can just grab its name directly. We delete the header from the request
@@ -76,13 +74,18 @@ export const createHandler = function (options) {
         delete request.headers[NFFunctionName];
         const functionRoute = request.header(NFFunctionRoute);
         delete request.headers[NFFunctionRoute];
-        // If we didn't match a function with a custom route, let's try to match
-        // using the fixed URL format.
+        // If there's still no function found, we check the functionsRegistry again.
+        // This is needed for the functions:serve command, where the dev server that normally does the matching doesn't run.
+        // It also matches the default URL (.netlify/functions/builders)
         if (!functionName) {
-            const cleanPath = request.path.replace(/^\/.netlify\/(functions|builders)/, '');
-            functionName = cleanPath.split('/').find(Boolean);
+            const match = await functionsRegistry.getFunctionForURLPath(request.url, request.method, 
+            // we're pretending there's no static file at the same URL.
+            // This is wrong, but in local dev we already did the matching
+            // in a downstream server where we had access to the file system, so this never hits.
+            () => Promise.resolve(false));
+            functionName = match?.func?.name;
         }
-        const func = functionsRegistry.get(functionName);
+        const func = functionsRegistry.get(functionName ?? '');
         if (func === undefined) {
             response.statusCode = 404;
             response.end('Function not found...');
@@ -99,15 +102,13 @@ export const createHandler = function (options) {
             body = request.body.toString(isBase64Encoded ? 'base64' : 'utf8');
         }
         let remoteAddress = request.header('x-forwarded-for') || request.connection.remoteAddress || '';
-        remoteAddress = remoteAddress
-            .split(remoteAddress.includes('.') ? ':' : ',')
-            .pop()
-            .trim();
-        let requestPath = request.path;
-        if (request.header('x-netlify-original-pathname')) {
-            requestPath = request.header('x-netlify-original-pathname');
-            delete request.headers['x-netlify-original-pathname'];
-        }
+        remoteAddress =
+            remoteAddress
+                .split(remoteAddress.includes('.') ? ':' : ',')
+                .pop()
+                ?.trim() ?? '';
+        const requestPath = request.header('x-netlify-original-pathname') ?? request.path;
+        delete request.headers['x-netlify-original-pathname'];
         let requestQuery = request.query;
         if (request.header('x-netlify-original-search')) {
             const newRequestQuery = {};
@@ -120,7 +121,7 @@ export const createHandler = function (options) {
             delete request.headers['x-netlify-original-search'];
         }
         const queryParams = Object.entries(requestQuery).reduce((prev, [key, value]) => ({ ...prev, [key]: Array.isArray(value) ? value : [value] }), {});
-        const geoLocation = await getGeoLocation({ ...options, mode: options.geo });
+        const geoLocation = await getGeoLocation({ ...options, mode: options.geolocationMode });
         const headers = Object.entries({
             ...request.headers,
             'client-ip': [remoteAddress],
@@ -191,9 +192,8 @@ export const createHandler = function (options) {
         }
     };
 };
-// @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
 const getFunctionsServer = (options) => {
-    const { buildersPrefix = '', functionsPrefix = '', functionsRegistry, siteUrl } = options;
+    const { functionsRegistry, siteUrl } = options;
     const app = express();
     const functionHandler = createHandler(options);
     app.set('query parser', 'simple');
@@ -206,27 +206,9 @@ const getFunctionsServer = (options) => {
     app.use(expressLogging(console, {
         blacklist: ['/favicon.ico'],
     }));
-    app.all(`${functionsPrefix}*`, functionHandler);
-    app.all(`${buildersPrefix}*`, functionHandler);
+    app.all('*', functionHandler);
     return app;
 };
-/**
- *
- * @param {object} options
- * @param {import("../blobs/blobs.js").BlobsContext} options.blobsContext
- * @param {import('../../commands/base-command.js').default} options.command
- * @param {*} options.capabilities
- * @param {*} options.config
- * @param {boolean} options.debug
- * @param {*} options.loadDistFunctions
- * @param {*} options.settings
- * @param {*} options.site
- * @param {*} options.siteInfo
- * @param {string} options.siteUrl
- * @param {*} options.timeouts
- * @returns {Promise<import('./registry.js').FunctionsRegistry | undefined>}
- */
-// @ts-expect-error TS(7006) FIXME: Parameter 'options' implicitly has an 'any' type.
 export const startFunctionsServer = async (options) => {
     const { blobsContext, capabilities, command, config, debug, loadDistFunctions, settings, site, siteInfo, siteUrl, timeouts, } = options;
     const internalFunctionsDir = await getInternalFunctionsDir({ base: site.root });
@@ -283,29 +265,20 @@ export const startFunctionsServer = async (options) => {
         timeouts,
     });
     await functionsRegistry.scan(functionsDirectories);
-    const server = getFunctionsServer(Object.assign(options, { functionsRegistry }));
+    const server = getFunctionsServer({ ...options, functionsRegistry });
     await startWebServer({ server, settings, debug });
     return functionsRegistry;
 };
-/**
- *
- * @param {object} config
- * @param {boolean} config.debug
- * @param {ReturnType<Awaited<typeof getFunctionsServer>>} config.server
- * @param {*} config.settings
- */
-// @ts-expect-error TS(7031) FIXME: Binding element 'debug' implicitly has an 'any' ty... Remove this comment to see the full error message
-const startWebServer = async ({ debug, server, settings }) => {
-    await new Promise((/** @type {(resolve: void) => void} */ resolve) => {
+const startWebServer = async ({ debug, server, settings, }) => {
+    await new Promise((resolve) => {
         // @ts-expect-error TS(7006) FIXME: Parameter 'err' implicitly has an 'any' type.
-        server.listen(settings.functionsPort, (/** @type {unknown} */ err) => {
+        server.listen(settings.functionsPort, (err) => {
             if (err) {
                 errorExit(`${NETLIFYDEVERR} Unable to start functions server: ${err}`);
             }
             else if (debug) {
                 log(`${NETLIFYDEVLOG} Functions server is listening on ${settings.functionsPort}`);
             }
-            // @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
             resolve();
         });
     });