@serwist/cli 9.0.3 → 9.0.5

package/dist/bin.js

@@ -11,7 +11,7 @@ import chalk from 'chalk';
 import { statSync, writeFileSync } from 'node:fs';
 import stringifyObject from 'stringify-object';
 import { glob } from 'glob';
-import inquirer from 'inquirer';
+import { input, checkbox, select, Separator } from '@inquirer/prompts';
 
 const constants = {
     defaultConfigFile: "serwist.config.js",
@@ -67,35 +67,40 @@ const getSubdirectories = async ()=>{
 };
 const askRootOfWebApp = async ()=>{
     const subdirectories = await getSubdirectories();
-    const { manualDirectoryInput, globDirectory } = await (()=>{
+    const { globDirectory, manualDirectoryInput } = await (async ()=>{
         if (subdirectories.length > 0) {
             const manualEntryChoice = "Manually enter path";
-            return inquirer.prompt([
-                {
-                    name: "globDirectory",
-                    type: "list",
-                    message: oneLine`What is the root of your web app (i.e. which directory do
-          you deploy)?`,
-                    choices: [
-                        ...subdirectories,
-                        new inquirer.Separator(),
-                        manualEntryChoice
-                    ]
-                },
-                {
-                    name: "manualDirectoryInput",
-                    when: (answers)=>answers.globDirectory === manualEntryChoice,
+            const globDirectory = await select({
+                message: "What is the root of your web app (i.e. which directory do you deploy)?",
+                choices: [
+                    ...subdirectories.map((dir)=>({
+                            value: dir
+                        })),
+                    new Separator(),
+                    {
+                        value: manualEntryChoice
+                    }
+                ]
+            });
+            let manualDirectoryInput = undefined;
+            if (globDirectory === manualEntryChoice) {
+                manualDirectoryInput = await input({
                     message: "Please enter the path to the root of your web app:"
-                }
-            ]);
-        }
-        return inquirer.prompt([
-            {
-                name: "globDirectory",
-                message: "Please enter the path to the root of your web app:",
-                default: "."
+                });
             }
-        ]);
+            return {
+                globDirectory,
+                manualDirectoryInput
+            };
+        }
+        const globDirectory = await input({
+            message: "Please enter the path to the root of your web app:",
+            default: "."
+        });
+        return {
+            globDirectory,
+            manualDirectoryInput: undefined
+        };
     })();
     const stat = statSync(manualDirectoryInput || globDirectory);
     assert(stat.isDirectory(), errors["glob-directory-invalid"]);
@@ -125,66 +130,56 @@ const askQuestions = async ()=>{
     const globDirectory = await askRootOfWebApp();
     const fileExtensions = await getAllFileExtensions(globDirectory);
     assert(fileExtensions.length > 0, errors["no-file-extensions-found"]);
-    const { swSrc, swDest, selectedExtensions, configLocation } = await inquirer.prompt([
-        {
-            name: "swSrc",
-            message: oneLine`Where's your existing service worker file? To be used with
-        injectManifest, it should include a call to
-        'self.__SW_MANIFEST'`,
-            type: "input",
-            validate (input) {
-                if (typeof input !== "string") {
-                    return "You must provide a valid 'swSrc'!";
-                }
-                if (!statSync(input, {
-                    throwIfNoEntry: false
-                })?.isFile()) {
-                    return "'swSrc' must point to a valid file!";
-                }
-                return true;
+    const swSrc = await input({
+        message: "Where's your existing service worker file? To be used with 'injectManifest', it should include a call to 'self.__SW_MANIFEST'",
+        validate (input) {
+            if (typeof input !== "string") {
+                return "You must provide a valid 'swSrc'!";
             }
-        },
-        {
-            name: "swDest",
-            message: "Where would you like your service worker file to be saved?",
-            type: "input",
-            default: upath.join(globDirectory, "sw.js"),
-            validate (input) {
-                if (typeof input !== "string") {
-                    return "You must provide a valid 'swDest'!";
-                }
-                return true;
+            if (!statSync(input, {
+                throwIfNoEntry: false
+            })?.isFile()) {
+                return "'swSrc' must point to a valid file!";
             }
-        },
-        {
-            name: "selectedExtensions",
-            message: "Which file types would you like to precache?",
-            type: "checkbox",
-            choices: fileExtensions,
-            default: fileExtensions,
-            validate (input) {
-                if (!Array.isArray(input)) {
-                    return "'selectedExtensions' is not an array. This is most likely a bug.";
-                }
-                if (input.length === 0) {
-                    return errors["no-file-extensions-selected"];
-                }
-                return true;
+            return true;
+        }
+    });
+    const swDest = await input({
+        message: "Where would you like your service worker file to be saved?",
+        default: upath.join(globDirectory, "sw.js"),
+        validate (input) {
+            if (typeof input !== "string") {
+                return "You must provide a valid 'swDest'!";
             }
-        },
-        {
-            name: "configLocation",
-            message: "Where would you like to save these configuration options?",
-            type: "input",
-            default: constants.defaultConfigFile,
-            validate (input) {
-                if (typeof input !== "string") {
-                    return "You must provide a valid location!";
-                }
-                return true;
+            return true;
+        }
+    });
+    const selectedExtensions = await checkbox({
+        message: "Which file types would you like to precache?",
+        choices: fileExtensions.map((ext)=>({
+                value: ext,
+                checked: true
+            })),
+        validate (input) {
+            if (!Array.isArray(input)) {
+                return "'selectedExtensions' is not an array. This is most likely a bug.";
             }
+            if (input.length === 0) {
+                return errors["no-file-extensions-selected"];
+            }
+            return true;
         }
-    ]);
+    });
+    const configLocation = await input({
+        message: "Where would you like to save these configuration options?",
+        default: constants.defaultConfigFile,
+        validate (input) {
+            if (typeof input !== "string") {
+                return "You must provide a valid location!";
+            }
+            return true;
+        }
+    });
     const globPatterns = [
         `**/*.${selectedExtensions.length === 1 ? selectedExtensions[0] : `{${selectedExtensions.join(",")}}`}`
     ];

package/dist/lib/ask-questions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ask-questions.d.ts","sourceRoot":"","sources":["../../src/lib/ask-questions.ts"],"names":[],"mappings":"AAuFA,UAAU,wBAAwB;IAChC,MAAM,EAAE;QACN,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,wBAAwB,CAsFrE,CAAC"}
+{"version":3,"file":"ask-questions.d.ts","sourceRoot":"","sources":["../../src/lib/ask-questions.ts"],"names":[],"mappings":"AAmFA,UAAU,wBAAwB;IAChC,MAAM,EAAE;QACN,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;KACpB,CAAC;IACF,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,wBAAwB,CAuErE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@serwist/cli",
-  "version": "9.0.3",
+  "version": "9.0.5",
   "type": "module",
   "description": "The command line interface of Serwist.",
   "files": [
@@ -28,18 +28,18 @@
     "serwist": "cli.js"
   },
   "dependencies": {
+    "@inquirer/prompts": "5.1.2",
     "chalk": "5.3.0",
     "chokidar": "3.6.0",
     "common-tags": "1.8.2",
     "fs-extra": "11.2.0",
-    "glob": "10.4.1",
-    "inquirer": "9.2.23",
+    "glob": "10.4.5",
     "meow": "13.2.0",
     "pretty-bytes": "6.1.1",
     "stringify-object": "5.0.0",
     "upath": "2.0.1",
-    "update-notifier": "7.0.0",
-    "@serwist/build": "9.0.3"
+    "update-notifier": "7.1.0",
+    "@serwist/build": "9.0.5"
   },
   "devDependencies": {
     "@types/common-tags": "1.8.4",
@@ -47,9 +47,9 @@
     "@types/inquirer": "9.0.7",
     "@types/stringify-object": "4.0.5",
     "@types/update-notifier": "6.0.8",
-    "rollup": "4.18.0",
-    "typescript": "5.4.5",
-    "@serwist/configs": "9.0.3"
+    "rollup": "4.18.1",
+    "typescript": "5.5.3",
+    "@serwist/configs": "9.0.5"
   },
   "scripts": {
     "build": "rimraf dist && NODE_ENV=production rollup --config rollup.config.js",