fix(refactor): use output.buffer for pack

Author: lukekarrys

lib/commands/pack.js

@@ -53,20 +53,16 @@ class Pack extends BaseCommand {
         prefix: this.npm.localPrefix,
         workspaces: this.workspacePaths,
       })
-      const pkgContents = await getContents(manifest, tarballData)
-      tarballs.push(pkgContents)
+      tarballs.push(await getContents(manifest, tarballData))
     }
 
-    // XXX(BREAKING_CHANGE): publish outputs a json object with package
-    // names as keys. Pack should do the same here instead of an array
-    if (json) {
-      output.standard(JSON.stringify(tarballs, null, 2))
-      return
-    }
-
-    for (const tar of tarballs) {
-      logTar(tar, { unicode })
-      output.standard(tar.filename.replace(/^@/, '').replace(/\//, '-'))
+    for (const [index, tar] of Object.entries(tarballs)) {
+      // XXX(BREAKING_CHANGE): publish outputs a json object with package
+      // names as keys. Pack should do the same here instead of an array
+      logTar(tar, { unicode, json, key: index })
+      if (!json) {
+        output.standard(tar.filename.replace(/^@/, '').replace(/\//, '-'))
+      }
     }
   }
 
@@ -82,7 +78,7 @@ class Pack extends BaseCommand {
     }
 
     await this.setWorkspaces()
-    return this.exec([...this.workspacePaths, ...args.filter(a => a !== '.')])
+    return this.exec([...this.workspacePaths, ...args])
   }
 }
 

lib/commands/publish.js

@@ -104,18 +104,13 @@ class Publish extends BaseCommand {
       workspaces: this.workspacePaths,
     })
     const pkgContents = await getContents(manifest, tarballData)
+    logTar(pkgContents, { unicode, json, key: workspace })
 
     // The purpose of re-reading the manifest is in case it changed,
     // so that we send the latest and greatest thing to the registry
     // note that publishConfig might have changed as well!
     manifest = await this.#getManifest(spec, opts, true)
 
-    if (json) {
-      output.buffer(workspace ? { [workspace]: pkgContents } : pkgContents)
-    } else {
-      logTar(pkgContents, { unicode })
-    }
-
     const resolved = npa.resolve(manifest.name, manifest.version)
 
     // make sure tag is valid, this will throw if invalid

lib/utils/tar.js

@@ -1,14 +1,17 @@
 const tar = require('tar')
 const ssri = require('ssri')
-const { log } = require('proc-log')
+const { log, output } = require('proc-log')
 const formatBytes = require('./format-bytes.js')
 const localeCompare = require('@isaacs/string-locale-compare')('en', {
   sensitivity: 'case',
   numeric: true,
 })
 
-const logTar = (tarball, opts = {}) => {
-  const { unicode = false } = opts
+const logTar = (tarball, { unicode = false, json, key } = {}) => {
+  if (json) {
+    output.buffer(key == null ? tarball : { [key]: tarball })
+    return
+  }
   log.notice('')
   log.notice('', `${unicode ? '📦 ' : 'package:'} ${tarball.name}@${tarball.version}`)
   log.notice('Tarball Contents')