deps: @npmcli/promise-spawn@5.0.0 (#5757)

12 files changed, 66 insertions, 115 deletions

diff --git a/DEPENDENCIES.md b/DEPENDENCIES.md
index ce0a5d454..861a2406f 100644
--- a/DEPENDENCIES.md
+++ b/DEPENDENCIES.md
@@ -207,7 +207,6 @@ graph LR;
   npmcli-metavuln-calculator-->pacote;
   npmcli-metavuln-calculator-->semver;
   npmcli-package-json-->json-parse-even-better-errors;
-  npmcli-promise-spawn-->infer-owner;
   npmcli-run-script-->npmcli-node-gyp["@npmcli/node-gyp"];
   npmcli-run-script-->npmcli-promise-spawn["@npmcli/promise-spawn"];
   npmcli-run-script-->read-package-json-fast;
@@ -870,7 +869,6 @@ graph LR;
   npmcli-move-file-->mkdirp;
   npmcli-move-file-->rimraf;
   npmcli-package-json-->json-parse-even-better-errors;
-  npmcli-promise-spawn-->infer-owner;
   npmcli-query-->postcss-selector-parser;
   npmcli-run-script-->node-gyp;
   npmcli-run-script-->npmcli-node-gyp["@npmcli/node-gyp"];
@@ -1102,5 +1100,5 @@ packages higher up the chain.
  - npm-registry-fetch, libnpmversion
  - @npmcli/git, make-fetch-happen, @npmcli/config, init-package-json
  - @npmcli/installed-package-contents, @npmcli/map-workspaces, cacache, npm-pick-manifest, @npmcli/run-script, read-package-json, readdir-scoped-modules, promzard
- - @npmcli/docs, npm-bundled, read-package-json-fast, @npmcli/fs, unique-filename, @npmcli/promise-spawn, npm-install-checks, npm-package-arg, npm-packlist, normalize-package-data, @npmcli/package-json, bin-links, nopt, npmlog, parse-conflict-json, dezalgo, read
- - ignore-walk, @npmcli/eslint-config, @npmcli/template-oss, npm-normalize-package-bin, @npmcli/name-from-folder, json-parse-even-better-errors, semver, @npmcli/move-file, fs-minipass, ssri, unique-slug, infer-owner, hosted-git-info, proc-log, validate-npm-package-name, @npmcli/node-gyp, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, wrappy, treeverse, minify-registry-metadata, @npmcli/disparity-colors, @npmcli/ci-detect, mute-stream, ini, npm-audit-report, npm-user-validate
\ No newline at end of file
+ - @npmcli/docs, npm-bundled, read-package-json-fast, @npmcli/fs, unique-filename, npm-install-checks, npm-package-arg, npm-packlist, normalize-package-data, @npmcli/package-json, bin-links, nopt, npmlog, parse-conflict-json, dezalgo, read
+ - ignore-walk, @npmcli/eslint-config, @npmcli/template-oss, npm-normalize-package-bin, @npmcli/name-from-folder, json-parse-even-better-errors, semver, @npmcli/move-file, fs-minipass, ssri, unique-slug, @npmcli/promise-spawn, hosted-git-info, proc-log, validate-npm-package-name, @npmcli/node-gyp, minipass-fetch, @npmcli/query, cmd-shim, read-cmd-shim, write-file-atomic, abbrev, are-we-there-yet, gauge, wrappy, treeverse, minify-registry-metadata, @npmcli/disparity-colors, @npmcli/ci-detect, mute-stream, ini, npm-audit-report, npm-user-validate
\ No newline at end of file
diff --git a/node_modules/@npmcli/git/package.json b/node_modules/@npmcli/git/package.json
index 91381accd..1f28874cd 100644
--- a/node_modules/@npmcli/git/package.json
+++ b/node_modules/@npmcli/git/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/git",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "main": "lib/index.js",
   "files": [
     "bin/",
@@ -32,14 +32,14 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.5.1",
-    "npm-package-arg": "^9.1.0",
+    "@npmcli/template-oss": "4.7.1",
+    "npm-package-arg": "^10.0.0",
     "rimraf": "^3.0.2",
     "slash": "^3.0.0",
     "tap": "^16.0.1"
   },
   "dependencies": {
-    "@npmcli/promise-spawn": "^4.0.0",
+    "@npmcli/promise-spawn": "^5.0.0",
     "lru-cache": "^7.4.4",
     "mkdirp": "^1.0.4",
     "npm-pick-manifest": "^8.0.0",
@@ -55,6 +55,6 @@
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
     "windowsCI": false,
-    "version": "4.5.1"
+    "version": "4.7.1"
   }
 }
