@thegetty/quire-cli 1.0.0-pre-release.8 → 1.0.0-pre-release.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thegetty/quire-cli",
   "description": "Quire command-line interface",
-  "version": "1.0.0-pre-release.8",
+  "version": "1.0.0-pre-release.10",
   "author": "Getty Digital",
   "license": "J Paul Getty Trust",
   "bugs": {

package/src/commands/index.js

@@ -1,4 +1,5 @@
-import { fileURLToPath } from 'node:url'
+import { IS_WINDOWS } from '#helpers/os-utils.js'
+import { fileURLToPath, pathToFileURL } from 'node:url'
 import fs from 'fs-extra'
 import path from 'node:path'
 
@@ -14,7 +15,10 @@ const thisfile = path.basename(__filename)
 const commands = await Promise.all(
   fs.readdirSync(__dirname)
     .filter((file) => file !== thisfile && file.match(/^.*\.js$/))
-    .map((file) => import(path.resolve(__dirname, file)))
+    .map((file) => IS_WINDOWS
+      ? import(pathToFileURL(path.resolve(__dirname, file)))
+      : import(path.resolve(__dirname, file))
+    )
 ).then((modules) => {
   return modules.map(({ default: CommandClass }) => new CommandClass())
 })

package/src/helpers/os-utils.js

@@ -0,0 +1,5 @@
+/**
+ * Determine if the process is running on Windows operating system
+ */
+export const IS_WINDOWS =
+  process.platform === 'win32' || /^(cygwin|msys)$/.test(process.env.OSTYPE)

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

@@ -1,3 +1,5 @@
+import { IS_WINDOWS } from '#helpers/os-utils.js'
+import { pathToFileURL } from 'node:url'
 import path from 'node:path'
 import paths, { eleventyRoot, projectRoot } from './paths.js'
 
@@ -18,7 +20,10 @@ const factory = async (options = {}) => {
   /**
    * Dynamically import the correct version of Eleventy from `lib/quire/versions`
    */
-  const { default: Eleventy } = await import(path.join(eleventyRoot, 'node_modules', '@11ty', 'eleventy', 'src', 'Eleventy.js'))
+  const modulePath = path.join(eleventyRoot, 'node_modules', '@11ty', 'eleventy', 'src', 'Eleventy.js')
+  const { default: Eleventy } = IS_WINDOWS
+    ? await import(pathToFileURL(modulePath))
+    : await import(modulePath)
 
   /**
    * Set Eleventy passthrough copy options
@@ -89,6 +94,7 @@ export default {
     console.info('[CLI:11ty] running eleventy build')
     console.info(`[CLI:11ty] projectRoot ${projectRoot}`)
 
+    process.env.ELEVENTY_ENV = 'production'
     if (options.debug) process.env.DEBUG = 'Eleventy*'
 
     const eleventy = await factory(options)
@@ -100,6 +106,7 @@ export default {
   serve: async (options = {}) => {
     console.info('[CLI:11ty] running development server')
 
+    process.env.ELEVENTY_ENV = 'development'
     if (options.debug) process.env.DEBUG = 'Eleventy*'
 
     const eleventy = await factory(options)

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

@@ -43,13 +43,15 @@ export default {
   build: async (options = {}) => {
     console.info('[CLI:11ty] running eleventy build')
 
-    const eleventyCommand = factory()
+    const eleventyCommand = factory(options)
 
     /**
      * Set execa environment variables
      * @see https://github.com/sindresorhus/execa#env
      */
-    const execaEnv = {}
+    const execaEnv = {
+      ELEVENTY_ENV: 'production'
+    }
 
     if (options.debug) execaEnv.DEBUG = 'Eleventy*'
 
@@ -74,7 +76,9 @@ export default {
      * Set execa environment variables
      * @see https://github.com/sindresorhus/execa#env
      */
-    const execaEnv = {}
+    const execaEnv = {
+      ELEVENTY_ENV: 'development'
+    }
 
     if (options.debug) execaEnv.DEBUG = 'Eleventy*'
 

package/src/lib/quire/index.js

@@ -1,3 +1,4 @@
+import { IS_WINDOWS } from '#helpers/os-utils.js'
 import { chdir, cwd } from 'node:process'
 import { execa, execaCommand } from 'execa'
 import { fileURLToPath } from 'node:url'
@@ -16,9 +17,6 @@ const INSTALL_PATH = path.join('src', 'lib', 'quire', 'versions')
 const PACKAGE_NAME = '@thegetty/quire-11ty'
 const VERSION_FILE = '.quire'
 
-const IS_WINDOWS =
-  process.platform === 'win32' || /^(cygwin|msys)$/.test(process.env.OSTYPE)
-
 /**
  * Return an absolute path to an installed `quire-11ty` version
  *
@@ -30,7 +28,7 @@ function getPath(version='latest') {
     console.error(`[CLI:quire] \`quire-11ty@${version}\` is not installed`)
     return null
   }
-  console.debug(`[CLI:quire] \%`, absolutePath)
+  console.debug(`[CLI:quire] %s`, absolutePath)
   return absolutePath
 }