@netlify/build 29.56.1 → 29.58.0

package/lib/error/types.d.ts

@@ -74,6 +74,14 @@ type PluginInfo = {
     pluginPackageJson: {
         version?: string;
     };
+    extensionMetadata?: {
+        slug: string;
+        name: string;
+        version: string;
+        has_build: boolean;
+        has_connector: boolean;
+        author?: string;
+    };
 };
 export type BuildCommandLocation = {
     buildCommand: string;

package/lib/error/types.js

@@ -112,6 +112,8 @@ const pluginDataToTracingAttributes = function (pluginInfo) {
     return {
         [`${pluginAttributePrefix}.name`]: pluginInfo?.packageName,
         [`${pluginAttributePrefix}.version`]: pluginInfo?.pluginPackageJson?.version,
+        [`${pluginAttributePrefix}.extensionAuthor`]: pluginInfo?.extensionMetadata?.author,
+        [`${pluginAttributePrefix}.extensionSlug`]: pluginInfo?.extensionMetadata?.slug,
     };
 };
 /**

package/lib/plugins/load.js

@@ -42,7 +42,7 @@ const tLoadAllPlugins = async function ({ pluginsOptions, childProcesses, packag
 const loadAllPlugins = measureDuration(tLoadAllPlugins, 'load_plugins');
 // Retrieve plugin steps for one plugin.
 // Do it by executing the plugin `load` event handler.
-const loadPlugin = async function ({ packageName, pluginPackageJson, pluginPackageJson: { version } = {}, pluginPath, inputs, loadedFrom, origin }, { childProcesses, index, packageJson, logs, debug, verbose, netlifyConfig, featureFlags, systemLog }) {
+const loadPlugin = async function ({ packageName, pluginPackageJson, pluginPackageJson: { version } = {}, pluginPath, inputs, loadedFrom, origin, integration, }, { childProcesses, index, packageJson, logs, debug, verbose, netlifyConfig, featureFlags, systemLog }) {
     const { childProcess } = childProcesses[index];
     const loadEvent = 'load';
     const cleanup = captureStandardError(childProcess, systemLog, loadEvent, featureFlags);
@@ -61,6 +61,7 @@ const loadPlugin = async function ({ packageName, pluginPackageJson, pluginPacka
             origin,
             pluginPackageJson,
             childProcess,
+            extensionMetadata: integration,
         }));
         return pluginSteps;
     }
@@ -70,7 +71,11 @@ const loadPlugin = async function ({ packageName, pluginPackageJson, pluginPacka
             await pSetTimeout(0);
         }
         addErrorInfo(error, {
-            plugin: { packageName, pluginPackageJson },
+            plugin: {
+                packageName,
+                pluginPackageJson,
+                extensionMetadata: integration,
+            },
             location: { event: loadEvent, packageName, loadedFrom, origin },
         });
         addPluginLoadErrorStatus({ error, packageName, version, debug });

package/lib/plugins/spawn.js

@@ -1,9 +1,10 @@
 import { createRequire } from 'module';
+import { platform } from 'os';
 import { fileURLToPath, pathToFileURL } from 'url';
 import { promisify } from 'util';
 import { trace } from '@opentelemetry/api';
 import { execaNode } from 'execa';
-import { gte } from 'semver';
+import { gte, satisfies } from 'semver';
 import { addErrorInfo } from '../error/info.js';
 import { logIncompatiblePlugins, logLoadingIntegration, logLoadingPlugins, logOutdatedPlugins, logRuntime, } from '../log/messages/compatibility.js';
 import { isTrustedPlugin } from '../steps/plugin.js';
@@ -128,5 +129,17 @@ const stopPlugin = async function ({ childProcess, logs, pluginOptions: { packag
         });
         childProcess.disconnect();
     }
-    childProcess.kill();
+    // On Windows with Node 21+, there's a bug where attempting to kill a child process
+    // results in an EPERM error. Ignore the error in that case.
+    // See: https://github.com/nodejs/node/issues/51766
+    // We also disable execa's `forceKillAfterTimeout` in this case
+    // which can cause unhandled rejection.
+    try {
+        childProcess.kill('SIGTERM', {
+            forceKillAfterTimeout: platform() === 'win32' && satisfies(process.version, '>=21') ? false : undefined,
+        });
+    }
+    catch {
+        // no-op
+    }
 };

package/lib/plugins_core/blobs_upload/index.js

@@ -47,7 +47,8 @@ const coreStep = async function ({ logs, deployId, buildDir, packagePath, consta
         await pMap(blobsToUpload, async ({ key, contentPath, metadataPath }) => {
             systemLog(`Uploading blob ${key}`);
             const { data, metadata } = await getFileWithMetadata(key, contentPath, metadataPath);
-            await blobStore.set(key, data, { metadata });
+            const arrayBuffer = data.buffer.slice(data.byteOffset, data.byteOffset + data.length);
+            await blobStore.set(key, arrayBuffer, { metadata });
         }, { concurrency: 10 });
     }
     catch (err) {

package/lib/plugins_core/dev_blobs_upload/index.js

@@ -54,7 +54,8 @@ const coreStep = async function ({ debug, logs, deployId, buildDir, quiet, packa
                 log(logs, `- Uploading blob ${key}`, { indent: true });
             }
             const { data, metadata } = await getFileWithMetadata(key, contentPath, metadataPath);
-            await blobStore.set(key, data, { metadata });
+            const arrayBuffer = data.buffer.slice(data.byteOffset, data.byteOffset + data.length);
+            await blobStore.set(key, arrayBuffer, { metadata });
         }, { concurrency: 10 });
     }
     catch (err) {

package/lib/plugins_core/functions/index.d.ts

@@ -1,4 +1,4 @@
-import { FunctionResult } from '@netlify/zip-it-and-ship-it';
+import { zipFunctions, FunctionResult } from '@netlify/zip-it-and-ship-it';
 export declare const bundleFunctions: {
     event: string;
     coreStep: ({ childEnv, constants: { INTERNAL_FUNCTIONS_SRC: relativeInternalFunctionsSrc, IS_LOCAL: isRunningLocally, FUNCTIONS_SRC: relativeFunctionsSrc, FUNCTIONS_DIST: relativeFunctionsDist, }, buildDir, branch, packagePath, logs, netlifyConfig, featureFlags, repositoryRoot, userNodeVersion, systemLog, }: {

package/lib/plugins_core/pre_dev_cleanup/index.js

@@ -1,7 +1,6 @@
 import { rm, stat } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import { listFrameworks } from '@netlify/framework-info';
-import { log } from '../../log/logger.js';
 const dirExists = async (path) => {
     try {
         await stat(path);
@@ -26,7 +25,7 @@ const coreStep = async (input) => {
     for (const dir of dirs) {
         await rm(resolve(input.buildDir, dir), { recursive: true, force: true });
     }
-    log(input.logs, `Cleaned up ${dirs.join(', ')}.`);
+    input.systemLog(input.logs, `Cleaned up ${dirs.join(', ')}.`);
     return {};
 };
 const condition = async (input) => {

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

package/lib/steps/plugin.js

@@ -10,7 +10,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, defaultConfig, configMutations, headersPath, redirectsPath, constants, steps, error, logs, outputFlusher, systemLog, featureFlags, debug, verbose, }) {
+export const firePluginStep = async function ({ event, childProcess, packageName, packagePath, pluginPackageJson, loadedFrom, origin, envChanges, errorParams, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, constants, steps, error, logs, outputFlusher, systemLog, featureFlags, debug, verbose, extensionMetadata, }) {
     const standardStreams = getStandardStreams(outputFlusher);
     const listeners = pipePluginOutput(childProcess, logs, standardStreams);
     const otelCarrier = {};
@@ -63,7 +63,7 @@ export const firePluginStep = async function ({ event, childProcess, packageName
         const errorType = getPluginErrorType(newError, loadedFrom, packageName);
         addErrorInfo(newError, {
             ...errorType,
-            plugin: { pluginPackageJson, packageName },
+            plugin: { pluginPackageJson, packageName, extensionMetadata },
             location: { event, packageName, loadedFrom, origin },
         });
         return { newError };

package/lib/steps/run_step.d.ts

@@ -1,4 +1,4 @@
-export declare const runStep: ({ event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, coreStepQuiet, pluginPackageJson, loadedFrom, origin, condition, configPath, outputConfigPath, buildDir, packagePath, repositoryRoot, nodePath, index, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, mode, api, errorMonitor, deployId, errorParams, error, failedPlugins, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, }: {
+export declare const runStep: ({ event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, coreStepQuiet, pluginPackageJson, loadedFrom, origin, condition, configPath, outputConfigPath, buildDir, packagePath, repositoryRoot, nodePath, index, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, mode, api, errorMonitor, deployId, errorParams, error, failedPlugins, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, extensionMetadata, }: {
     event: any;
     childProcess: any;
     packageName: any;
@@ -51,4 +51,5 @@ export declare const runStep: ({ event, childProcess, packageName, coreStep, cor
     userNodeVersion: any;
     explicitSecretKeys: any;
     edgeFunctionsBootstrapURL: any;
+    extensionMetadata: any;
 }) => Promise<{}>;

package/lib/steps/run_step.js

@@ -11,7 +11,7 @@ import { firePluginStep } from './plugin.js';
 import { getStepReturn } from './return.js';
 const tracer = trace.getTracer('steps');
 // Run a step (core, build command or plugin)
-export const runStep = async function ({ event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, coreStepQuiet, pluginPackageJson, loadedFrom, origin, condition, configPath, outputConfigPath, buildDir, packagePath, repositoryRoot, nodePath, index, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, mode, api, errorMonitor, deployId, errorParams, error, failedPlugins, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, }) {
+export const runStep = async function ({ event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, coreStepQuiet, pluginPackageJson, loadedFrom, origin, condition, configPath, outputConfigPath, buildDir, packagePath, repositoryRoot, nodePath, index, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, mode, api, errorMonitor, deployId, errorParams, error, failedPlugins, configOpts, netlifyConfig, defaultConfig, configMutations, headersPath, redirectsPath, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, extensionMetadata, }) {
     // Add relevant attributes to the upcoming span context
     const attributes = {
         'build.execution.step.name': coreStepName,
@@ -67,6 +67,7 @@ export const runStep = async function ({ event, childProcess, packageName, coreS
         }
         const fireStep = getFireStep(packageName, coreStepId, event);
         const { newEnvChanges, netlifyConfig: netlifyConfigA = netlifyConfig, configMutations: configMutationsA = configMutations, headersPath: headersPathA = headersPath, redirectsPath: redirectsPathA = redirectsPath, newError, newStatus, timers: timersA, durationNs, metrics, } = await fireStep({
+            extensionMetadata,
             defaultConfig,
             event,
             childProcess,
@@ -203,7 +204,7 @@ const getFireStep = function (packageName, coreStepId, event) {
     const parentTag = normalizeTagName(packageName);
     return measureDuration(tFireStep, event, { parentTag, category: 'pluginEvent' });
 };
-const tFireStep = function ({ defaultConfig, event, childProcess, packageName, pluginPackageJson, loadedFrom, outputFlusher, origin, coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, packagePath, nodePath, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, error, logs, debug, quiet, systemLog, verbose, saveConfig, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, featureFlags, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, deployId, }) {
+const tFireStep = function ({ defaultConfig, event, childProcess, packageName, pluginPackageJson, loadedFrom, outputFlusher, origin, coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, packagePath, nodePath, childEnv, context, branch, envChanges, constants, steps, buildbotServerSocket, events, error, logs, debug, quiet, systemLog, verbose, saveConfig, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, featureFlags, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, deployId, extensionMetadata, }) {
     if (coreStep !== undefined) {
         return fireCoreStep({
             coreStep,
@@ -267,5 +268,6 @@ const tFireStep = function ({ defaultConfig, event, childProcess, packageName, p
         featureFlags,
         debug,
         verbose,
+        extensionMetadata,
     });
 };

package/lib/steps/run_steps.js

@@ -8,11 +8,12 @@ import { runStep } from './run_step.js';
 // If an error arises, runs `onError` events.
 // Runs `onEnd` events at the end, whether an error was thrown or not.
 export const runSteps = async function ({ defaultConfig, steps, buildbotServerSocket, events, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, packagePath, repositoryRoot, nodePath, childEnv, context, branch, constants, mode, api, errorMonitor, deployId, errorParams, netlifyConfig, configOpts, logs, debug, systemLog, verbose, saveConfig, timers, testOpts, featureFlags, quiet, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, }) {
-    const { index: stepsCount, error: errorA, netlifyConfig: netlifyConfigC, statuses: statusesB, failedPlugins: failedPluginsA, timers: timersC, configMutations: configMutationsB, metrics: metricsC, } = await pReduce(steps, async ({ index, error, failedPlugins, envChanges, netlifyConfig: netlifyConfigA, configMutations, headersPath: headersPathA, redirectsPath: redirectsPathA, statuses, timers: timersA, metrics: metricsA, }, { event, childProcess, packageName, coreStep, coreStepId, coreStepName, coreStepDescription, pluginPackageJson, loadedFrom, origin, condition, quiet: coreStepQuiet, }) => {
+    const { index: stepsCount, error: errorA, netlifyConfig: netlifyConfigC, statuses: statusesB, failedPlugins: failedPluginsA, timers: timersC, configMutations: configMutationsB, metrics: metricsC, } = await pReduce(steps, async ({ index, error, failedPlugins, envChanges, netlifyConfig: netlifyConfigA, configMutations, headersPath: headersPathA, redirectsPath: redirectsPathA, statuses, timers: timersA, metrics: metricsA, }, { event, childProcess, packageName, extensionMetadata, coreStep, coreStepId, coreStepName, coreStepDescription, pluginPackageJson, loadedFrom, origin, condition, quiet: coreStepQuiet, }) => {
         const { newIndex = index, newError = error, failedPlugin = [], newEnvChanges = {}, netlifyConfig: netlifyConfigB = netlifyConfigA, configMutations: configMutationsA = configMutations, headersPath: headersPathB = headersPathA, redirectsPath: redirectsPathB = redirectsPathA, newStatus, timers: timersB = timersA, metrics: metricsB = [], } = await runStep({
             event,
             childProcess,
             packageName,
+            extensionMetadata,
             coreStep,
             coreStepId,
             coreStepName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.56.1",
+  "version": "29.58.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -69,16 +69,16 @@
   "dependencies": {
     "@bugsnag/js": "^7.0.0",
     "@netlify/blobs": "^7.4.0",
-    "@netlify/cache-utils": "^5.1.6",
-    "@netlify/config": "^20.19.1",
-    "@netlify/edge-bundler": "12.2.3",
-    "@netlify/framework-info": "^9.8.13",
-    "@netlify/functions-utils": "^5.2.93",
-    "@netlify/git-utils": "^5.1.1",
-    "@netlify/opentelemetry-utils": "^1.2.1",
+    "@netlify/cache-utils": "^5.2.0",
+    "@netlify/config": "^20.21.0",
+    "@netlify/edge-bundler": "12.3.1",
+    "@netlify/framework-info": "^9.9.0",
+    "@netlify/functions-utils": "^5.3.1",
+    "@netlify/git-utils": "^5.2.0",
+    "@netlify/opentelemetry-utils": "^1.3.0",
     "@netlify/plugins-list": "^6.80.0",
-    "@netlify/run-utils": "^5.1.1",
-    "@netlify/zip-it-and-ship-it": "9.41.1",
+    "@netlify/run-utils": "^5.2.0",
+    "@netlify/zip-it-and-ship-it": "9.42.1",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^6.0.0",
     "chalk": "^5.0.0",
@@ -127,7 +127,7 @@
     "yargs": "^17.6.0"
   },
   "devDependencies": {
-    "@netlify/nock-udp": "^3.1.2",
+    "@netlify/nock-udp": "^3.2.0",
     "@opentelemetry/api": "~1.8.0",
     "@opentelemetry/sdk-trace-base": "~1.24.0",
     "@types/node": "^14.18.53",
@@ -165,5 +165,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "319d6b39f8382f114b1f7d138b3ea3a312a7b55c"
+  "gitHead": "214d1726e1f87eedf1aeb3b62ba5b3e87b84bfab"
 }