diff --git a/node_modules/@npmcli/installed-package-contents/package.json b/node_modules/@npmcli/installed-package-contents/package.json
index 09caada99..aac2de130 100644
--- a/node_modules/@npmcli/installed-package-contents/package.json
+++ b/node_modules/@npmcli/installed-package-contents/package.json
@@ -1,11 +1,11 @@
 {
   "name": "@npmcli/installed-package-contents",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Get the list of files installed in a package in node_modules, including bundled dependencies",
   "author": "GitHub Inc.",
   "main": "lib/index.js",
   "bin": {
-    "installed-package-contents": "index.js"
+    "installed-package-contents": "lib/index.js"
   },
   "license": "ISC",
   "scripts": {
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.5.1",
+    "@npmcli/template-oss": "4.6.2",
     "mkdirp": "^1.0.4",
     "require-inject": "^1.4.4",
     "tap": "^16.3.0"
@@ -41,7 +41,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.5.1"
+    "version": "4.6.2"
   },
   "tap": {
     "nyc-arg": [
diff --git a/node_modules/@npmcli/promise-spawn/lib/index.js b/node_modules/@npmcli/promise-spawn/lib/index.js
index 84ddc83d1..8fa815177 100644
--- a/node_modules/@npmcli/promise-spawn/lib/index.js
+++ b/node_modules/@npmcli/promise-spawn/lib/index.js
@@ -1,5 +1,4 @@
 const { spawn } = require('child_process')
-const inferOwner = require('infer-owner')
 
 const isPipe = (stdio = 'pipe', fd) =>
   stdio === 'pipe' || stdio === null ? true
@@ -8,28 +7,6 @@ const isPipe = (stdio = 'pipe', fd) =>
 
 // 'extra' object is for decorating the error a bit more
 const promiseSpawn = (cmd, args, opts = {}, extra = {}) => {
-  const cwd = opts.cwd || process.cwd()
-  const isRoot = process.getuid && process.getuid() === 0
-  const { uid, gid } = isRoot ? inferOwner.sync(cwd) : {}
-  return promiseSpawnUid(cmd, args, {
-    ...opts,
-    cwd,
-    uid,
-    gid,
-  }, extra)
-}
-
-const stdioResult = (stdout, stderr, { stdioString, stdio }) =>
-  stdioString ? {
-    stdout: isPipe(stdio, 1) ? Buffer.concat(stdout).toString() : null,
-    stderr: isPipe(stdio, 2) ? Buffer.concat(stderr).toString() : null,
-  }
-  : {
-    stdout: isPipe(stdio, 1) ? Buffer.concat(stdout) : null,
-    stderr: isPipe(stdio, 2) ? Buffer.concat(stderr) : null,
-  }
-
-const promiseSpawnUid = (cmd, args, opts, extra) => {
   let proc
   const p = new Promise((res, rej) => {
     proc = spawn(cmd, args, opts)
@@ -72,4 +49,14 @@ const promiseSpawnUid = (cmd, args, opts, extra) => {
   return p
 }
 
+const stdioResult = (stdout, stderr, { stdioString, stdio }) =>
+  stdioString ? {
+    stdout: isPipe(stdio, 1) ? Buffer.concat(stdout).toString().trim() : null,
+    stderr: isPipe(stdio, 2) ? Buffer.concat(stderr).toString().trim() : null,
+  }
+  : {
+    stdout: isPipe(stdio, 1) ? Buffer.concat(stdout) : null,
+    stderr: isPipe(stdio, 2) ? Buffer.concat(stderr) : null,
+  }
+
 module.exports = promiseSpawn
diff --git a/node_modules/@npmcli/promise-spawn/package.json b/node_modules/@npmcli/promise-spawn/package.json
index a6d05e3d7..93ae0259c 100644
--- a/node_modules/@npmcli/promise-spawn/package.json
+++ b/node_modules/@npmcli/promise-spawn/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/promise-spawn",
-  "version": "4.0.0",
+  "version": "5.0.0",
   "files": [
     "bin/",
     "lib/"
@@ -31,8 +31,8 @@
     ]
   },
   "devDependencies": {
-    "@npmcli/eslint-config": "^3.0.1",
-    "@npmcli/template-oss": "4.5.1",
+    "@npmcli/eslint-config": "^4.0.0",
+    "@npmcli/template-oss": "4.7.1",
     "minipass": "^3.1.1",
     "tap": "^16.0.1"
   },
@@ -41,9 +41,6 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.5.1"
-  },
-  "dependencies": {
-    "infer-owner": "^1.0.4"
+    "version": "4.7.1"
   }
 }
diff --git a/node_modules/@npmcli/run-script/package.json b/node_modules/@npmcli/run-script/package.json
index 3c5935046..2b4494ff7 100644
--- a/node_modules/@npmcli/run-script/package.json
+++ b/node_modules/@npmcli/run-script/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/run-script",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Run a lifecycle script for a package (descendant of npm-lifecycle)",
   "author": "GitHub Inc.",
   "license": "ISC",
@@ -16,14 +16,14 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/template-oss": "4.5.1",
+    "@npmcli/template-oss": "4.7.1",
     "minipass": "^3.1.6",
     "require-inject": "^1.4.4",
     "tap": "^16.0.1"
   },
   "dependencies": {
     "@npmcli/node-gyp": "^3.0.0",
-    "@npmcli/promise-spawn": "^4.0.0",
+    "@npmcli/promise-spawn": "^5.0.0",
     "node-gyp": "^9.0.0",
     "read-package-json-fast": "^3.0.0",
     "which": "^2.0.2"
@@ -42,7 +42,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.5.1"
+    "version": "4.7.1"
   },
   "tap": {
     "nyc-arg": [
diff --git a/node_modules/pacote/package.json b/node_modules/pacote/package.json
index 07adc61dc..66a4b695e 100644
--- a/node_modules/pacote/package.json
+++ b/node_modules/pacote/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pacote",
-  "version": "15.0.2",
+  "version": "15.0.4",
   "description": "JavaScript package downloader",
   "author": "GitHub Inc.",
   "bin": {
@@ -26,8 +26,8 @@
   },
   "devDependencies": {
     "@npmcli/arborist": "^6.0.0 || ^6.0.0-pre.0",
-    "@npmcli/eslint-config": "^3.1.0",
-    "@npmcli/template-oss": "4.6.2",
+    "@npmcli/eslint-config": "^4.0.0",
+    "@npmcli/template-oss": "4.7.1",
     "hosted-git-info": "^6.0.0",
     "mutate-fs": "^2.1.1",
     "nock": "^13.2.4",
@@ -45,8 +45,8 @@
   ],
   "dependencies": {
     "@npmcli/git": "^4.0.0",
-    "@npmcli/installed-package-contents": "^2.0.0",
-    "@npmcli/promise-spawn": "^4.0.0",
+    "@npmcli/installed-package-contents": "^2.0.1",
+    "@npmcli/promise-spawn": "^5.0.0",
     "@npmcli/run-script": "^5.0.0",
     "cacache": "^17.0.0",
     "fs-minipass": "^2.1.0",
@@ -71,7 +71,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.6.2",
+    "version": "4.7.1",
     "windowsCI": false
   }
 }
diff --git a/package-lock.json b/package-lock.json
index e84cc520f..0f1e9eb3c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -165,7 +165,7 @@
         "@npmcli/docs": "^1.0.0",
         "@npmcli/eslint-config": "^4.0.0",
         "@npmcli/git": "^4.0.1",
-        "@npmcli/promise-spawn": "^4.0.0",
+        "@npmcli/promise-spawn": "^5.0.0",
         "@npmcli/template-oss": "4.6.2",
         "licensee": "^8.2.0",
         "nock": "^13.2.4",
@@ -2224,12 +2224,12 @@
       }
     },
     "node_modules/@npmcli/git": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.1.tgz",
-      "integrity": "sha512-sfaCFyZO7Zsxia2TNHW8TeHFIUnK63896EZFA5K0vCReOMFi9aELB5RZyFveRLaBE/pT1BS6RxbTWZGjulNgSg==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-4.0.2.tgz",
+      "integrity": "sha512-jBSmCI3F6KTZrWwez6mH6lJPWg3llZlQiHR05/sOw83H1vMc9nnL39ceP8x3SEkDJkaluXG/w4drdYS4FDONgA==",
       "inBundle": true,
       "dependencies": {
-        "@npmcli/promise-spawn": "^4.0.0",
+        "@npmcli/promise-spawn": "^5.0.0",
         "lru-cache": "^7.4.4",
         "mkdirp": "^1.0.4",
         "npm-pick-manifest": "^8.0.0",
@@ -2244,16 +2244,16 @@
       }
     },
     "node_modules/@npmcli/installed-package-contents": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.0.tgz",
