@thegetty/quire-cli 1.0.0-rc.21 → 1.0.0-rc.23

package/CHANGELOG.md

@@ -12,13 +12,7 @@ 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.21]
-
-### Fixed
-
-- Fixed missing import of `node:path`
-
-## [1.0.0-rc.20]
+## [1.0.0-rc.23]
 
 ### Changed
 
@@ -28,6 +22,18 @@ Changelog entries are classified using the following labels:
 
 - Quire new command fails with newer version of Node #968
 
+## [1.0.0-rc.22]
+
+:warning: broken release candidate
+
+## [1.0.0-rc.21]
+
+:warning: broken release candidate
+
+## [1.0.0-rc.20]
+
+:warning: broken release candidate
+
 ## [1.0.0-rc.19]
 
 ### Added

package/bin/cli.js

@@ -1,16 +1,9 @@
 #!/usr/bin/env -S node --no-warnings
-import { dirname, join } from 'node:path'
-import { fileURLToPath } from 'node:url'
-import fs from 'node:fs'
 import cli from '#src/main.js'
 import config from '#src/lib/conf/config.js'
+import packageConfig from '#src/packageConfig.js'
 import updateNotifier from 'update-notifier'
 
-const __dirname = dirname(fileURLToPath(import.meta.url))
-
-const packagePath = join(__dirname, 'package.json')
-const packageConfig = JSON.parse(fs.readFileSync(packagePath, 'utf8'))
-
 process.removeAllListeners('warning')
 
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thegetty/quire-cli",
   "description": "Quire command-line interface",
-  "version": "1.0.0-rc.21",
+  "version": "1.0.0-rc.23",
   "author": "Getty Digital",
   "license": "SEE LICENSE IN https://github.com/thegetty/quire/blob/main/LICENSE",
   "bugs": {
@@ -68,6 +68,7 @@
     "ora": "^6.1.2",
     "pagedjs-cli": "^0.4.3",
     "patch-package": "^8.0.0",
+    "read-package-up": "^11.0.0",
     "semver": "^7.3.8",
     "simple-git": "^3.16.0",
     "update-notifier": "^7.3.1"

package/src/lib/conf/config.js

@@ -1,16 +1,9 @@
-import { fileURLToPath } from 'node:url'
 import Conf from 'conf'
 import defaults from './defaults.js'
-import fs from 'node:fs'
 import migrations from './migrations.js'
-import path from 'node:path'
+import packageConfig from '#src/packageConfig.js'
 import schema from './schema.js'
 
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-
-const packagePath = path.join(__dirname, 'package.json')
-const packageConfig = JSON.parse(fs.readFileSync(packagePath, 'utf8'))
-
 const { name, version } = packageConfig
 
 const beforeEachMigration = (store, context) => {

package/src/lib/quire/index.js

@@ -1,20 +1,15 @@
 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 fetch from 'node-fetch'
 import fs from 'fs-extra'
 import git from '#src/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 __dirname = path.dirname(fileURLToPath(import.meta.url))
-
-const packagePath = path.join(__dirname, 'package.json')
-const packageConfig = JSON.parse(fs.readFileSync(packagePath, 'utf8'))
-
 const { name: PACKAGE_NAME } = packageConfig
 
 // Version install path is relative to process working directory

package/src/main.js

@@ -1,12 +1,7 @@
 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'
-
-const packagePath = join(fileURLToPath(import.meta.url), 'package.json')
-const packageConfig = JSON.parse(fs.readFileSync(packagePath, 'utf8'))
+import packageConfig from '#src/packageConfig.js'
 
 const { version } = packageConfig
 

package/src/packageConfig.js

@@ -0,0 +1,16 @@
+import { dirname } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { readPackageUpSync } from 'read-package-up'
+
+const __filename = fileURLToPath(import.meta.url)
+const __dirname = dirname(__filename)
+
+/**
+ * Nota bene:
+ * working directory will be the path from which quire-cli commands are run;
+ * readPackageUpSync must be called with the change working directory option
+ * set to the path of this module to find the quire-cli package config file.
+ */
+const { packageJson } = readPackageUpSync({ cwd: __dirname, normalize: true })
+
+export default packageJson