@serwist/cli 9.0.6 → 9.0.8

package/dist/app.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,MAAM,CAAC;AAIjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAyC/C,eAAO,MAAM,GAAG,WAAkB,UAAU,CAAC,cAAc,CAAC,KAAG,OAAO,CAAC,IAAI,CAiF1E,CAAC"}
+{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,MAAM,IAAI,UAAU,EAAE,MAAM,MAAM,CAAC;AAGjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAyC/C,eAAO,MAAM,GAAG,WAAkB,UAAU,CAAC,cAAc,CAAC,KAAG,OAAO,CAAC,IAAI,CAiF1E,CAAC"}

package/dist/bin.js

@@ -2,15 +2,15 @@
 import meow from 'meow';
 import updateNotifier from 'update-notifier';
 import assert from 'node:assert';
+import path from 'node:path';
 import { injectManifest } from '@serwist/build';
 import chokidar from 'chokidar';
+import { glob } from 'glob';
 import prettyBytes from 'pretty-bytes';
-import upath from 'upath';
 import { oneLine } from 'common-tags';
 import chalk from 'chalk';
 import { statSync, writeFileSync } from 'node:fs';
 import stringifyObject from 'stringify-object';
-import { glob } from 'glob';
 import { input, checkbox, select, Separator } from '@inquirer/prompts';
 
 const constants = {
@@ -60,6 +60,10 @@ const readConfig = async (configFile)=>{
     return (await import(configFile)).default;
 };
 
+const toUnix = (p)=>{
+    return p.replace(/\\/g, "/").replace(/(?<!^)\/+/g, "/");
+};
+
 const getSubdirectories = async ()=>{
     return await glob("*/", {
         ignore: constants.ignoredDirectories.map((directory)=>`${directory}/`)
@@ -117,7 +121,7 @@ const getAllFileExtensions = async (globDirectory)=>{
     });
     const extensions = new Set();
     for (const file of files){
-        const extension = upath.extname(file);
+        const extension = path.extname(file);
         if (extension) {
             extensions.add(extension.replace(/^\./, ""));
         }
@@ -146,7 +150,7 @@ const askQuestions = async ()=>{
     });
     const swDest = await input({
         message: "Where would you like your service worker file to be saved?",
-        default: upath.join(globDirectory, "sw.js"),
+        default: toUnix(path.join(globDirectory, "sw.js")),
         validate (input) {
             if (typeof input !== "string") {
                 return "You must provide a valid 'swDest'!";
@@ -234,7 +238,7 @@ const app = async (params)=>{
             }
         case "inject-manifest":
             {
-                const configPath = upath.resolve(process.cwd(), option || constants.defaultConfigFile);
+                const configPath = path.resolve(process.cwd(), option || constants.defaultConfigFile);
                 let config;
                 try {
                     config = await readConfig(configPath);
@@ -250,17 +254,15 @@ const app = async (params)=>{
                 }
                 logger.log(`Using configuration from ${configPath}.`);
                 if (params?.flags?.watch) {
-                    const options = {
-                        ignoreInitial: true
-                    };
-                    if (config.globIgnores) {
-                        options.ignored = config.globIgnores;
-                    }
-                    if (config.globDirectory) {
-                        options.cwd = config.globDirectory;
-                    }
                     if (config.globPatterns) {
-                        chokidar.watch(config.globPatterns, options).on("all", async ()=>{
+                        chokidar.watch(await glob(config.globPatterns, {
+                            cwd: config.globDirectory,
+                            follow: config.globFollow,
+                            ignore: config.globIgnores
+                        }), {
+                            ignoreInitial: true,
+                            cwd: config.globDirectory
+                        }).on("all", async ()=>{
                             if (config === null) return;
                             await runBuildCommand({
                                 config,

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":"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"}
+{"version":3,"file":"ask-questions.d.ts","sourceRoot":"","sources":["../../src/lib/ask-questions.ts"],"names":[],"mappings":"AAoFA,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.6",
+  "version": "9.0.8",
   "type": "module",
   "description": "The command line interface of Serwist.",
   "files": [
@@ -31,28 +31,26 @@
     "serwist": "cli.js"
   },
   "dependencies": {
-    "@inquirer/prompts": "5.3.8",
+    "@inquirer/prompts": "6.0.1",
     "chalk": "5.3.0",
-    "chokidar": "3.6.0",
+    "chokidar": "4.0.0",
     "common-tags": "1.8.2",
-    "fs-extra": "11.2.0",
     "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.2.0",
-    "@serwist/build": "9.0.6"
+    "update-notifier": "7.3.1",
+    "@serwist/build": "9.0.8"
   },
   "devDependencies": {
     "@types/common-tags": "1.8.4",
-    "@types/fs-extra": "11.0.4",
     "@types/inquirer": "9.0.7",
     "@types/stringify-object": "4.0.5",
     "@types/update-notifier": "6.0.8",
-    "rollup": "4.21.0",
-    "typescript": "5.5.4",
-    "@serwist/configs": "9.0.6"
+    "rollup": "4.21.3",
+    "typescript": "5.6.2",
+    "@serwist/configs": "9.0.8",
+    "@serwist/utils": "9.0.8"
   },
   "scripts": {
     "build": "rimraf dist && NODE_ENV=production rollup --config rollup.config.js",