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

package/CHANGELOG.md

@@ -12,32 +12,31 @@ 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.22]
+## [1.0.0-rc.24]
 
-### Added
+### Changed
 
-- `read-package-up` to dependencies
-- `packageConfig` module, exports parsed `package.json` configuration file
+- Replace Node `import` assertions (deprecated) with a packageConfig module
 
-### Changed
+### Fixed
 
-- Read package configuration using `read-package-up` and export the  configuration object from the `packageConfig` module
+- Quire new command fails with newer version of Node #968
 
-## [1.0.0-rc.21]
+## [1.0.0-rc.23]
 
-### Fixed
+:warning: broken release candidate
 
-- Fixed missing import of `node:path`
+## [1.0.0-rc.22]
 
-## [1.0.0-rc.20]
+:warning: broken release candidate
 
-### Changed
+## [1.0.0-rc.21]
 
-- Replace Node `import` assertions (deprecated) with file operations
+:warning: broken release candidate
 
-### Fixed
+## [1.0.0-rc.20]
 
-- Quire new command fails with newer version of Node #968
+:warning: broken release candidate
 
 ## [1.0.0-rc.19]
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thegetty/quire-cli",
   "description": "Quire command-line interface",
-  "version": "1.0.0-rc.22",
+  "version": "1.0.0-rc.24",
   "author": "Getty Digital",
   "license": "SEE LICENSE IN https://github.com/thegetty/quire/blob/main/LICENSE",
   "bugs": {
@@ -64,6 +64,7 @@
     "install-npm-version": "^1.0.9",
     "js-yaml": "^4.1.0",
     "loglevel": "^1.8.1",
+    "node-fetch": "^3.3.2",
     "open": "^8.4.0",
     "ora": "^6.1.2",
     "pagedjs-cli": "^0.4.3",

package/src/lib/quire/index.js

@@ -10,21 +10,20 @@ import packageConfig from '#src/packageConfig.js'
 import path from 'node:path'
 import semver from 'semver'
 
-const { name: PACKAGE_NAME } = packageConfig
-
 // 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'
 
 /**
- * Return an absolute path to an installed `quire-11ty` version
+ * Return an absolute path to an installed quire-11ty version
  *
- * @return  {String}  path to installed `quire-11ty` version
+ * @return  {String}  path to installed quire-11ty version
  */
 function getPath(version='latest') {
-  const absolutePath = path.relative('/', `${INSTALL_PATH}/${version}`)
+  const absolutePath = path.relative('/', path.join(INSTALL_PATH, version))
   if (!fs.existsSync(absolutePath)) {
-    console.error(`[CLI:quire] \`quire-11ty@${version}\` is not installed`)
+    console.error(`[CLI:quire] quire-11ty@${version} is not installed`)
     return null
   }
   console.debug(`[CLI:quire] %s`, absolutePath)
@@ -32,7 +31,7 @@ function getPath(version='latest') {
 }
 
 /**
- * Read the required `quire-11ty` version for the project `.quire` file
+ * Read the required quire-11ty version for the quire version file
  *
  * @param    {String}   projectPath  Absolute system path to the project root
  *
@@ -47,7 +46,7 @@ function getVersion(projectPath) {
 }
 
 /**
- * Read the required `quire-11ty` and starter versions from starter `package.json` `peerDependencies`
+ * Read required quire-11ty and starter versions from starter peerDependencies
  *
  * @param    {String}   projectPath  Absolute system path to the project root
  *
@@ -101,19 +100,19 @@ async function initStarter (starter, projectPath, options) {
     .catch((error) => console.error('[CLI:error] ', error))
 
   /**
-   * Determine the `quire-11ty` version to use in the new project,
-   * from the `quireVersion` option or as required by the starter project.
+   * Determine the quire-11ty version to use in the new project,
+   * from the quireVersion option or as required by the starter project.
    *
-   * Uses `latest` to get the latest semantic version compatible with version ranges
+   * Uses 'latest' to get the latest semantic version compatible with version ranges
    */
   const { quire11tyVersion, starterVersion } = await getVersionsFromStarter(projectPath)
   const quireVersion = await latest(options.quireVersion || quire11tyVersion)
   setVersion(projectPath, quireVersion)
 
   /**
-   * Write quire-11ty, cli, starter name and version to VERSION_FILE
+   * Write quire-11ty, quire-cli, starter versions to the version file
    */
-  const versionInfo = { 
+  const versionInfo = {
     cli: packageConfig.version,
     starter: `${starter}@${starterVersion}`,
   }
@@ -142,7 +141,7 @@ async function initStarter (starter, projectPath, options) {
 }
 
 /**
- * Install `quire-11ty`, default to 'latest' version
+ * Install quire-11ty (default to 'latest' version)
  *
  * @TODO refactor this to be callable by the installInProject method
  *
@@ -182,8 +181,7 @@ async function install(options = {}) {
    * the final `_site` package when running `quire build`
    */
   const currentWorkingDirectory = cwd()
-  const versionDir = path.join(absoluteInstallPath, version)
-  chdir(versionDir)
+  chdir(path.join(absoluteInstallPath, version))
   await execaCommand('npm cache clean --force')
   await execaCommand('npm install --save-dev')
 }

package/src/main.js

@@ -1,7 +1,4 @@
 import { Argument, Command, Option } from 'commander'
-import { dirname, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
-import fs from 'node:fs'
 import commands from '#src/commands/index.js'
 import config from '#lib/conf/config.js'
 import packageConfig from '#src/packageConfig.js'

package/src/packageConfig.js

@@ -1,5 +1,15 @@
+import { dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
 import { readPackageUpSync } from 'read-package-up'
 
-const { packageJson } = readPackageUpSync()
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+
+/**
+ * Nota bene: current working directory will be that from which cli commands
+ * are being, readPackageUpSync is passed the directory of this module as the
+ * starting path to search for the quire-cli package config file.
+ */
+const { packageJson } = readPackageUpSync({ cwd: __dirname, normalize: true })
 
 export default packageJson