@thegetty/quire-cli 1.0.0-rc.6 → 1.0.0-rc.7

package/package.json

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

package/src/commands/create.js

@@ -22,7 +22,8 @@ export default class CreateCommand extends Command {
       [ '[starter]', 'repository url or local path for a starter project' ],
     ],
     options: [
-      [ '--quire <version>', 'quire-11ty version to install', 'latest' ],
+      [ '--quire-path <path>', 'local path to quire-11ty package' ],
+      [ '--quire-version <version>', 'quire-11ty version to install', 'latest' ],
       // [ '--eject', 'install quire-11ty into the project directory', true ],
       [ '--debug', 'debug the `quire new` command', false ],
     ],

package/src/lib/quire/index.js

@@ -112,10 +112,10 @@ async function initStarter (starter, projectPath, options) {
   /**
    * Determine `quire-11ty` version required by the starter project.
    *
-   * A version specified in `options.quire` overrides the version in starter
+   * A version specified in `options.quireVersion` overrides the version in starter
    * project `package.json`.
    */
-  const quireVersion = options.quire || await getVersionFromStarter(projectPath)
+  const quireVersion = options.quireVersion || await getVersionFromStarter(projectPath)
   setVersion(projectPath, quireVersion)
 
   // Re-initialize project directory as a new git repository
@@ -150,7 +150,7 @@ async function initStarter (starter, projectPath, options) {
  * @return  {Promise}
  */
 async function install(options = {}) {
-  const version = options.quire || 'latest'
+  const version = options.quireVersion || 'latest'
   console.debug(`[CLI:quire] installing quire-11ty@${version}`)
   const absoluteInstallPath = path.join(__dirname, 'versions')
   fs.ensureDirSync(absoluteInstallPath)
@@ -199,8 +199,9 @@ async function install(options = {}) {
  * @return  {Promise}
  */
 async function installInProject(projectPath, options = {}) {
-  const version = options.quire || 'latest'
-  console.debug(`[CLI:quire] installing quire-11ty@${version} into ${projectPath}`)
+  const { quirePath, quireVersion } = options
+  const quire11tyPackage = fs.existsSync(quirePath) ? quirePath : `${PACKAGE_NAME}@${quireVersion}`
+  console.debug(`[CLI:quire] installing ${quire11tyPackage} into ${projectPath}`)
 
   /**
    * Delete the starter project package configuration so that it can be replaced
@@ -227,7 +228,7 @@ async function installInProject(projectPath, options = {}) {
     Verbosity: options.debug ? 'Debug' : 'Silent',
     WorkingDirectory: projectPath
   }
-  await inv.Install(`${PACKAGE_NAME}@${version}`, installOptions)
+  await inv.Install(quire11tyPackage, installOptions)
 
   // delete empty `node_modules` directory that `install-npm-version` creates
   const invNodeModulesDir = path.join(projectPath, 'node_modules')