@empiricalrun/test-run 0.17.0 → 0.17.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @empiricalrun/test-run
 
+## 0.17.1
+
+### Patch Changes
+
+- 8b1be9e: fix: html report attachment urls for pw 1.60.0
+- Updated dependencies [8b1be9e]
+  - @empiricalrun/reporter@0.29.1
+
 ## 0.17.0
 
 ### Minor Changes

package/dist/lib/merge-reports/html.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/html.ts"],"names":[],"mappings":"AAaA,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAsIf"}
+{"version":3,"file":"html.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/html.ts"],"names":[],"mappings":"AAeA,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,IAAI,CAAC,CAoHf"}

package/dist/lib/merge-reports/html.js

@@ -52,10 +52,7 @@ async function patchMergedHtmlReport(htmlFilePath, summaryJsonFilePath) {
         logger_1.logger.error(`[Merge Reports] Failed to read HTML file:`, error);
         return;
     }
-    // Support both old format (1.53.x) and new format (1.57.0+)
-    const oldFormatMatch = htmlContent.match(/window\.playwrightReportBase64\s*=\s*"(?:data:application\/zip;base64,)?([^"]+)"/);
-    const newFormatMatch = htmlContent.match(/<script\s+id="playwrightReportBase64"[^>]*>(?:data:application\/zip;base64,)?([^<]+)<\/script>/);
-    const base64 = oldFormatMatch?.[1] || newFormatMatch?.[1];
+    const base64 = (0, reporter_1.findPlaywrightReportBase64)(htmlContent);
     if (!base64) {
         logger_1.logger.error(`[Merge Reports] Base64 zip data not found in HTML`);
         return;
@@ -89,13 +86,7 @@ async function patchMergedHtmlReport(htmlFilePath, summaryJsonFilePath) {
         const newBuffer = await (0, zip_1.createZipFromDirectory)(tempDir);
         const newBase64 = newBuffer.toString("base64");
         logger_1.logger.info(`[Merge Reports] New zip created in ${Date.now() - stepTime}ms`);
-        let updatedHtml;
-        if (oldFormatMatch) {
-            updatedHtml = htmlContent.replace(/(window\.playwrightReportBase64\s*=\s*")(?:data:application\/zip;base64,)?[^"]*(")/, `$1data:application/zip;base64,${newBase64}$2`);
-        }
-        else {
-            updatedHtml = htmlContent.replace(/(<script\s+id="playwrightReportBase64"[^>]*>)(?:data:application\/zip;base64,)?[^<]*(<\/script>)/, `$1data:application/zip;base64,${newBase64}$2`);
-        }
+        const updatedHtml = (0, reporter_1.replacePlaywrightReportBase64)(htmlContent, newBase64);
         await fs_1.default.promises.writeFile(htmlFilePath, updatedHtml, "utf8");
         logger_1.logger.info(`[Merge Reports] HTML file patched successfully`);
     }

package/dist/lib/merge-reports/index.d.ts

@@ -2,6 +2,8 @@ import type { MergeReportsOptions, UploadOptions } from "./types";
 export { patchMergedHtmlReport } from "./html";
 export { patchSummaryJson } from "./json";
 export type { MergeReportsOptions, UploadOptions } from "./types";
+export declare function parsePlaywrightVersionFromReportJsonl(content: string): string | null;
+export declare function getPlaywrightVersionForMerge(blobDir: string): Promise<string | null>;
 export declare function runPlaywrightMergeReports(options: MergeReportsOptions): Promise<{
     success: boolean;
 }>;

package/dist/lib/merge-reports/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAElE,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AA0DlE,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAsC/B;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAoCjC;AAED,wBAAsB,mBAAmB,CAAC,EACxC,SAAS,EACT,aAAa,GACd,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,CAAC;CAC9B,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDhB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAgFhC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/lib/merge-reports/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAElE,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,YAAY,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AA0DlE,wBAAgB,qCAAqC,CACnD,OAAO,EAAE,MAAM,GACd,MAAM,GAAG,IAAI,CA6Bf;AAMD,wBAAsB,4BAA4B,CAChD,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAyCxB;AAED,wBAAsB,yBAAyB,CAC7C,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA+C/B;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAoCjC;AAED,wBAAsB,mBAAmB,CAAC,EACxC,SAAS,EACT,aAAa,GACd,EAAE;IACD,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,aAAa,CAAC;CAC9B,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDhB;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE;IAC1C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAgFhC"}

package/dist/lib/merge-reports/index.js

@@ -4,6 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.patchSummaryJson = exports.patchMergedHtmlReport = void 0;
+exports.parsePlaywrightVersionFromReportJsonl = parsePlaywrightVersionFromReportJsonl;
+exports.getPlaywrightVersionForMerge = getPlaywrightVersionForMerge;
 exports.runPlaywrightMergeReports = runPlaywrightMergeReports;
 exports.extractUrlMappingsFromBlobs = extractUrlMappingsFromBlobs;
 exports.uploadMergedReports = uploadMergedReports;
@@ -64,15 +66,81 @@ function getCredentialsFromEnv(enableS3) {
     }
     return null;
 }
+function parsePlaywrightVersionFromReportJsonl(content) {
+    let userAgentVersion = null;
+    for (const line of content.split("\n")) {
+        if (!line.trim()) {
+            continue;
+        }
+        try {
+            const event = JSON.parse(line);
+            if (event.method === "onConfigure") {
+                const version = event.params?.config?.version;
+                if (typeof version === "string") {
+                    return version;
+                }
+            }
+            if (event.method === "onBlobReportMetadata") {
+                const userAgent = event.params?.userAgent;
+                if (typeof userAgent === "string") {
+                    const match = userAgent.match(/\bPlaywright\/([^\s)]+)/);
+                    if (match?.[1])
+                        userAgentVersion = match[1];
+                }
+            }
+        }
+        catch {
+            // Ignore malformed lines; Playwright merge-reports will validate the blob.
+        }
+    }
+    return userAgentVersion;
+}
+function isSafePlaywrightVersion(version) {
+    return /^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(version);
+}
+async function getPlaywrightVersionForMerge(blobDir) {
+    const override = process.env.PLAYWRIGHT_MERGE_VERSION;
+    if (override) {
+        if (!isSafePlaywrightVersion(override)) {
+            throw new Error(`Invalid PLAYWRIGHT_MERGE_VERSION: ${override}`);
+        }
+        return override;
+    }
+    const versions = new Set();
+    const files = fs_1.default.readdirSync(blobDir).filter((f) => f.endsWith(".zip"));
+    for (const fileName of files) {
+        const reportJsonl = await (0, zip_1.readZipEntry)(path_1.default.join(blobDir, fileName), "report.jsonl");
+        if (!reportJsonl) {
+            continue;
+        }
+        const version = parsePlaywrightVersionFromReportJsonl(reportJsonl.toString("utf8"));
+        if (version) {
+            if (!isSafePlaywrightVersion(version)) {
+                throw new Error(`Invalid Playwright version in ${fileName}: ${version}`);
+            }
+            versions.add(version);
+        }
+    }
+    if (versions.size > 1) {
+        logger_1.logger.warn(`[Merge Reports] Multiple Playwright versions found in blobs: ${Array.from(versions).join(", ")}`);
+    }
+    return versions.values().next().value ?? null;
+}
 async function runPlaywrightMergeReports(options) {
     const { blobDir, outputDir, cwd } = options;
     logger_1.logger.debug(`[Merge Reports] Running playwright merge-reports`);
     logger_1.logger.debug(`[Merge Reports] Blob dir: ${blobDir}`);
     logger_1.logger.debug(`[Merge Reports] Output dir: ${outputDir}`);
     try {
+        const playwrightVersion = await getPlaywrightVersionForMerge(blobDir);
+        if (!playwrightVersion) {
+            logger_1.logger.error(`[Merge Reports] Could not determine Playwright version from blob reports`);
+            return { success: false };
+        }
+        logger_1.logger.debug(`[Merge Reports] Playwright version: ${playwrightVersion}`);
         await (0, cmd_1.spawnCmd)("npx", [
             "--yes",
-            "playwright@1.58.2",
+            `playwright@${playwrightVersion}`,
             "merge-reports",
             blobDir,
             "--reporter",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/test-run",
-  "version": "0.17.0",
+  "version": "0.17.1",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -37,7 +37,7 @@
     "minimatch": "^10.0.1",
     "ts-morph": "^23.0.0",
     "@empiricalrun/r2-uploader": "^0.9.1",
-    "@empiricalrun/reporter": "^0.29.0"
+    "@empiricalrun/reporter": "^0.29.1"
   },
   "devDependencies": {
     "@playwright/test": "1.60.0",
@@ -46,7 +46,7 @@
     "@types/console-log-level": "^1.4.5",
     "@types/node": "^22.5.5",
     "memfs": "^4.17.1",
-    "@empiricalrun/shared-types": "0.13.0"
+    "@empiricalrun/shared-types": "0.14.0"
   },
   "scripts": {
     "dev": "tsc --build --watch",