@netlify/build 36.4.7 → 36.4.8

package/lib/core/config.d.ts

@@ -45,7 +45,7 @@ export const loadConfig: ({ timers, ...opts }: {
     [x: string]: any;
     timers: any;
 }, ...args: any[]) => Promise<any>;
-export function resolveUpdatedConfig(configOpts: any, configMutations: any, defaultConfig: any): Promise<import("packages/config/lib/main.js").Config>;
+export function resolveUpdatedConfig(configOpts: any, configMutations: any, defaultConfig: any, configMutationsOrigin: any, errorType: any): Promise<import("packages/config/lib/main.js").Config>;
 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

@@ -84,20 +84,20 @@ const logConfigInfo = function ({ logs, configPath, buildDir, netlifyConfig, con
 // normalized.
 // We use `debug: false` to avoid any debug logs. Otherwise, every configuration
 // 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, defaultConfig) {
+// Configuration errors are assigned the type given by the caller, which knows
+// whether a plugin or a core step changed the configuration.
+export const resolveUpdatedConfig = async function (configOpts, configMutations, defaultConfig, configMutationsOrigin, errorType) {
     try {
-        const resolved = await resolveConfig({
+        return await resolveConfig({
             ...configOpts,
             configMutations,
+            configMutationsOrigin,
             defaultConfig,
             debug: false,
         });
-        return resolved;
     }
     catch (error) {
-        changeErrorType(error, 'resolveConfig', 'pluginValidation');
+        changeErrorType(error, 'resolveConfig', errorType);
         throw error;
     }
 };

package/lib/error/parse/parse.js

@@ -1,6 +1,6 @@
 import { serializeObject } from '../../log/serialize.js';
 import { getErrorInfo } from '../info.js';
-import { getTypeInfo } from '../types.js';
+import { DEFAULT_TITLE, getTypeInfo } from '../types.js';
 import { getLocationInfo } from './location.js';
 import { normalizeError } from './normalize.js';
 import { getPluginInfo } from './plugin.js';
@@ -66,5 +66,11 @@ const getTitle = function (title, errorInfo) {
     if (typeof title !== 'function') {
         return title;
     }
-    return title(errorInfo);
+    try {
+        return title(errorInfo);
+    }
+    catch {
+        // A title built from missing error information must not lose the error.
+        return DEFAULT_TITLE;
+    }
 };

package/lib/error/types.d.ts

@@ -165,4 +165,5 @@ type ErrorTypeMap =
  */
 'cancelBuild' | 'resolveConfig' | 'dependencies' | 'pluginInput' | 'pluginUnsupportedVersion' | 'buildCommand' | 'functionsBundling' | 'secretScanningFoundSecrets' | 'failPlugin' | 'failBuild' | 'pluginValidation' | 'pluginInternal' | 'ipc' | 'corePlugin' | 'trustedPlugin' | 'coreStep' | 'api' | 'deploy' | 'deployInternal' | 'exception' | 'telemetry';
 export type ErrorTypes = ErrorTypeMap;
+export declare const DEFAULT_TITLE: string;
 export {};

package/lib/error/types.js

@@ -320,3 +320,5 @@ const TYPES = {
 };
 // When no error type matches, it's an uncaught exception, i.e. a bug
 const DEFAULT_TYPE = 'exception';
+// Fallback when a title cannot be built from the error information
+export const DEFAULT_TITLE = TYPES[DEFAULT_TYPE].title;

package/lib/plugins_core/frameworks_api/index.js

@@ -56,7 +56,7 @@ const coreStep = async function ({ buildDir, netlifyConfig, packagePath, systemL
     }
     catch (err) {
         systemLog(`Failed to read Frameworks API: ${err.message}`);
-        throw new Error('An error occured while processing the platform configurarion defined by your framework');
+        throw new Error('An error occurred while processing the platform configuration defined by your framework');
     }
     if (!config) {
         return {};
@@ -83,6 +83,7 @@ const coreStep = async function ({ buildDir, netlifyConfig, packagePath, systemL
     const configMutations = getConfigMutations(netlifyConfig, newConfig, applyDeployConfig.event);
     return {
         configMutations,
+        configMutationsOrigin: 'the Frameworks API',
     };
 };
 export const applyDeployConfig = {

package/lib/steps/core_step.js

@@ -8,7 +8,7 @@ export const fireCoreStep = async function ({ deployEnvVars, coreStep, coreStepI
     try {
         const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]);
         const childEnvA = setEnvChanges(envChanges, { ...childEnv });
-        const { newEnvChanges = {}, configMutations: newConfigMutations = [], tags, metrics, } = await coreStep({
+        const { newEnvChanges = {}, configMutations: newConfigMutations = [], configMutationsOrigin, tags, metrics, } = await coreStep({
             deployEnvVars,
             api,
             configPath,
@@ -54,6 +54,7 @@ export const fireCoreStep = async function ({ deployEnvVars, coreStep, coreStepI
             logs: logsA,
             systemLog,
             debug,
+            configMutationsOrigin: configMutationsOrigin ?? coreStepName,
         });
         return {
             newEnvChanges,

package/lib/steps/plugin.js

@@ -49,6 +49,7 @@ export const firePluginStep = async function ({ event, childProcess, packageName
             systemLog,
             debug,
             source: packageName,
+            configErrorType: 'pluginValidation',
         });
         const newStatus = getSuccessStatus(status, { steps, event, packageName });
         return {

package/lib/steps/update_config.d.ts

@@ -1,4 +1,4 @@
-export function updateNetlifyConfig({ configOpts, netlifyConfig, defaultConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, systemLog, debug, source, }: {
+export function updateNetlifyConfig({ configOpts, netlifyConfig, defaultConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, systemLog, debug, source, configMutationsOrigin, configErrorType, }: {
     configOpts: any;
     netlifyConfig: any;
     defaultConfig: any;
@@ -12,6 +12,8 @@ export function updateNetlifyConfig({ configOpts, netlifyConfig, defaultConfig,
     systemLog: any;
     debug: any;
     source?: string | undefined;
+    configMutationsOrigin?: any;
+    configErrorType?: string | undefined;
 }): Promise<{
     netlifyConfig: any;
     configMutations: any;

package/lib/steps/update_config.js

@@ -6,11 +6,11 @@ import { logConfigMutations, systemLogConfigMutations } from '../log/messages/mu
 import { pathExists } from '../utils/path_exists.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, defaultConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, systemLog, debug, source = '', }) {
+export const updateNetlifyConfig = async function ({ configOpts, netlifyConfig, defaultConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, systemLog, debug, source = '', configMutationsOrigin = source || undefined, configErrorType = 'resolveConfig', }) {
     if (!(await shouldUpdateConfig({ newConfigMutations, configSideFiles, headersPath, redirectsPath }))) {
         return { netlifyConfig, configMutations };
     }
-    validateConfigMutations(newConfigMutations);
+    validateConfigMutations(newConfigMutations, configErrorType);
     // Don't log configuration mutations performed by code that has been authored
     // by Netlify (i.e. core steps or build plugins in the `@netlify/` scope),
     // since that won't give users any useful or actionable information. For
@@ -23,7 +23,7 @@ export const updateNetlifyConfig = async function ({ configOpts, netlifyConfig,
         systemLogConfigMutations(systemLog, newConfigMutations);
     }
     const mergedConfigMutations = [...configMutations, ...newConfigMutations];
-    const { config: netlifyConfigA, headersPath: headersPathA, redirectsPath: redirectsPathA, } = await resolveUpdatedConfig(configOpts, mergedConfigMutations, defaultConfig);
+    const { config: netlifyConfigA, headersPath: headersPathA, redirectsPath: redirectsPathA, } = await resolveUpdatedConfig(configOpts, mergedConfigMutations, defaultConfig, configMutationsOrigin, configErrorType);
     logConfigOnUpdate({ logs, netlifyConfig: netlifyConfigA, debug });
     errorParams.netlifyConfig = netlifyConfigA;
     return {
@@ -54,12 +54,12 @@ export const listConfigSideFiles = async function (sideFiles) {
     return existingSideFiles.filter(Boolean).sort();
 };
 // Validate each new configuration change
-const validateConfigMutations = function (newConfigMutations) {
+const validateConfigMutations = function (newConfigMutations, errorType) {
     try {
         newConfigMutations.forEach(validateConfigMutation);
     }
     catch (error) {
-        addErrorInfo(error, { type: 'pluginValidation' });
+        addErrorInfo(error, { type: errorType });
         throw error;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "36.4.7",
+  "version": "36.4.8",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -66,7 +66,7 @@
     "@bugsnag/js": "^8.0.0",
     "@netlify/blobs": "^11.0.3",
     "@netlify/cache-utils": "^7.1.2",
-    "@netlify/config": "^25.2.4",
+    "@netlify/config": "^25.2.5",
     "@netlify/edge-bundler": "16.0.4",
     "@netlify/functions-utils": "^7.1.9",
     "@netlify/git-utils": "^7.1.1",
@@ -137,5 +137,5 @@
   "engines": {
     "node": ">=22.12.0"
   },
-  "gitHead": "d30dc9ad0c79ea23f01354f2487187d3398f5de2"
+  "gitHead": "ff2974e358a0d36f213a9a24e844cd0c3ca44c18"
 }