@thegetty/quire-cli 1.0.0-pre-release.15 → 1.0.0-pre-release.16

package/bin/cli.js

@@ -20,7 +20,7 @@ const INTERVAL = Object.freeze({
  * @todo user configuration of choosen update interval
  */
 const notifier = updateNotifier({
-  distTag: 'latest',
+  distTag: 'pre-release',
   pkg: packageConfig,
   updateCheckInterval: INTERVAL.DAILY,
 })

package/package.json

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

package/src/commands/preview.js

@@ -40,7 +40,7 @@ export default class PreviewCommand extends Command {
     super(PreviewCommand.definition)
   }
 
-  async action(args, options, command) {
+  async action(options, command) {
     if (options.debug) {
       console.debug('[CLI] Command \'%s\' called with arguments [%o] and options %o', this.name(), args.join(', '), options)
     }

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

@@ -1,4 +1,4 @@
-import { IS_WINDOWS } from '#helpers/os-utils.js'
+import { dynamicImport } from '#helpers/os-utils.js'
 import { pathToFileURL } from 'node:url'
 import path from 'node:path'
 import paths, { eleventyRoot, projectRoot } from './paths.js'
@@ -21,9 +21,7 @@ const factory = async (options = {}) => {
    * Dynamically import the correct version of Eleventy from `lib/quire/versions`
    */
   const modulePath = path.join(eleventyRoot, 'node_modules', '@11ty', 'eleventy', 'src', 'Eleventy.js')
-  const { default: Eleventy } = IS_WINDOWS
-    ? await import(pathToFileURL(modulePath))
-    : await import(modulePath)
+  const { default: Eleventy } = await dynamicImport(modulePath)
 
   /**
    * Set Eleventy passthrough copy options
@@ -66,23 +64,23 @@ const factory = async (options = {}) => {
        * to the `config` file however the quire-cli separates 11ty from the
        * project directory (`input`) and needs to use absolute system paths.
        */
-      const addPassthroughCopy = eleventyConfig.addPassthroughCopy.bind(eleventyConfig)
-      eleventyConfig.addPassthroughCopy = (entry) => {
-        if (typeof entry === 'string') {
-          const filePath = path.resolve(entry) //path.join(projectRoot, file)
-          // console.debug('[11ty:API] passthrough copy %s', filePath)
-          return addPassthroughCopy(filePath, copyOptions)
-        } else {
-          // console.debug('[11ty:API] passthrough copy %o', entry)
-          entry = Object.fromEntries(
-            Object.entries(entry).map(([ src, dest ]) => {
-              return [ path.join(eleventyRoot, src), path.resolve(dest) ]
-            })
-          )
-          // console.debug('[11ty:API] passthrough copy %o', entry)
-          return addPassthroughCopy(entry, copyOptions)
-        }
-      }
+      // const addPassthroughCopy = eleventyConfig.addPassthroughCopy.bind(eleventyConfig)
+      // eleventyConfig.addPassthroughCopy = (entry) => {
+      //   if (typeof entry === 'string') {
+      //     const filePath = path.resolve(entry) //path.join(projectRoot, file)
+      //     // console.debug('[11ty:API] passthrough copy %s', filePath)
+      //     return addPassthroughCopy(filePath, copyOptions)
+      //   } else {
+      //     // console.debug('[11ty:API] passthrough copy %o', entry)
+      //     entry = Object.fromEntries(
+      //       Object.entries(entry).map(([ src, dest ]) => {
+      //         return [ path.join(eleventyRoot, src), path.resolve(dest) ]
+      //       })
+      //     )
+      //     // console.debug('[11ty:API] passthrough copy %o', entry)
+      //     return addPassthroughCopy(entry, copyOptions)
+      //   }
+      // }
 
       /**
        * Event callback when a build completes

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

@@ -83,11 +83,20 @@ export const eleventyRoot = getEleventyRoot()
 const inputDir = path.join(projectRoot, 'content')
 
 export default {
+  /**
+   * An abolsute path to eleventy config module
+   */
   config: path.join(eleventyRoot, '.eleventy.js'),
-  epub: path.relative(eleventyRoot, path.join(projectRoot, '_epub')),
+  /**
+   * Paths _relative to_ the eleventy config module
+   */
   input: path.relative(eleventyRoot, inputDir),
   output: path.relative(eleventyRoot, path.join(projectRoot, '_site')),
-  data: path.relative(inputDir, path.join(eleventyRoot, '_computed')),
+  epub: path.relative(eleventyRoot, path.join(projectRoot, '_epub')),
+  /**
+   * Paths _relative to_ the `input` directory
+   */
+  data: '_computed',
   includes: path.relative(inputDir, path.join(eleventyRoot, '_includes')),
   layouts: path.relative(inputDir, path.join(eleventyRoot, '_layouts')),
   public: './public',