@antora/content-aggregator 3.1.3 → 3.1.5

package/lib/aggregate-content.js

@@ -274,9 +274,10 @@ async function collectFilesFromSource (source, repo, remoteName, authStatus) {
 // QUESTION should we resolve HEAD to a ref eagerly to avoid having to do a match on it?
 async function selectReferences (source, repo, remote) {
   let { branches: branchPatterns, tags: tagPatterns, worktrees: worktreePatterns = '.' } = source
-  const isBare = repo.noCheckout
+  const managed = 'url' in repo
+  const isBare = managed || repo.noCheckout
   const patternCache = repo.cache[REF_PATTERN_CACHE_KEY]
-  const noWorktree = repo.url ? undefined : false
+  const noWorktree = managed ? undefined : false
   const refs = new Map()
   if (
     tagPatterns &&
@@ -369,10 +370,11 @@ async function selectReferences (source, repo, remote) {
         refs.set(shortname, { shortname, fullname: 'heads/' + shortname, type: 'branch', head })
       }
     }
-  } else if (!remoteBranches.length) {
+  } else if (!managed || !remoteBranches.length) {
     const localBranches = await git.listBranches(repo)
     if (localBranches.length) {
       for (const shortname of filterRefs(localBranches, branchPatterns, patternCache)) {
+        if (refs.has(shortname)) continue // NOTE prefer remote branches in bare repository
         refs.set(shortname, { shortname, fullname: 'heads/' + shortname, type: 'branch', head: noWorktree })
       }
     }
@@ -826,9 +828,12 @@ function onGitComplete (err) {
 
 function resolveCredentials (credentialsFromUrlHolder, url, auth) {
   const credentialsFromUrl = credentialsFromUrlHolder.get() || {}
-  credentialsFromUrlHolder.clear()
   if ('Authorization' in auth.headers) {
-    if (!('username' in credentialsFromUrl)) return this.rejected({ url, auth })
+    if ('username' in credentialsFromUrl) {
+      credentialsFromUrlHolder.clear()
+    } else {
+      return this.rejected({ url, auth })
+    }
   } else if ('username' in credentialsFromUrl) {
     return credentialsFromUrl
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.1.3",
+  "version": "3.1.5",
   "description": "Fetches and aggregates content from distributed sources for use in an Antora documentation pipeline.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -29,12 +29,12 @@
   },
   "dependencies": {
     "@antora/expand-path-helper": "~2.0",
-    "@antora/logger": "3.1.3",
+    "@antora/logger": "3.1.5",
     "@antora/user-require-helper": "~2.0",
     "braces": "~3.0",
     "cache-directory": "~2.0",
     "glob-stream": "~7.0",
-    "hpagent": "~1.1",
+    "hpagent": "~1.2",
     "isomorphic-git": "~1.21",
     "js-yaml": "~4.1",
     "multi-progress": "~4.0",
@@ -62,7 +62,7 @@
   ],
   "scripts": {
     "test": "_mocha",
-    "prepublishOnly": "node $npm_config_local_prefix/npm/prepublishOnly.js",
-    "postpublish": "node $npm_config_local_prefix/npm/postpublish.js"
+    "prepublishOnly": "npx -y downdoc --prepublish",
+    "postpublish": "npx -y downdoc --postpublish"
   }
 }