@reddoorla/maintenance 0.10.1 → 0.10.3

package/dist/cli/bin.js

@@ -284,12 +284,37 @@ 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 { dirname as dirname2, join as join21 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
+function resolveAssetsDir() {
+  if (cachedAssetsDir) return cachedAssetsDir;
+  let dir = dirname2(fileURLToPath2(import.meta.url));
+  while (true) {
+    const srcCandidate = join21(dir, "src", "reports", "maintenance-email", "assets", "check.png");
+    if (existsSync2(srcCandidate)) {
+      cachedAssetsDir = dirname2(srcCandidate);
+      return cachedAssetsDir;
+    }
+    const distCandidate = join21(dir, "dist", "reports", "maintenance-email", "assets", "check.png");
+    if (existsSync2(distCandidate)) {
+      cachedAssetsDir = dirname2(distCandidate);
+      return cachedAssetsDir;
+    }
+    const parent = dirname2(dir);
+    if (parent === dir) {
+      throw new Error(
+        `loadBundledImages: could not locate maintenance-email assets dir by walking up from ${fileURLToPath2(import.meta.url)}. Checked both src/ and dist/ layouts.`
+      );
+    }
+    dir = parent;
+  }
+}
 async function loadBundledImages() {
+  const assetsDir = resolveAssetsDir();
   const [check, blurred] = await Promise.all([
-    readFile13(join21(here, "check.png")),
-    readFile13(join21(here, "blurredTests.jpg"))
+    readFile13(join21(assetsDir, "check.png")),
+    readFile13(join21(assetsDir, "blurredTests.jpg"))
   ]);
   return {
     check: {
@@ -306,13 +331,13 @@ async function loadBundledImages() {
     }
   };
 }
-var here, CHECK_CID, BLURRED_CID;
+var CHECK_CID, BLURRED_CID, cachedAssetsDir;
 var init_assets = __esm({
   "src/reports/maintenance-email/assets/index.ts"() {
     "use strict";
-    here = dirname2(fileURLToPath2(import.meta.url));
     CHECK_CID = "rd-check-png";
     BLURRED_CID = "rd-blurred-tests-jpg";
+    cachedAssetsDir = null;
   }
 });
 
@@ -1357,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 });
@@ -2498,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) {
@@ -2940,8 +2970,8 @@ import { fileURLToPath } from "url";
 import { dirname, join as join18 } from "path";
 function selfPackageVersion(callerImportMetaUrl) {
   try {
-    const here3 = dirname(fileURLToPath(callerImportMetaUrl));
-    const raw = readFileSync(join18(here3, "..", "..", "package.json"), "utf-8");
+    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";
   } catch {
@@ -3498,8 +3528,8 @@ function resolvePackageVersion(fromDir) {
 }
 
 // src/cli/bin.ts
-var here2 = dirname5(fileURLToPath3(import.meta.url));
-var version = resolvePackageVersion(here2);
+var here = dirname5(fileURLToPath3(import.meta.url));
+var version = resolvePackageVersion(here);
 var AUDIT_DESCRIPTIONS = {
   deps: "Diff site package.json against the bundled baseline version map.",
   lighthouse: "Run @lhci/cli autorun using the canonical lighthouserc.",