netlify-cli 17.29.0 → 17.31.0

package/dist/commands/base-command.d.ts

@@ -29,6 +29,7 @@ export default class BaseCommand extends Command {
     workspacePackage?: string;
     featureFlags: FeatureFlags;
     siteId?: string;
+    accountId?: string;
     /**
      * IMPORTANT this function will be called for each command!
      * Don't do anything expensive in there.

package/dist/commands/base-command.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"AAOA,OAAO,EAAiB,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,WAAW,CAAA;AA0BjD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAOxD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC,CAAA;AAuGD,0EAA0E;AAC1E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;;IAC9C,4DAA4D;IAE5D,OAAO,EAAE,cAAc,CAAA;IACvB,SAAS,EAAE,SAAS,CAAyC;IAE7D,OAAO,EAAE,OAAO,CAAA;IAEhB;;;;OAIG;IAGH,UAAU,SAAgB;IAE1B;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB,YAAY,EAAE,YAAY,CAAK;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;IAqDxC,mIAAmI;IACnI,aAAa;IAKb,mFAAmF;IACnF,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,oCAAoC;IACpC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE;IAK9B,iEAAiE;IACjE,UAAU,IAAI,IAAI;IAgIlB,kEAAkE;IAC5D,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO;IAwBtB,YAAY,CAAC,aAAa,CAAC,EAAE,MAAM;IAQnC,uBAAuB;IA4D7B,8CAA8C;IAC9C,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAOpD;;OAEG;YACW,IAAI;IAyLlB,iDAAiD;IAC3C,SAAS,CAAC,MAAM,EAAE;QACtB,GAAG,EAAE,MAAM,CAAA;QACX,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;QACrB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,2EAA2E;QAC3E,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC;IAgDpC;;OAEG;IACH,gBAAgB,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;IAI5C;;;;OAIG;IACH,iBAAiB,IAAI,YAAY,GAAG,KAAK;IAIzC;;OAEG;IACH,cAAc,CAAC,CAAC,GAAG,IAAI,GAAG,OAAO,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC;CAGjE"}
+{"version":3,"file":"base-command.d.ts","sourceRoot":"","sources":["../../src/commands/base-command.ts"],"names":[],"mappings":"AAOA,OAAO,EAAiB,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAE5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAU,MAAM,WAAW,CAAA;AA0BjD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAQxD,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,YAAY,CAAA;AAEhD,KAAK,SAAS,GAAG;IACf,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAClC,CAAA;AAuGD,0EAA0E;AAC1E,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,OAAO;;IAC9C,4DAA4D;IAE5D,OAAO,EAAE,cAAc,CAAA;IACvB,SAAS,EAAE,SAAS,CAAyC;IAE7D,OAAO,EAAE,OAAO,CAAA;IAEhB;;;;OAIG;IAGH,UAAU,SAAgB;IAE1B;;;OAGG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,uEAAuE;IACvE,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB,YAAY,EAAE,YAAY,CAAK;IAC/B,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,SAAS,CAAC,EAAE,MAAM,CAAA;IAElB;;;OAGG;IACH,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW;IAqDxC,mIAAmI;IACnI,aAAa;IAKb,mFAAmF;IACnF,QAAQ,EAAE,MAAM,EAAE,CAAK;IACvB,oCAAoC;IACpC,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE;IAK9B,iEAAiE;IACjE,UAAU,IAAI,IAAI;IAgIlB,kEAAkE;IAC5D,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO;IAwBtB,YAAY,CAAC,aAAa,CAAC,EAAE,MAAM;IAQnC,uBAAuB;IA4D7B,8CAA8C;IAC9C,mBAAmB,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAOpD;;OAEG;YACW,IAAI;IA2LlB,iDAAiD;IAC3C,SAAS,CAAC,MAAM,EAAE;QACtB,GAAG,EAAE,MAAM,CAAA;QACX,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;QACrB,OAAO,CAAC,EAAE,OAAO,CAAA;QACjB,2EAA2E;QAC3E,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,WAAW,CAAC,EAAE,MAAM,CAAA;QACpB,cAAc,CAAC,EAAE,MAAM,CAAA;QACvB,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,UAAU,CAAC,EAAE,MAAM,CAAA;QACnB,MAAM,CAAC,EAAE,MAAM,CAAA;KAChB,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC;IAiDpC;;OAEG;IACH,gBAAgB,CAAC,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;IAI5C;;;;OAIG;IACH,iBAAiB,IAAI,YAAY,GAAG,KAAK;IAIzC;;OAEG;IACH,cAAc,CAAC,CAAC,GAAG,IAAI,GAAG,OAAO,GAAG,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC;CAGjE"}

package/dist/commands/base-command.js

@@ -29,6 +29,7 @@ import merge from 'lodash/merge.js';
 import { NetlifyAPI } from 'netlify';
 import { getAgent } from '../lib/http-agent.js';
 import { NETLIFY_CYAN, USER_AGENT, chalk, error, exit, getToken, log, version, normalizeConfig, padLeft, pollForToken, sortOptions, warn, } from '../utils/command-helpers.js';
+import { getFrameworksAPIPaths } from '../utils/frameworks-api.js';
 import getGlobalConfig from '../utils/get-global-config.js';
 import { getSiteByName } from '../utils/get-site.js';
 import openBrowser from '../utils/open-browser.js';
@@ -449,6 +450,7 @@ class BaseCommand extends Command {
             try {
                 const site = await api.getSite({ siteId: actionCommand.siteId, feature_flags: 'cli' });
                 actionCommand.featureFlags = site.feature_flags;
+                actionCommand.accountId = site.account_id;
             }
             catch {
                 // if the site is not found, that could mean that the user passed a site name, not an ID
@@ -531,6 +533,7 @@ class BaseCommand extends Command {
             globalConfig,
             // state of current site dir
             state,
+            frameworksAPIPaths: getFrameworksAPIPaths(buildDir, this.workspacePackage),
         };
         debug(`${this.name()}:init`)('end');
     }
@@ -540,6 +543,7 @@ class BaseCommand extends Command {
         const flags = this.opts();
         try {
             return await resolveConfig({
+                accountId: this.accountId,
                 config: config.configFilePath,
                 packagePath: config.packagePath,
                 repositoryRoot: config.repositoryRoot,

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

@@ -1 +1 @@
-{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/deploy.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAgCxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAouB5C,eAAO,MAAM,MAAM,YAAmB,YAAY,WAAW,WAAW,kBAmHvE,CAAA"}
+{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../src/commands/deploy/deploy.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAiCxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAwuB5C,eAAO,MAAM,MAAM,YAAmB,YAAY,WAAW,WAAW,kBAmHvE,CAAA"}

package/dist/commands/deploy/deploy.js

@@ -356,10 +356,15 @@ title, }) => {
         results = await api.createSiteDeploy({ siteId, title, body: { draft, branch: alias } });
         deployId = results.id;
         const internalFunctionsFolder = await getInternalFunctionsDir({ base: site.root, packagePath, ensureExists: true });
+        await command.netlify.frameworksAPIPaths.functions.ensureExists();
         // The order of the directories matter: zip-it-and-ship-it will prioritize
         // functions from the rightmost directories. In this case, we want user
         // functions to take precedence over internal functions.
-        const functionDirectories = [internalFunctionsFolder, functionsFolder].filter((folder) => Boolean(folder));
+        const functionDirectories = [
+            internalFunctionsFolder,
+            command.netlify.frameworksAPIPaths.functions.path,
+            functionsFolder,
+        ].filter((folder) => Boolean(folder));
         const manifestPath = skipFunctionsCache ? null : await getFunctionsManifestPath({ base: site.root, packagePath });
         const redirectsPath = `${deployFolder}/_redirects`;
         const headersPath = `${deployFolder}/_headers`;

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":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AA6BxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAG5C,eAAO,MAAM,KAAK,YAAmB,YAAY,WAAW,WAAW,uBA0JtE,CAAA"}
+{"version":3,"file":"serve.d.ts","sourceRoot":"","sources":["../../../src/commands/serve/serve.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AA8BxC,OAAO,WAAW,MAAM,oBAAoB,CAAA;AAG5C,eAAO,MAAM,KAAK,YAAmB,YAAY,WAAW,WAAW,uBA8JtE,CAAA"}

package/dist/commands/serve/serve.js

@@ -7,13 +7,14 @@ import { NETLIFYDEVERR, NETLIFYDEVLOG, NETLIFYDEVWARN, chalk, exit, log, normali
 import detectServerSettings, { getConfigWithPlugins } from '../../utils/detect-server-settings.js';
 import { UNLINKED_SITE_MOCK_ID, getDotEnvVariables, getSiteInformation, injectEnvVariables } from '../../utils/dev.js';
 import { getEnvelopeEnv } from '../../utils/env/index.js';
+import { getFrameworksAPIConfig } from '../../utils/frameworks-api.js';
 import { getInternalFunctionsDir } from '../../utils/functions/functions.js';
 import { ensureNetlifyIgnore } from '../../utils/gitignore.js';
 import openBrowser from '../../utils/open-browser.js';
 import { generateInspectSettings, startProxyServer } from '../../utils/proxy-server.js';
 import { runBuildTimeline } from '../../utils/run-build.js';
 export const serve = async (options, command) => {
-    const { api, cachedConfig, config, repositoryRoot, site, siteInfo, state } = command.netlify;
+    const { api, cachedConfig, config, frameworksAPIPaths, repositoryRoot, site, siteInfo, state } = command.netlify;
     config.dev = { ...config.dev };
     config.build = { ...config.build };
     const devConfig = {
@@ -51,6 +52,7 @@ export const serve = async (options, command) => {
         ensureExists: true,
         packagePath: command.workspacePackage,
     });
+    await frameworksAPIPaths.functions.ensureExists();
     let settings;
     try {
         settings = await detectServerSettings(devConfig, options, command);
@@ -78,6 +80,7 @@ export const serve = async (options, command) => {
         options,
         env: {},
     });
+    const mergedConfig = await getFrameworksAPIConfig(config, frameworksAPIPaths.config.path);
     // Now we generate a second Blobs context object, this time with edge access
     // for runtime access (i.e. from functions and edge functions).
     const runtimeBlobsContext = await getBlobsContextWithEdgeAccess(blobsOptions);
@@ -85,7 +88,7 @@ export const serve = async (options, command) => {
     const functionsRegistry = await startFunctionsServer({
         blobsContext: runtimeBlobsContext,
         command,
-        config,
+        config: mergedConfig,
         debug: options.debug,
         loadDistFunctions: true,
         settings,
@@ -118,7 +121,7 @@ export const serve = async (options, command) => {
         addonsUrls,
         blobsContext: runtimeBlobsContext,
         command,
-        config,
+        config: mergedConfig,
         configPath: configPathOverride,
         debug: options.debug,
         disableEdgeFunctions: options.internalDisableEdgeFunctions,

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

@@ -101,6 +101,7 @@ export declare class EdgeFunctionsRegistry {
     private scanForFunctions;
     private setupWatchers;
     private setupWatcherForDirectory;
+    private get usesFrameworksAPI();
 }
 export {};
 //# sourceMappingURL=registry.d.ts.map

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

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

@@ -338,9 +338,16 @@ export class EdgeFunctionsRegistry {
                 success: true,
             };
         }
+        const importMapPaths = [this.importMapFromTOML, this.importMapFromDeployConfig];
+        if (this.usesFrameworksAPI) {
+            const { edgeFunctionsImportMap } = this.command.netlify.frameworksAPIPaths;
+            if (await edgeFunctionsImportMap.exists()) {
+                importMapPaths.push(edgeFunctionsImportMap.path);
+            }
+        }
         const { functionsConfig, graph, npmSpecifiersWithExtraneousFiles, success } = await this.runIsolate(this.functions, this.env, {
             getFunctionsConfig: true,
-            importMapPaths: [this.importMapFromTOML, this.importMapFromDeployConfig].filter(nonNullable),
+            importMapPaths: importMapPaths.filter(nonNullable),
         });
         return { functionsConfig, graph, npmSpecifiersWithExtraneousFiles, success };
     }
@@ -370,11 +377,13 @@ export class EdgeFunctionsRegistry {
             : undefined;
     }
     async scanForFunctions() {
-        const [internalFunctions, userFunctions] = await Promise.all([
+        const [frameworkFunctions, integrationFunctions, userFunctions] = await Promise.all([
+            this.usesFrameworksAPI ? this.bundler.find([this.command.netlify.frameworksAPIPaths.edgeFunctions.path]) : [],
             this.bundler.find([this.internalDirectory]),
             this.bundler.find(this.directories),
             this.scanForDeployConfig(),
         ]);
+        const internalFunctions = [...frameworkFunctions, ...integrationFunctions];
         const functions = [...internalFunctions, ...userFunctions];
         const newFunctions = functions.filter((func) => {
             const functionExists = this.functions.some((existingFunc) => func.name === existingFunc.name && func.path === existingFunc.path);
@@ -419,4 +428,9 @@ export class EdgeFunctionsRegistry {
         });
         this.directoryWatchers.set(this.projectDir, watcher);
     }
+    // We only take into account edge functions from the Frameworks API in
+    // the `serve` command, since we don't run the build command in `dev`.
+    get usesFrameworksAPI() {
+        return this.command.name() === 'serve';
+    }
 }

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

@@ -1,4 +1,5 @@
 import { ListedFunction, listFunctions } from '@netlify/zip-it-and-ship-it';
+import { getFrameworksAPIPaths } from '../../utils/frameworks-api.js';
 import type { BlobsContext } from '../blobs/blobs.js';
 import NetlifyFunction from './netlify-function.js';
 export declare const DEFAULT_FUNCTION_URL_EXPRESSION: RegExp;
@@ -27,9 +28,11 @@ export declare class FunctionsRegistry {
     private projectRoot;
     private isConnected;
     private debug;
-    constructor({ blobsContext, capabilities, config, debug, isConnected, logLambdaCompat, manifest, projectRoot, settings, timeouts, }: {
+    private frameworksAPIPaths;
+    constructor({ blobsContext, capabilities, config, debug, frameworksAPIPaths, isConnected, logLambdaCompat, manifest, projectRoot, settings, timeouts, }: {
         projectRoot: string;
         debug?: boolean;
+        frameworksAPIPaths: ReturnType<typeof getFrameworksAPIPaths>;
         isConnected?: boolean;
         blobsContext: BlobsContext;
     } & object);

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

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/registry.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAc3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIrD,OAAO,eAAe,MAAM,uBAAuB,CAAA;AAGnD,eAAO,MAAM,+BAA+B,QAAiD,CAAA;AAO7F;;GAEG;AAEH,qBAAa,iBAAiB;IAC5B;;OAEG;IACH,OAAO,CAAC,SAAS,CAAqC;IAEtD;;;OAGG;IACH,OAAO,CAAC,gBAAgB,CAAgE;IAExF;;;OAGG;IACH,OAAO,CAAC,sBAAsB,CAAQ;IAEtC;;OAEG;IACH,OAAO,CAAC,YAAY,CAAc;IAElC,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,KAAK,CAAS;gBAEV,EACV,YAAY,EAEZ,YAAY,EAEZ,MAAM,EACN,KAAa,EACb,WAAmB,EAEnB,eAAe,EAEf,QAAQ,EACR,WAAW,EAEX,QAAQ,EAER,QAAQ,GACT,EAAE;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAC;QAAC,WAAW,CAAC,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,YAAY,CAAA;KAAE,GAAG,MAAM;IAoDvG,iBAAiB;IAoBjB;;;;OAIG;WACU,oBAAoB,CAAC,SAAS,EAAE,MAAM;IAmBnD;;;OAGG;IACG,0BAA0B,CAAC,IAAI,EAAE,eAAe,EAAE,SAAS,UAAQ;IAsEzE;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM;IAIhB;;;;;;OAMG;IACG,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC;;;;;;;IAyClG;;OAEG;IACH,MAAM,CAAC,QAAQ,CACb,KAAK,EAAE,YAAY,GAAG,WAAW,GAAG,QAAQ,GAAG,uBAAuB,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,EAC7G,EAAE,IAAI,EAAE,QAAa,EAAE,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE;IAoEzE;;OAEG;IACG,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,QAAQ,UAAQ;IA+DtF;;;OAGG;IAEG,aAAa,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC;IAI7D;;;;OAIG;IACG,IAAI,CAAC,YAAY,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE;IAkH/C;;;;OAIG;IACG,qBAAqB,CAAC,SAAS,EAAE,MAAM;IAoB7C;;OAEG;IACG,kBAAkB,CAAC,IAAI,EAAE,eAAe;IAc9C;;OAEG;IACG,aAAa,CAAC,IAAI,EAAE,eAAe;CAU1C"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../src/lib/functions/registry.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAA;AAa3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAA;AAErE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAIrD,OAAO,eAAe,MAAM,uBAAuB,CAAA;AAGnD,eAAO,MAAM,+BAA+B,QAAiD,CAAA;AAQ7F;;GAEG;AAEH,qBAAa,iBAAiB;IAC5B;;OAEG;IACH,OAAO,CAAC,SAAS,CAAqC;IAEtD;;;OAGG;IACH,OAAO,CAAC,gBAAgB,CAAgE;IAExF;;;OAGG;IACH,OAAO,CAAC,sBAAsB,CAAQ;IAEtC;;OAEG;IACH,OAAO,CAAC,YAAY,CAAc;IAElC,OAAO,CAAC,WAAW,CAAQ;IAC3B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,kBAAkB,CAA0C;gBAExD,EACV,YAAY,EAEZ,YAAY,EAEZ,MAAM,EACN,KAAa,EACb,kBAAkB,EAClB,WAAmB,EAEnB,eAAe,EAEf,QAAQ,EACR,WAAW,EAEX,QAAQ,EAER,QAAQ,GACT,EAAE;QACD,WAAW,EAAE,MAAM,CAAA;QACnB,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,kBAAkB,EAAE,UAAU,CAAC,OAAO,qBAAqB,CAAC,CAAA;QAC5D,WAAW,CAAC,EAAE,OAAO,CAAA;QACrB,YAAY,EAAE,YAAY,CAAA;KAC3B,GAAG,MAAM;IAqDV,iBAAiB;IAoBjB;;;;OAIG;WACU,oBAAoB,CAAC,SAAS,EAAE,MAAM;IAmBnD;;;OAGG;IACG,0BAA0B,CAAC,IAAI,EAAE,eAAe,EAAE,SAAS,UAAQ;IAsEzE;;OAEG;IACH,GAAG,CAAC,IAAI,EAAE,MAAM;IAIhB;;;;;;OAMG;IACG,qBAAqB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC;;;;;;;IAyClG;;OAEG;IACH,MAAM,CAAC,QAAQ,CACb,KAAK,EAAE,YAAY,GAAG,WAAW,GAAG,QAAQ,GAAG,uBAAuB,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,EAC7G,EAAE,IAAI,EAAE,QAAa,EAAE,EAAE;QAAE,IAAI,EAAE,eAAe,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE;IAoEzE;;OAEG;IACG,gBAAgB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,QAAQ,UAAQ;IAsEtF;;;OAGG;IAEG,aAAa,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC;IAI7D;;;;OAIG;IACG,IAAI,CAAC,YAAY,EAAE,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE;IAkH/C;;;;OAIG;IACG,qBAAqB,CAAC,SAAS,EAAE,MAAM;IAoB7C;;OAEG;IACG,kBAAkB,CAAC,IAAI,EAAE,eAAe;IAc9C;;OAEG;IACG,aAAa,CAAC,IAAI,EAAE,eAAe;CAU1C"}

package/dist/lib/functions/registry.js

@@ -13,7 +13,8 @@ import runtimes from './runtimes/index.js';
 export const DEFAULT_FUNCTION_URL_EXPRESSION = /^\/.netlify\/(functions|builders)\/([^/]+).*/;
 const TYPES_PACKAGE = '@netlify/functions';
 const ZIP_EXTENSION = '.zip';
-const isInternalFunction = (func) => func.mainFile.includes(getPathInProject([INTERNAL_FUNCTIONS_FOLDER]));
+const isInternalFunction = (func, frameworksAPIFunctionsPath) => func.mainFile.includes(getPathInProject([INTERNAL_FUNCTIONS_FOLDER])) ||
+    func.mainFile.includes(frameworksAPIFunctionsPath);
 /**
  * @typedef {"buildError" | "extracted" | "loaded" | "missing-types-package" | "reloaded" | "reloading" | "removed"} FunctionEvent
  */
@@ -22,7 +23,7 @@ export class FunctionsRegistry {
     // @ts-expect-error TS(7031) FIXME: Binding element 'capabilities' implicitly has an '... Remove this comment to see the full error message
     capabilities, 
     // @ts-expect-error TS(7031) FIXME: Binding element 'config' implicitly has an 'any' t... Remove this comment to see the full error message
-    config, debug = false, isConnected = false, 
+    config, debug = false, frameworksAPIPaths, isConnected = false, 
     // @ts-expect-error TS(7031) FIXME: Binding element 'logLambdaCompat' implicitly has a... Remove this comment to see the full error message
     logLambdaCompat, 
     // @ts-expect-error TS(7031) FIXME: Binding element 'manifest' implicitly has an 'any'... Remove this comment to see the full error message
@@ -50,6 +51,7 @@ export class FunctionsRegistry {
         // @ts-expect-error TS(2339) FIXME: Property 'config' does not exist on type 'Function... Remove this comment to see the full error message
         this.config = config;
         this.debug = debug;
+        this.frameworksAPIPaths = frameworksAPIPaths;
         this.isConnected = isConnected;
         this.projectRoot = projectRoot;
         // @ts-expect-error TS(2339) FIXME: Property 'timeouts' does not exist on type 'Functi... Remove this comment to see the full error message
@@ -295,13 +297,19 @@ export class FunctionsRegistry {
         // the new location.
         if (extname(func.mainFile) === ZIP_EXTENSION) {
             const unzippedDirectory = await this.unzipFunction(func);
-            if (this.debug) {
-                FunctionsRegistry.logEvent('extracted', { func });
-            }
             // If there's a manifest file, look up the function in order to extract
             // the build data.
             // @ts-expect-error TS(2339) FIXME: Property 'manifest' does not exist on type 'Functi... Remove this comment to see the full error message
             const manifestEntry = (this.manifest?.functions || []).find((manifestFunc) => manifestFunc.name === func.name);
+            // We found a zipped function that does not have a corresponding entry in
+            // the manifest. This shouldn't happen, but we ignore the function in
+            // this case.
+            if (!manifestEntry) {
+                return;
+            }
+            if (this.debug) {
+                FunctionsRegistry.logEvent('extracted', { func });
+            }
             func.buildData = {
                 ...manifestEntry?.buildData,
                 routes: manifestEntry?.routes,
@@ -357,9 +365,9 @@ export class FunctionsRegistry {
         // user-defined functions take precedence over internal functions,
         // so we want to ignore any internal functions where there's a user-defined one with the same name
         const ignoredFunctions = new Set(functions
-            .filter((func) => isInternalFunction(func) &&
+            .filter((func) => isInternalFunction(func, this.frameworksAPIPaths.functions.path) &&
             this.functions.has(func.name) &&
-            !isInternalFunction(this.functions.get(func.name)))
+            !isInternalFunction(this.functions.get(func.name), this.frameworksAPIPaths.functions.path))
             .map((func) => func.name));
         // Before registering any functions, we look for any functions that were on
         // the previous list but are missing from the new one. We unregister them.

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":"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;AAWvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAMrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAuDjD,eAAO,MAAM,aAAa,YAAsB,yBAAyB,KAAG,cA6K3E,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"}
+{"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;AAWvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAMrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAuDjD,eAAO,MAAM,aAAa,YAAsB,yBAAyB,KAAG,cA6K3E,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,CAsFvC,CAAA"}

package/dist/lib/functions/server.js

@@ -249,7 +249,11 @@ export const startFunctionsServer = async (options) => {
     else {
         // The order of the function directories matters. Rightmost directories take
         // precedence.
-        const sourceDirectories = [internalFunctionsDir, settings.functions].filter(Boolean);
+        const sourceDirectories = [
+            internalFunctionsDir,
+            command.netlify.frameworksAPIPaths.functions.path,
+            settings.functions,
+        ].filter(Boolean);
         functionsDirectories.push(...sourceDirectories);
     }
     try {
@@ -268,6 +272,7 @@ export const startFunctionsServer = async (options) => {
         capabilities,
         config,
         debug,
+        frameworksAPIPaths: command.netlify.frameworksAPIPaths,
         isConnected: Boolean(siteUrl),
         logLambdaCompat: isFeatureFlagEnabled('cli_log_lambda_compat', siteInfo),
         manifest,