@netlify/build 33.4.7 → 33.5.1

package/lib/log/messages/core_steps.d.ts

@@ -3,7 +3,7 @@ export function logBundleResults({ logs, results }: {
     results: import("@netlify/zip-it-and-ship-it").FunctionResult[];
 }): void;
 export function logFunctionsNonExistingDir(logs: any, relativeFunctionsSrc: any): void;
-export function logFunctionsToBundle({ logs, userFunctions, userFunctionsSrc, userFunctionsSrcExists, internalFunctions, internalFunctionsSrc, frameworkFunctions, type, }: {
+export function logFunctionsToBundle({ logs, userFunctions, userFunctionsSrc, userFunctionsSrcExists, internalFunctions, internalFunctionsSrc, frameworkFunctions, generatedFunctions, type, }: {
     logs: any;
     userFunctions: any;
     userFunctionsSrc: any;
@@ -11,6 +11,7 @@ export function logFunctionsToBundle({ logs, userFunctions, userFunctionsSrc, us
     internalFunctions: any;
     internalFunctionsSrc: any;
     frameworkFunctions: any;
+    generatedFunctions: any;
     type?: string | undefined;
 }): void;
 export function logSecretsScanSkipMessage(logs: any, msg: any): void;

package/lib/log/messages/core_steps.js

@@ -48,17 +48,31 @@ export const logFunctionsNonExistingDir = function (logs, relativeFunctionsSrc)
     log(logs, `The Netlify Functions setting targets a non-existing directory: ${relativeFunctionsSrc}`);
 };
 // Print the list of Netlify Functions about to be bundled
-export const logFunctionsToBundle = function ({ logs, userFunctions, userFunctionsSrc, userFunctionsSrcExists, internalFunctions, internalFunctionsSrc, frameworkFunctions, type = 'Functions', }) {
+export const logFunctionsToBundle = function ({ logs, userFunctions, userFunctionsSrc, userFunctionsSrcExists, internalFunctions, internalFunctionsSrc, frameworkFunctions, generatedFunctions, type = 'Functions', }) {
+    let needsSpace = false;
+    if (generatedFunctions.length !== 0) {
+        for (const id in generatedFunctions) {
+            const { displayName, generatorType, functionNames } = generatedFunctions[id];
+            if (needsSpace)
+                log(logs, '');
+            log(logs, `Packaging ${type} generated by ${THEME.highlightWords(displayName)} ${generatorType}:`);
+            logArray(logs, functionNames, { indent: false });
+            needsSpace = true;
+        }
+    }
     if (internalFunctions.length !== 0) {
+        if (needsSpace)
+            log(logs, '');
         log(logs, `Packaging ${type} from ${THEME.highlightWords(internalFunctionsSrc)} directory:`);
         logArray(logs, internalFunctions, { indent: false });
+        needsSpace = true;
     }
     if (frameworkFunctions.length !== 0) {
-        if (internalFunctions.length !== 0) {
+        if (needsSpace)
             log(logs, '');
-        }
         log(logs, `Packaging ${type} generated by your framework:`);
         logArray(logs, frameworkFunctions, { indent: false });
+        needsSpace = true;
     }
     if (!userFunctionsSrcExists) {
         return;
@@ -67,9 +81,8 @@ export const logFunctionsToBundle = function ({ logs, userFunctions, userFunctio
         log(logs, `No ${type} were found in ${THEME.highlightWords(userFunctionsSrc)} directory`);
         return;
     }
-    if (internalFunctions.length !== 0 || frameworkFunctions.length !== 0) {
+    if (needsSpace)
         log(logs, '');
-    }
     log(logs, `Packaging ${type} from ${THEME.highlightWords(userFunctionsSrc)} directory:`);
     logArray(logs, userFunctions, { indent: false });
 };

package/lib/plugins/child/run.d.ts

@@ -17,4 +17,7 @@ export function run({ event, error, constants, envChanges, featureFlags, netlify
         [x: string]: any;
     };
     configMutations: any;
+    returnValue: {
+        generatedFunctions: any[];
+    } | undefined;
 }>;

package/lib/plugins/child/run.js

@@ -12,8 +12,9 @@ export const run = async function ({ event, error, constants, envChanges, featur
     return context.with(getGlobalContext(), async () => {
         const method = methods[event];
         const runState = {};
+        const generatedFunctions = [];
         const systemLog = getSystemLog();
-        const utils = getUtils({ event, constants, runState });
+        const utils = getUtils({ event, constants, generatedFunctions, runState });
         const netlifyConfigCopy = cloneNetlifyConfig(netlifyConfig);
         const runOptions = {
             utils,
@@ -32,6 +33,7 @@ export const run = async function ({ event, error, constants, envChanges, featur
         logPluginMethodEnd(verbose);
         const newEnvChanges = getNewEnvChanges(envBefore, netlifyConfig, netlifyConfigCopy);
         const configMutations = getConfigMutations(netlifyConfig, netlifyConfigCopy, event);
-        return { ...runState, newEnvChanges, configMutations };
+        const returnValue = generatedFunctions.length ? { generatedFunctions } : undefined;
+        return { ...runState, newEnvChanges, configMutations, returnValue };
     });
 };

package/lib/plugins/child/utils.d.ts

@@ -1,10 +1,11 @@
-export function getUtils({ event, constants: { FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, CACHE_DIR }, runState, }: {
+export function getUtils({ event, constants: { FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, CACHE_DIR }, generatedFunctions, runState, }: {
     event: any;
     constants: {
         FUNCTIONS_SRC: any;
         INTERNAL_FUNCTIONS_SRC: any;
         CACHE_DIR: any;
     };
+    generatedFunctions?: never[] | undefined;
     runState: any;
 }): {
     build: {
@@ -25,6 +26,7 @@ export function getUtils({ event, constants: { FUNCTIONS_SRC, INTERNAL_FUNCTIONS
         add: (src: any) => Promise<void>;
         list: any;
         listAll: any;
+        generate: (functionPath: any) => any;
     };
     status: {
         show: any;

package/lib/plugins/child/utils.js

@@ -7,11 +7,11 @@ import { isSoftFailEvent } from '../events.js';
 import { addLazyProp } from './lazy.js';
 import { show } from './status.js';
 // Retrieve the `utils` argument.
-export const getUtils = function ({ event, constants: { FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, CACHE_DIR }, runState, }) {
+export const getUtils = function ({ event, constants: { FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, CACHE_DIR }, generatedFunctions = [], runState, }) {
     run.command = runCommand;
     const build = getBuildUtils(event);
     const cache = getCacheUtils(CACHE_DIR);
-    const functions = getFunctionsUtils(FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC);
+    const functions = getFunctionsUtils(FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, generatedFunctions);
     const status = getStatusUtils(runState);
     const utils = { build, cache, run, functions, status };
     addLazyProp(utils, 'git', () => getGitUtils());
@@ -30,12 +30,14 @@ const getBuildUtils = function (event) {
 const getCacheUtils = function (CACHE_DIR) {
     return cacheBindOpts({ cacheDir: CACHE_DIR });
 };
-const getFunctionsUtils = function (FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC) {
+const getFunctionsUtils = function (FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC, generatedFunctions) {
     const functionsDirectories = [INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC].filter(Boolean);
     const add = (src) => functionsAdd(src, INTERNAL_FUNCTIONS_SRC, { fail: failBuild });
     const list = functionsList.bind(null, functionsDirectories, { fail: failBuild });
     const listAll = functionsListAll.bind(null, functionsDirectories, { fail: failBuild });
-    return { add, list, listAll };
+    const generate = (functionPath) => generatedFunctions.push({ path: functionPath });
+    /** @type import('../../types/options/netlify_plugin_functions_util.js').NetlifyPluginFunctionsUtil */
+    return { add, list, listAll, generate };
 };
 const getStatusUtils = function (runState) {
     return { show: show.bind(undefined, runState) };

package/lib/plugins_core/edge_functions/index.js

@@ -123,6 +123,7 @@ const logFunctions = async ({ frameworksAPISrcPath, internalSrcDirectory, intern
         internalFunctionsSrc: internalSrcDirectory,
         frameworkFunctions: frameworkFunctions.map(({ name }) => name),
         type: 'Edge Functions',
+        generatedFunctions: [],
     });
 };
 export const bundleEdgeFunctions = {

package/lib/plugins_core/functions/index.d.ts

@@ -1,7 +1,7 @@
 import { zipFunctions, type FunctionResult } from '@netlify/zip-it-and-ship-it';
 export declare const bundleFunctions: {
     event: string;
-    coreStep: ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC: relativeInternalFunctionsSrc, IS_LOCAL: isRunningLocally, FUNCTIONS_SRC: relativeFunctionsSrc, FUNCTIONS_DIST: relativeFunctionsDist, }, buildDir, branch, packagePath, logs, netlifyConfig, featureFlags, repositoryRoot, userNodeVersion, systemLog, }: {
+    coreStep: ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC: relativeInternalFunctionsSrc, IS_LOCAL: isRunningLocally, FUNCTIONS_SRC: relativeFunctionsSrc, FUNCTIONS_DIST: relativeFunctionsDist, }, buildDir, branch, packagePath, logs, netlifyConfig, featureFlags, repositoryRoot, userNodeVersion, systemLog, returnValues, }: {
         childEnv: any;
         constants: {
             INTERNAL_FUNCTIONS_SRC: any;
@@ -18,6 +18,7 @@ export declare const bundleFunctions: {
         repositoryRoot: any;
         userNodeVersion: any;
         systemLog: any;
+        returnValues: any;
     }) => Promise<{
         tags?: undefined;
         metrics?: undefined;
@@ -37,13 +38,14 @@ export declare const bundleFunctions: {
     coreStepId: string;
     coreStepName: string;
     coreStepDescription: () => string;
-    condition: ({ buildDir, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC }, packagePath, }: {
+    condition: ({ buildDir, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC }, packagePath, returnValues, }: {
         buildDir: any;
         constants: {
             INTERNAL_FUNCTIONS_SRC: any;
             FUNCTIONS_SRC: any;
         };
         packagePath: any;
+        returnValues: any;
     }) => Promise<boolean>;
 };
 export declare const zipItAndShipIt: {

package/lib/plugins_core/functions/index.js

@@ -1,4 +1,4 @@
-import { resolve } from 'path';
+import { basename, resolve } from 'path';
 import { RUNTIME, zipFunctions } from '@netlify/zip-it-and-ship-it';
 import { pathExists } from 'path-exists';
 import { addErrorInfo } from '../../error/info.js';
@@ -46,7 +46,7 @@ const validateCustomRoutes = function (functions) {
         }
     }
 };
-const zipFunctionsAndLogResults = async ({ branch, buildDir, childEnv, featureFlags, functionsConfig, functionsDist, functionsSrc, frameworkFunctionsSrc, internalFunctionsSrc, isRunningLocally, logs, repositoryRoot, userNodeVersion, systemLog, }) => {
+const zipFunctionsAndLogResults = async ({ branch, buildDir, childEnv, featureFlags, functionsConfig, functionsDist, functionsSrc, generatedFunctions, frameworkFunctionsSrc, internalFunctionsSrc, isRunningLocally, logs, repositoryRoot, userNodeVersion, systemLog, }) => {
     const zisiParameters = getZisiParameters({
         branch,
         buildDir,
@@ -63,7 +63,7 @@ const zipFunctionsAndLogResults = async ({ branch, buildDir, childEnv, featureFl
     try {
         // Printing an empty line before bundling output.
         log(logs, '');
-        const sourceDirectories = [internalFunctionsSrc, frameworkFunctionsSrc, functionsSrc].filter(Boolean);
+        const sourceDirectories = [internalFunctionsSrc, frameworkFunctionsSrc, functionsSrc, ...generatedFunctions].filter(Boolean);
         const results = await zipItAndShipIt.zipFunctions(sourceDirectories, functionsDist, zisiParameters);
         validateCustomRoutes(results);
         const bundlers = Array.from(getBundlers(results));
@@ -75,7 +75,7 @@ const zipFunctionsAndLogResults = async ({ branch, buildDir, childEnv, featureFl
     }
 };
 // Plugin to package Netlify functions with @netlify/zip-it-and-ship-it
-const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC: relativeInternalFunctionsSrc, IS_LOCAL: isRunningLocally, FUNCTIONS_SRC: relativeFunctionsSrc, FUNCTIONS_DIST: relativeFunctionsDist, }, buildDir, branch, packagePath, logs, netlifyConfig, featureFlags, repositoryRoot, userNodeVersion, systemLog, }) {
+const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC: relativeInternalFunctionsSrc, IS_LOCAL: isRunningLocally, FUNCTIONS_SRC: relativeFunctionsSrc, FUNCTIONS_DIST: relativeFunctionsDist, }, buildDir, branch, packagePath, logs, netlifyConfig, featureFlags, repositoryRoot, userNodeVersion, systemLog, returnValues, }) {
     const functionsSrc = relativeFunctionsSrc === undefined ? undefined : resolve(buildDir, relativeFunctionsSrc);
     const functionsDist = resolve(buildDir, relativeFunctionsDist);
     const internalFunctionsSrc = resolve(buildDir, relativeInternalFunctionsSrc);
@@ -98,6 +98,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
             log(logs, '');
         }
     }
+    const generatedFunctions = getGeneratedFunctionPaths(returnValues);
     logFunctionsToBundle({
         logs,
         userFunctions,
@@ -106,8 +107,12 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
         internalFunctions,
         internalFunctionsSrc: relativeInternalFunctionsSrc,
         frameworkFunctions,
+        generatedFunctions: getGeneratedFunctionsByGenerator(returnValues),
     });
-    if (userFunctions.length === 0 && internalFunctions.length === 0 && frameworkFunctions.length === 0) {
+    if (userFunctions.length === 0 &&
+        internalFunctions.length === 0 &&
+        frameworkFunctions.length === 0 &&
+        generatedFunctions.length === 0) {
         return {};
     }
     const { bundlers } = await zipFunctionsAndLogResults({
@@ -125,6 +130,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
         repositoryRoot,
         userNodeVersion,
         systemLog,
+        generatedFunctions,
     });
     const metrics = getMetrics(internalFunctions, userFunctions);
     return {
@@ -138,7 +144,7 @@ const coreStep = async function ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC
 // one configured by the user or the internal one) exists. We use a dynamic
 // `condition` because the directories might be created by the build command
 // or plugins.
-const hasFunctionsDirectories = async function ({ buildDir, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC }, packagePath, }) {
+const hasFunctionsDirectories = async function ({ buildDir, constants: { INTERNAL_FUNCTIONS_SRC, FUNCTIONS_SRC }, packagePath, returnValues, }) {
     const hasFunctionsSrc = FUNCTIONS_SRC !== undefined && FUNCTIONS_SRC !== '';
     if (hasFunctionsSrc) {
         return true;
@@ -148,7 +154,39 @@ const hasFunctionsDirectories = async function ({ buildDir, constants: { INTERNA
         return true;
     }
     const frameworkFunctionsSrc = resolve(buildDir, packagePath || '', FRAMEWORKS_API_FUNCTIONS_ENDPOINT);
-    return await pathExists(frameworkFunctionsSrc);
+    if (await pathExists(frameworkFunctionsSrc)) {
+        return true;
+    }
+    // We must run the core step if the return value of any of the previous steps
+    // has declared generated functions.
+    for (const id in returnValues) {
+        if (returnValues[id].generatedFunctions && returnValues[id].generatedFunctions.length !== 0) {
+            return true;
+        }
+    }
+    return false;
+};
+// Takes a list of return values and produces an array with the paths of all
+// generated functions.
+const getGeneratedFunctionPaths = (returnValues) => {
+    return Object.values(returnValues).flatMap((returnValue) => returnValue.generatedFunctions?.map((func) => func.path) || []);
+};
+// Takes a list of return values and produces an object with the names of the
+// generated functions for each generator. This is used for printing logs only.
+const getGeneratedFunctionsByGenerator = (returnValues) => {
+    const result = {};
+    for (const id in returnValues) {
+        const { displayName, generatedFunctions, generatorType } = returnValues[id];
+        if (!generatedFunctions || generatedFunctions.length === 0) {
+            continue;
+        }
+        result[id] = {
+            displayName,
+            generatorType,
+            functionNames: generatedFunctions.map((func) => basename(func.path)),
+        };
+    }
+    return result;
 };
 export const bundleFunctions = {
     event: 'onBuild',

package/lib/steps/core_step.d.ts

@@ -1,4 +1,4 @@
-export declare const fireCoreStep: ({ coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, packagePath, constants, buildbotServerSocket, events, logs, quiet, nodePath, childEnv, context, branch, envChanges, errorParams, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, featureFlags, debug, systemLog, saveConfig, userNodeVersion, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, deployId, outputFlusher, api, }: {
+export declare const fireCoreStep: ({ coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, packagePath, constants, buildbotServerSocket, events, logs, quiet, nodePath, childEnv, context, branch, envChanges, errorParams, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, featureFlags, debug, systemLog, saveConfig, userNodeVersion, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, deployId, outputFlusher, api, returnValues, }: {
     coreStep: any;
     coreStepId: any;
     coreStepName: any;
@@ -35,6 +35,7 @@ export declare const fireCoreStep: ({ coreStep, coreStepId, coreStepName, config
     deployId: any;
     outputFlusher: any;
     api: any;
+    returnValues: any;
 }) => Promise<{
     newEnvChanges: any;
     netlifyConfig: any;

package/lib/steps/core_step.js

@@ -3,7 +3,7 @@ import { addErrorInfo, isBuildError } from '../error/info.js';
 import { addOutputFlusher } from '../log/logger.js';
 import { updateNetlifyConfig, listConfigSideFiles } from './update_config.js';
 // Fire a core step
-export const fireCoreStep = async function ({ coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, packagePath, constants, buildbotServerSocket, events, logs, quiet, nodePath, childEnv, context, branch, envChanges, errorParams, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, featureFlags, debug, systemLog, saveConfig, userNodeVersion, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, deployId, outputFlusher, api, }) {
+export const fireCoreStep = async function ({ coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, packagePath, constants, buildbotServerSocket, events, logs, quiet, nodePath, childEnv, context, branch, envChanges, errorParams, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, featureFlags, debug, systemLog, saveConfig, userNodeVersion, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, deployId, outputFlusher, api, returnValues, }) {
     const logsA = outputFlusher ? addOutputFlusher(logs, outputFlusher) : logs;
     try {
         const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]);
@@ -38,6 +38,7 @@ export const fireCoreStep = async function ({ coreStep, coreStepId, coreStepName
             enhancedSecretScan,
             edgeFunctionsBootstrapURL,
             deployId,
+            returnValues,
         });
         const { netlifyConfig: netlifyConfigA, configMutations: configMutationsA, headersPath: headersPathA, redirectsPath: redirectsPathA, } = await updateNetlifyConfig({
             configOpts,

package/lib/steps/plugin.d.ts

@@ -32,6 +32,7 @@ export function firePluginStep({ event, childProcess, packageName, packagePath,
     headersPath: any;
     redirectsPath: any;
     newStatus: any;
+    returnValue: any;
     newError?: undefined;
 } | {
     newError: any;
@@ -41,4 +42,5 @@ export function firePluginStep({ event, childProcess, packageName, packagePath,
     headersPath?: undefined;
     redirectsPath?: undefined;
     newStatus?: undefined;
+    returnValue?: undefined;
 }>;

package/lib/steps/plugin.js

@@ -18,7 +18,7 @@ export const firePluginStep = async function ({ event, childProcess, packageName
     const logsA = outputFlusher ? addOutputFlusher(logs, outputFlusher) : logs;
     try {
         const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]);
-        const { newEnvChanges, configMutations: newConfigMutations, status, } = await callChild({
+        const { newEnvChanges, configMutations: newConfigMutations, returnValue, status, } = await callChild({
             childProcess,
             eventName: 'run',
             payload: {
@@ -58,6 +58,7 @@ export const firePluginStep = async function ({ event, childProcess, packageName
             headersPath: headersPathA,
             redirectsPath: redirectsPathA,
             newStatus,
+            returnValue,
         };
     }
     catch (newError) {

package/lib/steps/return.d.ts

@@ -1,4 +1,4 @@
-export function getStepReturn({ event, packageName, newError, newEnvChanges, newStatus, coreStep, coreStepName: timerName, childEnv, mode, api, errorMonitor, deployId, netlifyConfig, configMutations, headersPath, redirectsPath, logs, outputFlusher, debug, timers, durationNs, testOpts, systemLog, quiet, metrics, }: {
+export function getStepReturn({ event, packageName, newError, newEnvChanges, newStatus, coreStep, coreStepName: timerName, childEnv, mode, api, errorMonitor, deployId, netlifyConfig, configMutations, headersPath, redirectsPath, logs, outputFlusher, debug, timers, durationNs, testOpts, systemLog, quiet, metrics, returnValue, }: {
     event: any;
     packageName: any;
     newError: any;
@@ -24,6 +24,7 @@ export function getStepReturn({ event, packageName, newError, newEnvChanges, new
     systemLog: any;
     quiet: any;
     metrics: any;
+    returnValue: any;
 }): Promise<{
     failedPlugin: string[];
     newStatus: {
@@ -53,4 +54,5 @@ export function getStepReturn({ event, packageName, newError, newEnvChanges, new
     newStatus: any;
     timers: any;
     metrics: any;
+    returnValue: any;
 };

package/lib/steps/return.js

@@ -1,7 +1,7 @@
 import { logTimer } from '../log/messages/core.js';
 import { handleStepError } from './error.js';
 // Retrieve the return value of a step
-export const getStepReturn = function ({ event, packageName, newError, newEnvChanges, newStatus, coreStep, coreStepName: timerName = `${packageName} ${event}`, childEnv, mode, api, errorMonitor, deployId, netlifyConfig, configMutations, headersPath, redirectsPath, logs, outputFlusher, debug, timers, durationNs, testOpts, systemLog, quiet, metrics, }) {
+export const getStepReturn = function ({ event, packageName, newError, newEnvChanges, newStatus, coreStep, coreStepName: timerName = `${packageName} ${event}`, childEnv, mode, api, errorMonitor, deployId, netlifyConfig, configMutations, headersPath, redirectsPath, logs, outputFlusher, debug, timers, durationNs, testOpts, systemLog, quiet, metrics, returnValue, }) {
     if (newError !== undefined) {
         return handleStepError({
             event,
@@ -21,5 +21,15 @@ export const getStepReturn = function ({ event, packageName, newError, newEnvCha
     if (!quiet) {
         logTimer(logs, durationNs, timerName, systemLog, outputFlusher);
     }
-    return { newEnvChanges, netlifyConfig, configMutations, headersPath, redirectsPath, newStatus, timers, metrics };
+    return {
+        newEnvChanges,
+        netlifyConfig,
+        configMutations,
+        headersPath,
+        redirectsPath,
+        newStatus,
+        timers,
+        metrics,
+        returnValue,
+    };
 };

package/lib/steps/run_step.d.ts

@@ -1,4 +1,4 @@
-export declare const runStep: ({ event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, coreStepQuiet, pluginPackageJson, loadedFrom, origin, condition, configPath, outputConfigPath, buildDir, packagePath, repositoryRoot, nodePath, index, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, mode, api, errorMonitor, deployId, errorParams, error, failedPlugins, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, extensionMetadata, }: {
+export declare const runStep: ({ event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, coreStepQuiet, pluginPackageJson, loadedFrom, origin, condition, configPath, outputConfigPath, buildDir, packagePath, repositoryRoot, nodePath, index, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, mode, api, errorMonitor, deployId, errorParams, error, failedPlugins, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, extensionMetadata, returnValues, }: {
     event: any;
     childProcess: any;
     packageName: any;
@@ -53,4 +53,5 @@ export declare const runStep: ({ event, childProcess, packageName, coreStep, cor
     enhancedSecretScan: any;
     edgeFunctionsBootstrapURL: any;
     extensionMetadata: any;
+    returnValues: any;
 }) => Promise<{}>;

package/lib/steps/run_step.js

@@ -11,7 +11,7 @@ import { firePluginStep } from './plugin.js';
 import { getStepReturn } from './return.js';
 const tracer = trace.getTracer('steps');
 // Run a step (core, build command or plugin)
-export const runStep = async function ({ event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, coreStepQuiet, pluginPackageJson, loadedFrom, origin, condition, configPath, outputConfigPath, buildDir, packagePath, repositoryRoot, nodePath, index, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, mode, api, errorMonitor, deployId, errorParams, error, failedPlugins, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, extensionMetadata, }) {
+export const runStep = async function ({ event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, coreStepQuiet, pluginPackageJson, loadedFrom, origin, condition, configPath, outputConfigPath, buildDir, packagePath, repositoryRoot, nodePath, index, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, mode, api, errorMonitor, deployId, errorParams, error, failedPlugins, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, extensionMetadata, returnValues, }) {
     // Add relevant attributes to the upcoming span context
     const attributes = {
         'build.execution.step.name': coreStepName,
@@ -47,6 +47,7 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
             explicitSecretKeys,
             enhancedSecretScan,
             deployId,
+            returnValues,
             featureFlags,
         });
         span.setAttribute('build.execution.step.should_run', shouldRun);
@@ -61,7 +62,7 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
             };
         const outputFlusher = new OutputFlusher(logPluginStart);
         const fireStep = getFireStep(packageName, coreStepId, event);
-        const { newEnvChanges, netlifyConfig: netlifyConfigA = netlifyConfig, configMutations: configMutationsA = configMutations, headersPath: headersPathA = headersPath, redirectsPath: redirectsPathA = redirectsPath, newError, newStatus, timers: timersA, durationNs, metrics, } = await fireStep({
+        const { newEnvChanges, netlifyConfig: netlifyConfigA = netlifyConfig, configMutations: configMutationsA = configMutations, headersPath: headersPathA = headersPath, redirectsPath: redirectsPathA = redirectsPath, newError, newStatus, timers: timersA, durationNs, metrics, returnValue, } = await fireStep({
             extensionMetadata,
             defaultConfig,
             event,
@@ -109,6 +110,7 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
             edgeFunctionsBootstrapURL,
             deployId,
             api,
+            returnValues,
         });
         const newValues = await getStepReturn({
             event,
@@ -136,6 +138,7 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
             systemLog,
             quiet: quiet || coreStepQuiet,
             metrics,
+            returnValue,
         });
         span.end();
         return { ...newValues, newIndex: index + 1 };
@@ -172,7 +175,7 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
 // or available. However, one might be created by a build plugin, in which case,
 // those core plugins should be triggered. We use a dynamic `condition()` to
 // model this behavior.
-const shouldRunStep = async function ({ event, packageName, error, packagePath, failedPlugins, netlifyConfig, condition, constants, buildbotServerSocket, buildDir, saveConfig, explicitSecretKeys, enhancedSecretScan, deployId, featureFlags = {}, }) {
+const shouldRunStep = async function ({ event, packageName, error, packagePath, failedPlugins, netlifyConfig, condition, constants, buildbotServerSocket, buildDir, saveConfig, explicitSecretKeys, enhancedSecretScan, deployId, returnValues, featureFlags = {}, }) {
     if (failedPlugins.includes(packageName) ||
         (condition !== undefined &&
             !(await condition({
@@ -185,6 +188,7 @@ const shouldRunStep = async function ({ event, packageName, error, packagePath,
                 explicitSecretKeys,
                 enhancedSecretScan,
                 deployId,
+                returnValues,
                 featureFlags,
             })))) {
         return false;
@@ -202,7 +206,7 @@ const getFireStep = function (packageName, coreStepId, event) {
     const parentTag = normalizeTagName(packageName);
     return measureDuration(tFireStep, event, { parentTag, category: 'pluginEvent' });
 };
-const tFireStep = function ({ defaultConfig, event, childProcess, packageName, pluginPackageJson, loadedFrom, outputFlusher, origin, coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, packagePath, nodePath, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, error, logs, debug, quiet, systemLog, verbose, saveConfig, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, featureFlags, userNodeVersion, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, deployId, extensionMetadata, api, }) {
+const tFireStep = function ({ defaultConfig, event, childProcess, packageName, pluginPackageJson, loadedFrom, outputFlusher, origin, coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, packagePath, nodePath, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, error, logs, debug, quiet, systemLog, verbose, saveConfig, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, featureFlags, userNodeVersion, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, deployId, extensionMetadata, api, returnValues, }) {
     if (coreStep !== undefined) {
         return fireCoreStep({
             coreStep,
@@ -241,6 +245,7 @@ const tFireStep = function ({ defaultConfig, event, childProcess, packageName, p
             edgeFunctionsBootstrapURL,
             deployId,
             api,
+            returnValues,
         });
     }
     return firePluginStep({

package/lib/steps/run_steps.d.ts

@@ -43,4 +43,5 @@ export function runSteps({ defaultConfig, steps, buildbotServerSocket, events, c
     timers: any;
     configMutations: never[];
     metrics: never[];
+    returnValues: {};
 }>;

package/lib/steps/run_steps.js

@@ -8,8 +8,8 @@ import { runStep } from './run_step.js';
 // If an error arises, runs `onError` events.
 // Runs `onEnd` events at the end, whether an error was thrown or not.
 export const runSteps = async function ({ defaultConfig, steps, buildbotServerSocket, events, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, packagePath, repositoryRoot, nodePath, childEnv, context, branch, constants, mode, api, errorMonitor, deployId, errorParams, netlifyConfig, configOpts, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, enhancedSecretScan, edgeFunctionsBootstrapURL, }) {
-    const { index: stepsCount, error: errorA, netlifyConfig: netlifyConfigC, statuses: statusesB, failedPlugins: failedPluginsA, timers: timersC, configMutations: configMutationsB, metrics: metricsC, } = await pReduce(steps, async ({ index, error, failedPlugins, envChanges, netlifyConfig: netlifyConfigA, configMutations, headersPath: headersPathA, redirectsPath: redirectsPathA, statuses, timers: timersA, metrics: metricsA, }, { event, childProcess, packageName, extensionMetadata, coreStep, coreStepId, coreStepName, coreStepDescription, pluginPackageJson, loadedFrom, origin, condition, quiet: coreStepQuiet, }) => {
-        const { newIndex = index, newError = error, failedPlugin = [], newEnvChanges = {}, netlifyConfig: netlifyConfigB = netlifyConfigA, configMutations: configMutationsA = configMutations, headersPath: headersPathB = headersPathA, redirectsPath: redirectsPathB = redirectsPathA, newStatus, timers: timersB = timersA, metrics: metricsB = [], } = await runStep({
+    const { index: stepsCount, error: errorA, netlifyConfig: netlifyConfigC, statuses: statusesB, failedPlugins: failedPluginsA, timers: timersC, configMutations: configMutationsB, metrics: metricsC, returnValues, } = await pReduce(steps, async ({ index, error, failedPlugins, envChanges, netlifyConfig: netlifyConfigA, configMutations, headersPath: headersPathA, redirectsPath: redirectsPathA, statuses, timers: timersA, metrics: metricsA, returnValues, }, { event, childProcess, packageName, extensionMetadata, coreStep, coreStepId, coreStepName, coreStepDescription, pluginPackageJson, loadedFrom, origin, condition, quiet: coreStepQuiet, }) => {
+        const { newIndex = index, newError = error, failedPlugin = [], newEnvChanges = {}, netlifyConfig: netlifyConfigB = netlifyConfigA, configMutations: configMutationsA = configMutations, headersPath: headersPathB = headersPathA, redirectsPath: redirectsPathB = redirectsPathA, newStatus, timers: timersB = timersA, metrics: metricsB = [], returnValue, } = await runStep({
             event,
             childProcess,
             packageName,
@@ -44,6 +44,7 @@ export const runSteps = async function ({ defaultConfig, steps, buildbotServerSo
             deployId,
             errorParams,
             error,
+            returnValues,
             failedPlugins,
             configOpts,
             defaultConfig,
@@ -66,6 +67,14 @@ export const runSteps = async function ({ defaultConfig, steps, buildbotServerSo
             edgeFunctionsBootstrapURL,
         });
         const statusesA = addStatus({ newStatus, statuses, event, packageName, pluginPackageJson });
+        /** @type import('../types/step.js').ReturnValue */
+        const augmentedReturnValue = returnValue
+            ? {
+                ...returnValue,
+                displayName: extensionMetadata?.name || extensionMetadata?.slug || packageName,
+                generatorType: extensionMetadata ? 'extension' : 'build plugin',
+            }
+            : undefined;
         return {
             index: newIndex,
             error: newError,
@@ -78,6 +87,7 @@ export const runSteps = async function ({ defaultConfig, steps, buildbotServerSo
             statuses: statusesA,
             timers: timersB,
             metrics: [...metricsA, ...metricsB],
+            returnValues: augmentedReturnValue ? { ...returnValues, [packageName]: augmentedReturnValue } : returnValues,
         };
     }, {
         index: 0,
@@ -90,6 +100,7 @@ export const runSteps = async function ({ defaultConfig, steps, buildbotServerSo
         statuses: [],
         timers,
         metrics: [],
+        returnValues: {},
     });
     // Instead of throwing any build failure right away, we wait for `onError`,
     // etc. to complete. This is why we are throwing only now.
@@ -105,5 +116,6 @@ export const runSteps = async function ({ defaultConfig, steps, buildbotServerSo
         timers: timersC,
         configMutations: configMutationsB,
         metrics: metricsC,
+        returnValues,
     };
 };

package/lib/types/options/netlify_plugin_functions_util.d.ts

@@ -24,5 +24,15 @@ export interface NetlifyPluginFunctionsUtil {
      * @param path Path to the function file or directory.
      */
     add(path: string): Promise<void>;
+    /**
+     * Registers a function generated by the plugin. Unlike `add`, which copies
+     * the function to the project directory, `generate` simply informs the build
+     * process that there's a function to be bundled at a specific location. The
+     * plugin is responsible for holding the source of the function and all the
+     * required files, including npm modules.
+     *
+     * @param mainFile Absolute path to the function's main file.
+     */
+    generate(mainFile: string): void;
 }
 export {};

package/lib/types/step.d.ts

@@ -0,0 +1,9 @@
+interface GeneratedFunction {
+    path: string;
+}
+export interface ReturnValue {
+    displayName: string;
+    generatedFunctions?: GeneratedFunction[];
+    generatorType: 'build plugin' | 'extension';
+}
+export {};

package/lib/types/step.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "33.4.7",
+  "version": "33.5.1",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -67,16 +67,16 @@
   "license": "MIT",
   "dependencies": {
     "@bugsnag/js": "^8.0.0",
-    "@netlify/blobs": "^10.0.1",
+    "@netlify/blobs": "^10.0.2",
     "@netlify/cache-utils": "^6.0.3",
     "@netlify/config": "^23.0.11",
     "@netlify/edge-bundler": "14.0.6",
-    "@netlify/functions-utils": "^6.0.11",
+    "@netlify/functions-utils": "^6.0.13",
     "@netlify/git-utils": "^6.0.2",
     "@netlify/opentelemetry-utils": "^2.0.1",
     "@netlify/plugins-list": "^6.80.0",
     "@netlify/run-utils": "^6.0.2",
-    "@netlify/zip-it-and-ship-it": "12.1.5",
+    "@netlify/zip-it-and-ship-it": "12.2.1",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^7.0.0",
     "chalk": "^5.0.0",
@@ -85,7 +85,7 @@
     "fdir": "^6.0.1",
     "figures": "^6.0.0",
     "filter-obj": "^6.0.0",
-    "hot-shots": "10.2.1",
+    "hot-shots": "11.1.0",
     "indent-string": "^5.0.0",
     "is-plain-obj": "^4.0.0",
     "keep-func-props": "^6.0.0",
@@ -138,7 +138,7 @@
     "moize": "^6.0.0",
     "npm-run-all2": "^6.0.0",
     "process-exists": "^5.0.0",
-    "sinon": "^20.0.0",
+    "sinon": "^21.0.0",
     "tmp-promise": "^3.0.2",
     "tsd": "^0.32.0",
     "vitest": "^3.0.0",
@@ -156,5 +156,5 @@
   "engines": {
     "node": ">=18.14.0"
   },
-  "gitHead": "e663c8f1a5667e6737c689c33f7cabd6b2a98774"
+  "gitHead": "a317a69700be1392b54976ef34b456ac47d75f5a"
 }