@antora/html-single-extension 1.0.0-rc.4 → 1.0.0-rc.6

package/lib/converter.js

@@ -31,13 +31,11 @@ async function convert (file, convertAttributes, buildConfig, { logCommand, runC
       if (exts.length) extDslTypes.forEach((type) => (Opal.const_get_local(Extensions, type).$$iclasses.length = 0))
     }
   } else {
-    const { command, cwd = process.cwd(), attributeOptionFlag, outputOptionFlag, stderr = 'print' } = buildConfig
+    const { command, cwd = process.cwd(), attributeOptionFlag, stderr = 'print' } = buildConfig
     if (!command) return null
-    const extraArgs = convertAttributes.toArgs(attributeOptionFlag || '-a')
-    const stdout =
-      outputOptionFlag === false
-        ? 'buffer'
-        : extraArgs.push(outputOptionFlag || '-o', convertAttributes.outfile) && 'print'
+    const outputOptionFlag = buildConfig.outputOptionFlag || (buildConfig.outputOptionFlag === false ? false : '-o')
+    const extraArgs = convertAttributes.toArgs(attributeOptionFlag || '-a', outputOptionFlag)
+    const stdout = outputOptionFlag ? 'print' : 'buffer'
     logCommand?.(command, extraArgs, file, convertAttributes)
     return runCommand(command, extraArgs.concat('-'), { parse: true, cwd, stdin: file.contents, stdout, stderr })
   }
@@ -45,7 +43,8 @@ async function convert (file, convertAttributes, buildConfig, { logCommand, runC
 
 function getDefaultCommand (cwd, playbook) {
   const defaultCommand = playbook?.runtime.stacktrace ? `${DEFAULT_COMMAND} --trace` : DEFAULT_COMMAND
-  return fsp.access(ospath.join(cwd, 'Gemfile.lock')).then(
+  const bundleLockfile = playbook?.env.BUNDLE_LOCKFILE ?? `${playbook?.env.BUNDLE_GEMFILE ?? 'Gemfile'}.lock`
+  return fsp.access(ospath.resolve(cwd, bundleLockfile)).then(
     () => `bundle exec ${defaultCommand}`,
     () => defaultCommand
   )

package/lib/index.js

@@ -3,12 +3,5 @@
 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
+  this.require('@antora/assembler', { require }).configure(this, converter, config, providers)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antora/html-single-extension",
-  "version": "1.0.0-rc.4",
+  "version": "1.0.0-rc.6",
   "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)",
@@ -32,7 +32,7 @@
     "#package": "./package.json"
   },
   "dependencies": {
-    "@antora/assembler": "1.0.0-rc.4"
+    "@antora/assembler": "1.0.0-rc.6"
   },
   "engines": {
     "node": ">=20.0.0"