@antora/content-aggregator 3.1.11 → 3.1.12

package/lib/aggregate-content.js

@@ -1,32 +1,32 @@
 'use strict'
 
 const computeOrigin = require('./compute-origin')
-const { createHash } = require('node:crypto')
+const { createHash } = require('crypto')
 const createGitHttpPlugin = require('./git-plugin-http')
 const decodeUint8Array = require('./decode-uint8-array')
 const deepClone = require('./deep-clone')
-const EventEmitter = require('node:events')
+const EventEmitter = require('events')
 const expandPath = require('@antora/expand-path-helper')
 const File = require('./file')
 const filterRefs = require('./filter-refs')
-const fs = require('node:fs')
+const fs = require('fs')
 const { promises: fsp } = fs
 const getCacheDir = require('cache-directory')
 const GitCredentialManagerStore = require('./git-credential-manager-store')
 const git = require('./git')
 const { NotFoundError, ObjectTypeError, UnknownTransportError, UrlParseError } = git.Errors
 const { globStream } = require('fast-glob')
-const { inspect } = require('node:util')
+const { inspect } = require('util')
 const invariably = require('./invariably')
 const logger = require('./logger')
 const { makeMatcherRx, versionMatcherOpts: VERSION_MATCHER_OPTS } = require('./matcher')
 const MultiProgress = require('multi-progress') // calls require('progress') as a peer dependencies
-const ospath = require('node:path')
+const ospath = require('path')
 const { posix: path } = ospath
 const posixify = require('./posixify')
 const removeGitSuffix = require('./remove-git-suffix')
 const { fs: resolvePathGlobsFs, git: resolvePathGlobsGit } = require('./resolve-path-globs')
-const { pipeline, Writable } = require('node:stream')
+const { pipeline, Writable } = require('stream')
 const forEach = (write) => new Writable({ objectMode: true, write })
 const userRequire = require('@antora/user-require-helper')
 const yaml = require('js-yaml')
@@ -102,8 +102,7 @@ function aggregateContent (playbook) {
     }, new Map())
     const progress = quiet ? undefined : createProgress(sourcesByUrl.keys(), process.stdout)
     const refPatternCache = Object.assign(new Map(), { braces: new Map() })
-    const fetchConfig = { always: fetch, depth: Math.max(0, gitConfig.fetchDepth ?? 1) }
-    const loadOpts = { cacheDir, fetch: fetchConfig, gitPlugins, progress, startDir, refPatternCache }
+    const loadOpts = { cacheDir, fetch, gitPlugins, progress, startDir, refPatternCache }
     return collectFiles(sourcesByUrl, loadOpts, concurrency).then(buildAggregate, (err) => {
       progress?.terminate()
       throw err
@@ -111,11 +110,11 @@ function aggregateContent (playbook) {
   })
 }
 
