@antora/site-publisher 3.0.0-alpha.8 → 3.0.0-beta.3

package/README.md

@@ -5,7 +5,7 @@ More than one destination may be specified, and this component supports differen
 Custom providers can be used to add support for additional destinations.
 
 [Antora](https://antora.org) is a modular static site generator designed for creating documentation sites from AsciiDoc documents.
-Its site generator pipeline aggregates documents from versioned content repositories and processes them using [Asciidoctor](https://asciidoctor.org).
+Its site generator aggregates documents from versioned content repositories and processes them using [Asciidoctor](https://asciidoctor.org).
 
 ## Copyright and License
 

package/lib/index.js

@@ -3,8 +3,8 @@
 /**
  * Site Publisher component for Antora
  *
- * Publishes the files generated in an Antora documentation pipeline to the
- * destination(s) specified in the playbook.
+ * Publishes the files generated by the Antora generator to the destination(s)
+ * specified in the playbook.
  *
  * @namespace site-publisher
  */

package/lib/providers/fs.js

@@ -19,40 +19,10 @@ function publishToFs (config, files, playbook) {
     fileUri: 'file://' + (posixify ? '/' + posixify(absDestDir) : absDestDir),
   }
   return config.clean
-    ? rmdir(absDestDir)
+    ? fsp['rm' in fsp ? 'rm' : 'rmdir'](absDestDir, { recursive: true, force: true })
       .then(() => publishStream(vfsDest(absDestDir), files))
       .then(() => report)
     : publishStream(vfsDest(absDestDir), files).then(() => report)
 }
 
-/**
- * Removes the specified directory (including all of its contents) or file.
- * Equivalent to fs.promises.rmdir(dir, { recursive: true }) in Node 12.
- */
-function rmdir (dir) {
-  return fsp
-    .readdir(dir, { withFileTypes: true })
-    .then((lst) =>
-      Promise.all(
-        lst.map((it) =>
-          it.isDirectory()
-            ? rmdir(ospath.join(dir, it.name))
-            : fsp.unlink(ospath.join(dir, it.name)).catch((unlinkErr) => {
-              if (unlinkErr.code !== 'ENOENT') throw unlinkErr
-            })
-        )
-      )
-    )
-    .then(() => fsp.rmdir(dir))
-    .catch((err) => {
-      if (err.code === 'ENOENT') return
-      if (err.code === 'ENOTDIR') {
-        return fsp.unlink(dir).catch((unlinkErr) => {
-          if (unlinkErr.code !== 'ENOENT') throw unlinkErr
-        })
-      }
-      throw err
-    })
-}
-
 module.exports = publishToFs

package/lib/publish-site.js

@@ -56,7 +56,7 @@ async function publishSite (playbook, catalogs) {
           return userRequire(provider, userRequireContext).bind(null, options)
         } catch (err) {
           const prettyErr = new Error('Unsupported destination provider: ' + provider)
-          prettyErr.stack = `\nCaused by: ${err.stack}`
+          prettyErr.stack += `\nCaused by: ${err.stack || err}`
           throw prettyErr
         }
     }

package/lib/readable-output-file-array.js

@@ -12,13 +12,17 @@ class File extends Vinyl {
 class ReadableOutputFileArray extends Readable {
   constructor (array) {
     super({ objectMode: true })
-    this.array = array.slice()
+    this._array = array.slice().reverse()
   }
 
   _read (size) {
-    const read = this.array.splice(0, size)
-    while (read.length) this.push(toOutputFile(read.shift()))
-    if (!this.array.length) this.push(null)
+    const array = this._array
+    while (size--) {
+      const next = array.pop()
+      if (next === undefined) break
+      this.push(toOutputFile(next))
+    }
+    if (size > -1) this.push(null)
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/site-publisher",
-  "version": "3.0.0-alpha.8",
+  "version": "3.0.0-beta.3",
   "description": "Publishes the files generated in an Antora documentation pipeline to the destination(s) specified in the playbook.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -22,7 +22,7 @@
     "vinyl-fs": "~3.0"
   },
   "engines": {
-    "node": ">=10.17.0"
+    "node": ">=12.21.0"
   },
   "files": [
     "lib/"
@@ -35,5 +35,5 @@
     "static site",
     "web publishing"
   ],
-  "gitHead": "2e5695bea11fb5719989c329c97e66d36e29659f"
+  "gitHead": "45da95a2e2dea538379d2d9f42013d2208fb86c3"
 }