Merge branch 'main' into renovate/micromatch-4.x-lockfile

netlify · May 23, 2024 · a5dbe1e · a5dbe1e
2 parents 1e9f766 + bbbba76
commit a5dbe1e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/build/package.json b/packages/build/package.json
@@ -76,7 +76,7 @@
     "@netlify/functions-utils": "^5.2.57",
     "@netlify/git-utils": "^5.1.1",
     "@netlify/opentelemetry-utils": "^1.2.1",
-    "@netlify/plugins-list": "^6.79.0",
+    "@netlify/plugins-list": "^6.80.0",
     "@netlify/run-utils": "^5.1.1",
     "@netlify/zip-it-and-ship-it": "9.33.0",
     "@sindresorhus/slugify": "^2.0.0",

diff --git a/packages/config/src/log/logger.js b/packages/config/src/log/logger.js
@@ -3,6 +3,10 @@ import figures from 'figures'
 import { serializeObject } from './serialize.js'
 import { THEME } from './theme.js'
 
+export const logsAreBuffered = (logs) => {
+  return logs !== undefined && 'stdout' in logs
+}
+
 // When the `buffer` option is true, we return logs instead of printing them
 // on the console. The logs are accumulated in a `logs` array variable.
 export const getBufferLogs = function ({ buffer }) {
@@ -19,10 +23,14 @@ export const log = function (logs, string, { color } = {}) {
   const stringA = String(string).replace(EMPTY_LINES_REGEXP, EMPTY_LINE)
   const stringB = color === undefined ? stringA : color(stringA)
 
-  if (logs !== undefined) {
-    // `logs` is a stateful variable
+  if (logs && logs.outputFlusher) {
+    logs.outputFlusher.flush()
+  }
 
+  if (logsAreBuffered(logs)) {
+    // `logs` is a stateful variable
     logs.stderr.push(stringB)
+
     return
   }