-async function collectFiles (sourcesByUrl, loadOpts, concurrency, fetchedUrls = []) {
+async function collectFiles (sourcesByUrl, loadOpts, concurrency, fetchedUrls) {
   const loadTasks = [...sourcesByUrl.entries()].map(([url, sources]) => {
     const loadOptsForUrl = Object.assign({}, loadOpts)
-    if (loadOpts.fetch.always && fetchedUrls.length && fetchedUrls.includes(url)) loadOptsForUrl.fetch.always = false
-    if (tagsSpecified(sources)) loadOptsForUrl.fetch.tags = true
+    if (loadOpts.fetch && fetchedUrls && fetchedUrls.length && fetchedUrls.includes(url)) loadOptsForUrl.fetch = false
+    if (tagsSpecified(sources)) loadOptsForUrl.fetchTags = true
     return loadRepository.bind(null, url, loadOptsForUrl, { url, sources })
   })
   return gracefulPromiseAllWithLimit(loadTasks, concurrency.fetch).then(([results, rejections]) => {
@@ -164,7 +163,7 @@ async function loadRepository (url, opts, result = {}) {
   if (~url.indexOf(':') && GIT_URI_DETECTOR_RX.test(url)) {
     let credentials, displayUrl
     ;({ displayUrl, url, credentials } = extractCredentials(url))
-    const { cacheDir, fetch, gitPlugins, progress } = opts
+    const { cacheDir, fetch, fetchTags, gitPlugins, progress } = opts
     dir = ospath.join(cacheDir, generateCloneFolderName(displayUrl))
     // NOTE the presence of the url property on the repo object implies the repository is remote
     repo = { cache, dir, fs, gitdir: dir, noCheckout: true, url }
@@ -172,9 +171,9 @@ async function loadRepository (url, opts, result = {}) {
     const validStateFile = ospath.join(dir, VALID_STATE_FILENAME)
     try {
       await fsp.access(validStateFile)
-      if (fetch.always) {
+      if (fetch) {
         await fsp.unlink(validStateFile)
-        const fetchOpts = buildFetchOptions(repo, progress, displayUrl, credentials, gitPlugins, fetch, 'fetch')
+        const fetchOpts = buildFetchOptions(repo, progress, displayUrl, credentials, gitPlugins, fetchTags, 'fetch')
         await git
           .fetch(fetchOpts)
           .then(() => {
@@ -194,7 +193,7 @@ async function loadRepository (url, opts, result = {}) {
     } catch (gitErr) {
       await fsp['rm' in fsp ? 'rm' : 'rmdir'](dir, { recursive: true, force: true })
       if (gitErr.rethrow) throw transformGitCloneError(gitErr, displayUrl)
-      const fetchOpts = buildFetchOptions(repo, progress, displayUrl, credentials, gitPlugins, fetch, 'clone')
+      const fetchOpts = buildFetchOptions(repo, progress, displayUrl, credentials, gitPlugins, fetchTags, 'clone')
       await git
         .clone(fetchOpts)
         .then(() => git.resolveRef(Object.assign({ ref: 'HEAD', depth: 1 }, repo)))
@@ -211,15 +210,8 @@ async function loadRepository (url, opts, result = {}) {
         .then(() => fetchOpts.onProgress?.finish())
     }
   } else if (await isDirectory((dir = expandPath(url, { dot: opts.startDir })))) {
-    const dotgit = ospath.join(dir, '.git')
-    const dotgitStat = await fsp.stat(dotgit).catch(() => ({ isFile: invariably.false, isDirectory: invariably.false }))
-    if (dotgitStat.isDirectory()) {
-      repo = { cache, dir, fs, gitdir: dotgit }
-    } else if (dotgitStat.isFile()) {
-      repo = await resolveRepositoryFromWorktree({ cache, dir, fs, gitdir: dotgit })
-    } else {
-      repo = { cache, dir, fs, gitdir: dir, noCheckout: true }
-    }
+    const gitdir = ospath.join(dir, '.git')
+    repo = (await isDirectory(gitdir)) ? { cache, dir, fs, gitdir } : { cache, dir, fs, gitdir: dir, noCheckout: true }
     try {
       await git.resolveRef(Object.assign({ ref: 'HEAD', depth: 1 }, repo))
     } catch {
@@ -293,7 +285,7 @@ async function selectStartPathsForRepository (repo, authStatus, sources) {
 
 // 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
+  let { branches: branchPatterns, tags: tagPatterns, worktrees: worktreePatterns = '.' } = source
   const managed = 'url' in repo
   const isBare = managed || repo.noCheckout
   const patternCache = repo.cache[REF_PATTERN_CACHE_KEY]
@@ -313,16 +305,7 @@ async function selectReferences (source, repo, remote) {
       }
     }
   }
-  if (
-    !branchPatterns ||
-    !(branchPatterns = Array.isArray(branchPatterns)
-      ? branchPatterns.map((pattern) => String(pattern))
-      : splitRefPatterns(String(branchPatterns))).length
-  ) {
-    return [...refs.values()]
-  }
-  const worktreeName = repo.worktreeName // possibly switch to worktree property ({ name, dir}) in future
-  if (worktreeName) branchPatterns = branchPatterns.map((it) => (it === 'HEAD' ? 'HEAD@' + worktreeName : it))
+  if (!branchPatterns) return [...refs.values()]
   if (worktreePatterns) {
     if (worktreePatterns === '.') {
       worktreePatterns = ['.']
@@ -332,14 +315,14 @@ async function selectReferences (source, repo, remote) {
       worktreePatterns = Array.isArray(worktreePatterns)
         ? worktreePatterns.map((pattern) => String(pattern))
         : splitRefPatterns(String(worktreePatterns))
-      if (worktreeName) worktreePatterns = worktreePatterns.map((it) => (it === '@' ? worktreeName : it))
     }
   } else {
-    worktreePatterns = worktreePatterns === undefined ? [worktreeName || '.'] : []
+    worktreePatterns = []
   }
-  let currentBranch
-  if (branchPatterns.length === 1 && (branchPatterns[0] === 'HEAD' || branchPatterns[0] === '.')) {
-    if ((currentBranch = await getCurrentBranchName(repo, remote).then((branch) => branch ?? false))) {
+  const branchPatternsString = String(branchPatterns)
+  if (branchPatternsString === 'HEAD' || branchPatternsString === '.') {
+    const currentBranch = await getCurrentBranchName(repo, remote)
+    if (currentBranch) {
       branchPatterns = [currentBranch]
     } else if (isBare) {
       return [...refs.values()]
@@ -349,11 +332,17 @@ async function selectReferences (source, repo, remote) {
       refs.set('HEAD', { shortname: 'HEAD', fullname: 'HEAD', type: 'branch', detached: true, head })
       return [...refs.values()]
     }
-  } else {
+  } else if (
+    (branchPatterns = Array.isArray(branchPatterns)
+      ? branchPatterns.map((pattern) => String(pattern))
+      : splitRefPatterns(branchPatternsString)).length
+  ) {
     let headBranchIdx
     // NOTE we can assume at least two entries if HEAD or . are present
     if (~(headBranchIdx = branchPatterns.indexOf('HEAD')) || ~(headBranchIdx = branchPatterns.indexOf('.'))) {
-      if ((currentBranch = await getCurrentBranchName(repo, remote).then((branch) => branch ?? false))) {
+      const currentBranch = await getCurrentBranchName(repo, remote)
+      if (currentBranch) {
+        // NOTE ignore if current branch is already in list
         if (~branchPatterns.indexOf(currentBranch)) {
           branchPatterns.splice(headBranchIdx, 1)
         } else {
@@ -372,6 +361,8 @@ async function selectReferences (source, repo, remote) {
         branchPatterns.splice(headBranchIdx, 1)
       }
     }
+  } else {
+    return [...refs.values()]
   }
   // NOTE isomorphic-git includes HEAD in list of remote branches (see https://isomorphic-git.org/docs/listBranches)
   const remoteBranches = remote
@@ -385,27 +376,11 @@ async function selectReferences (source, repo, remote) {
   }
   // NOTE only consider local branches if repo has a worktree or there are no remote tracking branches
   if (!isBare) {
-    const localBranches = await git.listBranches(repo).then((branches) => {
-      if (branches.length) return branches
-      if (currentBranch == null) return getCurrentBranchName(repo).then((branch) => (branch ? [branch] : []))
-      return currentBranch ? [currentBranch] : []
-    })
+    const localBranches = await git.listBranches(repo)
     if (localBranches.length) {
       const worktrees = await findWorktrees(repo, worktreePatterns)
-      let onMatch
-      if ((worktreePatterns.join('') || '.') !== '.') {
-        const symbolicNames = new Map()
-        worktrees.forEach(({ name, symbolicName = 'HEAD@' + name }, shortname) => {
-          localBranches.push(symbolicName)
-          symbolicNames.set(symbolicName, shortname)
-        })
-        onMatch = (candidate, { pattern }) => {
-          const shortname = symbolicNames.get(candidate)
-          return shortname ? (pattern.startsWith('HEAD@') ? shortname : undefined) : candidate
-        }
-      }
-      for (const shortname of filterRefs(localBranches, branchPatterns, patternCache, onMatch)) {
-        const head = (worktrees.get(shortname) || { head: noWorktree }).head
+      for (const shortname of filterRefs(localBranches, branchPatterns, patternCache)) {
+        const head = worktrees.get(shortname) || noWorktree
         refs.set(shortname, { shortname, fullname: 'heads/' + shortname, type: 'branch', head })
       }
     }
@@ -425,13 +400,15 @@ async function selectReferences (source, repo, remote) {
  * Returns the current branch name or undefined if the HEAD is detached.
  */
 function getCurrentBranchName (repo, remote) {
-  return (
-    remote && repo.noCheckout
-      ? git
-          .resolveRef(Object.assign({ ref: 'refs/remotes/' + remote + '/HEAD', depth: 2 }, repo))
-          .catch(() => git.resolveRef(Object.assign({ ref: 'HEAD', depth: 2 }, repo)))
-      : git.resolveRef(Object.assign({ ref: 'HEAD', depth: 2 }, repo))
-  ).then((ref) => (ref.startsWith('refs/') ? ref.replace(SHORTEN_REF_RX, '') : undefined))
+  let refPromise
+  if (repo.noCheckout) {
+    refPromise = git
+      .resolveRef(Object.assign({ ref: 'refs/remotes/' + remote + '/HEAD', depth: 2 }, repo))
+      .catch(() => git.resolveRef(Object.assign({ ref: 'HEAD', depth: 2 }, repo)))
+  } else {
+    refPromise = git.resolveRef(Object.assign({ ref: 'HEAD', depth: 2 }, repo))
+  }
+  return refPromise.then((ref) => (ref.startsWith('refs/') ? ref.replace(SHORTEN_REF_RX, '') : undefined))
 }
 
 async function selectStartPaths (source, repo, ref) {
@@ -775,7 +752,7 @@ function loadComponentDescriptor (files, ref, version) {
     throw new Error(`version in ${COMPONENT_DESC_FILENAME} cannot have path segments: ${version}`)
   }
   data.version = version
-  return camelCaseKeys(data, ['asciidoc', 'ext'])
+  return camelCaseKeys(data, ['asciidoc'])
 }
 
 function assignFileProperties (file, origin) {
@@ -792,20 +769,18 @@ function assignFileProperties (file, origin) {
   return file
 }
 
-function buildFetchOptions (repo, progress, displayUrl, credentialsFromUrl, gitPlugins, fetch, operation) {
+function buildFetchOptions (repo, progress, displayUrl, credentialsFromUrl, gitPlugins, fetchTags, operation) {
   const { credentialManager, http, urlRouter } = gitPlugins
-  const corsProxy = false
-  const depth = fetch.depth || undefined
   const onAuth = resolveCredentials.bind(credentialManager, new Map().set(undefined, credentialsFromUrl))
   const onAuthFailure = onAuth
   const onAuthSuccess = (url) => credentialManager.approved({ url })
-  const opts = Object.assign({ corsProxy, depth, http, onAuth, onAuthFailure, onAuthSuccess }, repo)
+  const opts = Object.assign({ corsProxy: false, depth: 1, http, onAuth, onAuthFailure, onAuthSuccess }, repo)
   if (urlRouter) opts.url = urlRouter.ensureGitSuffix(opts.url)
   if (progress) opts.onProgress = createProgressListener(progress, displayUrl, operation)
   if (operation === 'fetch') {
     opts.prune = true
-    if (fetch.tags) opts.tags = opts.pruneTags = true
-  } else if (!fetch.tags) {
+    if (fetchTags) opts.tags = opts.pruneTags = true
+  } else if (!fetchTags) {
     opts.noTags = true
   }
   return opts
@@ -900,11 +875,7 @@ function resolveCredentials (credentialsFromUrlHolder, url, auth) {
 }
 
 function identifyAuthStatus (credentialManager, credentials, url) {
-  const status = credentialManager.status({ url })
-  if (credentials) {
-    return typeof status === 'string' && status.startsWith('requested,') ? 'auth-required' : 'auth-embedded'
-  }
-  if (status != null) return 'auth-required'
+  return credentials ? 'auth-embedded' : credentialManager.status({ url }) ? 'auth-required' : undefined
 }
 
 /**
@@ -1058,50 +1029,39 @@ function coerceToString (value) {
   return value == null ? '' : String(value)
 }
 
-function resolveRepositoryFromWorktree (repo) {
-  return fsp
-    .readFile(repo.gitdir, 'utf8')
-    .then((contents) => contents.substr(8).trimEnd())
-    .then((worktreeGitdir) =>
-      fsp.readFile(ospath.join(worktreeGitdir, 'commondir'), 'utf8').then(
-        (contents) => {
-          const gitdir = ospath.join(worktreeGitdir, contents.trimEnd())
-          const dir = ospath.basename(gitdir) === '.git' ? ospath.dirname(gitdir) : gitdir
-          return Object.assign(repo, { dir, gitdir, worktreeName: ospath.basename(worktreeGitdir) })
-        },
-        () => repo
-      )
-    )
-}
-
 function findWorktrees (repo, patterns) {
   if (!patterns.length) return new Map()
-  const mainWorktree =
-    patterns[0] === '.' && (patterns = patterns.slice(1))
-      ? getCurrentBranchName(repo).then((branch) => branch && [branch, { head: repo.dir, name: '.' }])
-      : Promise.resolve()
-  const worktreesDir = patterns.length ? ospath.join(repo.dir, '.git', 'worktrees') : undefined
+  const linkedOnly = patterns[0] === '.' ? !(patterns = patterns.slice(1)) : true
+  let worktreesDir
   const patternCache = repo.cache[REF_PATTERN_CACHE_KEY]
   return (
-    worktreesDir
+    patterns.length
       ? fsp
-          .readdir(worktreesDir)
+          .readdir((worktreesDir = ospath.join(repo.dir, '.git', 'worktrees')))
           .then((worktreeNames) => filterRefs(worktreeNames, patterns, patternCache), invariably.emptyArray)
           .then((worktreeNames) =>
-            Promise.all(
-              worktreeNames.map((worktreeName) => {
-                const gitdir = ospath.resolve(worktreesDir, worktreeName)
-                // NOTE branch name defaults to worktree name if HEAD is detached
-                return getCurrentBranchName(Object.assign({}, repo, { gitdir })).then((branch = worktreeName) =>
-                  fsp
-                    .readFile(ospath.join(gitdir, 'gitdir'), 'utf8')
-                    .then((contents) => [branch, { head: ospath.dirname(contents.trimEnd()), name: worktreeName }])
-                )
-              })
-            )
+            worktreeNames.length
+              ? Promise.all(
+                  worktreeNames.map((worktreeName) => {
+                    const gitdir = ospath.resolve(worktreesDir, worktreeName)
+                    // NOTE uses name of worktree as branch name if HEAD is detached
+                    return git
+                      .currentBranch(Object.assign({}, repo, { gitdir }))
+                      .then((branch = worktreeName) =>
+                        fsp
+                          .readFile(ospath.join(gitdir, 'gitdir'), 'utf8')
+                          .then((contents) => ({ branch, dir: ospath.dirname(contents.trimEnd()) }))
+                      )
+                  })
+                ).then((entries) => entries.reduce((accum, it) => accum.set(it.branch, it.dir), new Map()))
+              : new Map()
           )
-      : Promise.resolve()
-  ).then((entries = []) => mainWorktree.then((entry) => new Map(entry ? entries.push(entry) && entries : entries)))
+      : Promise.resolve(new Map())
+  ).then((worktrees) =>
+    linkedOnly
+      ? worktrees
+      : git.currentBranch(repo).then((branch) => (branch ? worktrees.set(branch, repo.dir) : worktrees))
+  )
 }
 
 async function gracefulPromiseAllWithLimit (tasks, limit = Infinity) {

package/lib/compute-origin.js

@@ -1,10 +1,10 @@
 'use strict'
 
-const { posix: path } = require('node:path')
+const { posix: path } = require('path')
 const posixify = require('./posixify')
 const removeGitSuffix = require('./remove-git-suffix')
 
-const EDIT_URL_TEMPLATE_VAR_RX = /\{(web_url|ref(?:hash|name|type)?|path)\}/g
+const EDIT_URL_TEMPLATE_VAR_RX = /\{(web_url|ref(?:hash|name|type)|path)\}/g
 const HOSTED_GIT_REPO_RX = /^(?:https?:\/\/|.+@)(git(?:hub|lab)\.com|bitbucket\.org|pagure\.io)[/:](.+?)(?:\.git)?$/
 
 function computeOrigin (url, authStatus, gitdir, ref, startPath, worktreePath = undefined, editUrl = true) {
@@ -33,16 +33,14 @@ function computeOrigin (url, authStatus, gitdir, ref, startPath, worktreePath =
         category = 'f'
       } else if (host === 'bitbucket.org') {
         action = 'src'
-      } else {
-        if (reftype === 'branch') action = 'edit'
-        if (host.startsWith('gitlab.')) action = '-/' + action
+      } else if (reftype === 'branch') {
+        action = 'edit'
       }
       origin.editUrlPattern = 'https://' + path.join(match[1], match[2], action, refname, category, startPath, '%s')
     }
   } else if (editUrl) {
     const vars = {
       path: () => (startPath ? path.join(startPath, '%s') : '%s'),
-      ref: () => 'refs/' + (reftype === 'branch' ? 'heads' : reftype) + '/' + refname,
       refhash: () => refhash,
       reftype: () => reftype,
       refname: () => refname,

package/lib/decode-uint8-array.js

@@ -3,4 +3,4 @@
 module.exports = (({ StringDecoder }) => {
   const decoder = new StringDecoder()
   return decoder.write.bind(decoder)
-})(require('node:string_decoder'))
+})(require('string_decoder'))

package/lib/filter-refs.js

@@ -4,11 +4,9 @@ const { makeMatcherRx, refMatcherOpts: getMatcherOpts, MATCH_ALL_RX } = require(
 
 function compileRx (pattern, opts) {
   if (pattern === '*' || pattern === '**') return MATCH_ALL_RX
-  const rx =
-    pattern.charAt() === '!' // we handle negate ourselves
-      ? Object.defineProperty(makeMatcherRx((pattern = pattern.substr(1)), opts), 'negated', { value: true })
-      : makeMatcherRx(pattern, opts)
-  return Object.defineProperty(rx, 'pattern', { value: pattern })
+  return pattern.charAt() === '!' // do our own negate
+    ? Object.defineProperty(makeMatcherRx(pattern.substr(1), opts), 'negated', { value: true })
+    : makeMatcherRx(pattern, opts)
 }
 
 function createMatcher (patterns, cache = Object.assign(new Map(), { braces: new Map() })) {
@@ -16,8 +14,8 @@ function createMatcher (patterns, cache = Object.assign(new Map(), { braces: new
     (pattern) => cache.get(pattern) || cache.set(pattern, compileRx(pattern, getMatcherOpts(cache))).get(pattern)
   )
   if (rxs[0].negated) rxs.unshift(MATCH_ALL_RX)
-  return (candidate, onMatch) => {
-    let matched, symbolic
+  return (candidate) => {
+    let matched
     for (const rx of rxs) {
       let voteIfMatched = true
       if (matched) {
@@ -26,22 +24,16 @@ function createMatcher (patterns, cache = Object.assign(new Map(), { braces: new
       } else if (rx.negated) {
         continue
       }
-      if (rx.test(candidate) || (symbolic && rx.test(symbolic) && (candidate = symbolic))) {
-        if (onMatch) {
-          if (!(matched = onMatch(candidate, rx))) continue
-          ;[symbolic, candidate] = [candidate, matched]
-        }
-        matched = voteIfMatched && candidate
-      }
+      if (rx.test(candidate)) matched = voteIfMatched
     }
     return matched
   }
 }
 
-function filterRefs (candidates, patterns, cache, onMatch) {
-  const match = createMatcher(patterns, cache)
+function filterRefs (candidates, patterns, cache) {
+  const isMatch = createMatcher(patterns, cache)
   return candidates.reduce((accum, candidate) => {
-    if ((candidate = match(candidate, onMatch))) accum.push(candidate)
+    if (isMatch(candidate)) accum.push(candidate)
     return accum
   }, [])
 }

package/lib/git-credential-manager-store.js

@@ -1,10 +1,10 @@
 'use strict'
 
-const { homedir } = require('node:os')
+const { homedir } = require('os')
 const expandPath = require('@antora/expand-path-helper')
-const { promises: fsp } = require('node:fs')
+const { promises: fsp } = require('fs')
 const invariably = require('./invariably')
-const ospath = require('node:path')
+const ospath = require('path')
 
 class GitCredentialManagerStore {
   configure ({ config, startDir }) {
@@ -86,11 +86,11 @@ class GitCredentialManagerStore {
   }
 
   async approved ({ url }) {
-    this.urls[url] = (url in this.urls ? this.urls[url] + ',' : '') + 'approved'
+    this.urls[url] = 'approved'
   }
 
   async rejected ({ url, auth }) {
-    this.urls[url] = (url in this.urls ? this.urls[url] + ',' : '') + 'rejected'
+    this.urls[url] = 'rejected'
     const statusCode = 401
     const statusMessage = 'HTTP Basic: Access Denied'
     const err = new Error(`HTTP Error: ${statusCode} ${statusMessage}`)

package/lib/git.js

@@ -1,10 +1,3 @@
 'use strict'
 
-const zlib = require('node:zlib')
-const { promisify } = require('node:util')
-
-module.exports = ((pakoModuleId) => {
-  const git = require('isomorphic-git')
-  require(pakoModuleId).inflate = promisify(zlib.inflate)
-  return git
-})('pako')
+module.exports = require('isomorphic-git')

package/lib/matcher.js

@@ -17,7 +17,7 @@ const BASE_OPTS = {
 }
 
 module.exports = {
-  MATCH_ALL_RX: Object.defineProperty({ test: () => true }, 'pattern', { value: '*' }),
+  MATCH_ALL_RX: { test: () => true },
   expandBraces,
   makeMatcherRx: makeRe,
   pathMatcherOpts: Object.assign({}, BASE_OPTS, { dot: false }),

package/lib/posixify.js

@@ -1,3 +1,3 @@
 'use strict'
 
-module.exports = require('node:path').sep === '\\' ? (p) => p.replace(/\\/g, '/') : undefined
+module.exports = require('path').sep === '\\' ? (p) => p.replace(/\\/g, '/') : undefined

package/lib/resolve-path-globs.js

@@ -1,7 +1,7 @@
 'use strict'
 
 const deepFlatten = require('./deep-flatten')
-const { promises: fsp } = require('node:fs')
+const { promises: fsp } = require('fs')
 const git = require('./git')
 const invariably = require('./invariably')
 const { expandBraces, makeMatcherRx, pathMatcherOpts: MATCHER_OPTS } = require('./matcher')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/content-aggregator",
-  "version": "3.1.11",
+  "version": "3.1.12",
   "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)",
@@ -13,8 +13,7 @@
   "homepage": "https://antora.org",
   "repository": {
     "type": "git",
-    "url": "git+https://gitlab.com/antora/antora.git",
-    "directory": "packages/content-aggregator"
+    "url": "git+https://gitlab.com/antora/antora.git"
   },
   "bugs": {
     "url": "https://gitlab.com/antora/antora/issues"
@@ -33,7 +32,7 @@
   },
   "dependencies": {
     "@antora/expand-path-helper": "~3.0",
-    "@antora/logger": "3.1.11",
+    "@antora/logger": "3.1.12",
     "@antora/user-require-helper": "~3.0",
     "braces": "~3.0",
     "cache-directory": "~2.0",
@@ -49,7 +48,7 @@
     "vinyl": "~3.0"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=16.0.0"
   },
   "files": [
     "lib/"
@@ -66,7 +65,7 @@
   ],
   "scripts": {
     "test": "_mocha",
-    "prepublishOnly": "npx -y downdoc@latest --prepublish",
-    "postpublish": "npx -y downdoc@latest --postpublish"
+    "prepublishOnly": "npx -y downdoc --prepublish",
+    "postpublish": "npx -y downdoc --postpublish"
   }
 }