From fbb6e94ad82d4149b0d03986276434b5ea82d482 Mon Sep 17 00:00:00 2001
From: Gar <gar+gh@danger.computer>
Date: Wed, 29 Mar 2023 14:08:05 -0700
Subject: [PATCH] fix: don't break up log message across lines

---
 lib/utils/exit-handler.js                             | 6 ++----
 smoke-tests/tap-snapshots/test/index.js.test.cjs      | 3 +--
 smoke-tests/test/fixtures/setup.js                    | 2 +-
 tap-snapshots/test/lib/utils/exit-handler.js.test.cjs | 6 ++----
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/lib/utils/exit-handler.js b/lib/utils/exit-handler.js
index b5fc7042bd020..b5d6cd030fb5c 100644
--- a/lib/utils/exit-handler.js
+++ b/lib/utils/exit-handler.js
@@ -5,8 +5,6 @@ const log = require('./log-shim.js')
 const errorMessage = require('./error-message.js')
 const replaceInfo = require('./replace-info.js')
 
-const indent = (val) => Array.isArray(val) ? val.map(v => indent(v)) : `    ${val}`
-
 let npm = null // set by the cli
 let exitHandlerCalled = false
 let showLogFileError = false
@@ -73,7 +71,7 @@ process.on('exit', code => {
       const message = []
 
       if (timingFile) {
-        message.push('Timing info written to:', indent(timingFile))
+        message.push(`Timing info written to: ${timingFile}`)
       } else if (timing) {
         message.push(
           `The timing file was not written due to an error writing to the directory: ${timingDir}`
@@ -81,7 +79,7 @@ process.on('exit', code => {
       }
 
       if (logFiles.length) {
-        message.push('A complete log of this run can be found in:', ...indent(logFiles))
+        message.push(`A complete log of this run can be found in: ${logFiles}`)
       } else if (logsMax <= 0) {
         // user specified no log file
         message.push(`Log files were not written due to the config logs-max=${logsMax}`)
diff --git a/smoke-tests/tap-snapshots/test/index.js.test.cjs b/smoke-tests/tap-snapshots/test/index.js.test.cjs
index 615fd5286307e..e01ed454b6514 100644
--- a/smoke-tests/tap-snapshots/test/index.js.test.cjs
+++ b/smoke-tests/tap-snapshots/test/index.js.test.cjs
@@ -68,8 +68,7 @@ npm ERR! aliases: clean-install, ic, install-clean, isntall-clean
 npm ERR! 
 npm ERR! Run "npm help ci" for more info
 
-npm ERR! A complete log of this run can be found in:
-
+npm ERR! A complete log of this run can be found in: {NPM}/{TESTDIR}/cache/_logs/{LOG}
 `
 
 exports[`test/index.js TAP basic npm diff > should have expected diff output 1`] = `
diff --git a/smoke-tests/test/fixtures/setup.js b/smoke-tests/test/fixtures/setup.js
index 683a8ffbc7153..180fe02a15383 100644
--- a/smoke-tests/test/fixtures/setup.js
+++ b/smoke-tests/test/fixtures/setup.js
@@ -124,7 +124,7 @@ module.exports = async (t, { testdir = {}, debug } = {}) => {
       .replace(/\r\n/g, '\n')
       .replace(/ \(in a browser\)/g, '')
       .replace(/^npm@.* /gm, 'npm ')
-      .replace(/^.*debug-[0-9]+.log$/gm, '')
+      .replace(/[0-9TZ_-]*debug-[0-9]+.log$/gm, '{LOG}')
       .replace(/in \d+[ms]+$/gm, 'in {TIME}')
   }
   const log = (...a) => debugLog(cleanOutput(a.join(' ')))
diff --git a/tap-snapshots/test/lib/utils/exit-handler.js.test.cjs b/tap-snapshots/test/lib/utils/exit-handler.js.test.cjs
index c22e6f7ae7ccc..9371127539233 100644
--- a/tap-snapshots/test/lib/utils/exit-handler.js.test.cjs
+++ b/tap-snapshots/test/lib/utils/exit-handler.js.test.cjs
@@ -32,8 +32,7 @@ XX error ERR DETAIL Unknown error
 XX verbose exit 1
 XX timing npm Completed in {TIME}ms
 XX verbose code 1
-XX error A complete log of this run can be found in:
-XX error     {CWD}/cache/_logs/{DATE}-debug-0.log
+XX error A complete log of this run can be found in: {CWD}/cache/_logs/{DATE}-debug-0.log
 `
 
 exports[`test/lib/utils/exit-handler.js TAP handles unknown error with logs and debug file > logs 1`] = `
@@ -63,6 +62,5 @@ error ERR DETAIL Unknown error
 verbose exit 1
 timing npm Completed in {TIME}ms
 verbose code 1
-error  A complete log of this run can be found in:
-    {CWD}/cache/_logs/{DATE}-debug-0.log
+error  A complete log of this run can be found in: {CWD}/cache/_logs/{DATE}-debug-0.log
 `