@netlify/build 29.34.1 → 29.35.1

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/resolve.js

@@ -1,4 +1,4 @@
-import { join } from 'path';
+import { join, resolve } from 'path';
 import { addErrorInfo } from '../error/info.js';
 import { installMissingPlugins, installIntegrationPlugins } from '../install/missing.js';
 import { resolvePath, tryResolvePath } from '../utils/resolve.js';
@@ -129,12 +129,14 @@ const handleIntegrations = async function ({ integrations, autoPluginsDir, mode,
         autoPluginsDir,
         buildDir,
         context,
+        testOpts,
     })));
 };
-const resolveIntegration = async function ({ integration, autoPluginsDir, buildDir, context }) {
+const resolveIntegration = async function ({ integration, autoPluginsDir, buildDir, context, testOpts }) {
     if (typeof integration.dev !== 'undefined' && context === 'dev') {
         const { path } = integration.dev;
-        const pluginPath = await resolvePath(`${path}/.ntli/build`, buildDir);
+        const integrationDir = testOpts.cwd ? resolve(testOpts.cwd, path) : resolve(path);
+        const pluginPath = await resolvePath(`${integrationDir}/.ntli/build`, buildDir);
         return { pluginPath, packageName: `${integration.slug}`, isIntegration: true, integration, loadedFrom: 'local' };
     }
     const pluginPath = await resolvePath(`${integration.slug}-buildhooks`, autoPluginsDir);

package/lib/plugins_core/deploy_config/index.js

@@ -1,12 +1,13 @@
 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 = [['images', 'remote_images']];
-const coreStep = async function ({ buildDir, systemLog = () => {
+const coreStep = async function ({ buildDir, netlifyConfig, systemLog = () => {
     // no-op
 }, }) {
     const configPath = resolve(buildDir, '.netlify/deploy/v1/config.json');
@@ -24,8 +25,12 @@ const coreStep = async function ({ buildDir, systemLog = () => {
         throw new Error('An error occured while processing the platform configurarion defined by your framework');
     }
     // Filtering out any properties that can't be mutated using this API.
-    config = filterConfig(config, [], ALLOWED_PROPERTIES, systemLog);
-    const configMutations = getConfigMutations({}, config, applyDeployConfig.event);
+    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,
     };

package/lib/steps/get.js

@@ -32,7 +32,7 @@ export const getDevSteps = function (command, steps, eventHandlers) {
         coreStepDescription: () => 'Run command for local development',
     };
     const eventSteps = getEventSteps(eventHandlers);
-    const sortedSteps = sortSteps([...steps, eventSteps, preDevCleanup, devCommandStep], DEV_EVENTS);
+    const sortedSteps = sortSteps([preDevCleanup, ...steps, eventSteps, devCommandStep], DEV_EVENTS);
     const events = getEvents(sortedSteps);
     return { steps: sortedSteps, events };
 };

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.1",
+  "version": "29.35.1",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -73,12 +73,12 @@
     "@netlify/config": "^20.12.0",
     "@netlify/edge-bundler": "11.2.2",
     "@netlify/framework-info": "^9.8.10",
-    "@netlify/functions-utils": "^5.2.50",
+    "@netlify/functions-utils": "^5.2.51",
     "@netlify/git-utils": "^5.1.1",
     "@netlify/opentelemetry-utils": "^1.0.1",
     "@netlify/plugins-list": "^6.73.0",
     "@netlify/run-utils": "^5.1.1",
-    "@netlify/zip-it-and-ship-it": "9.29.1",
+    "@netlify/zip-it-and-ship-it": "9.29.2",
     "@opentelemetry/api": "~1.6.0",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^6.0.0",
@@ -163,5 +163,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "a3aeeffb4beb614aa4b20d03dd2228c55c825509"
+  "gitHead": "3b4449ddf0a4c4107fb0f1a4a56408839c927583"
 }