@netlify/build 29.26.5 → 29.27.0

package/lib/core/build.d.ts

@@ -33,7 +33,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, 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, 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;
@@ -62,6 +62,7 @@ export declare const runAndReportBuild: ({ pluginsOptions, netlifyConfig, config
     logs: any;
     debug: any;
     systemLog: any;
+    systemLogFile: any;
     verbose: any;
     timers: any;
     sendStatus: any;

package/lib/core/build.js

@@ -121,6 +121,7 @@ const tExecBuild = async function ({ config, defaultConfig, cachedConfig, cached
         logs,
         debug,
         systemLog,
+        systemLogFile,
         verbose,
         timers: timersA,
         sendStatus,
@@ -150,7 +151,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, 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, 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,
@@ -179,6 +180,7 @@ export const runAndReportBuild = async function ({ pluginsOptions, netlifyConfig
             logs,
             debug,
             systemLog,
+            systemLogFile,
             verbose,
             timers,
             sendStatus,
@@ -254,7 +256,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, 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, 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,
@@ -285,6 +287,7 @@ const initAndRunBuild = async function ({ pluginsOptions, netlifyConfig, configO
         timers: timersA,
         featureFlags,
         quiet,
+        systemLogFile,
     });
     try {
         const { stepsCount, netlifyConfig: netlifyConfigA, statuses, failedPlugins, timers: timersC, configMutations, metrics, } = await runBuild({

package/lib/plugins/child/run.js

@@ -1,14 +1,25 @@
 import { getNewEnvChanges, setEnvChanges } from '../../env/changes.js';
 import { logPluginMethodStart, logPluginMethodEnd } from '../../log/messages/ipc.js';
 import { cloneNetlifyConfig, getConfigMutations } from './diff.js';
+import { getSystemLog } from './systemLog.js';
 import { getUtils } from './utils.js';
 // Run a specific plugin event handler
 export const run = async function ({ event, error, constants, envChanges, featureFlags, netlifyConfig }, { methods, inputs, packageJson, verbose }) {
     const method = methods[event];
     const runState = {};
+    const systemLog = getSystemLog();
     const utils = getUtils({ event, constants, runState });
     const netlifyConfigCopy = cloneNetlifyConfig(netlifyConfig);
-    const runOptions = { utils, constants, inputs, netlifyConfig: netlifyConfigCopy, packageJson, error, featureFlags };
+    const runOptions = {
+        utils,
+        constants,
+        inputs,
+        netlifyConfig: netlifyConfigCopy,
+        packageJson,
+        error,
+        featureFlags,
+        systemLog,
+    };
     const envBefore = setEnvChanges(envChanges);
     logPluginMethodStart(verbose);
     await method(runOptions);

package/lib/plugins/child/systemLog.d.ts

@@ -0,0 +1 @@
+export function getSystemLog(): ((message: any) => void) | undefined;

package/lib/plugins/child/systemLog.js

@@ -0,0 +1,14 @@
+import { appendFileSync, openSync } from 'fs';
+const systemLogLocation = '/dev/fd/4';
+export const getSystemLog = () => {
+    try {
+        // throws if system log wasn't hooked up
+        const fd = openSync(systemLogLocation, 'a');
+        return (message) => {
+            appendFileSync(fd, `${message}\n`);
+        };
+    }
+    catch {
+        return;
+    }
+};

package/lib/plugins/spawn.js

@@ -2,6 +2,7 @@ import { fileURLToPath } from 'url';
 import { execaNode } from 'execa';
 import { addErrorInfo } from '../error/info.js';
 import { logRuntime, logLoadingPlugins, logOutdatedPlugins, logIncompatiblePlugins, logLoadingIntegration, } from '../log/messages/compatibility.js';
+import { isTrustedPlugin } from '../steps/plugin.js';
 import { measureDuration } from '../time/main.js';
 import { getEventFromChild } from './ipc.js';
 import { getSpawnInfo } from './options.js';
@@ -12,7 +13,7 @@ const CHILD_MAIN_FILE = fileURLToPath(new URL('child/main.js', import.meta.url))
 //    (for both security and safety reasons)
 //  - logs can be buffered which allows manipulating them for log shipping,
 //    transforming and parallel plugins
-const tStartPlugins = async function ({ pluginsOptions, buildDir, childEnv, logs, debug, quiet }) {
+const tStartPlugins = async function ({ pluginsOptions, buildDir, childEnv, logs, debug, quiet, systemLogFile }) {
     if (!quiet) {
         logRuntime(logs, pluginsOptions);
         logLoadingPlugins(logs, pluginsOptions, debug);
@@ -20,11 +21,11 @@ const tStartPlugins = async function ({ pluginsOptions, buildDir, childEnv, logs
     }
     logOutdatedPlugins(logs, pluginsOptions);
     logIncompatiblePlugins(logs, pluginsOptions);
-    const childProcesses = await Promise.all(pluginsOptions.map(({ pluginDir, nodePath }) => startPlugin({ pluginDir, nodePath, buildDir, childEnv })));
+    const childProcesses = await Promise.all(pluginsOptions.map(({ pluginDir, nodePath, pluginPackageJson }) => startPlugin({ pluginDir, nodePath, buildDir, childEnv, systemLogFile, pluginPackageJson })));
     return { childProcesses };
 };
 export const startPlugins = measureDuration(tStartPlugins, 'start_plugins');
-const startPlugin = async function ({ pluginDir, nodePath, buildDir, childEnv }) {
+const startPlugin = async function ({ pluginDir, nodePath, buildDir, childEnv, systemLogFile, pluginPackageJson }) {
     const childProcess = execaNode(CHILD_MAIN_FILE, [], {
         cwd: buildDir,
         preferLocal: true,
@@ -33,6 +34,7 @@ const startPlugin = async function ({ pluginDir, nodePath, buildDir, childEnv })
         execPath: nodePath,
         env: childEnv,
         extendEnv: false,
+        stdio: isTrustedPlugin(pluginPackageJson) && systemLogFile ? ['pipe', 'pipe', 'pipe', 'ipc', systemLogFile] : undefined,
     });
     try {
         await getEventFromChild(childProcess, 'ready');

package/lib/plugins_core/secrets_scanning/utils.js

@@ -63,7 +63,7 @@ export function getSecretKeysToScanFor(env, secretKeys) {
  * @returns string[] of relative paths from base of files that should be searched
  */
 export async function getFilePathsToScan({ env, base }) {
-    const omitPathsAlways = ['.git/'];
+    const omitPathsAlways = ['.git/', '.cache/'];
     // node modules is dense and is only useful to scan if the repo itself commits these
     // files. As a simple check to understand if the repo would commit these files, we expect
     // that they would not ignore them from their git settings. So if gitignore includes

package/lib/steps/plugin.d.ts

@@ -1,3 +1,4 @@
+export function isTrustedPlugin(pluginPackageJson: any): any;
 export function firePluginStep({ event, childProcess, packageName, packagePath, pluginPackageJson, loadedFrom, origin, envChanges, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, constants, steps, error, logs, featureFlags, debug, verbose, }: {
     event: any;
     childProcess: any;

package/lib/steps/plugin.js

@@ -5,10 +5,10 @@ import { callChild } from '../plugins/ipc.js';
 import { getSuccessStatus } from '../status/success.js';
 import { getPluginErrorType } from './error.js';
 import { updateNetlifyConfig, listConfigSideFiles } from './update_config.js';
+export const isTrustedPlugin = (pluginPackageJson) => pluginPackageJson?.name?.startsWith('@netlify/');
 // Fire a plugin step
 export const firePluginStep = async function ({ event, childProcess, packageName, packagePath, pluginPackageJson, loadedFrom, origin, envChanges, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, constants, steps, error, logs, featureFlags, debug, verbose, }) {
     const listeners = pipePluginOutput(childProcess, logs);
-    const isTrustedPlugin = pluginPackageJson?.name?.startsWith('@netlify/');
     try {
         const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]);
         const { newEnvChanges, configMutations: newConfigMutations, status, } = await callChild({
@@ -18,7 +18,7 @@ export const firePluginStep = async function ({ event, childProcess, packageName
                 event,
                 error,
                 envChanges,
-                featureFlags: isTrustedPlugin ? featureFlags : undefined,
+                featureFlags: isTrustedPlugin(pluginPackageJson) ? featureFlags : undefined,
                 netlifyConfig,
                 constants,
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.26.5",
+  "version": "29.27.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -68,13 +68,13 @@
     "@honeycombio/opentelemetry-node": "^0.5.0",
     "@netlify/cache-utils": "^5.1.5",
     "@netlify/config": "^20.10.0",
-    "@netlify/edge-bundler": "10.1.1",
+    "@netlify/edge-bundler": "10.1.3",
     "@netlify/framework-info": "^9.8.10",
-    "@netlify/functions-utils": "^5.2.40",
+    "@netlify/functions-utils": "^5.2.41",
     "@netlify/git-utils": "^5.1.1",
     "@netlify/plugins-list": "^6.72.0",
     "@netlify/run-utils": "^5.1.1",
-    "@netlify/zip-it-and-ship-it": "9.26.1",
+    "@netlify/zip-it-and-ship-it": "9.26.2",
     "@opentelemetry/api": "^1.4.1",
     "@opentelemetry/core": "^1.17.1",
     "@sindresorhus/slugify": "^2.0.0",
@@ -146,5 +146,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "01ca6c705c4b568b7552a7d90a9801ebdc747594"
+  "gitHead": "e9b30f5bedacb107dd52d95cfd7cb932791c18d8"
 }

package/types/netlify_plugin_options.d.ts

@@ -21,4 +21,5 @@ export interface NetlifyPluginOptions<TInputs extends PluginInputs<StringKeys<TI
   constants: NetlifyPluginConstants
   utils: NetlifyPluginUtils
   featureFlags?: Record<string, unknown>
+  systemLog?(message: string): void
 }