@antora/ui-loader 3.2.0-alpha.9 → 3.2.0-rc.2

package/lib/file.js

@@ -50,7 +50,7 @@ class ZipReadable extends Readable {
       throw new Error('ZipReadable requires ZipFile to be initialized with lazyEntries:true option')
     }
     if ((this._startPath = options.startPath) && (this._startPath = path.join('/', this._startPath + '/')) !== '/') {
-      this._startPath = this._startPath.slice(1)
+      this._startPath = this._startPath.substring(1)
     } else {
       this._startPath = undefined
     }
@@ -66,7 +66,7 @@ class ZipReadable extends Readable {
         let path_ = entry.fileName
         if (this._startPath) {
           if (path_.length < this._startPath.length || !path_.startsWith(this._startPath)) return zipFile.readEntry()
-          path_ = path_.slice(this._startPath.length)
+          path_ = path_.substring(this._startPath.length)
         }
         const isLink = (mode & fsc.S_IFMT) === fsc.S_IFLNK
         const stat = {

package/lib/load-ui.js

@@ -15,6 +15,7 @@ const { posix: path } = ospath
 const picomatch = require('picomatch')
 const posixify = ospath.sep === '\\' ? (p) => p.replace(/\\/g, '/') : undefined
 const { pipeline, PassThrough, Writable } = require('node:stream')
+const drain = () => new Writable({ objectMode: true, write: (_chunk, _enc, next) => next() })
 const forEach = (write, final) => new Writable({ objectMode: true, write, final })
 const through = () => new PassThrough({ objectMode: true })
 const UiCatalog = require('./ui-catalog')
@@ -275,7 +276,7 @@ function classifyFile (file, config) {
 }
 
 function resolveType (file) {
-  const firstPathSegment = file.path.split('/', 1)[0]
+  const firstPathSegment = file.path.split('/')[0]
   if (firstPathSegment === 'layouts') return 'layout'
   if (firstPathSegment === 'helpers') return 'helper'
   if (firstPathSegment === 'partials') return 'partial'
@@ -284,7 +285,7 @@ function resolveType (file) {
 
 function resolveOut (file, outputDir = '_') {
   let dirname = path.join(outputDir, file.dirname)
-  if (dirname.charAt() === '/') dirname = dirname.substr(1)
+  if (dirname.charAt() === '/') dirname = dirname.substring(1)
   const basename = file.basename
   return { dirname, basename, path: path.join(dirname, basename) }
 }
@@ -329,8 +330,8 @@ function srcFs (cwd) {
 }
 
 function srcZip (file, options = {}) {
-  const result = options.testOnly // is it necessary to close streams in this case, or just sink()?
-    ? forEach((file_, _, done) => (file_.isStream() ? file_.contents.on('close', done).destroy() : done()))
+  const result = options.testOnly
+    ? forEach((file_, _, done) => (file_.isStream() ? pipeline(file_.contents, through(), drain(), done) : done()))
     : through()
   yauzl[file instanceof Buffer ? 'fromBuffer' : 'open'](file, { lazyEntries: true }, (err, zipFile) => {
     if (err) return result.emit('error', err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/ui-loader",
-  "version": "3.2.0-alpha.9",
+  "version": "3.2.0-rc.2",
   "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)",
@@ -34,15 +34,15 @@
     "cache-directory": "~2.0",
     "fast-glob": "~3.3",
     "hpagent": "~1.2",
-    "js-yaml": "~4.1",
+    "js-yaml": "~4.2",
     "picomatch": "~4.0",
     "should-proxy": "~1.0",
     "simple-get": "~4.0",
     "vinyl": "~3.0",
-    "yauzl": "~3.1"
+    "yauzl": "~3.4"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "files": [
     "lib/"
@@ -57,7 +57,7 @@
     "web publishing"
   ],
   "scripts": {
-    "test": "_mocha",
+    "test": "node --test",
     "prepublishOnly": "npx -y downdoc@latest --prepublish",
     "postpublish": "npx -y downdoc@latest --postpublish"
   }