fixing conflicts

Author: roblarsen

lib/cli.js

@@ -3,7 +3,8 @@ const yargs_parser = require("yargs-parser");
 const path = require("path");
 const chalk = require("chalk");
 const langsList = require("./countries.json");
-const prompts = require("prompts");
+const inquirer = require("inquirer");
+const fuzzy = require("fuzzy");
 const ora = require("ora");
 const { extract } = require("pacote");
 const glob = require("fast-glob");
@@ -13,7 +14,11 @@ const packageName = "html5-boilerplate";
 const tempDir = os.tmpdir() + `/${packageName}-staging`;
 const elapsed = require("elapsed-time-logger");
 const compareVersions = require("compare-versions");
-
+let spinner;
+inquirer.registerPrompt(
+  "autocomplete",
+  require("inquirer-autocomplete-prompt")
+);
 module.exports = async (argvs) => {
   const argv = yargs_parser(argvs, {
     alias: { release: ["r"], yes: ["y"] },
@@ -26,7 +31,7 @@ module.exports = async (argvs) => {
     console.log(chalk.red("Aborted"));
     return;
   }
-  let spinner = ora(
+  spinner = ora(
     `Downloading ${packageName} version '${version}' to ${targetDir}`
   ).start();
   await fs.ensureDir(tempDir);
@@ -38,24 +43,20 @@ module.exports = async (argvs) => {
     );
     await fs.copy(tempDir + "/dist", targetDir);
     const timerDownloaded = timer.get();
-    spinner.stop();
     await onLoad(targetDir, version, argv);
-    console.log(
-      chalk.green("✔") +
-        ` ${nameWithVersion} copied to ${targetDir} in ${timerDownloaded}. Have fun!`
+    spinner.succeed(
+      ` ${nameWithVersion} copied to ${targetDir} in ${timerDownloaded}. Have fun!`
     );
     return;
   } catch (err) {
-    spinner.stop();
     if (err.code === "ETARGET") {
       const msg = chalk.red(
-        `✖ version '${err.wanted}' not found in npm registry\navailable versions:\n`
+        `version '${err.wanted}' not found in npm registry\navailable versions:\n`
       );
-      console.log(msg + err.versions.reverse().join(" | "));
+      spinner.fail(msg + err.versions.reverse().join(" | "));
       throw err.code;
     }
-    console.error(err);
-    console.log(chalk.red("✖ Unexpected error"));
+    spinner.fail("✖ Unexpected error");
     throw new Error(err);
   } finally {
     await fs.remove(tempDir);
@@ -64,7 +65,7 @@ module.exports = async (argvs) => {
 };
 
 const checkFolder = async (targetDir, argv) => {
-  const folderExists = await fs.exists(targetDir);
+  const folderExists = await fs.pathExists(targetDir);
   if (!folderExists) {
     return true;
   }
@@ -73,11 +74,11 @@ const checkFolder = async (targetDir, argv) => {
   }
   const folderFiles = await fs.readdir(targetDir);
   if (folderFiles.length !== -1) {
-    const { override } = await prompts({
+    const { override } = await inquirer.prompt({
       type: "confirm",
       name: "override",
       message: `${targetDir} is not an empty folder, proceed?`,
-      initial: true,
+      default: true,
     });
     return override;
   }
@@ -96,41 +97,44 @@ const onLoad = async (targetDir, version, argv) => {
   if (skipPrompts) {
     return;
   }
-  let langListOut = langsList.map((v) => {
-    return { title: `${v.title} (${v.value})`, value: v.value };
-  });
-  langListOut.splice(1, 0, { title: "Enter custom", value: "custom" });
-  let lang = argv.lang;
+  const langListMap = {};
+  const langListOut = [];
   /* istanbul ignore if */
-  if (!lang) {
-    let langChoice = await prompts({
-      type: "select",
-      name: "langChoice",
-      message: "Select language",
-      choices: langListOut,
-    });
-    if (langChoice === "custom") {
-      let customLang = await prompts({
-        type: "text",
-        name: "customLang",
-        message: "Enter custom language code",
-      });
-      langChoice = customLang;
+  if (!argv.lang) {
+    for (const { title, value } of langsList) {
+      const text = `${title} (${value})`;
+      langListMap[text] = value;
+      langListOut.push(text);
     }
-    lang = langChoice || "";
+    langListOut.splice(1, 0, "Enter custom");
   }
-  const isJqueryIncluded =
-    version !== "latest" && compareVersions(version, "8.0.0"); // jQuery removed in >= v8
-  let removeJqueryFlag = false;
-  if (isJqueryIncluded) {
-    let { removeJquery } = await prompts({
+  spinner.stop();
+  const { langChoice, customLang, removeJquery } = await inquirer.prompt([
+    {
+      type: "autocomplete",
+      name: "langChoice",
+      message: "Select language",
+      when: !argv.lang,
+      source: async (answers, input = "") =>
+        fuzzy.filter(input, langListOut).map(({ original }) => original),
+    },
+    {
+      type: "input",
+      name: "customLang",
+      message: "Enter custom language code",
+      when: ({ langChoice }) => !argv.lang && langChoice === langListOut[1],
+    },
+    {
       type: "confirm",
       name: "removeJquery",
       message: "Remove jQuery?",
-      initial: true,
-    });
-    removeJqueryFlag = removeJquery;
-  }
+      when: version !== "latest" && compareVersions(version, "8.0.0"),
+      default: true,
+    },
+  ]);
+  spinner.start();
+  const lang = argv.lang || langListMap[langChoice] || customLang || "";
+  const removeJqueryFlag = removeJquery !== undefined ? removeJquery : false;
   try {
     const indexFile = targetDir + "/index.html";
     const sourceHTML = await fs.readFile(indexFile, "utf-8");
@@ -145,6 +149,7 @@ const onLoad = async (targetDir, version, argv) => {
       );
     }
     await fs.writeFile(indexFile, resultHTML);
+    return;
   } catch (err) {
     /* istanbul ignore next */
     throw new Error(err);