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

package/CHANGELOG.md

@@ -12,6 +12,23 @@ 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.26]
+
+### Changed
+
+- Import path using node namespace in the cli info command
+- Correct file extension of cmd module called by the cli
+
+## [1.0.0-rc.25]
+
+### Changed
+
+- Use quire-cli config values for quire-11ty version and version file name
+
+### Fixed
+
+- Install path for quire-11ty versions
+
 ## [1.0.0-rc.24]
 
 ### Changed

package/package.json

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

package/src/commands/info.js

@@ -2,7 +2,7 @@ import Command from '#src/Command.js'
 import { execaCommand } from 'execa'
 import fs from 'node:fs'
 import os from 'node:os'
-import path from 'path'
+import path from 'node:path'
 import testcwd from '#helpers/test-cwd.js'
 
 /**

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

@@ -19,7 +19,7 @@ const factory = (options = {}) => {
    * Use the version of Eleventy installed to `lib/quire/versions`
    */
   const eleventy =
-    path.join(eleventyRoot, 'node_modules', '@11ty', 'eleventy', 'cmd.js')
+    path.join(eleventyRoot, 'node_modules', '@11ty', 'eleventy', 'cmd.cjs')
 
   const command = [
     eleventy,

package/src/lib/quire/index.js

@@ -1,26 +1,33 @@
 import { IS_WINDOWS } from '#helpers/os-utils.js'
 import { chdir, cwd } from 'node:process'
 import { execa, execaCommand } from 'execa'
+import { fileURLToPath } from 'node:url'
 import { isEmpty } from '#helpers/is-empty.js'
+import config from '#lib/conf/config.js'
 import fetch from 'node-fetch'
 import fs from 'fs-extra'
-import git from '#src/lib/git/index.js'
+import git from '#lib/git/index.js'
 import inv from 'install-npm-version'
 import packageConfig from '#src/packageConfig.js'
 import path from 'node:path'
 import semver from 'semver'
 
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = path.dirname(__filename)
+
 // Version install path is relative to process working directory
 const INSTALL_PATH = path.join('src', 'lib', 'quire', 'versions')
 const PACKAGE_NAME = '@thegetty/quire-11ty'
-const VERSION_FILE = '.quire'
+
+const QUIRE_VERSION = config.get('quireVersion')
+const VERSION_FILE = config.get('versionFile')
 
 /**
  * Return an absolute path to an installed quire-11ty version
  *
  * @return  {String}  path to installed quire-11ty version
  */
-function getPath(version='latest') {
+function getPath(version=QUIRE_VERSION) {
   const absolutePath = path.relative('/', path.join(INSTALL_PATH, version))
   if (!fs.existsSync(absolutePath)) {
     console.error(`[CLI:quire] quire-11ty@${version} is not installed`)
@@ -86,8 +93,8 @@ async function initStarter (starter, projectPath, options) {
   }
 
   console.debug('[CLI:quire] init-starter',
-    `\n  project root: "${projectPath}"`,
-    `\n  starter: "${starter}"`
+    `\n  project: ${path.join(__dirname, projectPath)}`,
+    `\n  starter: ${starter}`
   )
 
   /**
@@ -149,7 +156,7 @@ async function initStarter (starter, projectPath, options) {
  * @return  {Promise}
  */
 async function install(options = {}) {
-  const version = options.quireVersion || 'latest'
+  const version = options.quireVersion || QUIRE_VERSION
   console.debug(`[CLI:quire] installing quire-11ty@${version}`)
   const absoluteInstallPath = path.join(__dirname, 'versions')
   fs.ensureDirSync(absoluteInstallPath)
@@ -180,7 +187,6 @@ async function install(options = {}) {
    * these must be `devDependencies` so that they are not bundled into
    * the final `_site` package when running `quire build`
    */
-  const currentWorkingDirectory = cwd()
   chdir(path.join(absoluteInstallPath, version))
   await execaCommand('npm cache clean --force')
   await execaCommand('npm install --save-dev')

package/src/LOGGING.md

@@ -1,16 +0,0 @@
-
-## Logging
-
-- https://betterstack.com/community/guides/logging/nodejs-logging-best-practices/
-
-### `debug-js`
-- https://github.com/debug-js/debug
-- https://github.com/commenthol/debug-level
-
-### Pino
-- https://betterstack.com/community/guides/logging/how-to-install-setup-and-use-pino-to-log-node-js-applications/
-- https://github.com/pinojs/pino
-
-### Winston
-- https://betterstack.com/community/guides/logging/how-to-install-setup-and-use-winston-and-morgan-to-log-node-js-applications/
-- https://github.com/winstonjs/winston

package/src/commands/config/config-get.js

@@ -1,35 +0,0 @@
-import Command from '#src/Command.js'
-
-/**
- * Quire CLI `config get` Command
- *
- * @class      ConfigGetCommand
- * @extends    {Command}
- */
-export default class ConfigGetCommand extends Command {
-  static definition = {
-    name: 'config-get',
-    description: 'Get the value of a Quire CLI configuration property',
-    summary: 'get a cli configuration property',
-    version: '1.0.0',
-    args: [
-      [ '[property]', 'configuration property' ]
-    ]
-  }
-
-  constructor() {
-    super(ConfigGetCommand.definition)
-  }
-
-  /**
-   * @param      {String}  key
-   * @param      {Object}  options
-   * @return     {Promise}
-   */
-  async action(property, options = {}) {
-    for (const [ key, value ] of Object.entries(this.config.store)) {
-      if (key.startsWith('__internal__') && !options.debug) continue
-      console.info(`${key}: ${JSON.stringify(value, null, 2)}`)
-    }
-  }
-}

package/src/commands/config/config-reset.js

@@ -1,34 +0,0 @@
-import Command from '#src/Command.js'
-
-/**
- * Quire CLI `config reset` Command
- *
- * @class      ConfigResetCommand
- * @extends    {Command}
- */
-export default class ConfigResetCommand extends Command {
-  static definition = {
-    name: 'config-reset',
-    description: 'Reset the Quire CLI configuration to the default',
-    summary: 'reset cli configuration properties to default values',
-    version: '1.0.0',
-  }
-
-  constructor() {
-    super(ConfigResetCommand.definition)
-  }
-
-  /**
-   * @return     {Promise}
-   */
-  async action(options = {}) {
-    if (options.debug) {
-      console.info('Command \'%s\' called with options %o', this.name(), options)
-    }
-
-    for (const [ key, value ] of Object.entries(this.config.store)) {
-      if (key.startsWith('__internal__') && !options.debug) continue
-      console.info(`${key}: ${JSON.stringify(value, null, 2)}`)
-    }
-  }
-}

package/src/commands/config/config-set.js

@@ -1,37 +0,0 @@
-import Command from '#src/Command.js'
-
-/**
- * Quire CLI `config set` Command
- *
- * @class      ConfigCommand
- * @extends    {Command}
- */
-export default class ConfigSetCommand extends Command {
-  static definition = {
-    name: 'config-set',
-    description: 'Set a Quire CLI configuration property',
-    summary: 'set a cli configuration property',
-    version: '1.0.0',
-    args: [
-      [ '[key]', 'configuration property key' ],
-      [ '[value]', 'configuration property value' ]
-    ]
-  }
-
-  constructor() {
-    super(ConfigSetCommand.definition)
-  }
-
-  /**
-   * @param      {String}  key
-   * @param      {String}  value
-   * @param      {Object}  options
-   * @return     {Promise}
-   */
-  async action(key, value, options = {}) {
-    for (const [ key, value ] of Object.entries(this.config.store)) {
-      if (key.startsWith('__internal__') && !options.debug) continue
-      console.info(`${key}: ${JSON.stringify(value, null, 2)}`)
-    }
-  }
-}