@netlify/build 29.49.1 → 29.50.1

package/lib/core/build.d.ts

@@ -32,9 +32,10 @@ export declare const startBuild: (flags: Partial<BuildFlags>) => {
     };
 };
 export declare const execBuild: any;
-export declare const runAndReportBuild: ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, packagePath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, token, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }: {
+export declare const runAndReportBuild: ({ pluginsOptions, netlifyConfig, cachedConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, packagePath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, token, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }: {
     pluginsOptions: any;
     netlifyConfig: any;
+    cachedConfig: any;
     configOpts: any;
     siteInfo: any;
     configPath: any;

package/lib/core/build.js

@@ -97,6 +97,7 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
     const { pluginsOptions: pluginsOptionsA, netlifyConfig: netlifyConfigA, stepsCount, timers: timersB, configMutations, metrics, } = await runAndReportBuild({
         pluginsOptions,
         netlifyConfig,
+        cachedConfig,
         configOpts,
         siteInfo,
         configPath,
@@ -152,11 +153,12 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
 };
 export const execBuild = measureDuration(tExecBuild, 'total', { parentTag: 'build_site' });
 // Runs a build then report any plugin statuses
-export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, packagePath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, token, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }) {
+export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig, cachedConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, packagePath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, token, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }) {
     try {
         const { stepsCount, netlifyConfig: netlifyConfigA, statuses, pluginsOptions: pluginsOptionsA, failedPlugins, timers: timersA, configMutations, metrics, } = await initAndRunBuild({
             pluginsOptions,
             netlifyConfig,
+            cachedConfig,
             configOpts,
             siteInfo,
             configPath,
@@ -258,7 +260,7 @@ export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig
     }
 };
 // Initialize plugin processes then runs a build
-const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, packagePath, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, dry, mode, api, token, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, sendStatus, saveConfig, timers, testOpts, buildbotServerSocket, constants, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }) {
+const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, cachedConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, packagePath, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, dry, mode, api, token, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, sendStatus, saveConfig, timers, testOpts, buildbotServerSocket, constants, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }) {
     const { pluginsOptions: pluginsOptionsA, timers: timersA } = await getPluginsOptions({
         pluginsOptions,
         netlifyConfig,
@@ -311,6 +313,7 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configO
             childProcesses,
             pluginsOptions: pluginsOptionsA,
             netlifyConfig,
+            cachedConfig,
             configOpts,
             packageJson,
             configPath,
@@ -380,7 +383,7 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configO
 };
 // Load plugin main files, retrieve their event handlers then runs them,
 // together with the build command
-const runBuild = async function ({ childProcesses, pluginsOptions, netlifyConfig, configOpts, packageJson, configPath, outputConfigPath, userNodeVersion, headersPath, redirectsPath, buildDir, repositoryRoot, packagePath, nodePath, childEnv, context, branch, dry, buildbotServerSocket, constants, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, timeline, devCommand, quiet, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }) {
+const runBuild = async function ({ childProcesses, pluginsOptions, netlifyConfig, cachedConfig, configOpts, packageJson, configPath, outputConfigPath, userNodeVersion, headersPath, redirectsPath, buildDir, repositoryRoot, packagePath, nodePath, childEnv, context, branch, dry, buildbotServerSocket, constants, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, timeline, devCommand, quiet, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }) {
     const { pluginsSteps, timers: timersA } = await loadPlugins({
         pluginsOptions,
         childProcesses,
@@ -420,6 +423,7 @@ const runBuild = async function ({ childProcesses, pluginsOptions, netlifyConfig
         deployId,
         errorParams,
         netlifyConfig,
+        cachedConfig,
         configOpts,
         logs,
         debug,

package/lib/core/config.d.ts

@@ -38,7 +38,7 @@ export function getConfigOpts({ config, defaultConfig, cwd, repositoryRoot, pack
     featureFlags: any;
 };
 export const loadConfig: any;
-export function resolveUpdatedConfig(configOpts: any, configMutations: any): Promise<any>;
+export function resolveUpdatedConfig(configOpts: any, configMutations: any, cachedConfig: any): Promise<any>;
 export function saveUpdatedConfig({ configMutations, buildDir, repositoryRoot, configPath, outputConfigPath, headersPath, redirectsPath, logs, featureFlags, context, branch, debug, saveConfig, }: {
     configMutations: any;
     buildDir: any;

package/lib/core/config.js

@@ -1,9 +1,9 @@
-import { resolveConfig, updateConfig, restoreConfig } from '@netlify/config';
+import { resolveConfig, restoreConfig, updateConfig } from '@netlify/config';
 import mapObj from 'map-obj';
 import { getChildEnv } from '../env/main.js';
 import { addApiErrorHandlers } from '../error/api.js';
 import { changeErrorType } from '../error/info.js';
-import { logBuildDir, logConfigPath, logConfig, logContext } from '../log/messages/config.js';
+import { logBuildDir, logConfig, logConfigPath, logContext } from '../log/messages/config.js';
 import { logConfigOnUpload, logHeadersOnUpload, logRedirectsOnUpload } from '../log/messages/mutations.js';
 import { measureDuration } from '../time/main.js';
 import { getPackageJson } from '../utils/package.js';
@@ -85,9 +85,14 @@ const logConfigInfo = function ({ logs, configPath, buildDir, netlifyConfig, con
 // change would create debug logs which would be too verbose.
 // Errors are propagated and assigned to the specific plugin or core step
 // which changed the configuration.
-export const resolveUpdatedConfig = async function (configOpts, configMutations) {
+export const resolveUpdatedConfig = async function (configOpts, configMutations, cachedConfig) {
     try {
-        return await resolveConfig({ ...configOpts, configMutations, debug: false });
+        return await resolveConfig({
+            ...configOpts,
+            configMutations,
+            cachedConfig,
+            debug: false,
+        });
     }
     catch (error) {
         changeErrorType(error, 'resolveConfig', 'pluginValidation');

package/lib/plugins_core/edge_functions/index.js

@@ -22,7 +22,7 @@ const coreStep = async function ({ buildDir, packagePath, constants: { EDGE_FUNC
     const generatedFunctionPaths = [internalSrcPath];
     if (featureFlags.netlify_build_frameworks_api) {
         if (await pathExists(frameworksAPISrcPath)) {
-            generatedFunctionPaths.unshift(frameworksAPISrcPath);
+            generatedFunctionPaths.push(frameworksAPISrcPath);
         }
         const frameworkImportMap = resolve(buildDir, packagePath || '', FRAMEWORKS_API_EDGE_FUNCTIONS_ENDPOINT, FRAMEWORKS_API_EDGE_FUNCTIONS_IMPORT_MAP);
         if (await pathExists(frameworkImportMap)) {

package/lib/plugins_core/functions/index.js

@@ -62,7 +62,7 @@ const zipFunctionsAndLogResults = async ({ buildDir, childEnv, featureFlags, fun
     try {
         // Printing an empty line before bundling output.
         log(logs, '');
-        const sourceDirectories = [frameworkFunctionsSrc, internalFunctionsSrc, functionsSrc].filter(Boolean);
+        const sourceDirectories = [internalFunctionsSrc, frameworkFunctionsSrc, functionsSrc].filter(Boolean);
         const results = await zipItAndShipIt.zipFunctions(sourceDirectories, functionsDist, zisiParameters);
         validateCustomRoutes(results);
         const bundlers = Array.from(getBundlers(results));

package/lib/plugins_core/pre_cleanup/index.js

@@ -1,22 +1,22 @@
 import { rm } from 'node:fs/promises';
-import { scanForBlobs, getBlobsDirs } from '../../utils/blobs.js';
+import { resolve } from 'node:path';
+import { getBlobsDirs } from '../../utils/blobs.js';
+import { FRAMEWORKS_API_ENDPOINT } from '../../utils/frameworks_api.js';
 const coreStep = async ({ buildDir, packagePath }) => {
-    const blobsDirs = getBlobsDirs(buildDir, packagePath);
+    const dirs = [...getBlobsDirs(buildDir, packagePath), resolve(buildDir, packagePath || '', FRAMEWORKS_API_ENDPOINT)];
     try {
-        await Promise.all(blobsDirs.map((dir) => rm(dir, { recursive: true, force: true })));
+        await Promise.all(dirs.map((dir) => rm(dir, { recursive: true, force: true })));
     }
     catch {
         // Ignore errors if it fails, we can continue anyway.
     }
     return {};
 };
-const blobsPresent = async ({ buildDir, packagePath }) => Boolean(await scanForBlobs(buildDir, packagePath));
 export const preCleanup = {
     event: 'onPreBuild',
     coreStep,
     coreStepId: 'pre_cleanup',
     coreStepName: 'Pre cleanup',
     coreStepDescription: () => 'Cleaning up leftover files from previous builds',
-    condition: blobsPresent,
     quiet: true,
 };

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, configMutations, headersPath, redirectsPath, featureFlags, debug, systemLog, saveConfig, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, deployId, outputFlusher, }: {
+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, cachedConfig, configMutations, headersPath, redirectsPath, featureFlags, debug, systemLog, saveConfig, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, deployId, outputFlusher, }: {
     coreStep: any;
     coreStepId: any;
     coreStepName: any;
@@ -20,6 +20,7 @@ export declare const fireCoreStep: ({ coreStep, coreStepId, coreStepName, config
     errorParams: any;
     configOpts: any;
     netlifyConfig: any;
+    cachedConfig: any;
     configMutations: any;
     headersPath: any;
     redirectsPath: 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, configMutations, headersPath, redirectsPath, featureFlags, debug, systemLog, saveConfig, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, deployId, outputFlusher, }) {
+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, cachedConfig, configMutations, headersPath, redirectsPath, featureFlags, debug, systemLog, saveConfig, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, deployId, outputFlusher, }) {
     const logsA = outputFlusher ? addOutputFlusher(logs, outputFlusher) : logs;
     try {
         const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]);
@@ -23,6 +23,7 @@ export const fireCoreStep = async function ({ coreStep, coreStepId, coreStepName
             branch,
             childEnv: childEnvA,
             netlifyConfig,
+            cachedConfig,
             nodePath,
             configMutations,
             headersPath,
@@ -39,6 +40,7 @@ export const fireCoreStep = async function ({ coreStep, coreStepId, coreStepName
         const { netlifyConfig: netlifyConfigA, configMutations: configMutationsA, headersPath: headersPathA, redirectsPath: redirectsPathA, } = await updateNetlifyConfig({
             configOpts,
             netlifyConfig,
+            cachedConfig,
             headersPath,
             redirectsPath,
             configMutations,

package/lib/steps/get.js

@@ -3,9 +3,9 @@ import { DEV_EVENTS, EVENTS } from '../plugins/events.js';
 import { uploadBlobs } from '../plugins_core/blobs_upload/index.js';
 import { buildCommandCore } from '../plugins_core/build_command.js';
 import { deploySite } from '../plugins_core/deploy/index.js';
-import { applyDeployConfig } from '../plugins_core/deploy_config/index.js';
 import { devUploadBlobs } from '../plugins_core/dev_blobs_upload/index.js';
 import { bundleEdgeFunctions } from '../plugins_core/edge_functions/index.js';
+import { applyDeployConfig } from '../plugins_core/frameworks_api/index.js';
 import { bundleFunctions } from '../plugins_core/functions/index.js';
 import { preCleanup } from '../plugins_core/pre_cleanup/index.js';
 import { preDevCleanup } from '../plugins_core/pre_dev_cleanup/index.js';

package/lib/steps/plugin.d.ts

@@ -1,5 +1,5 @@
 export function isTrustedPlugin(packageName: any): any;
-export function firePluginStep({ event, childProcess, packageName, packagePath, pluginPackageJson, loadedFrom, origin, envChanges, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, constants, steps, error, logs, outputFlusher, systemLog, featureFlags, debug, verbose, }: {
+export function firePluginStep({ event, childProcess, packageName, packagePath, pluginPackageJson, loadedFrom, origin, envChanges, errorParams, configOpts, netlifyConfig, cachedConfig, configMutations, headersPath, redirectsPath, constants, steps, error, logs, outputFlusher, systemLog, featureFlags, debug, verbose, }: {
     event: any;
     childProcess: any;
     packageName: any;
@@ -11,6 +11,7 @@ export function firePluginStep({ event, childProcess, packageName, packagePath,
     errorParams: any;
     configOpts: any;
     netlifyConfig: any;
+    cachedConfig: any;
     configMutations: any;
     headersPath: any;
     redirectsPath: any;

package/lib/steps/plugin.js

@@ -10,7 +10,7 @@ import { getPluginErrorType } from './error.js';
 import { updateNetlifyConfig, listConfigSideFiles } from './update_config.js';
 export const isTrustedPlugin = (packageName) => packageName?.startsWith('@netlify/');
 // Fire a plugin step
-export const firePluginStep = async function ({ event, childProcess, packageName, packagePath, pluginPackageJson, loadedFrom, origin, envChanges, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, constants, steps, error, logs, outputFlusher, systemLog, featureFlags, debug, verbose, }) {
+export const firePluginStep = async function ({ event, childProcess, packageName, packagePath, pluginPackageJson, loadedFrom, origin, envChanges, errorParams, configOpts, netlifyConfig, cachedConfig, configMutations, headersPath, redirectsPath, constants, steps, error, logs, outputFlusher, systemLog, featureFlags, debug, verbose, }) {
     const standardStreams = getStandardStreams(outputFlusher);
     const listeners = pipePluginOutput(childProcess, logs, standardStreams);
     const otelCarrier = {};
@@ -36,6 +36,7 @@ export const firePluginStep = async function ({ event, childProcess, packageName
         const { netlifyConfig: netlifyConfigA, configMutations: configMutationsA, headersPath: headersPathA, redirectsPath: redirectsPathA, } = await updateNetlifyConfig({
             configOpts,
             netlifyConfig,
+            cachedConfig,
             headersPath,
             packagePath,
             redirectsPath,

package/lib/steps/run_core_steps.js

@@ -70,6 +70,7 @@ const executeBuildStep = async function ({ config, packagePath, defaultConfig, c
     Object.assign(errorParams, { netlifyConfig, siteInfo, childEnv, userNodeVersion });
     try {
         const { netlifyConfig: netlifyConfigA, configMutations } = await runBuildStep({
+            cachedConfig,
             netlifyConfig,
             buildDir,
             nodePath,
@@ -106,13 +107,14 @@ const executeBuildStep = async function ({ config, packagePath, defaultConfig, c
         throw error;
     }
 };
-const runBuildStep = async function ({ netlifyConfig, buildDir, nodePath, constants, logs, debug, featureFlags, packagePath, childEnv, buildSteps, repositoryRoot, systemLog, edgeFunctionsBootstrapURL, deployId, quiet, }) {
+const runBuildStep = async function ({ cachedConfig, netlifyConfig, buildDir, nodePath, constants, logs, debug, featureFlags, packagePath, childEnv, buildSteps, repositoryRoot, systemLog, edgeFunctionsBootstrapURL, deployId, quiet, }) {
     const { netlifyConfig: netlifyConfigA, configMutations } = await runSteps({
         steps: getBuildSteps(buildSteps),
         buildDir,
         nodePath,
         constants,
         netlifyConfig,
+        cachedConfig,
         logs,
         debug,
         timers: [],

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, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, }: {
+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, cachedConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, }: {
     event: any;
     childProcess: any;
     packageName: any;
@@ -35,6 +35,7 @@ export declare const runStep: ({ event, childProcess, packageName, coreStep, cor
     failedPlugins: any;
     configOpts: any;
     netlifyConfig: any;
+    cachedConfig: any;
     configMutations: any;
     headersPath: any;
     redirectsPath: any;

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, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, }) {
+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, cachedConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, }) {
     // Add relevant attributes to the upcoming span context
     const attributes = {
         'build.execution.step.name': coreStepName,
@@ -67,6 +67,7 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
         }
         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({
+            cachedConfig,
             event,
             childProcess,
             packageName,
@@ -202,7 +203,7 @@ const getFireStep = function (packageName, coreStepId, event) {
     const parentTag = normalizeTagName(packageName);
     return measureDuration(tFireStep, event, { parentTag, category: 'pluginEvent' });
 };
-const tFireStep = function ({ 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, edgeFunctionsBootstrapURL, deployId, }) {
+const tFireStep = function ({ cachedConfig, 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, edgeFunctionsBootstrapURL, deployId, }) {
     if (coreStep !== undefined) {
         return fireCoreStep({
             coreStep,
@@ -227,6 +228,7 @@ const tFireStep = function ({ event, childProcess, packageName, pluginPackageJso
             errorParams,
             configOpts,
             netlifyConfig,
+            cachedConfig,
             configMutations,
             headersPath,
             redirectsPath,
@@ -253,6 +255,7 @@ const tFireStep = function ({ event, childProcess, packageName, pluginPackageJso
         errorParams,
         configOpts,
         netlifyConfig,
+        cachedConfig,
         configMutations,
         headersPath,
         redirectsPath,

package/lib/steps/run_steps.d.ts

@@ -1,4 +1,5 @@
-export function runSteps({ 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, edgeFunctionsBootstrapURL, }: {
+export function runSteps({ cachedConfig, 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, edgeFunctionsBootstrapURL, }: {
+    cachedConfig: any;
     steps: any;
     buildbotServerSocket: any;
     events: any;

package/lib/steps/run_steps.js

@@ -7,7 +7,7 @@ import { runStep } from './run_step.js';
 // list of `failedPlugins` (that ran `utils.build.failPlugin()`).
 // 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 ({ 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, edgeFunctionsBootstrapURL, }) {
+export const runSteps = async function ({ cachedConfig, 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, 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, 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({
             event,
@@ -45,6 +45,7 @@ export const runSteps = async function ({ steps, buildbotServerSocket, events, c
             error,
             failedPlugins,
             configOpts,
+            cachedConfig,
             netlifyConfig: netlifyConfigA,
             configMutations,
             headersPath: headersPathA,

package/lib/steps/update_config.d.ts

@@ -1,6 +1,7 @@
-export function updateNetlifyConfig({ configOpts, netlifyConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, systemLog, debug, source, }: {
+export function updateNetlifyConfig({ configOpts, netlifyConfig, cachedConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, systemLog, debug, source, }: {
     configOpts: any;
     netlifyConfig: any;
+    cachedConfig: any;
     headersPath: any;
     redirectsPath: any;
     configMutations: any;

package/lib/steps/update_config.js

@@ -7,7 +7,7 @@ import { logConfigOnUpdate } from '../log/messages/config.js';
 import { logConfigMutations, systemLogConfigMutations } from '../log/messages/mutations.js';
 // If `netlifyConfig` was updated or `_redirects` was created, the configuration
 // is updated by calling `@netlify/config` again.
-export const updateNetlifyConfig = async function ({ configOpts, netlifyConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, systemLog, debug, source = '', }) {
+export const updateNetlifyConfig = async function ({ configOpts, netlifyConfig, cachedConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, systemLog, debug, source = '', }) {
     if (!(await shouldUpdateConfig({ newConfigMutations, configSideFiles, headersPath, redirectsPath }))) {
         return { netlifyConfig, configMutations };
     }
@@ -23,13 +23,13 @@ export const updateNetlifyConfig = async function ({ configOpts, netlifyConfig,
     else {
         systemLogConfigMutations(systemLog, newConfigMutations);
     }
-    const configMutationsA = [...configMutations, ...newConfigMutations];
-    const { config: netlifyConfigA, headersPath: headersPathA, redirectsPath: redirectsPathA, } = await resolveUpdatedConfig(configOpts, configMutationsA);
+    const mergedConfigMutations = [...configMutations, ...newConfigMutations];
+    const { config: netlifyConfigA, headersPath: headersPathA, redirectsPath: redirectsPathA, } = await resolveUpdatedConfig(configOpts, mergedConfigMutations, cachedConfig);
     logConfigOnUpdate({ logs, netlifyConfig: netlifyConfigA, debug });
     errorParams.netlifyConfig = netlifyConfigA;
     return {
         netlifyConfig: netlifyConfigA,
-        configMutations: configMutationsA,
+        configMutations: mergedConfigMutations,
         headersPath: headersPathA,
         redirectsPath: redirectsPathA,
     };

package/lib/utils/blobs.js

@@ -75,24 +75,22 @@ const METADATA_SUFFIX = '.json';
  * path to its metadata file.
  */
 export const getKeysToUpload = async (blobsDir) => {
-    const blobsToUpload = [];
     const files = await new fdir()
         .withRelativePaths() // we want the relative path from the blobsDir
         .filter((fpath) => !path.basename(fpath).startsWith(METADATA_PREFIX))
         .crawl(blobsDir)
         .withPromise();
-    files.forEach((filePath) => {
+    return files.map((filePath) => {
         const key = filePath.split(path.sep).join('/');
         const contentPath = path.resolve(blobsDir, filePath);
         const basename = path.basename(filePath);
         const metadataPath = path.resolve(blobsDir, path.dirname(filePath), `${METADATA_PREFIX}${basename}${METADATA_SUFFIX}`);
-        blobsToUpload.push({
+        return {
             key,
             contentPath,
             metadataPath,
-        });
+        };
     });
-    return blobsToUpload;
 };
 /** Read a file and its metadata file from the blobs directory */
 export const getFileWithMetadata = async (key, contentPath, metadataPath) => {

package/lib/utils/frameworks_api.d.ts

@@ -1,3 +1,4 @@
+export declare const FRAMEWORKS_API_ENDPOINT = ".netlify/v1";
 export declare const FRAMEWORKS_API_BLOBS_ENDPOINT = ".netlify/v1/blobs";
 export declare const FRAMEWORKS_API_CONFIG_ENDPOINT = ".netlify/v1/config.json";
 export declare const FRAMEWORKS_API_EDGE_FUNCTIONS_ENDPOINT = ".netlify/v1/edge-functions";

package/lib/utils/frameworks_api.js

@@ -1,10 +1,11 @@
 import { basename, dirname, resolve, sep } from 'node:path';
 import { fdir } from 'fdir';
-export const FRAMEWORKS_API_BLOBS_ENDPOINT = '.netlify/v1/blobs';
-export const FRAMEWORKS_API_CONFIG_ENDPOINT = '.netlify/v1/config.json';
-export const FRAMEWORKS_API_EDGE_FUNCTIONS_ENDPOINT = '.netlify/v1/edge-functions';
+export const FRAMEWORKS_API_ENDPOINT = '.netlify/v1';
+export const FRAMEWORKS_API_BLOBS_ENDPOINT = `${FRAMEWORKS_API_ENDPOINT}/blobs`;
+export const FRAMEWORKS_API_CONFIG_ENDPOINT = `${FRAMEWORKS_API_ENDPOINT}/config.json`;
+export const FRAMEWORKS_API_EDGE_FUNCTIONS_ENDPOINT = `${FRAMEWORKS_API_ENDPOINT}/edge-functions`;
 export const FRAMEWORKS_API_EDGE_FUNCTIONS_IMPORT_MAP = 'import_map.json';
-export const FRAMEWORKS_API_FUNCTIONS_ENDPOINT = '.netlify/v1/functions';
+export const FRAMEWORKS_API_FUNCTIONS_ENDPOINT = `${FRAMEWORKS_API_ENDPOINT}/functions`;
 /**
  * Traverses a directory tree in search of leaf files. The key of each leaf
  * file is determined by its path relative to the base directory.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.49.1",
+  "version": "29.50.1",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -73,12 +73,12 @@
     "@netlify/config": "^20.15.4",
     "@netlify/edge-bundler": "12.1.1",
     "@netlify/framework-info": "^9.8.13",
-    "@netlify/functions-utils": "^5.2.69",
+    "@netlify/functions-utils": "^5.2.70",
     "@netlify/git-utils": "^5.1.1",
     "@netlify/opentelemetry-utils": "^1.2.1",
     "@netlify/plugins-list": "^6.80.0",
     "@netlify/run-utils": "^5.1.1",
-    "@netlify/zip-it-and-ship-it": "9.37.1",
+    "@netlify/zip-it-and-ship-it": "9.37.2",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^6.0.0",
     "chalk": "^5.0.0",
@@ -165,5 +165,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "b993b18469d4355e164f605e742e69dcb5612905"
+  "gitHead": "9c70c485d48f98c4f2a3ec46ddd918af3c845084"
 }