@netlify/build 29.34.0 → 29.35.0

package/lib/core/main.d.ts

@@ -1,3 +1,4 @@
+import type { BufferedLogs } from '../log/logger.js';
 import { BuildFlags } from './types.js';
 /**
  * Main entry point of Netlify Build.
@@ -8,7 +9,7 @@ import { BuildFlags } from './types.js';
 export declare function buildSite(flags?: Partial<BuildFlags>): Promise<{
     success: boolean;
     severityCode: number;
-    logs: any;
+    logs: BufferedLogs | undefined;
     netlifyConfig?: any;
     configMutations?: any;
 }>;

package/lib/plugins_core/deploy_config/index.js

@@ -1,26 +1,12 @@
 import { promises as fs } from 'fs';
 import { resolve } from 'path';
 import { mergeConfigs } from '@netlify/config';
+import { getConfigMutations } from '../../plugins/child/diff.js';
 import { filterConfig } from './util.js';
 // The properties that can be set using this API. Each element represents a
 // path using dot-notation — e.g. `["build", "functions"]` represents the
 // `build.functions` property.
-const ALLOWED_PROPERTIES = [
-    ['build', 'edge_functions'],
-    ['build', 'functions'],
-    ['build', 'publish'],
-    ['functions', '*'],
-    ['functions', '*', '*'],
-    ['headers'],
-    ['images', 'remote_images'],
-    ['redirects'],
-];
-// For array properties, any values set in this API will be merged with the
-// main configuration file in such a way that user-defined values always take
-// precedence. The exception are these properties that let frameworks set
-// values that should be evaluated before any user-defined values. They use
-// a special notation where `headers!` represents "forced headers", etc.
-const OVERRIDE_PROPERTIES = new Set(['headers!', 'redirects!']);
+const ALLOWED_PROPERTIES = [['images', 'remote_images']];
 const coreStep = async function ({ buildDir, netlifyConfig, systemLog = () => {
     // no-op
 }, }) {
@@ -38,26 +24,16 @@ const coreStep = async function ({ buildDir, netlifyConfig, systemLog = () => {
         systemLog(`Failed to read Deploy Configuration API: ${err.message}`);
         throw new Error('An error occured while processing the platform configurarion defined by your framework');
     }
-    const configOverrides = {};
-    for (const key in config) {
-        // If the key uses the special notation for defining mutations that should
-        // take precedence over user-defined properties, extract the canonical
-        // property, set it on a different object, and delete it from the main one.
-        if (OVERRIDE_PROPERTIES.has(key)) {
-            const canonicalKey = key.slice(0, -1);
-            configOverrides[canonicalKey] = config[key];
-            delete config[key];
-        }
-    }
     // Filtering out any properties that can't be mutated using this API.
-    config = filterConfig(config, [], ALLOWED_PROPERTIES, systemLog);
-    // Merging the different configuration sources. The order here is important.
-    // Leftmost elements of the array take precedence.
-    const newConfig = mergeConfigs([config, netlifyConfig, configOverrides], { concatenateArrays: true });
-    for (const key in newConfig) {
-        netlifyConfig[key] = newConfig[key];
-    }
-    return {};
+    const filteredConfig = filterConfig(config, [], ALLOWED_PROPERTIES, systemLog);
+    // Merging the config extracted from the API with the initial config.
+    const newConfig = mergeConfigs([filteredConfig, netlifyConfig], { concatenateArrays: true });
+    // Diffing the initial and the new configs to compute the mutations (what
+    // changed between them).
+    const configMutations = getConfigMutations(netlifyConfig, newConfig, applyDeployConfig.event);
+    return {
+        configMutations,
+    };
 };
 export const applyDeployConfig = {
     event: 'onBuild',

package/lib/steps/plugin.js

@@ -37,6 +37,7 @@ export const firePluginStep = async function ({ event, childProcess, packageName
             errorParams,
             logs,
             debug,
+            source: packageName,
         });
         const newStatus = getSuccessStatus(status, { steps, event, packageName });
         return {

package/lib/steps/update_config.d.ts

@@ -1,4 +1,4 @@
-export function updateNetlifyConfig({ configOpts, netlifyConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, debug, }: {
+export function updateNetlifyConfig({ configOpts, netlifyConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, debug, source, }: {
     configOpts: any;
     netlifyConfig: any;
     headersPath: any;
@@ -9,6 +9,7 @@ export function updateNetlifyConfig({ configOpts, netlifyConfig, headersPath, re
     errorParams: any;
     logs: any;
     debug: any;
+    source?: string | undefined;
 }): Promise<{
     netlifyConfig: any;
     configMutations: any;

package/lib/steps/update_config.js

@@ -7,12 +7,17 @@ import { logConfigOnUpdate } from '../log/messages/config.js';
 import { logConfigMutations } 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, debug, }) {
+export const updateNetlifyConfig = async function ({ configOpts, netlifyConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, debug, source = '', }) {
     if (!(await shouldUpdateConfig({ newConfigMutations, configSideFiles, headersPath, redirectsPath }))) {
         return { netlifyConfig, configMutations };
     }
     validateConfigMutations(newConfigMutations);
-    logConfigMutations(logs, newConfigMutations, debug);
+    // 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.
+    if (source !== '' && !source.startsWith('@netlify/')) {
+        logConfigMutations(logs, newConfigMutations, debug);
+    }
     const configMutationsA = [...configMutations, ...newConfigMutations];
     const { config: netlifyConfigA, headersPath: headersPathA, redirectsPath: redirectsPathA, } = await resolveUpdatedConfig(configOpts, configMutationsA);
     logConfigOnUpdate({ logs, netlifyConfig: netlifyConfigA, debug });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.34.0",
+  "version": "29.35.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -163,5 +163,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "24f130e0d2e27091cd5998cb23f19718e3785824"
+  "gitHead": "536aea5ec8dc76503d247828c65c4d247fa2a7ae"
 }