@netlify/build 29.35.0 → 29.36.0

package/lib/log/messages/mutations.d.ts

@@ -1,4 +1,5 @@
 export function logConfigMutations(logs: any, newConfigMutations: any, debug: any): void;
+export function systemLogConfigMutations(systemLog: any, configMutations: any): void;
 export function logConfigOnUpload({ logs, configPath, debug }: {
     logs: any;
     configPath: any;

package/lib/log/messages/mutations.js

@@ -5,7 +5,14 @@ import { log, logMessage, logSubHeader } from '../logger.js';
 export const logConfigMutations = function (logs, newConfigMutations, debug) {
     const configMutationsToLog = debug ? newConfigMutations : newConfigMutations.filter(shouldLogConfigMutation);
     configMutationsToLog.forEach(({ keysString, value }) => {
-        logConfigMutation(logs, keysString, value);
+        const message = getConfigMutationLog(keysString, value);
+        log(logs, message);
+    });
+};
+export const systemLogConfigMutations = function (systemLog, configMutations) {
+    configMutations.forEach(({ keysString, value }) => {
+        const message = getConfigMutationLog(keysString, value);
+        systemLog(message);
     });
 };
 // Some configuration mutations are only logged in debug mode
@@ -16,9 +23,9 @@ const shouldLogConfigMutation = function ({ keysString }) {
 // function file. This can be very verbose, especially for plugins which create
 // many function files like Essential Next.js
 const HIDDEN_PROPS = ['functions'];
-const logConfigMutation = function (logs, keysString, value) {
+const getConfigMutationLog = function (keysString, value) {
     const newValue = shouldHideConfigValue(keysString) ? '' : ` to ${inspect(value, { colors: false })}`;
-    log(logs, `Netlify configuration property "${keysString}" value changed${newValue}.`);
+    return `Netlify configuration property "${keysString}" value changed${newValue}.`;
 };
 const shouldHideConfigValue = function (keysString) {
     return SECRET_PROPS.some((secretProp) => keysString.startsWith(secretProp));

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/steps/core_step.js

@@ -44,6 +44,7 @@ export const fireCoreStep = async function ({ coreStep, coreStepId, coreStepName
             configSideFiles,
             errorParams,
             logs,
+            systemLog,
             debug,
         });
         return {

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.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, featureFlags, debug, verbose, }: {
+export function firePluginStep({ event, childProcess, packageName, packagePath, pluginPackageJson, loadedFrom, origin, envChanges, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, constants, steps, error, logs, systemLog, featureFlags, debug, verbose, }: {
     event: any;
     childProcess: any;
     packageName: any;
@@ -18,6 +18,7 @@ export function firePluginStep({ event, childProcess, packageName, packagePath,
     steps: any;
     error: any;
     logs: any;
+    systemLog: any;
     featureFlags: any;
     debug: any;
     verbose: any;

package/lib/steps/plugin.js

@@ -7,7 +7,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, featureFlags, debug, verbose, }) {
+export const firePluginStep = async function ({ event, childProcess, packageName, packagePath, pluginPackageJson, loadedFrom, origin, envChanges, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, constants, steps, error, logs, systemLog, featureFlags, debug, verbose, }) {
     const listeners = pipePluginOutput(childProcess, logs);
     try {
         const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]);
@@ -36,6 +36,7 @@ export const firePluginStep = async function ({ event, childProcess, packageName
             configSideFiles,
             errorParams,
             logs,
+            systemLog,
             debug,
             source: packageName,
         });

package/lib/steps/run_step.js

@@ -242,6 +242,7 @@ const tFireStep = function ({ event, childProcess, packageName, pluginPackageJso
         steps,
         error,
         logs,
+        systemLog,
         featureFlags,
         debug,
         verbose,

package/lib/steps/update_config.d.ts

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

package/lib/steps/update_config.js

@@ -4,20 +4,25 @@ import { pathExists } from 'path-exists';
 import { resolveUpdatedConfig } from '../core/config.js';
 import { addErrorInfo } from '../error/info.js';
 import { logConfigOnUpdate } from '../log/messages/config.js';
-import { logConfigMutations } from '../log/messages/mutations.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, debug, source = '', }) {
+export const updateNetlifyConfig = async function ({ configOpts, netlifyConfig, headersPath, redirectsPath, configMutations, newConfigMutations, configSideFiles, errorParams, logs, systemLog, debug, source = '', }) {
     if (!(await shouldUpdateConfig({ newConfigMutations, configSideFiles, headersPath, redirectsPath }))) {
         return { netlifyConfig, configMutations };
     }
     validateConfigMutations(newConfigMutations);
     // 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/')) {
+    // since that won't give users any useful or actionable information. For
+    // these, emit a system log instead.
+    const shouldLogConfigMutationsToUser = source !== '' && !source.startsWith('@netlify/');
+    if (shouldLogConfigMutationsToUser) {
         logConfigMutations(logs, newConfigMutations, debug);
     }
+    else {
+        systemLogConfigMutations(systemLog, newConfigMutations);
+    }
     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.35.0",
+  "version": "29.36.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -73,13 +73,13 @@
     "@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/opentelemetry-utils": "^1.0.2",
     "@netlify/plugins-list": "^6.73.0",
     "@netlify/run-utils": "^5.1.1",
-    "@netlify/zip-it-and-ship-it": "9.29.1",
-    "@opentelemetry/api": "~1.6.0",
+    "@netlify/zip-it-and-ship-it": "9.29.2",
+    "@opentelemetry/api": "~1.7.0",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^6.0.0",
     "chalk": "^5.0.0",
@@ -153,7 +153,7 @@
     "yarn": "^1.22.4"
   },
   "peerDependencies": {
-    "@netlify/opentelemetry-sdk-setup": "^1.0.2"
+    "@netlify/opentelemetry-sdk-setup": "^1.0.3"
   },
   "peerDependenciesMeta": {
     "@netlify/opentelemetry-sdk-setup": {
@@ -163,5 +163,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "536aea5ec8dc76503d247828c65c4d247fa2a7ae"
+  "gitHead": "a8bdf29ae5ff7adbf74cf5600b40660da000a602"
 }