@netlify/build 29.43.0 → 29.44.0

package/lib/core/build.js

@@ -382,6 +382,8 @@ const runBuild = async function ({ childProcesses, pluginsOptions, netlifyConfig
         debug,
         verbose,
         netlifyConfig,
+        featureFlags,
+        systemLog,
     });
     const { steps, events } = timeline === 'dev' ? getDevSteps(devCommand, pluginsSteps, eventHandlers) : getSteps(pluginsSteps, eventHandlers);
     if (dry) {

package/lib/core/feature_flags.js

@@ -17,4 +17,5 @@ export const DEFAULT_FEATURE_FLAGS = {
     edge_functions_system_logger: false,
     netlify_build_reduced_output: false,
     netlify_build_updated_plugin_compatibility: false,
+    netlify_build_plugin_system_log: false,
 };

package/lib/plugins/load.d.ts

@@ -1,4 +1,4 @@
-export function loadPlugins({ pluginsOptions, childProcesses, packageJson, timers, logs, debug, verbose, netlifyConfig, }: {
+export function loadPlugins({ pluginsOptions, childProcesses, packageJson, timers, logs, debug, verbose, netlifyConfig, featureFlags, systemLog, }: {
     pluginsOptions: any;
     childProcesses: any;
     packageJson: any;
@@ -7,4 +7,6 @@ export function loadPlugins({ pluginsOptions, childProcesses, packageJson, timer
     debug: any;
     verbose: any;
     netlifyConfig: any;
+    featureFlags: any;
+    systemLog: any;
 }): Promise<any>;

package/lib/plugins/load.js

@@ -1,16 +1,39 @@
+import { promisify } from 'util';
 import { addErrorInfo } from '../error/info.js';
 import { addPluginLoadErrorStatus } from '../status/load_error.js';
 import { measureDuration } from '../time/main.js';
 import { callChild } from './ipc.js';
+const pSetTimeout = promisify(setTimeout);
 // Retrieve all plugins steps
 // Can use either a module name or a file path to the plugin.
-export const loadPlugins = async function ({ pluginsOptions, childProcesses, packageJson, timers, logs, debug, verbose, netlifyConfig, }) {
+export const loadPlugins = async function ({ pluginsOptions, childProcesses, packageJson, timers, logs, debug, verbose, netlifyConfig, featureFlags, systemLog, }) {
     return pluginsOptions.length === 0
         ? { pluginsSteps: [], timers }
-        : await loadAllPlugins({ pluginsOptions, childProcesses, packageJson, timers, logs, debug, verbose, netlifyConfig });
+        : await loadAllPlugins({
+            pluginsOptions,
+            childProcesses,
+            packageJson,
+            timers,
+            logs,
+            debug,
+            verbose,
+            netlifyConfig,
+            featureFlags,
+            systemLog,
+        });
 };
-const tLoadAllPlugins = async function ({ pluginsOptions, childProcesses, packageJson, logs, debug, verbose, netlifyConfig, }) {
-    const pluginsSteps = await Promise.all(pluginsOptions.map((pluginOptions, index) => loadPlugin(pluginOptions, { childProcesses, index, packageJson, logs, debug, verbose, netlifyConfig })));
+const tLoadAllPlugins = async function ({ pluginsOptions, childProcesses, packageJson, logs, debug, verbose, netlifyConfig, featureFlags, systemLog, }) {
+    const pluginsSteps = await Promise.all(pluginsOptions.map((pluginOptions, index) => loadPlugin(pluginOptions, {
+        childProcesses,
+        index,
+        packageJson,
+        logs,
+        debug,
+        verbose,
+        netlifyConfig,
+        featureFlags,
+        systemLog,
+    })));
     const pluginsStepsA = pluginsSteps.flat();
     return { pluginsSteps: pluginsStepsA };
 };
@@ -18,9 +41,19 @@ const tLoadAllPlugins = async function ({ pluginsOptions, childProcesses, packag
 const loadAllPlugins = measureDuration(tLoadAllPlugins, 'load_plugins');
 // Retrieve plugin steps for one plugin.
 // Do it by executing the plugin `load` event handler.
-const loadPlugin = async function ({ packageName, pluginPackageJson, pluginPackageJson: { version } = {}, pluginPath, inputs, loadedFrom, origin }, { childProcesses, index, packageJson, logs, debug, verbose, netlifyConfig }) {
+const loadPlugin = async function ({ packageName, pluginPackageJson, pluginPackageJson: { version } = {}, pluginPath, inputs, loadedFrom, origin }, { childProcesses, index, packageJson, logs, debug, verbose, netlifyConfig, featureFlags, systemLog }) {
     const { childProcess } = childProcesses[index];
     const loadEvent = 'load';
+    // A buffer for any data piped into the child process' stderr. We'll pipe
+    // this to system logs if we fail to load the plugin.
+    const bufferedStdErr = [];
+    let bufferedStdListener;
+    if (featureFlags.netlify_build_plugin_system_log && childProcess.stderr) {
+        bufferedStdListener = (data) => {
+            bufferedStdErr.push(data.toString().trimEnd());
+        };
+        childProcess.stderr.on('data', bufferedStdListener);
+    }
     try {
         const { events } = await callChild({
             childProcess,
@@ -40,6 +73,13 @@ const loadPlugin = async function ({ packageName, pluginPackageJson, pluginPacka
         return pluginSteps;
     }
     catch (error) {
+        if (featureFlags.netlify_build_plugin_system_log) {
+            // Wait for stderr to be flushed.
+            await pSetTimeout(0);
+            bufferedStdErr.forEach((line) => {
+                systemLog(line);
+            });
+        }
         addErrorInfo(error, {
             plugin: { packageName, pluginPackageJson },
             location: { event: loadEvent, packageName, loadedFrom, origin },
@@ -47,4 +87,9 @@ const loadPlugin = async function ({ packageName, pluginPackageJson, pluginPacka
         addPluginLoadErrorStatus({ error, packageName, version, debug });
         throw error;
     }
+    finally {
+        if (bufferedStdListener) {
+            childProcess.stderr.removeListener('data', bufferedStdListener);
+        }
+    }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.43.0",
+  "version": "29.44.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -165,5 +165,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "5c7e4326ca1e4f0134506295281f76ed842d31f5"
+  "gitHead": "bd868b81a1ead42e337bea8bebfee0d51307e078"
 }