@netlify/build 29.37.2 → 29.38.0

package/lib/plugins_core/blobs_upload/index.js

@@ -3,7 +3,7 @@ import { getDeployStore } from '@netlify/blobs';
 import pMap from 'p-map';
 import semver from 'semver';
 import { log, logError } from '../../log/logger.js';
-import { anyBlobsToUpload, getBlobsDir } from '../../utils/blobs.js';
+import { scanForBlobs } from '../../utils/blobs.js';
 import { getKeysToUpload, getFileWithMetadata } from './utils.js';
 const coreStep = async function ({ debug, logs, deployId, buildDir, quiet, packagePath, constants: { SITE_ID, NETLIFY_API_TOKEN, NETLIFY_API_HOST }, }) {
     // This should never happen due to the condition check
@@ -18,14 +18,28 @@ const coreStep = async function ({ debug, logs, deployId, buildDir, quiet, packa
         token: NETLIFY_API_TOKEN,
         apiURL: `https://${apiHost}`,
     };
+    // If we don't have native `fetch` in the global scope, add a polyfill.
     if (semver.lt(nodeVersion, '18.0.0')) {
         const nodeFetch = await import('node-fetch');
+        // @ts-expect-error The types between `node-fetch` and the native `fetch`
+        // are not a 100% match, even though the APIs are mostly compatible.
         storeOpts.fetch = nodeFetch.default;
     }
-    const blobStore = getDeployStore(storeOpts);
-    const blobsDir = getBlobsDir(buildDir, packagePath);
-    const keys = await getKeysToUpload(blobsDir);
+    const blobs = await scanForBlobs(buildDir, packagePath);
     // We checked earlier, but let's be extra safe
+    if (blobs === null) {
+        if (!quiet) {
+            log(logs, 'No blobs to upload to deploy store.');
+        }
+        return {};
+    }
+    // If using the deploy config API, configure the store to use the region that
+    // was configured for the deploy.
+    if (!blobs.isLegacyDirectory) {
+        storeOpts.experimentalRegion = 'auto';
+    }
+    const blobStore = getDeployStore(storeOpts);
+    const keys = await getKeysToUpload(blobs.directory);
     if (keys.length === 0) {
         if (!quiet) {
             log(logs, 'No blobs to upload to deploy store.');
@@ -39,7 +53,7 @@ const coreStep = async function ({ debug, logs, deployId, buildDir, quiet, packa
         if (debug && !quiet) {
             log(logs, `- Uploading blob ${key}`, { indent: true });
         }
-        const { data, metadata } = await getFileWithMetadata(blobsDir, key);
+        const { data, metadata } = await getFileWithMetadata(blobs.directory, key);
         await blobStore.set(key, data, { metadata });
     };
     try {
@@ -54,7 +68,7 @@ const coreStep = async function ({ debug, logs, deployId, buildDir, quiet, packa
     }
     return {};
 };
-const deployAndBlobsPresent = async ({ deployId, buildDir, packagePath, constants: { NETLIFY_API_TOKEN }, }) => Boolean(NETLIFY_API_TOKEN && deployId && (await anyBlobsToUpload(buildDir, packagePath)));
+const deployAndBlobsPresent = async ({ deployId, buildDir, packagePath, constants: { NETLIFY_API_TOKEN }, }) => Boolean(NETLIFY_API_TOKEN && deployId && (await scanForBlobs(buildDir, packagePath)));
 export const uploadBlobs = {
     event: 'onPostBuild',
     coreStep,

package/lib/plugins_core/pre_cleanup/index.js

@@ -1,16 +1,16 @@
 import { rm } from 'node:fs/promises';
-import { anyBlobsToUpload, getBlobsDir } from '../../utils/blobs.js';
+import { scanForBlobs, getBlobsDirs } from '../../utils/blobs.js';
 const coreStep = async ({ buildDir, packagePath }) => {
-    const blobsDir = getBlobsDir(buildDir, packagePath);
+    const blobsDirs = getBlobsDirs(buildDir, packagePath);
     try {
-        await rm(blobsDir, { recursive: true, force: true });
+        await Promise.all(blobsDirs.map((dir) => rm(dir, { recursive: true, force: true })));
     }
     catch {
         // Ignore errors if it fails, we can continue anyway.
     }
     return {};
 };
-const blobsPresent = ({ buildDir, packagePath }) => anyBlobsToUpload(buildDir, packagePath);
+const blobsPresent = async ({ buildDir, packagePath }) => Boolean(await scanForBlobs(buildDir, packagePath));
 export const preCleanup = {
     event: 'onPreBuild',
     coreStep,

package/lib/utils/blobs.d.ts

@@ -1,9 +1,15 @@
-/** Retrieve the absolute path of the deploy scoped internal blob directory */
-export declare const getBlobsDir: (buildDir: string, packagePath?: string) => string;
+/** Retrieve the absolute path of the deploy scoped internal blob directories */
+export declare const getBlobsDirs: (buildDir: string, packagePath?: string) => string[];
 /**
- * Detect if there are any blobs to upload
+ * Detect if there are any blobs to upload, and if so, what directory they're
+ * in and whether that directory is the legacy `.netlify/blobs` path or the
+ * newer deploy config API endpoint.
+ *
  * @param buildDir The build directory. (current working directory where the build is executed)
  * @param packagePath An optional package path for mono repositories
  * @returns
  */
-export declare const anyBlobsToUpload: (buildDir: string, packagePath?: string) => Promise<boolean>;
+export declare const scanForBlobs: (buildDir: string, packagePath?: string) => Promise<{
+    directory: string;
+    isLegacyDirectory: boolean;
+} | null>;

package/lib/utils/blobs.js

@@ -1,16 +1,37 @@
 import { resolve } from 'node:path';
 import { fdir } from 'fdir';
-const BLOBS_PATH = '.netlify/blobs/deploy';
-/** Retrieve the absolute path of the deploy scoped internal blob directory */
-export const getBlobsDir = (buildDir, packagePath) => resolve(buildDir, packagePath || '', BLOBS_PATH);
+const LEGACY_BLOBS_PATH = '.netlify/blobs/deploy';
+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) => [
+    resolve(buildDir, packagePath || '', DEPLOY_CONFIG_BLOBS_PATH),
+    resolve(buildDir, packagePath || '', LEGACY_BLOBS_PATH),
+];
 /**
- * Detect if there are any blobs to upload
+ * Detect if there are any blobs to upload, and if so, what directory they're
+ * in and whether that directory is the legacy `.netlify/blobs` path or the
+ * newer deploy config API endpoint.
+ *
  * @param buildDir The build directory. (current working directory where the build is executed)
  * @param packagePath An optional package path for mono repositories
  * @returns
  */
-export const anyBlobsToUpload = async function (buildDir, packagePath) {
-    const blobsDir = getBlobsDir(buildDir, packagePath);
-    const { files } = await new fdir().onlyCounts().crawl(blobsDir).withPromise();
-    return files > 0;
+export const scanForBlobs = async function (buildDir, packagePath) {
+    const blobsDir = resolve(buildDir, packagePath || '', DEPLOY_CONFIG_BLOBS_PATH);
+    const blobsDirScan = await new fdir().onlyCounts().crawl(blobsDir).withPromise();
+    if (blobsDirScan.files > 0) {
+        return {
+            directory: blobsDir,
+            isLegacyDirectory: false,
+        };
+    }
+    const legacyBlobsDir = resolve(buildDir, packagePath || '', LEGACY_BLOBS_PATH);
+    const legacyBlobsDirScan = await new fdir().onlyCounts().crawl(legacyBlobsDir).withPromise();
+    if (legacyBlobsDirScan.files > 0) {
+        return {
+            directory: legacyBlobsDir,
+            isLegacyDirectory: true,
+        };
+    }
+    return null;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.37.2",
+  "version": "29.38.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -68,7 +68,7 @@
   "license": "MIT",
   "dependencies": {
     "@bugsnag/js": "^7.0.0",
-    "@netlify/blobs": "^6.5.0",
+    "@netlify/blobs": "^7.2.0",
     "@netlify/cache-utils": "^5.1.5",
     "@netlify/config": "^20.12.1",
     "@netlify/edge-bundler": "11.3.0",
@@ -164,5 +164,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "5532a6654b3b644da7b7f348a7b71ed2f7285494"
+  "gitHead": "48dfa17701f997ce0c52995ab501d652fb113c5a"
 }