@reddoorla/maintenance 0.10.3 → 0.10.5

package/dist/index.js

@@ -397,6 +397,32 @@ async function readSiteConfig(sitePath) {
   return out;
 }
 
+// src/util/free-port.ts
+import { createServer } from "net";
+async function findFreePort() {
+  return new Promise((resolve, reject) => {
+    const server = createServer();
+    server.unref();
+    server.on("error", reject);
+    server.listen(0, "127.0.0.1", () => {
+      const addr = server.address();
+      if (typeof addr === "object" && addr) {
+        const port = addr.port;
+        server.close(() => resolve(port));
+      } else {
+        server.close();
+        reject(new Error("findFreePort: could not determine assigned port from socket"));
+      }
+    });
+  });
+}
+function withFreePort(url, port) {
+  const u = new URL(url);
+  u.hostname = "localhost";
+  u.port = String(port);
+  return u.toString();
+}
+
 // src/audits/lighthouse.ts
 async function readJsonMaybe(path) {
   try {
@@ -437,13 +463,19 @@ async function lighthouseAudit(ctx) {
   const site = ctx.site;
   const label = siteLabel(site);
   const siteCfg = await readSiteConfig(site.path);
-  const resolvedConfig = siteCfg.lighthouseUrl ? {
+  const port = await findFreePort();
+  const baseUrl = siteCfg.lighthouseUrl ?? lighthouseConfig.ci.collect.url[0];
+  const resolvedConfig = {
     ...lighthouseConfig,
     ci: {
       ...lighthouseConfig.ci,
-      collect: { ...lighthouseConfig.ci.collect, url: [siteCfg.lighthouseUrl] }
+      collect: {
+        ...lighthouseConfig.ci.collect,
+        url: [withFreePort(baseUrl, port)],
+        startServerCommand: `npm run vite:dev -- --port ${port} --strictPort`
+      }
     }
-  } : lighthouseConfig;
+  };
   const configDir = await mkdtemp(join4(tmpdir(), "reddoor-lhci-"));
   const configPath = join4(configDir, "lighthouserc.json");
   await writeFile(configPath, JSON.stringify(resolvedConfig), "utf-8");
@@ -554,6 +586,32 @@ async function readJsonMaybe2(path) {
     return null;
   }
 }
+function buildPlaywrightConfig(port) {
+  return `import { defineConfig } from "@playwright/test";
+
+export default defineConfig({
+  testDir: ".",
+  testMatch: /.*\\.spec\\.ts$/,
+  fullyParallel: true,
+  forbidOnly: !!process.env.CI,
+  retries: process.env.CI ? 2 : 0,
+  reporter: process.env.CI ? "github" : "list",
+  use: {
+    baseURL: "http://localhost:${port}",
+    trace: "on-first-retry",
+  },
+  webServer: {
+    // --strictPort: refuse to bump to a different port if ours is taken,
+    //   so the audit fails loudly instead of probing a zombie.
+    // reuseExistingServer:false: never reuse \u2014 we control the lifecycle.
+    command: "npm run vite:dev -- --port ${port} --strictPort",
+    url: "http://localhost:${port}/dev/a11y-fixtures",
+    reuseExistingServer: false,
+    timeout: 120_000,
+  },
+});
+`;
+}
 function buildSpec() {
   return `import { test, expect } from "@playwright/test";
 import AxeBuilder from "@axe-core/playwright";
@@ -607,19 +665,26 @@ async function a11yAudit(ctx) {
   const specDir = await mkdtemp2(join5(tmpdir2(), "reddoor-a11y-spec-"));
   const specPath = join5(specDir, "a11y.spec.ts");
   await writeFile2(specPath, buildSpec(), "utf-8");
+  const port = await findFreePort();
+  const configPath = join5(specDir, "playwright.config.ts");
+  await writeFile2(configPath, buildPlaywrightConfig(port), "utf-8");
   const resultsPath = join5(site.path, RESULTS_REL);
   await rm2(join5(site.path, ".reddoor-a11y"), { recursive: true, force: true });
   let raw;
   try {
-    raw = await spawn2("npx", ["--yes", "playwright", "test", "--reporter=line", specPath], {
-      cwd: site.path,
-      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
-    });
+    raw = await spawn2(
+      "npx",
+      ["--yes", "playwright", "test", `--config=${configPath}`, "--reporter=line", specPath],
+      {
+        cwd: site.path,
+        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 });
     const e = err;
@@ -1521,6 +1586,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--;
@@ -1809,15 +1888,25 @@ import { stat as stat3 } from "fs/promises";
 import { join as join17 } 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 join16 } from "path";
 function selfPackageVersion(callerImportMetaUrl) {
   try {
-    const here = dirname(fileURLToPath(callerImportMetaUrl));
-    const raw = readFileSync(join16(here, "..", "..", "package.json"), "utf-8");
-    const pkg = JSON.parse(raw);
-    return pkg.version ?? "0.0.0";
+    let dir = dirname(fileURLToPath(callerImportMetaUrl));
+    while (true) {
+      const candidate = join16(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";
   }
@@ -2152,7 +2241,7 @@ import mjml2html from "mjml";
 
 // src/reports/maintenance-email/assets/index.ts
 import { readFile as readFile11 } from "fs/promises";
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import { dirname as dirname3, join as join19 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 var CHECK_CID = "rd-check-png";
@@ -2163,12 +2252,12 @@ function resolveAssetsDir() {
   let dir = dirname3(fileURLToPath2(import.meta.url));
   while (true) {
     const srcCandidate = join19(dir, "src", "reports", "maintenance-email", "assets", "check.png");
-    if (existsSync2(srcCandidate)) {
+    if (existsSync3(srcCandidate)) {
       cachedAssetsDir = dirname3(srcCandidate);
       return cachedAssetsDir;
     }
     const distCandidate = join19(dir, "dist", "reports", "maintenance-email", "assets", "check.png");
-    if (existsSync2(distCandidate)) {
+    if (existsSync3(distCandidate)) {
       cachedAssetsDir = dirname3(distCandidate);
       return cachedAssetsDir;
     }
@@ -2839,6 +2928,8 @@ export {
   runAudits,
   runAuditsAcross,
   securityAudit,
+  selfCaretRange,
+  selfPackageVersion,
   sendApprovedReports,
   svelteCodemods,
   syncConfigs,