@antora/html-single-extension 1.0.0-beta.20 → 1.0.0-rc.10

package/lib/converter.js

@@ -6,48 +6,48 @@ const ospath = require('node:path')
 const DEFAULT_COMMAND = 'asciidoctor'
 const PACKAGE_NAME = require('../package.json').name
 
-async function convert (file, convertAttributes, buildConfig, { logCommand, runCommand }) {
+async function convert (file, conversionAttributes, buildConfig, { logCommand, runCommand }) {
   if (buildConfig.command === false) {
-    const Asciidoctor = this.require('@asciidoctor/core')()
-    const Extensions = Asciidoctor.Extensions
-    const exts = this.getVariables().siteAsciiDocConfig?.extensions || []
-    let extRegistry, extDslTypes
-    try {
-      if (exts.length) {
-        const contentCatalog = this.getVariables().contentCatalog
-        extDslTypes = Extensions.$constants(false).filter((name) => name.endsWith('Dsl'))
-        extRegistry = Extensions.create()
-        exts.forEach((ext) => ext.register(extRegistry, { file, contentCatalog }))
-      }
-      Asciidoctor.convert(file.contents, {
-        attributes: convertAttributes,
-        extension_registry: extRegistry,
-        mkdirs: true,
-        safe: 'safe',
-        sourcemap: true,
-        to_file: convertAttributes.outfile,
-      })
-    } finally {
-      if (exts.length) extDslTypes.forEach((type) => (Opal.const_get_local(Extensions, type).$$iclasses.length = 0))
+    const { loadAsciiDoc } = this.getFunctions()
+    const { contentCatalog, siteAsciiDocConfig } = this.getVariables()
+    const asciidocConfig = {
+      antoraResourceRefs: false,
+      attributes: conversionAttributes,
+      docdir: conversionAttributes.docdir,
+      docfile: conversionAttributes.docfile,
+      extensions: siteAsciiDocConfig?.extensions,
+      safe: 'unsafe',
+      sourcemap: true,
+      standalone: true,
     }
+    const doc = loadAsciiDoc(file, contentCatalog, asciidocConfig)
+    const html = typeof doc.withLogger === 'function' ? doc.withLogger(() => doc.convert()) : doc.convert()
+    await fsp.mkdir(conversionAttributes.outdir, { force: true, recursive: true })
+    await fsp.writeFile(conversionAttributes.outfile, html)
   } else {
-    const { command, cwd = process.cwd(), attributeOptionFlag = '-a', stderr = 'print' } = buildConfig
-    logCommand?.(command, file, convertAttributes, attributeOptionFlag)
-    const args = convertAttributes.toArgs(attributeOptionFlag, command).concat('-o', convertAttributes.outfile, '-')
-    return runCommand(command, args, { parse: true, cwd, stdin: file.contents, stdout: 'print', stderr })
+    const { command, cwd = process.cwd(), attributeOptionFlag, stderr = 'print' } = buildConfig
+    if (!command) return null
+    const outputOptionFlag = buildConfig.outputOptionFlag || (buildConfig.outputOptionFlag === false ? false : '-o')
+    const extraArgs = conversionAttributes.toArgs(attributeOptionFlag || '-a', outputOptionFlag)
+    const stdout = outputOptionFlag ? 'print' : 'buffer'
+    logCommand?.(command, extraArgs, file, conversionAttributes)
+    return runCommand(command, extraArgs.concat('-'), { parse: true, cwd, stdin: file.contents, stdout, stderr })
   }
 }
 
-function getDefaultCommand (cwd) {
-  return fsp.access(ospath.join(cwd, 'Gemfile.lock')).then(
-    () => `bundle exec ${DEFAULT_COMMAND}`,
-    () => DEFAULT_COMMAND
+function getDefaultCommand (cwd, playbook) {
+  const defaultCommand = playbook?.runtime.stacktrace ? `${DEFAULT_COMMAND} --trace` : DEFAULT_COMMAND
+  const bundleLockfile = playbook?.env.BUNDLE_LOCKFILE ?? `${playbook?.env.BUNDLE_GEMFILE ?? 'Gemfile'}.lock`
+  return fsp.access(ospath.resolve(cwd, bundleLockfile)).then(
+    () => `bundle exec ${defaultCommand}`,
+    () => defaultCommand
   )
 }
 
 module.exports = {
   convert,
-  backend: 'html',
+  backend: 'html-single',
+  format: 'html',
   getDefaultCommand,
   extname: '.html',
   mediaType: 'text/html',

package/lib/index.js

@@ -1,14 +1,8 @@
 'use strict'
 
+const { configure: configureAssembler } = require('@antora/assembler')
 const converter = require('./converter')
 
 module.exports.register = function ({ config }, providers) {
-  requireAssembler(this).configure(this, converter, config, providers)
-}
-
-function requireAssembler (context, packageName = '@antora/assembler') {
-  try {
-    return context.require(packageName) // when installed with Antora
-  } catch {}
-  return require(packageName) // when installed separate from Antora, perhaps in project
+  configureAssembler(this, converter, config, providers)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/html-single-extension",
-  "version": "1.0.0-beta.20",
+  "version": "1.0.0-rc.10",
   "description": "An Antora extension that uses Assembler to merge pages into assembly files, export them to standalone HTML documents, and publish them with the site.",
   "license": "MPL-2.0",
   "author": "OpenDevise Inc. (https://opendevise.com)",
@@ -19,8 +19,8 @@
   },
   "scripts": {
     "test": "node --test test/*-test.js",
-    "prepublishOnly": "npx -y downdoc --prepublish",
-    "postpublish": "npx -y downdoc --postpublish"
+    "prepublishOnly": "npx -y downdoc@latest --prepublish",
+    "postpublish": "npx -y downdoc@latest --postpublish"
   },
   "main": "lib/index.js",
   "exports": {
@@ -32,10 +32,10 @@
     "#package": "./package.json"
   },
   "dependencies": {
-    "@antora/assembler": "1.0.0-beta.20"
+    "@antora/assembler": "1.0.0-rc.10"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=20.0.0"
   },
   "files": [
     "lib/"