@netlify/build 29.46.4 → 29.47.0

package/lib/core/build.d.ts

@@ -32,7 +32,7 @@ export declare const startBuild: (flags: Partial<BuildFlags>) => {
     };
 };
 export declare const execBuild: any;
-export declare const runAndReportBuild: ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, packagePath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }: {
+export declare const runAndReportBuild: ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, packagePath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, token, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }: {
     pluginsOptions: any;
     netlifyConfig: any;
     configOpts: any;
@@ -55,6 +55,7 @@ export declare const runAndReportBuild: ({ pluginsOptions, netlifyConfig, config
     dry: any;
     mode: any;
     api: any;
+    token: any;
     errorMonitor: any;
     deployId: any;
     errorParams: any;

package/lib/core/build.js

@@ -13,6 +13,7 @@ import { reportStatuses } from '../status/report.js';
 import { getDevSteps, getSteps } from '../steps/get.js';
 import { runSteps } from '../steps/run_steps.js';
 import { initTimers, measureDuration } from '../time/main.js';
+import { getBlobsEnvironmentContext } from '../utils/blobs.js';
 import { getConfigOpts, loadConfig } from './config.js';
 import { getConstants } from './constants.js';
 import { doDryRun } from './dry.js';
@@ -114,6 +115,7 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
         dry,
         mode,
         api,
+        token,
         errorMonitor,
         deployId,
         errorParams,
@@ -150,7 +152,7 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
 };
 export const execBuild = measureDuration(tExecBuild, 'total', { parentTag: 'build_site' });
 // Runs a build then report any plugin statuses
-export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, packagePath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }) {
+export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, packagePath, buildDir, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, buildbotServerSocket, constants, dry, mode, api, token, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, timers, sendStatus, saveConfig, testOpts, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }) {
     try {
         const { stepsCount, netlifyConfig: netlifyConfigA, statuses, pluginsOptions: pluginsOptionsA, failedPlugins, timers: timersA, configMutations, metrics, } = await initAndRunBuild({
             pluginsOptions,
@@ -173,6 +175,7 @@ export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig
             dry,
             mode,
             api,
+            token,
             errorMonitor,
             deployId,
             errorParams,
@@ -255,7 +258,7 @@ export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig
     }
 };
 // Initialize plugin processes then runs a build
-const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, packagePath, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, dry, mode, api, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, sendStatus, saveConfig, timers, testOpts, buildbotServerSocket, constants, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }) {
+const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configOpts, siteInfo, configPath, outputConfigPath, headersPath, redirectsPath, buildDir, packagePath, repositoryRoot, nodePath, packageJson, userNodeVersion, childEnv, context, branch, dry, mode, api, token, errorMonitor, deployId, errorParams, logs, debug, systemLog, systemLogFile, verbose, sendStatus, saveConfig, timers, testOpts, buildbotServerSocket, constants, featureFlags, timeline, devCommand, quiet, integrations, explicitSecretKeys, edgeFunctionsBootstrapURL, eventHandlers, }) {
     const { pluginsOptions: pluginsOptionsA, timers: timersA } = await getPluginsOptions({
         pluginsOptions,
         netlifyConfig,
@@ -277,6 +280,9 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configO
         context,
         systemLog,
     });
+    const pluginsEnv = featureFlags.build_inject_blobs_context
+        ? { ...childEnv, ...getBlobsEnvironmentContext({ api, deployId: deployId, siteId: siteInfo?.id, token }) }
+        : childEnv;
     if (pluginsOptionsA?.length) {
         const buildPlugins = {};
         for (const plugin of pluginsOptionsA) {
@@ -290,7 +296,7 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configO
     const { childProcesses, timers: timersB } = await startPlugins({
         pluginsOptions: pluginsOptionsA,
         buildDir,
-        childEnv,
+        childEnv: pluginsEnv,
         logs,
         debug,
         timers: timersA,

package/lib/core/feature_flags.js

@@ -10,6 +10,7 @@ const getFeatureFlag = function (name) {
 };
 // Default values for feature flags
 export const DEFAULT_FEATURE_FLAGS = {
+    build_inject_blobs_context: false,
     buildbot_zisi_trace_nft: false,
     buildbot_zisi_esbuild_parser: false,
     buildbot_zisi_system_log: false,

package/lib/core/normalize_flags.d.ts

@@ -1,4 +1,5 @@
 import type { BuildFlags, Mode, TestOptions } from './types.js';
+export declare const DEFAULT_API_HOST = "api.netlify.com";
 export type ResolvedFlags = {
     env: Record<string, unknown>;
     token: string;

package/lib/core/normalize_flags.js

@@ -2,6 +2,7 @@ import { env, execPath } from 'process';
 import { logFlags } from '../log/messages/config.js';
 import { removeFalsy } from '../utils/remove_falsy.js';
 import { DEFAULT_FEATURE_FLAGS } from './feature_flags.js';
+export const DEFAULT_API_HOST = 'api.netlify.com';
 const REQUIRE_MODE = 'require';
 const DEFAULT_EDGE_FUNCTIONS_DIST = '.netlify/edge-functions-dist/';
 const DEFAULT_FUNCTIONS_DIST = '.netlify/functions/';
@@ -49,7 +50,7 @@ const getDefaultFlags = function ({ env: envOpt = {} }, combinedEnv) {
         bugsnagKey: combinedEnv.BUGSNAG_KEY,
         sendStatus: false,
         saveConfig: false,
-        apiHost: 'api.netlify.com',
+        apiHost: DEFAULT_API_HOST,
         testOpts: {},
         featureFlags: DEFAULT_FEATURE_FLAGS,
         statsd: { port: DEFAULT_STATSD_PORT },

package/lib/plugins_core/blobs_upload/index.js

@@ -2,6 +2,7 @@ import { version as nodeVersion } from 'node:process';
 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 { 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 }, }) {
@@ -10,7 +11,7 @@ const coreStep = async function ({ debug, logs, deployId, buildDir, quiet, packa
         return {};
     }
     // for cli deploys with `netlify deploy --build` the `NETLIFY_API_HOST` is undefined
-    const apiHost = NETLIFY_API_HOST || 'api.netlify.com';
+    const apiHost = NETLIFY_API_HOST || DEFAULT_API_HOST;
     const storeOpts = {
         siteID: SITE_ID,
         deployID: deployId,

package/lib/utils/blobs.d.ts

@@ -1,6 +1,20 @@
 /// <reference types="node" resolution-mode="require"/>
 /** Retrieve the absolute path of the deploy scoped internal blob directories */
 export declare const getBlobsDirs: (buildDir: string, packagePath?: string) => string[];
+interface EnvironmentContext {
+    api?: {
+        host: string;
+        scheme: string;
+    };
+    deployId?: string;
+    siteId?: string;
+    token?: string;
+}
+export declare const getBlobsEnvironmentContext: ({ api, deployId, siteId, token, }: EnvironmentContext) => {
+    NETLIFY_BLOBS_CONTEXT?: undefined;
+} | {
+    NETLIFY_BLOBS_CONTEXT: string;
+};
 /**
  * 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
@@ -21,3 +35,4 @@ export declare const getFileWithMetadata: (blobsDir: string, key: string) => Pro
     data: Buffer;
     metadata: Record<string, string>;
 }>;
+export {};

package/lib/utils/blobs.js

@@ -1,6 +1,7 @@
 import { readFile } from 'node:fs/promises';
 import path from 'node:path';
 import { fdir } from 'fdir';
+import { DEFAULT_API_HOST } from '../core/normalize_flags.js';
 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 */
@@ -8,6 +9,22 @@ export const getBlobsDirs = (buildDir, packagePath) => [
     path.resolve(buildDir, packagePath || '', DEPLOY_CONFIG_BLOBS_PATH),
     path.resolve(buildDir, packagePath || '', LEGACY_BLOBS_PATH),
 ];
+// TODO: Move this work to a method exported by `@netlify/blobs`.
+export const getBlobsEnvironmentContext = ({ api = { host: DEFAULT_API_HOST, scheme: 'https' }, deployId, siteId, token, }) => {
+    if (!deployId || !siteId || !token) {
+        return {};
+    }
+    const payload = {
+        apiURL: `${api.scheme}://${api.host}`,
+        deployID: deployId,
+        siteID: siteId,
+        token,
+    };
+    const encodedPayload = Buffer.from(JSON.stringify(payload)).toString('base64');
+    return {
+        NETLIFY_BLOBS_CONTEXT: encodedPayload,
+    };
+};
 /**
  * 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.46.4",
+  "version": "29.47.0",
   "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.14.1",
+    "@netlify/config": "^20.15.0",
     "@netlify/edge-bundler": "12.0.1",
     "@netlify/framework-info": "^9.8.13",
-    "@netlify/functions-utils": "^5.2.61",
+    "@netlify/functions-utils": "^5.2.62",
     "@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.34.1",
+    "@netlify/zip-it-and-ship-it": "9.34.2",
     "@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": "c99f5dcf3198d3a279ee06d7e42c204405cd977a"
+  "gitHead": "d4a4f3c4e6171dc9a70e79b10e7f7be55f9e8d76"
 }