@netlify/build 29.40.0 → 29.41.1

package/lib/core/build.js

@@ -1,4 +1,5 @@
 import { supportedRuntimes } from '@netlify/framework-info';
+import { addAttributesToActiveSpan } from '@netlify/opentelemetry-utils';
 import { getErrorInfo } from '../error/info.js';
 import { startErrorMonitor } from '../error/monitor/start.js';
 import { getBufferLogs, getSystemLogger } from '../log/logger.js';
@@ -276,6 +277,15 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configO
         context,
         systemLog,
     });
+    if (pluginsOptionsA?.length) {
+        const buildPlugins = {};
+        for (const plugin of pluginsOptionsA) {
+            if (plugin?.pluginPackageJson?.name) {
+                buildPlugins[`build.plugins['${plugin.pluginPackageJson.name}']`] = plugin?.pluginPackageJson?.version ?? 'N/A';
+            }
+        }
+        addAttributesToActiveSpan(buildPlugins);
+    }
     errorParams.pluginsOptions = pluginsOptionsA;
     const { childProcesses, timers: timersB } = await startPlugins({
         pluginsOptions: pluginsOptionsA,

package/lib/plugins_core/pre_dev_cleanup/index.js

@@ -1,7 +1,8 @@
 import { rm, stat } from 'node:fs/promises';
-import { resolve } from 'node:path';
+import { join, resolve } from 'node:path';
 import { listFrameworks } from '@netlify/framework-info';
 import { log } from '../../log/logger.js';
+import { DEPLOY_CONFIG_BLOBS_PATH, LEGACY_BLOBS_PATH } from '../../utils/blobs.js';
 const dirExists = async (path) => {
     try {
         await stat(path);
@@ -11,15 +12,21 @@ const dirExists = async (path) => {
         return false;
     }
 };
-const getDirtyDirs = async function ({ buildDir, constants: { INTERNAL_EDGE_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC }, }) {
-    const dirs = [];
+const getDirtyDirs = async function ({ buildDir, constants: { INTERNAL_EDGE_FUNCTIONS_SRC, INTERNAL_FUNCTIONS_SRC }, packagePath, }) {
+    const directories = [];
     if (INTERNAL_FUNCTIONS_SRC && (await dirExists(resolve(buildDir, INTERNAL_FUNCTIONS_SRC)))) {
-        dirs.push(INTERNAL_FUNCTIONS_SRC);
+        directories.push(INTERNAL_FUNCTIONS_SRC);
     }
     if (INTERNAL_EDGE_FUNCTIONS_SRC && (await dirExists(resolve(buildDir, INTERNAL_EDGE_FUNCTIONS_SRC)))) {
-        dirs.push(INTERNAL_EDGE_FUNCTIONS_SRC);
+        directories.push(INTERNAL_EDGE_FUNCTIONS_SRC);
     }
-    return dirs;
+    if (await dirExists(resolve(buildDir, packagePath || '', LEGACY_BLOBS_PATH))) {
+        directories.push(join(packagePath || '', LEGACY_BLOBS_PATH));
+    }
+    if (await dirExists(resolve(buildDir, packagePath || '', DEPLOY_CONFIG_BLOBS_PATH))) {
+        directories.push(join(packagePath || '', DEPLOY_CONFIG_BLOBS_PATH));
+    }
+    return directories;
 };
 const coreStep = async (input) => {
     const dirs = await getDirtyDirs(input);

package/lib/utils/blobs.d.ts

@@ -1,4 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
+export declare const LEGACY_BLOBS_PATH = ".netlify/blobs/deploy";
+export declare const DEPLOY_CONFIG_BLOBS_PATH = ".netlify/deploy/v1/blobs/deploy";
 /** Retrieve the absolute path of the deploy scoped internal blob directories */
 export declare const getBlobsDirs: (buildDir: string, packagePath?: string) => string[];
 /**

package/lib/utils/blobs.js

@@ -1,8 +1,8 @@
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { fdir } from 'fdir';
-const LEGACY_BLOBS_PATH = '.netlify/blobs/deploy';
-const DEPLOY_CONFIG_BLOBS_PATH = '.netlify/deploy/v1/blobs/deploy';
+export const LEGACY_BLOBS_PATH = '.netlify/blobs/deploy';
+export const DEPLOY_CONFIG_BLOBS_PATH = '.netlify/deploy/v1/blobs/deploy';
 /** Retrieve the absolute path of the deploy scoped internal blob directories */
 export const getBlobsDirs = (buildDir, packagePath) => [
     path.resolve(buildDir, packagePath || '', DEPLOY_CONFIG_BLOBS_PATH),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.40.0",
+  "version": "29.41.1",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -70,15 +70,15 @@
     "@bugsnag/js": "^7.0.0",
     "@netlify/blobs": "^7.3.0",
     "@netlify/cache-utils": "^5.1.5",
-    "@netlify/config": "^20.12.1",
-    "@netlify/edge-bundler": "11.4.0",
+    "@netlify/config": "^20.12.3",
+    "@netlify/edge-bundler": "12.0.0",
     "@netlify/framework-info": "^9.8.11",
     "@netlify/functions-utils": "^5.2.54",
     "@netlify/git-utils": "^5.1.1",
-    "@netlify/opentelemetry-utils": "^1.1.0",
+    "@netlify/opentelemetry-utils": "^1.2.0",
     "@netlify/plugins-list": "^6.77.0",
     "@netlify/run-utils": "^5.1.1",
-    "@netlify/zip-it-and-ship-it": "9.31.3",
+    "@netlify/zip-it-and-ship-it": "9.32.1",
     "@sindresorhus/slugify": "^2.0.0",
     "ansi-escapes": "^6.0.0",
     "chalk": "^5.0.0",
@@ -165,5 +165,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "f4914c535e667addf543117d17d9b1c78b162081"
+  "gitHead": "58fa495beea44671013bd5586c08dabc6d17bc20"
 }