@netlify/build 29.42.5 → 29.43.0

package/lib/log/logger.d.ts

@@ -38,4 +38,4 @@ export declare const reduceLogLines: (lines: any) => any;
  * the user-facing build logs)
  */
 export declare const getSystemLogger: (logs: BufferedLogs | undefined, debug: boolean, systemLogFile?: number) => (...args: any[]) => void;
-export declare const addOutputGate: (logs: Logs, outputFlusher: OutputFlusher) => Logs;
+export declare const addOutputFlusher: (logs: Logs, outputFlusher: OutputFlusher) => Logs;

package/lib/log/logger.js

@@ -144,7 +144,7 @@ systemLogFile) {
     });
     return (...args) => fileDescriptor.write(`${reduceLogLines(args)}\n`);
 };
-export const addOutputGate = (logs, outputFlusher) => {
+export const addOutputFlusher = (logs, outputFlusher) => {
     if (logsAreBuffered(logs)) {
         return {
             ...logs,

package/lib/log/output_flusher.d.ts

@@ -1,5 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 import { Transform } from 'stream';
+import type { StandardStreams } from './stream.js';
 declare const flusherSymbol: unique symbol;
 /**
  * Utility class for conditionally rendering certain output only if additional
@@ -21,4 +22,5 @@ export declare class OutputFlusherTransform extends Transform {
     constructor(flusher: OutputFlusher);
     _transform(chunk: any, _: string, callback: () => void): void;
 }
+export declare const getStandardStreams: (outputFlusher?: OutputFlusher) => StandardStreams;
 export {};

package/lib/log/output_flusher.js

@@ -1,3 +1,4 @@
+import { stdout, stderr } from 'process';
 import { Transform } from 'stream';
 const flusherSymbol = Symbol.for('@netlify/output-gate');
 /**
@@ -35,3 +36,16 @@ export class OutputFlusherTransform extends Transform {
         callback();
     }
 }
+export const getStandardStreams = (outputFlusher) => {
+    if (!outputFlusher) {
+        return {
+            stdout,
+            stderr,
+        };
+    }
+    return {
+        outputFlusher,
+        stdout: new OutputFlusherTransform(outputFlusher).pipe(stdout),
+        stderr: new OutputFlusherTransform(outputFlusher).pipe(stderr),
+    };
+};

package/lib/log/stream.d.ts

@@ -1,10 +1,23 @@
-export function getBuildCommandStdio(logs: any): "pipe" | "inherit";
-export function handleBuildCommandOutput({ stdout: commandStdout, stderr: commandStderr }: {
-    stdout: any;
-    stderr: any;
-}, logs: any): void;
-export function pipePluginOutput(childProcess: any, logs: any, outputFlusher: any): void | {
-    stdoutListener: any;
-    stderrListener: any;
+/// <reference types="node" resolution-mode="require"/>
+/// <reference types="node" resolution-mode="require"/>
+import type { ChildProcess } from '../plugins/spawn.js';
+import { Logs } from './logger.js';
+import type { OutputFlusher } from './output_flusher.js';
+export type StandardStreams = {
+    stderr: NodeJS.WriteStream;
+    stdout: NodeJS.WriteStream;
+    outputFlusher?: OutputFlusher;
 };
-export function unpipePluginOutput(childProcess: any, logs: any, listeners: any): Promise<void>;
+type LogsListener = (logs: string[], outputFlusher: OutputFlusher | undefined, chunk: Buffer) => void;
+type LogsListeners = {
+    stderrListener: LogsListener;
+    stdoutListener: LogsListener;
+};
+export declare const getBuildCommandStdio: (logs: Logs) => "pipe" | "inherit";
+export declare const handleBuildCommandOutput: ({ stdout: commandStdout, stderr: commandStderr }: {
+    stdout: string;
+    stderr: string;
+}, logs: Logs) => void;
+export declare const pipePluginOutput: (childProcess: ChildProcess, logs: Logs, standardStreams: StandardStreams) => void | LogsListeners;
+export declare const unpipePluginOutput: (childProcess: ChildProcess, logs: Logs, listeners: LogsListeners, standardStreams: StandardStreams) => Promise<void>;
+export {};

package/lib/log/stream.js

@@ -1,7 +1,5 @@
-import { stdout, stderr } from 'process';
 import { promisify } from 'util';
 import { logsAreBuffered } from './logger.js';
-import { OutputFlusherTransform } from './output_flusher.js';
 // TODO: replace with `timers/promises` after dropping Node < 15.0.0
 const pSetTimeout = promisify(setTimeout);
 // We try to use `stdio: inherit` because it keeps `stdout/stderr` as `TTY`,
@@ -29,41 +27,36 @@ const pushBuildCommandOutput = function (output, logsArray) {
     logsArray.push(output);
 };
 // Start plugin step output
-export const pipePluginOutput = function (childProcess, logs, outputFlusher) {
+export const pipePluginOutput = function (childProcess, logs, standardStreams) {
     if (!logsAreBuffered(logs)) {
-        return streamOutput(childProcess, outputFlusher);
+        return streamOutput(childProcess, standardStreams);
     }
-    return pushOutputToLogs(childProcess, logs, outputFlusher);
+    return pushOutputToLogs(childProcess, logs, standardStreams.outputFlusher);
 };
 // Stop streaming/buffering plugin step output
-export const unpipePluginOutput = async function (childProcess, logs, listeners) {
+export const unpipePluginOutput = async function (childProcess, logs, listeners, standardStreams) {
     // Let `childProcess` `stdout` and `stderr` flush before stopping redirecting
     await pSetTimeout(0);
     if (!logsAreBuffered(logs)) {
-        return unstreamOutput(childProcess);
+        return unstreamOutput(childProcess, standardStreams);
     }
-    unpushOutputToLogs(childProcess, logs, listeners);
+    unpushOutputToLogs(childProcess, listeners.stdoutListener, listeners.stderrListener);
 };
 // Usually, we stream stdout/stderr because it is more efficient
-const streamOutput = function (childProcess, outputFlusher) {
-    if (outputFlusher) {
-        childProcess.stdout.pipe(new OutputFlusherTransform(outputFlusher)).pipe(stdout);
-        childProcess.stderr.pipe(new OutputFlusherTransform(outputFlusher)).pipe(stderr);
-        return;
-    }
-    childProcess.stdout.pipe(stdout);
-    childProcess.stderr.pipe(stderr);
+const streamOutput = function (childProcess, standardStreams) {
+    childProcess.stdout?.pipe(standardStreams.stdout);
+    childProcess.stderr?.pipe(standardStreams.stderr);
 };
-const unstreamOutput = function (childProcess) {
-    childProcess.stdout.unpipe(stdout);
-    childProcess.stderr.unpipe(stderr);
+const unstreamOutput = function (childProcess, standardStreams) {
+    childProcess.stdout?.unpipe(standardStreams.stdout);
+    childProcess.stderr?.unpipe(standardStreams.stderr);
 };
 // In tests, we push to the `logs` array instead
 const pushOutputToLogs = function (childProcess, logs, outputFlusher) {
     const stdoutListener = logsListener.bind(null, logs.stdout, outputFlusher);
     const stderrListener = logsListener.bind(null, logs.stderr, outputFlusher);
-    childProcess.stdout.on('data', stdoutListener);
-    childProcess.stderr.on('data', stderrListener);
+    childProcess.stdout?.on('data', stdoutListener);
+    childProcess.stderr?.on('data', stderrListener);
     return { stdoutListener, stderrListener };
 };
 const logsListener = function (logs, outputFlusher, chunk) {
@@ -72,7 +65,7 @@ const logsListener = function (logs, outputFlusher, chunk) {
     }
     logs.push(chunk.toString().trimEnd());
 };
-const unpushOutputToLogs = function (childProcess, logs, { stdoutListener, stderrListener }) {
-    childProcess.stdout.removeListener('data', stdoutListener);
-    childProcess.stderr.removeListener('data', stderrListener);
+const unpushOutputToLogs = function (childProcess, stdoutListener, stderrListener) {
+    childProcess.stdout?.removeListener('data', stdoutListener);
+    childProcess.stderr?.removeListener('data', stderrListener);
 };

package/lib/plugins/compatibility.d.ts

@@ -1,4 +1,4 @@
-import { PackageJson } from 'read-pkg-up';
+import { PackageJson } from 'read-package-up';
 import { FeatureFlags } from '../core/feature_flags.js';
 import { SystemLogger } from '../plugins_core/types.js';
 import { PluginVersion } from './list.js';

package/lib/plugins/manifest/main.d.ts

@@ -1,4 +1,4 @@
-import { PackageJson } from 'read-pkg-up';
+import { PackageJson } from 'read-package-up';
 /**
  * Load plugin's `manifest.yml`
  */

package/lib/plugins/options.d.ts

@@ -1,4 +1,4 @@
-import { PackageJson } from 'read-pkg-up';
+import { PackageJson } from 'read-package-up';
 export declare const getPluginsOptions: any;
 /**
  * Retrieve information about @netlify/build when an error happens there and not

package/lib/plugins/plugin_conditions.d.ts

@@ -1,4 +1,4 @@
-import { PackageJson } from 'read-pkg-up';
+import { PackageJson } from 'read-package-up';
 import { type PluginVersion } from './list.js';
 type ConditionContext = {
     nodeVersion: string;

package/lib/plugins/spawn.d.ts

@@ -2,6 +2,7 @@ import { ExecaChildProcess } from 'execa';
 import { NetlifyConfig } from '../index.js';
 import { BufferedLogs } from '../log/logger.js';
 import { PluginsOptions } from './node_version.js';
+export type ChildProcess = ExecaChildProcess<string>;
 export declare const startPlugins: any;
 export declare const stopPlugins: ({ childProcesses, logs, verbose, pluginOptions, netlifyConfig, }: {
     logs: BufferedLogs;

package/lib/steps/core_step.js

@@ -1,10 +1,10 @@
 import { setEnvChanges } from '../env/changes.js';
 import { addErrorInfo, isBuildError } from '../error/info.js';
-import { addOutputGate } from '../log/logger.js';
+import { addOutputFlusher } from '../log/logger.js';
 import { updateNetlifyConfig, listConfigSideFiles } from './update_config.js';
 // Fire a core step
 export const fireCoreStep = async function ({ coreStep, coreStepId, coreStepName, configPath, outputConfigPath, buildDir, repositoryRoot, packagePath, constants, buildbotServerSocket, events, logs, quiet, nodePath, childEnv, context, branch, envChanges, errorParams, configOpts, netlifyConfig, configMutations, headersPath, redirectsPath, featureFlags, debug, systemLog, saveConfig, userNodeVersion, explicitSecretKeys, edgeFunctionsBootstrapURL, deployId, outputFlusher, }) {
-    const logsA = addOutputGate(logs, outputFlusher);
+    const logsA = outputFlusher ? addOutputFlusher(logs, outputFlusher) : logs;
     try {
         const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]);
         const childEnvA = setEnvChanges(envChanges, { ...childEnv });

package/lib/steps/plugin.js

@@ -1,7 +1,8 @@
 import { context, propagation } from '@opentelemetry/api';
 import { addErrorInfo } from '../error/info.js';
-import { addOutputGate } from '../log/logger.js';
+import { addOutputFlusher } from '../log/logger.js';
 import { logStepCompleted } from '../log/messages/ipc.js';
+import { getStandardStreams } from '../log/output_flusher.js';
 import { pipePluginOutput, unpipePluginOutput } from '../log/stream.js';
 import { callChild } from '../plugins/ipc.js';
 import { getSuccessStatus } from '../status/success.js';
@@ -10,10 +11,11 @@ import { updateNetlifyConfig, listConfigSideFiles } from './update_config.js';
 export const isTrustedPlugin = (packageName) => packageName?.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, outputFlusher, systemLog, featureFlags, debug, verbose, }) {
-    const listeners = pipePluginOutput(childProcess, logs, outputFlusher);
+    const standardStreams = getStandardStreams(outputFlusher);
+    const listeners = pipePluginOutput(childProcess, logs, standardStreams);
     const otelCarrier = {};
     propagation.inject(context.active(), otelCarrier);
-    const logsA = addOutputGate(logs, outputFlusher);
+    const logsA = outputFlusher ? addOutputFlusher(logs, outputFlusher) : logs;
     try {
         const configSideFiles = await listConfigSideFiles([headersPath, redirectsPath]);
         const { newEnvChanges, configMutations: newConfigMutations, status, } = await callChild({
@@ -28,7 +30,7 @@ export const firePluginStep = async function ({ event, childProcess, packageName
                 constants,
                 otelCarrier,
             },
-            logs,
+            logs: logsA,
             verbose,
         });
         const { netlifyConfig: netlifyConfigA, configMutations: configMutationsA, headersPath: headersPathA, redirectsPath: redirectsPathA, } = await updateNetlifyConfig({
@@ -66,7 +68,7 @@ export const firePluginStep = async function ({ event, childProcess, packageName
         return { newError };
     }
     finally {
-        await unpipePluginOutput(childProcess, logs, listeners);
+        await unpipePluginOutput(childProcess, logs, listeners, standardStreams);
         logStepCompleted(logs, verbose);
     }
 };

package/lib/utils/json.d.ts

@@ -1,4 +1,4 @@
-import type { PackageJson } from 'read-pkg-up';
+import type { PackageJson } from 'read-package-up';
 export type RootPackageJson = {
     name: string;
     version: string;

package/lib/utils/package.d.ts

@@ -1,4 +1,4 @@
-import { Options, PackageJson } from 'read-pkg-up';
+import { Options, PackageJson } from 'read-package-up';
 type PackageResult = {
     packageJson: PackageJson;
     packageDir?: string;

package/lib/utils/package.js

@@ -1,5 +1,5 @@
 import { dirname } from 'path';
-import { readPackageUp } from 'read-pkg-up';
+import { readPackageUp } from 'read-package-up';
 /**
  * Retrieve `package.json` from a specific directory
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@netlify/build",
-  "version": "29.42.5",
+  "version": "29.43.0",
   "description": "Netlify build module",
   "type": "module",
   "exports": "./lib/index.js",
@@ -111,7 +111,7 @@
     "pkg-dir": "^7.0.0",
     "pretty-ms": "^8.0.0",
     "ps-list": "^8.0.0",
-    "read-pkg-up": "^9.1.0",
+    "read-package-up": "^11.0.0",
     "readdirp": "^3.4.0",
     "resolve": "^2.0.0-next.1",
     "rfdc": "^1.3.0",
@@ -165,5 +165,5 @@
   "engines": {
     "node": "^14.16.0 || >=16.0.0"
   },
-  "gitHead": "9260347bbb405cdb44a5e52c3e619ab43f1354ac"
+  "gitHead": "5c7e4326ca1e4f0134506295281f76ed842d31f5"
 }