@netlify/build 29.34.0 → 29.34.1

package/lib/plugins_core/deploy_config/index.js

@@ -1,27 +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 coreStep = async function ({ buildDir, netlifyConfig, systemLog = () => {
+const ALLOWED_PROPERTIES = [['images', 'remote_images']];
+const coreStep = async function ({ buildDir, systemLog = () => {
     // no-op
 }, }) {
     const configPath = resolve(buildDir, '.netlify/deploy/v1/config.json');
@@ -38,26 +23,12 @@ 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 configMutations = getConfigMutations({}, config, applyDeployConfig.event);
+    return {
+        configMutations,
+    };
 };
 export const applyDeployConfig = {
     event: 'onBuild',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.34.0",
+  "version": "29.34.1",
   "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": "a3aeeffb4beb614aa4b20d03dd2228c55c825509"
 }