-      "integrity": "sha512-vpPDeSnqHAXaPK1l6lcIcpgK/aIe63AbNR5vbzOhO6I2rkaFZmviQZ5nAlSpt+vwKrOH1CnplOdoE5/x8FWtNA==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.1.tgz",
+      "integrity": "sha512-GIykAFdOVK31Q1/zAtT5MbxqQL2vyl9mvFJv+OGu01zxbhL3p0xc8gJjdNGX1mWmUT43aEKVO2L6V/2j4TOsAA==",
       "inBundle": true,
       "dependencies": {
         "npm-bundled": "^3.0.0",
         "npm-normalize-package-bin": "^3.0.0"
       },
       "bin": {
-        "installed-package-contents": "index.js"
+        "installed-package-contents": "lib/index.js"
       },
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
@@ -2328,13 +2328,10 @@
       }
     },
     "node_modules/@npmcli/promise-spawn": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-4.0.0.tgz",
-      "integrity": "sha512-LM/GRZSwkxar1jgd58yW5WspFWrFefh8a/KVy+sbOMa0pCwqlXWxXEjQRQzbtWExyhwPb2XSK/4mJnLeiVOYng==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-5.0.0.tgz",
+      "integrity": "sha512-q+Le2urM3NdxSFHj+VZXLTHKgmWxqHXUSqM5m9bjnV3EtThtJor64f5inmBkO9uEGZnhpjW0wL67Qf5qcgZkxw==",
       "inBundle": true,
