@antora/ui-loader 3.1.0 → 3.2.0-alpha.1

package/lib/constants.js

@@ -12,6 +12,5 @@ module.exports = Object.freeze({
     nosort: true,
     nounique: true,
     strict: false,
-    uniqueBy: (m) => m,
   },
 })

package/lib/load-ui.js

@@ -353,21 +353,20 @@ function resolveOut (file, outputDir = '_') {
 }
 
 function srcFs (cwd) {
-  const relpathStart = cwd.length + 1
-  return new Promise((resolve, reject, cache = Object.create(null), files = new Map()) =>
+  return new Promise((resolve, reject, cache = Object.create(null), files = new Map(), relpathStart = cwd.length + 1) =>
     pipeline(
       globStream(UI_SRC_GLOB, Object.assign({ cache, cwd }, UI_SRC_OPTS)),
       forEach(({ path: abspathPosix }, _, done) => {
-        if (Array.isArray(cache[abspathPosix])) return done() // detects some directories, but not all
+        if ((cache[abspathPosix] || {}).constructor === Array) return done() // detects some directories
         const abspath = posixify ? ospath.normalize(abspathPosix) : abspathPosix
         const relpath = abspath.substr(relpathStart)
         symlinkAwareStat(abspath).then(
           (stat) => {
-            if (stat.isDirectory()) return done() // detects remaining directories
+            if (stat.isDirectory()) return done() // detects directories that slipped through cache check
+            const relpathPosix = posixify ? posixify(relpath) : relpath
             fsp.readFile(abspath).then(
               (contents) => {
-                const path_ = posixify ? posixify(relpath) : relpath
-                files.set(path_, new File({ cwd, path: path_, contents, stat, local: true }))
+                files.set(relpathPosix, new File({ cwd, path: relpathPosix, contents, stat, local: true }))
                 done()
               },
               (readErr) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/ui-loader",
-  "version": "3.1.0",
+  "version": "3.2.0-alpha.1",
   "description": "Downloads a UI bundle, if necessary, and loads the files into a UI catalog for use in an Antora documentation pipeline.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -30,7 +30,7 @@
     "cache-directory": "~2.0",
     "glob-stream": "~7.0",
     "gulp-vinyl-zip": "~2.5",
-    "hpagent": "~1.0",
+    "hpagent": "~1.1",
     "js-yaml": "~4.1",
     "picomatch": "~2.3",
     "should-proxy": "~1.0",