@antora/pdf-extension 1.0.0-rc.4 → 1.0.0-rc.6

package/lib/converter.js

@@ -7,20 +7,19 @@ const DEFAULT_COMMAND = 'asciidoctor-pdf --sourcemap'
 const PACKAGE_NAME = require('../package.json').name
 
 async function convert (file, convertAttributes, buildConfig, { logCommand, runCommand }) {
-  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 })
 }
 
 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/pdf-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 the PDF format, 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"