@thegetty/quire-cli 1.0.0-rc.26 → 1.0.0-rc.28

package/CHANGELOG.md

@@ -12,6 +12,18 @@ Changelog entries are classified using the following labels:
 - `Fixed`: for any bug fixes
 - `Removed`: for deprecated features removed in this release
 
+## [1.0.0-rc.28]
+
+### Fixed
+
+- Fixed issue where `quire pdf` errored and failed (DEV-20270)
+
+## [1.0.0-rc.27]
+
+### Fixed
+
+- Fixed post-v3 `quire info` bug (DEV-19984)
+
 ## [1.0.0-rc.26]
 
 ### Changed

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thegetty/quire-cli",
   "description": "Quire command-line interface",
-  "version": "1.0.0-rc.26",
+  "version": "1.0.0-rc.28",
   "author": "Getty Digital",
   "license": "SEE LICENSE IN https://github.com/thegetty/quire/blob/main/LICENSE",
   "bugs": {

package/src/commands/info.js

@@ -40,17 +40,19 @@ export default class InfoCommand extends Command {
       console.debug('[CLI] Command \'%s\' called', this.name())
     }
 
+    // Load filename from config with a default constraint if it doesn't exist
     const versionFileName = this.config.get('versionFile')
+    let versionInfo = { cli: '<=1.0.0.rc-7' }
 
     try {
-      // the quire version file is always local to the project root
-      let fileData = fs.readFileSync(versionFileName, { encoding: 'utf8' })
-      versionInfo = JSON.parse(fileData)
+      const versionFileData = fs.readFileSync(versionFileName, { encoding: 'utf8' })
+
+      versionInfo = JSON.parse(versionFileData)      
     } catch (error) {
       console.warn(
         `This project was generated with the quire-cli prior to version 1.0.0.rc-8. Updating the version file to the new format, though this project's version file will not contain specific starter version information.`
       )
-      versionInfo = { cli: '<=1.0.0.rc-7' }
+
       fs.writeFileSync(versionFileName, JSON.stringify(versionInfo))
     }
 

package/src/commands/pdf.js

@@ -4,6 +4,7 @@ import fs from 'fs-extra'
 import libPdf from '#lib/pdf/index.js'
 import open from 'open'
 import path from 'node:path'
+import { pathToFileURL } from 'node:url'
 import yaml from 'js-yaml'
 
 /**
@@ -29,7 +30,7 @@ async function loadConfig(configPath) {
 
   if (fs.existsSync(schemaPath) && fs.existsSync(validatorPath)) {
 
-    const { validateUserConfig } = await import(validatorPath)
+    const { validateUserConfig } = await import(pathToFileURL(validatorPath))
   
     const schemaJSON = fs.readFileSync(schemaPath)
     const schema = JSON.parse(schemaJSON)

package/src/lib/11ty/cli.js

@@ -1,4 +1,5 @@
 import { execa } from 'execa'
+import fs from 'node:fs'
 import path from 'node:path'
 import paths, { eleventyRoot, projectRoot } from './paths.js'
 
@@ -17,9 +18,24 @@ const factory = (options = {}) => {
 
   /**
    * Use the version of Eleventy installed to `lib/quire/versions`
+   * 
+   * NB: in eleventy v3 the CLI extension (".cjs") is load-bearing but v2 is simply ".js"
+   * 
    */
-  const eleventy =
-    path.join(eleventyRoot, 'node_modules', '@11ty', 'eleventy', 'cmd.cjs')
+  const eleventyModuleDir = path.join(eleventyRoot, 'node_modules', '@11ty', 'eleventy')
+  const packagePath = path.join(eleventyModuleDir,'package.json')  
+
+  const pack = JSON.parse(fs.readFileSync(packagePath))
+
+  const { version } = pack
+
+  const eleventyMajorVer = version.split('.').at(0)
+
+  let eleventy = path.join(eleventyModuleDir,'cmd.cjs')
+
+  if ( Number(eleventyMajorVer) < 3 ) {
+    eleventy = path.join(eleventyModuleDir,'cmd.js')
+  }
 
   const command = [
     eleventy,