fix: consolidate registryConfig application logic

It should happen whenever we read a manifest anyways.

Tests were also rewritten to be real.

1 files changed, 15 insertions, 16 deletions

diff --git a/lib/commands/publish.js b/lib/commands/publish.js
index 51861c5aa..ff3036693 100644
--- a/lib/commands/publish.js
+++ b/lib/commands/publish.js
@@ -69,10 +69,6 @@ class Publish extends BaseCommand {
     const spec = npa(args[0])
     let manifest = await this.getManifest(spec, opts)
 
-    if (manifest.publishConfig) {
-      flatten(manifest.publishConfig, opts)
-    }
-
     // only run scripts for directory type publishes
     if (spec.type === 'directory' && !ignoreScripts) {
       await runScript({
@@ -92,12 +88,8 @@ class Publish extends BaseCommand {
     // 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)
-    if (manifest.publishConfig) {
-      flatten(manifest.publishConfig, opts)
-    }
 
-    // note that logTar calls log.notice(), so if we ARE in silent mode,
-    // this will do nothing, but we still want it in the debuglog if it fails.
+    // JSON already has the package contents
     if (!json) {
       logTar(pkgContents, { unicode })
     }
@@ -197,15 +189,22 @@ class Publish extends BaseCommand {
 
   // if it's a directory, read it from the file system
   // otherwise, get the full metadata from whatever it is
-  getManifest (spec, opts) {
+  // XXX can't pacote read the manifest from a directory?
+  async getManifest (spec, opts) {
+    let manifest
     if (spec.type === 'directory') {
-      return readJson(`${spec.fetchSpec}/package.json`)
+      manifest = await readJson(`${spec.fetchSpec}/package.json`)
+    } else {
+      manifest = await pacote.manifest(spec, {
+        ...opts,
+        fullmetadata: true,
+        fullReadJson: true,
+      })
+    }
+    if (manifest.publishConfig) {
+      flatten(manifest.publishConfig, opts)
     }
-    return pacote.manifest(spec, {
-      ...opts,
-      fullMetadata: true,
-      fullReadJson: true,
-    })
+    return manifest
   }
 }
 module.exports = Publish