@reddoorla/maintenance 0.10.2 → 0.10.4

package/dist/cli/bin.js

@@ -284,7 +284,7 @@ var init_reports = __esm({
 
 // src/reports/maintenance-email/assets/index.ts
 import { readFile as readFile13 } from "fs/promises";
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import { dirname as dirname2, join as join21 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function resolveAssetsDir() {
@@ -292,12 +292,12 @@ function resolveAssetsDir() {
   let dir = dirname2(fileURLToPath2(import.meta.url));
   while (true) {
     const srcCandidate = join21(dir, "src", "reports", "maintenance-email", "assets", "check.png");
-    if (existsSync2(srcCandidate)) {
+    if (existsSync3(srcCandidate)) {
       cachedAssetsDir = dirname2(srcCandidate);
       return cachedAssetsDir;
     }
     const distCandidate = join21(dir, "dist", "reports", "maintenance-email", "assets", "check.png");
-    if (existsSync2(distCandidate)) {
+    if (existsSync3(distCandidate)) {
       cachedAssetsDir = dirname2(distCandidate);
       return cachedAssetsDir;
     }
@@ -760,7 +760,7 @@ var init_orchestrate = __esm({
 });
 
 // src/cli/bin.ts
-import { dirname as dirname5 } from "path";
+import { dirname as dirname6 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { cac } from "cac";
 
@@ -1382,7 +1382,12 @@ async function a11yAudit(ctx) {
   try {
     raw = await spawn2("npx", ["--yes", "playwright", "test", "--reporter=line", specPath], {
       cwd: site.path,
-      env: { ...process.env, REDDOOR_A11Y_OUTPUT: resultsPath }
+      env: { ...process.env, REDDOOR_A11Y_OUTPUT: resultsPath },
+      // playwright on a cold tree downloads Chrome, boots the site's dev
+      // server, and runs axe over every configured route. The shared 30 s
+      // default in runAudits is fine for deps/lint/security but starves
+      // playwright (mirrors the lighthouse fix shipped earlier).
+      timeoutMs: 5 * 6e4
     });
   } catch (err) {
     await rm2(specDir, { recursive: true, force: true });
@@ -2523,7 +2528,7 @@ function injectRestIntoProps(scriptBody) {
   if (!match) return scriptBody;
   const destructured = match[1] ?? "";
   if (/\.\.\.\s*\w+/.test(destructured)) return scriptBody;
-  const trimmed = destructured.trim();
+  const trimmed = destructured.trim().replace(/,\s*$/, "");
   const newDestructured = trimmed === "" ? " ...rest " : ` ${trimmed}, ...rest `;
   let replacement;
   if (match[2] !== void 0) {
@@ -2628,6 +2633,20 @@ function findMatchingClose(source, openIdx) {
       i = closeStr + 1;
       continue;
     }
+    if (ch === "/") {
+      const next = source[i + 1];
+      if (next === "/") {
+        const eol = source.indexOf("\n", i + 2);
+        i = eol === -1 ? source.length : eol;
+        continue;
+      }
+      if (next === "*") {
+        const end = source.indexOf("*/", i + 2);
+        if (end === -1) return -1;
+        i = end + 2;
+        continue;
+      }
+    }
     if (ch === "{") depth++;
     else if (ch === "}") {
       depth--;
@@ -2960,15 +2979,25 @@ import { stat as stat4 } from "fs/promises";
 import { join as join19 } from "path";
 
 // src/util/self-version.ts
-import { readFileSync } from "fs";
+import { readFileSync, existsSync as existsSync2 } from "fs";
 import { fileURLToPath } from "url";
 import { dirname, join as join18 } from "path";
 function selfPackageVersion(callerImportMetaUrl) {
   try {
-    const here2 = dirname(fileURLToPath(callerImportMetaUrl));
-    const raw = readFileSync(join18(here2, "..", "..", "package.json"), "utf-8");
-    const pkg = JSON.parse(raw);
-    return pkg.version ?? "0.0.0";
+    let dir = dirname(fileURLToPath(callerImportMetaUrl));
+    while (true) {
+      const candidate = join18(dir, "package.json");
+      if (existsSync2(candidate)) {
+        const raw = readFileSync(candidate, "utf-8");
+        const pkg = JSON.parse(raw);
+        if (pkg.name === "@reddoorla/maintenance") {
+          return pkg.version ?? "0.0.0";
+        }
+      }
+      const parent = dirname(dir);
+      if (parent === dir) return "0.0.0";
+      dir = parent;
+    }
   } catch {
     return "0.0.0";
   }
@@ -3510,20 +3539,31 @@ async function runInitCommand(site, opts) {
 }
 
 // src/cli/version.ts
-import { readFileSync as readFileSync2 } from "fs";
-import { join as join23 } from "path";
+import { readFileSync as readFileSync2, existsSync as existsSync4 } from "fs";
+import { dirname as dirname5, join as join23 } from "path";
 function resolvePackageVersion(fromDir) {
   try {
-    const raw = readFileSync2(join23(fromDir, "..", "..", "package.json"), "utf-8");
-    const pkg = JSON.parse(raw);
-    return pkg.version ?? "unknown";
+    let dir = fromDir;
+    while (true) {
+      const candidate = join23(dir, "package.json");
+      if (existsSync4(candidate)) {
+        const raw = readFileSync2(candidate, "utf-8");
+        const pkg = JSON.parse(raw);
+        if (pkg.name === "@reddoorla/maintenance") {
+          return pkg.version ?? "unknown";
+        }
+      }
+      const parent = dirname5(dir);
+      if (parent === dir) return "unknown";
+      dir = parent;
+    }
   } catch {
     return "unknown";
   }
 }
 
 // src/cli/bin.ts
-var here = dirname5(fileURLToPath3(import.meta.url));
+var here = dirname6(fileURLToPath3(import.meta.url));
 var version = resolvePackageVersion(here);
 var AUDIT_DESCRIPTIONS = {
   deps: "Diff site package.json against the bundled baseline version map.",