@netlify/build 29.47.5 → 29.48.1

package/lib/log/logger.d.ts

@@ -1,3 +1,4 @@
+import type { SystemLogger } from '../plugins_core/types.js';
 import { OutputFlusher } from './output_flusher.js';
 export type Logs = BufferedLogs | StreamedLogs;
 export type BufferedLogs = {
@@ -37,5 +38,5 @@ export declare const reduceLogLines: (lines: any) => any;
  * Builds a function for logging data to the system logger (i.e. hidden from
  * the user-facing build logs)
  */
-export declare const getSystemLogger: (logs: BufferedLogs | undefined, debug: boolean, systemLogFile?: number) => (...args: any[]) => void;
+export declare const getSystemLogger: (logs: BufferedLogs | undefined, debug: boolean, systemLogFile?: number) => SystemLogger;
 export declare const addOutputFlusher: (logs: Logs, outputFlusher: OutputFlusher) => Logs;

package/lib/plugins_core/blobs_upload/index.js

@@ -3,9 +3,9 @@ import { getDeployStore } from '@netlify/blobs';
 import pMap from 'p-map';
 import semver from 'semver';
 import { DEFAULT_API_HOST } from '../../core/normalize_flags.js';
-import { log, logError } from '../../log/logger.js';
+import { logError } from '../../log/logger.js';
 import { getFileWithMetadata, getKeysToUpload, scanForBlobs } from '../../utils/blobs.js';
-const coreStep = async function ({ debug, logs, deployId, buildDir, quiet, packagePath, constants: { SITE_ID, NETLIFY_API_TOKEN, NETLIFY_API_HOST }, }) {
+const coreStep = async function ({ logs, deployId, buildDir, packagePath, constants: { SITE_ID, NETLIFY_API_TOKEN, NETLIFY_API_HOST }, systemLog, }) {
     // This should never happen due to the condition check
     if (!deployId || !NETLIFY_API_TOKEN) {
         return {};
@@ -26,9 +26,7 @@ const coreStep = async function ({ debug, logs, deployId, buildDir, quiet, packa
     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.');
-        }
+        systemLog('No blobs to upload to deploy store.');
         return {};
     }
     // If using the deploy config API, configure the store to use the region that
@@ -39,19 +37,13 @@ const coreStep = async function ({ debug, logs, deployId, buildDir, quiet, packa
     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.');
-        }
+        systemLog('No blobs to upload to deploy store.');
         return {};
     }
-    if (!quiet) {
-        log(logs, `Uploading ${keys.length} blobs to deploy store...`);
-    }
+    systemLog(`Uploading ${keys.length} blobs to deploy store`);
     try {
         await pMap(keys, async (key) => {
-            if (debug && !quiet) {
-                log(logs, `- Uploading blob ${key}`, { indent: true });
-            }
+            systemLog(`Uploading blob ${key}`);
             const { data, metadata } = await getFileWithMetadata(blobs.directory, key);
             await blobStore.set(key, data, { metadata });
         }, { concurrency: 10 });
@@ -60,9 +52,7 @@ const coreStep = async function ({ debug, logs, deployId, buildDir, quiet, packa
         logError(logs, `Error uploading blobs to deploy store: ${err.message}`);
         throw new Error(`Failed while uploading blobs to deploy store`);
     }
-    if (!quiet) {
-        log(logs, `Done uploading blobs to deploy store.`);
-    }
+    systemLog(`Done uploading blobs to deploy store.`);
     return {};
 };
 const deployAndBlobsPresent = async ({ deployId, buildDir, packagePath, constants: { NETLIFY_API_TOKEN }, }) => Boolean(NETLIFY_API_TOKEN && deployId && (await scanForBlobs(buildDir, packagePath)));

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

@@ -44,7 +44,8 @@ export declare const bundleFunctions: {
 };
 export declare const zipItAndShipIt: {
     zipFunctions(relativeSrcFolders: string | string[], destFolder: string, args_2?: import("@netlify/zip-it-and-ship-it").ZipFunctionsOptions | undefined): Promise<(Omit<import("packages/zip-it-and-ship-it/dist/function.js").FunctionArchive, "runtime"> & {
-        routes?: import("packages/zip-it-and-ship-it/dist/utils/routes.js").Route[] | undefined;
+        routes?: import("@netlify/zip-it-and-ship-it").ExtendedRoute[] | undefined;
+        excludedRoutes?: import("@netlify/zip-it-and-ship-it").Route[] | undefined;
         runtime: import("@netlify/zip-it-and-ship-it").RuntimeName;
         schedule?: string | undefined;
         runtimeAPIVersion?: number | undefined;

package/lib/plugins_core/types.d.ts

@@ -19,7 +19,7 @@ export type CoreStepFunctionArgs = {
     quiet?: boolean;
     debug?: boolean;
     logs?: BufferedLogs;
-    systemLog?: (message: unknown) => void;
+    systemLog: SystemLogger;
     edgeFunctionsBootstrapURL?: string;
     featureFlags?: Record<string, any>;
     netlifyConfig: NetlifyConfig;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.47.5",
+  "version": "29.48.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.15.2",
+    "@netlify/config": "^20.15.3",
     "@netlify/edge-bundler": "12.0.1",
     "@netlify/framework-info": "^9.8.13",
-    "@netlify/functions-utils": "^5.2.66",
+    "@netlify/functions-utils": "^5.2.68",
     "@netlify/git-utils": "^5.1.1",
     "@netlify/opentelemetry-utils": "^1.2.1",
     "@netlify/plugins-list": "^6.80.0",
     "@netlify/run-utils": "^5.1.1",
-    "@netlify/zip-it-and-ship-it": "9.35.1",
+    "@netlify/zip-it-and-ship-it": "9.37.0",
     "@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": "e4464a74add778cb61ff06702ef3a43367a930c3"
+  "gitHead": "10e722ebad2755434933ef205672e290d810259b"
 }