-      "dependencies": {
-        "infer-owner": "^1.0.4"
-      },
       "engines": {
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
@@ -2351,13 +2348,13 @@
       }
     },
     "node_modules/@npmcli/run-script": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-5.0.0.tgz",
-      "integrity": "sha512-AuqcoTOt7v4D2JqC7mCa+eUQHb64vWbwyu9o1hoJiq2kfZNwCB71f0s7tvUw+v+1B5XMdqcr98aGzjKIg7s6Vw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-5.0.1.tgz",
+      "integrity": "sha512-co/A+5LzdHQVLukfYT71x5e8+6HtIk2W9Jk5c8mE8LaGrkHazzRuZeyUmb6Ciaak7MRXRVOSoTaZ0zYEFVA/Gw==",
       "inBundle": true,
       "dependencies": {
         "@npmcli/node-gyp": "^3.0.0",
-        "@npmcli/promise-spawn": "^4.0.0",
+        "@npmcli/promise-spawn": "^5.0.0",
         "node-gyp": "^9.0.0",
         "read-package-json-fast": "^3.0.0",
         "which": "^2.0.2"
@@ -8920,14 +8917,14 @@
       }
     },
     "node_modules/pacote": {
-      "version": "15.0.2",
-      "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.0.2.tgz",
-      "integrity": "sha512-Gj4w436jiM9/0574JGI8nxpsuXssp5OhyBhnWijvzUVJdU5GvNvnYUgd5WA6mr6ImOQ7JqWqdA44ixBqqMfyZQ==",
+      "version": "15.0.4",
+      "resolved": "https://registry.npmjs.org/pacote/-/pacote-15.0.4.tgz",
+      "integrity": "sha512-6lSP0ly54fKrPIvXmVcmslqrcF8DL3y/RlNLwBWG1A3wd8sWcPF8hikTJDWqXUPMw6L04p6gqsJ/iLgRjth+6A==",
       "inBundle": true,
       "dependencies": {
         "@npmcli/git": "^4.0.0",
-        "@npmcli/installed-package-contents": "^2.0.0",
-        "@npmcli/promise-spawn": "^4.0.0",
+        "@npmcli/installed-package-contents": "^2.0.1",
+        "@npmcli/promise-spawn": "^5.0.0",
         "@npmcli/run-script": "^5.0.0",
         "cacache": "^17.0.0",
         "fs-minipass": "^2.1.0",
@@ -14024,7 +14021,7 @@
       "license": "ISC",
       "devDependencies": {
         "@npmcli/eslint-config": "^4.0.0",
-        "@npmcli/promise-spawn": "^4.0.0",
+        "@npmcli/promise-spawn": "^5.0.0",
         "@npmcli/template-oss": "4.6.2",
         "minify-registry-metadata": "^2.2.0",
         "rimraf": "^3.0.2",
diff --git a/package.json b/package.json
index 6f3d997bb..9f189e07c 100644
--- a/package.json
+++ b/package.json
@@ -202,7 +202,7 @@
     "@npmcli/docs": "^1.0.0",
     "@npmcli/eslint-config": "^4.0.0",
     "@npmcli/git": "^4.0.1",
-    "@npmcli/promise-spawn": "^4.0.0",
+    "@npmcli/promise-spawn": "^5.0.0",
     "@npmcli/template-oss": "4.6.2",
     "licensee": "^8.2.0",
     "nock": "^13.2.4",
diff --git a/smoke-tests/package.json b/smoke-tests/package.json
index c9b08a175..fcafbc5bc 100644
--- a/smoke-tests/package.json
+++ b/smoke-tests/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^4.0.0",
-    "@npmcli/promise-spawn": "^4.0.0",
+    "@npmcli/promise-spawn": "^5.0.0",
     "@npmcli/template-oss": "4.6.2",
     "minify-registry-metadata": "^2.2.0",
     "rimraf": "^3.0.2",
diff --git a/smoke-tests/tap-snapshots/test/index.js.test.cjs b/smoke-tests/tap-snapshots/test/index.js.test.cjs
index 98030692d..9f539bf8a 100644
--- a/smoke-tests/tap-snapshots/test/index.js.test.cjs
+++ b/smoke-tests/tap-snapshots/test/index.js.test.cjs
@@ -39,7 +39,6 @@ More configuration info: npm help config
 Configuration fields: npm help 7 config
 
 npm {CWD}
-
 `
 
 exports[`test/index.js TAP npm ci > should throw mismatch deps in lock file error 1`] = `
@@ -70,7 +69,6 @@ npm ERR! Run "npm help ci" for more info
 
 npm ERR! A complete log of this run can be found in:
 
-
 `
 
 exports[`test/index.js TAP npm diff > should have expected diff output 1`] = `
@@ -325,22 +323,18 @@ index v1.0.4..v1.1.1
 +function lexSort (a, b) {
 +  return a === b ? 0 : a > b ? 1 : -1
 +}
-
 `
 
 exports[`test/index.js TAP npm explain > should have expected explain output 1`] = `
 abbrev@1.0.4
 node_modules/abbrev
   abbrev@"^1.0.4" from the root project
-
 `
 
 exports[`test/index.js TAP npm fund > should have expected fund output 1`] = `
 project@1.0.0
 \`-- https://github.com/sponsors/isaacs
     \`-- promise-all-reject-late@1.0.1
-
-
 `
 
 exports[`test/index.js TAP npm init > should have successful npm init result 1`] = `
@@ -358,9 +352,6 @@ Wrote to {CWD}/smoke-tests/test/tap-testdir-index/project/package.json:
   "author": "",
   "license": "ISC"
 }
-
-
-
 `
 
 exports[`test/index.js TAP npm install dev dep > should have expected dev dep added lockfile result 1`] = `
@@ -423,18 +414,14 @@ exports[`test/index.js TAP npm install dev dep > should have expected dev dep ad
 `
 
 exports[`test/index.js TAP npm install dev dep > should have expected dev dep added reify output 1`] = `
-
 added 1 package 
 
 1 package is looking for funding
   run \`npm fund\` for details
-
 `
 
 exports[`test/index.js TAP npm install prodDep@version > should have expected install reify output 1`] = `
-
 added 1 package 
-
 `
 
 exports[`test/index.js TAP npm install prodDep@version > should have expected lockfile result 1`] = `
@@ -485,14 +472,11 @@ exports[`test/index.js TAP npm ls > should have expected ls output 1`] = `
 project@1.0.0 {CWD}/smoke-tests/test/tap-testdir-index/project
 +-- abbrev@1.0.4
 \`-- promise-all-reject-late@1.0.1
-
-
 `
 
 exports[`test/index.js TAP npm outdated > should have expected outdated output 1`] = `
 Package  Current  Wanted  Latest  Location             Depended by
 abbrev     1.0.4   1.1.1   1.1.1  node_modules/abbrev  project
-
 `
 
 exports[`test/index.js TAP npm pkg > should have expected npm pkg delete modified package.json result 1`] = `
@@ -546,7 +530,6 @@ exports[`test/index.js TAP npm pkg > should have expected pkg delete output 1`]
 
 exports[`test/index.js TAP npm pkg > should have expected pkg get output 1`] = `
 "ISC"
-
 `
 
 exports[`test/index.js TAP npm pkg > should have expected pkg set output 1`] = `
@@ -575,7 +558,6 @@ exports[`test/index.js TAP npm pkg > should print package.json contents 1`] = `
     ]
   }
 }
-
 `
 
 exports[`test/index.js TAP npm pkg set scripts > should have expected script added package.json result 1`] = `
@@ -607,16 +589,13 @@ exports[`test/index.js TAP npm pkg set scripts > should have expected set-script
 
 exports[`test/index.js TAP npm prefix > should have expected prefix output 1`] = `
 {CWD}/smoke-tests/test/tap-testdir-index/project
-
 `
 
 exports[`test/index.js TAP npm run-script > should have expected run-script output 1`] = `
-
 > project@1.0.0 hello
 > echo Hello
 
 Hello
-
 `
 
 exports[`test/index.js TAP npm uninstall > should have expected uninstall lockfile result 1`] = `
@@ -665,9 +644,7 @@ exports[`test/index.js TAP npm uninstall > should have expected uninstall packag
 `
 
 exports[`test/index.js TAP npm uninstall > should have expected uninstall reify output 1`] = `
-
 removed 1 package 
-
 `
 
 exports[`test/index.js TAP npm update dep > should have expected update lockfile result 1`] = `
@@ -731,16 +708,13 @@ exports[`test/index.js TAP npm update dep > should have expected update package.
 `
 
 exports[`test/index.js TAP npm update dep > should have expected update reify output 1`] = `
-
 changed 1 package 
 
 1 package is looking for funding
   run \`npm fund\` for details
-
 `
 
 exports[`test/index.js TAP npm view > should have expected view output 1`] = `
-
 abbrev@1.0.4 | MIT | deps: none | versions: 8
 Like ruby's abbrev module, but in js
 https://github.com/isaacs/abbrev-js#readme
@@ -760,5 +734,4 @@ dist-tags:
 latest: 1.1.1
 
 published over a year ago by isaacs <i@izs.me>
-
 `
diff --git a/workspaces/arborist/tap-snapshots/test/arborist/rebuild.js.test.cjs b/workspaces/arborist/tap-snapshots/test/arborist/rebuild.js.test.cjs
index 3a500be65..8cd2cfd32 100644
--- a/workspaces/arborist/tap-snapshots/test/arborist/rebuild.js.test.cjs
+++ b/workspaces/arborist/tap-snapshots/test/arborist/rebuild.js.test.cjs
@@ -26,8 +26,8 @@ Array [
       "version": "1.0.0",
     },
     "signal": null,
-    "stderr": "stderr\\n",
-    "stdout": "npm_package_dev\\n",
+    "stderr": "stderr",
+    "stdout": "npm_package_dev",
   },
   Object {
     "cmd": "node ../../env.js",
@@ -42,8 +42,8 @@ Array [
       "version": "1.0.0",
     },
     "signal": null,
-    "stderr": "stderr\\n",
-    "stdout": "npm_package_dev_optional\\n",
+    "stderr": "stderr",
+    "stdout": "npm_package_dev_optional",
   },
   Object {
     "cmd": "node ../../env.js",
@@ -58,11 +58,10 @@ Array [
       "version": "1.0.0",
     },
     "signal": null,
-    "stderr": "stderr\\n",
+    "stderr": "stderr",
     "stdout": String(
       npm_package_dev
       npm_package_optional
-      
     ),
   },
   Object {
@@ -81,8 +80,8 @@ Array [
       "version": "1.0.0",
     },
     "signal": null,
-    "stderr": "stderr\\n",
-    "stdout": "npm_package_optional\\n",
+    "stderr": "stderr",
+    "stdout": "npm_package_optional",
   },
 ]
 `