@empiricalrun/playwright-utils 0.43.0 → 0.44.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @empiricalrun/playwright-utils
 
+## 0.44.0
+
+### Minor Changes
+
+- d3981f9: fix: prevent attachment upload in blob zip
+
+## 0.43.1
+
+### Patch Changes
+
+- 5c120e0: fix: summary json generated after html
+
 ## 0.43.0
 
 ### Minor Changes

package/dist/config/index.js

@@ -51,8 +51,8 @@ function getReporters() {
             ],
         ]
         : [
-            ["json", { outputFile: "playwright-report/summary.json" }],
             ["html", { open: "never" }],
+            ["json", { outputFile: "playwright-report/summary.json" }],
         ];
     return [
         ["list"],

package/dist/reporter/empirical-reporter.d.ts

@@ -11,7 +11,7 @@ declare class EmpiricalReporter implements Reporter {
     private enqueTestAttachmentUploadTask;
     onTestEnd(test: TestCase, result: TestResult): void;
     onEnd(result: FullResult): Promise<void>;
-    private _logMissingFiles;
+    private _logReportDirContents;
     private _patchBlobReport;
     private _uploadBlobReport;
 }

package/dist/reporter/empirical-reporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"empirical-reporter.d.ts","sourceRoot":"","sources":["../../src/reporter/empirical-reporter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,UAAU,EACX,MAAM,2BAA2B,CAAC;AAqBnC,cAAM,iBAAkB,YAAW,QAAQ;IACzC,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,oBAAoB,CAG1B;IACF,OAAO,CAAC,sBAAsB,CAAuB;IACrD,OAAO,CAAC,YAAY,CAAgD;IACpE,OAAO,CAAC,iBAAiB,CAAyC;IAClE,OAAO,CAAC,gBAAgB,CAAkC;IAC1D,OAAO,CAAC,SAAS,CAAyB;;IAM1C,OAAO,CAAC,6BAA6B,CAkCnC;IAEF,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU;IAuGtC,KAAK,CAAC,MAAM,EAAE,UAAU;IAkH9B,OAAO,CAAC,gBAAgB;YAoBV,gBAAgB;YAOhB,iBAAiB;CAmChC;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"empirical-reporter.d.ts","sourceRoot":"","sources":["../../src/reporter/empirical-reporter.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,UAAU,EACX,MAAM,2BAA2B,CAAC;AAqBnC,cAAM,iBAAkB,YAAW,QAAQ;IACzC,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,oBAAoB,CAG1B;IACF,OAAO,CAAC,sBAAsB,CAAuB;IACrD,OAAO,CAAC,YAAY,CAAgD;IACpE,OAAO,CAAC,iBAAiB,CAAyC;IAClE,OAAO,CAAC,gBAAgB,CAAkC;IAC1D,OAAO,CAAC,SAAS,CAAyB;;IAM1C,OAAO,CAAC,6BAA6B,CAkCnC;IAEF,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU;IAuGtC,KAAK,CAAC,MAAM,EAAE,UAAU;IAiG9B,OAAO,CAAC,qBAAqB;YAkBf,gBAAgB;YAOhB,iBAAiB;CAmChC;AAED,eAAe,iBAAiB,CAAC"}

package/dist/reporter/empirical-reporter.js

@@ -129,35 +129,29 @@ class EmpiricalReporter {
         logger_1.logger.debug(`[Empirical Reporter] Test run completed with status: ${result.status}`);
         logger_1.logger.debug(`[Empirical Reporter] State: cwd=${this._currentWorkingDir}, hasSharding=${this._hasSharding}`);
         const startTime = Date.now();
-        logger_1.logger.debug("[Empirical Reporter] Starting final report upload at: ", new Intl.DateTimeFormat("en-US", {
-            hour: "2-digit",
-            minute: "2-digit",
-            second: "2-digit",
-        }).format(startTime));
-        const jsonFilePath = path_1.default.join(this._currentWorkingDir, "playwright-report", "summary.json");
+        const reportDir = path_1.default.join(this._currentWorkingDir, "playwright-report");
+        const jsonFilePath = path_1.default.join(reportDir, "summary.json");
+        const htmlFilePath = path_1.default.join(reportDir, "index.html");
         const jsonExists = fs_1.default.existsSync(jsonFilePath);
-        const htmlFilePath = path_1.default.join(this._currentWorkingDir, "playwright-report/index.html");
-        const htmlExists = await (0, util_1.checkFileExistsAsync)(htmlFilePath);
+        const htmlExists = fs_1.default.existsSync(htmlFilePath);
         if (!htmlExists || !jsonExists) {
-            this._logMissingFiles();
+            this._logReportDirContents();
         }
         if (htmlExists && jsonExists) {
-            logger_1.logger.debug("[Empirical Reporter] Updating the HTML Zip");
+            logger_1.logger.debug("[Empirical Reporter] Patching HTML with attachment URLs");
             await (0, util_1.updateHtmlZipFileAttachmentPaths)(jsonFilePath, htmlFilePath, this._testResultSourceDir);
-            logger_1.logger.debug("[Empirical Reporter] Uploading HTML file");
             await this._uploader.uploadFile(htmlFilePath, "index.html");
         }
-        else {
-            logger_1.logger.error(`[Empirical Reporter] playwright-report/index.html does not exist at: ${htmlFilePath}`);
+        else if (!htmlExists) {
+            logger_1.logger.error(`[Empirical Reporter] index.html not found at: ${htmlFilePath}`);
         }
         if (jsonExists) {
-            logger_1.logger.debug("[Empirical Reporter] Updating the JSON file");
+            logger_1.logger.debug("[Empirical Reporter] Patching summary.json with attachment URLs");
             await (0, util_1.updateSummaryJsonAttachmentPaths)(jsonFilePath, this._testResultSourceDir, `${this._uploader.urlPrefix}/data`);
-            logger_1.logger.debug("[Empirical Reporter] Uploading JSON file");
             await this._uploader.uploadFile(jsonFilePath, "summary.json");
         }
         else {
-            logger_1.logger.error(`[Empirical Reporter] summary.json does not exist at: ${jsonFilePath}`);
+            logger_1.logger.error(`[Empirical Reporter] summary.json not found at: ${jsonFilePath}`);
         }
         const traceFilePath = path_1.default.join(this._currentWorkingDir, "playwright-report/trace");
         const traceExists = await (0, util_1.checkFileExistsAsync)(traceFilePath);
@@ -188,21 +182,19 @@ class EmpiricalReporter {
         const timeDiff = Date.now() - startTime;
         logger_1.logger.debug("[Empirical Reporter] Time taken to upload after tests ended: ", timeDiff, "ms");
     }
-    _logMissingFiles() {
+    _logReportDirContents() {
         try {
-            const cwdFiles = fs_1.default.readdirSync(this._currentWorkingDir);
-            logger_1.logger.debug(`[Empirical Reporter] Files in cwd: ${cwdFiles.join(", ")}`);
             const reportDir = path_1.default.join(this._currentWorkingDir, "playwright-report");
             if (fs_1.default.existsSync(reportDir)) {
                 const reportFiles = fs_1.default.readdirSync(reportDir);
-                logger_1.logger.debug(`[Empirical Reporter] Files in playwright-report: ${reportFiles.join(", ")}`);
+                logger_1.logger.info(`[Empirical Reporter] Files in playwright-report: ${reportFiles.join(", ")}`);
             }
             else {
-                logger_1.logger.debug(`[Empirical Reporter] playwright-report directory does not exist`);
+                logger_1.logger.warn(`[Empirical Reporter] playwright-report directory does not exist`);
             }
         }
         catch (e) {
-            logger_1.logger.debug(`[Empirical Reporter] Error listing files: ${e}`);
+            logger_1.logger.error(`[Empirical Reporter] Error listing report dir: ${e}`);
         }
     }
     async _patchBlobReport(blobDir) {

package/dist/reporter/incremental-blob-reporter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"incremental-blob-reporter.d.ts","sourceRoot":"","sources":["../../src/reporter/incremental-blob-reporter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,UAAU,EACV,QAAQ,EACT,MAAM,2BAA2B,CAAC;AAUnC;;;;;;;GAOG;AACH,MAAM,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEnD,cAAM,uBAAwB,YAAW,QAAQ;IAC/C,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,WAAW,CAIjB;IACF,OAAO,CAAC,UAAU,CAGhB;IACF,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,iBAAiB,CAAc;IACvC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,UAAU,CAAsB;;IAexC,OAAO,CAAC,cAAc,CAA6B;IAEnD,OAAO,CAAC,mBAAmB;IAwB3B,OAAO,CAAC,oBAAoB;YAOd,eAAe;IAiC7B,OAAO,CAAC,2BAA2B;IA4BnC,OAAO,KAAK,QAAQ,GAKnB;IAED,OAAO,KAAK,UAAU,GAErB;IAED,OAAO,KAAK,aAAa,GAExB;IAED,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,gBAAgB;IAoBxB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,eAAe;IA2BvB,OAAO,CAAC,cAAc;YAQR,SAAS;IAwBvB,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI;IA+E/C,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI;IAerD,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI;IAyCnD,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI;IAmBrE,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI;IAsB7D,KAAK,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YAmBhC,kBAAkB;IA2ChC;;OAEG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAI5D,aAAa,IAAI,OAAO;CAGzB;AAID,wBAAgB,0BAA0B,IAAI,uBAAuB,GAAG,IAAI,CAE3E;AAED,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,uBAAuB,GAChC,IAAI,CAEN;AAED,eAAe,uBAAuB,CAAC"}
+{"version":3,"file":"incremental-blob-reporter.d.ts","sourceRoot":"","sources":["../../src/reporter/incremental-blob-reporter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EACV,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,UAAU,EACV,QAAQ,EACT,MAAM,2BAA2B,CAAC;AAcnC;;;;;;;GAOG;AACH,MAAM,MAAM,gBAAgB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEnD,cAAM,uBAAwB,YAAW,QAAQ;IAC/C,OAAO,CAAC,kBAAkB,CAAyB;IACnD,OAAO,CAAC,WAAW,CAIjB;IACF,OAAO,CAAC,UAAU,CAGhB;IACF,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,YAAY,CAAgB;IACpC,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,iBAAiB,CAA+B;IACxD,OAAO,CAAC,YAAY,CAAkC;IACtD,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,SAAS,CAAyB;IAC1C,OAAO,CAAC,YAAY,CAAkB;IACtC,OAAO,CAAC,iBAAiB,CAAc;IACvC,OAAO,CAAC,UAAU,CAAkB;IACpC,OAAO,CAAC,UAAU,CAAsB;;IAexC,OAAO,CAAC,cAAc,CAA6B;IAEnD,OAAO,CAAC,mBAAmB;IAyB3B,OAAO,CAAC,oBAAoB;YAOd,eAAe;IAiC7B,OAAO,CAAC,2BAA2B;IA4BnC,OAAO,KAAK,QAAQ,GAKnB;IAED,OAAO,KAAK,UAAU,GAErB;IAED,OAAO,KAAK,aAAa,GAExB;IAED,OAAO,CAAC,WAAW;IAKnB,OAAO,CAAC,kBAAkB;IAW1B,OAAO,CAAC,gBAAgB;IAuBxB,OAAO,CAAC,WAAW;IAInB,OAAO,CAAC,YAAY;IAUpB,OAAO,CAAC,UAAU;IASlB,OAAO,CAAC,YAAY;IAOpB,OAAO,CAAC,oBAAoB;IAgB5B,OAAO,CAAC,eAAe;IA2BvB,OAAO,CAAC,cAAc;YAQR,SAAS;IAwBvB,OAAO,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI;IA+E/C,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI;IAerD,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI;IAyCnD,WAAW,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI;IAmBrE,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,GAAG,IAAI;IAsB7D,KAAK,CAAC,MAAM,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;YAmBhC,kBAAkB;IA2ChC;;OAEG;IACH,gBAAgB,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI;IAI5D,aAAa,IAAI,OAAO;CAGzB;AAID,wBAAgB,0BAA0B,IAAI,uBAAuB,GAAG,IAAI,CAE3E;AAED,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,uBAAuB,GAChC,IAAI,CAEN;AAED,eAAe,uBAAuB,CAAC"}

package/dist/reporter/incremental-blob-reporter.js

@@ -13,6 +13,9 @@ const os_1 = __importDefault(require("os"));
 const path_1 = __importDefault(require("path"));
 const uploader_1 = require("./uploader");
 const BLOB_REPORT_VERSION = 2;
+function isLocalTesting() {
+    return process.env.LOCAL_TEST === "true";
+}
 class IncrementalBlobReporter {
     _currentWorkingDir = process.cwd();
     _stagingDir = path_1.default.join(this._currentWorkingDir, "blob-report-incremental", "staging");
@@ -48,7 +51,8 @@ class IncrementalBlobReporter {
             console.log("[IncrementalBlobReporter] SIGINT received, flushing and uploading...");
             this._flushAndUpload()
                 .then(() => {
-                console.log("[IncrementalBlobReporter] Flush and upload complete on SIGINT");
+                console.log("[IncrementalBlobReporter] Flush and upload complete on SIGINT, exiting");
+                process.exit(0);
             })
                 .catch((err) => {
                 console.error("[IncrementalBlobReporter] Flush/upload failed on SIGINT:", err);
@@ -80,7 +84,7 @@ class IncrementalBlobReporter {
         await this._uploader.uploadFile(this._zipPath, `blobs/incremental-report-${this._shardIndex}.zip`);
         await this._uploader.waitForUploads();
         console.log("[IncrementalBlobReporter] Flush and upload complete on SIGINT");
-        if (process.env.LOCAL_TEST === "true") {
+        if (isLocalTesting()) {
             await this._mergeForLocalTest();
         }
     }
@@ -127,6 +131,9 @@ class IncrementalBlobReporter {
     _embedAttachment(attachmentPath, resultId) {
         if (!attachmentPath || !fs_1.default.existsSync(attachmentPath))
             return null;
+        if (!isLocalTesting()) {
+            return null;
+        }
         const ext = path_1.default.extname(attachmentPath);
         const uniqueName = `${resultId}-${this._generateId()}${ext}`;
         const destPath = path_1.default.join(this._stagingDir, uniqueName);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.43.0",
+  "version": "0.44.0",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -43,11 +43,11 @@
     "puppeteer-extra-plugin-recaptcha": "^3.6.8",
     "rimraf": "^6.0.1",
     "ts-morph": "^23.0.0",
+    "@empiricalrun/llm": "^0.26.0",
     "@empiricalrun/cua": "^0.3.0",
     "@empiricalrun/dashboard-client": "^0.2.0",
-    "@empiricalrun/llm": "^0.26.0",
-    "@empiricalrun/r2-uploader": "^0.9.1",
-    "@empiricalrun/reporter": "^0.28.0"
+    "@empiricalrun/reporter": "^0.28.0",
+    "@empiricalrun/r2-uploader": "^0.9.1"
   },
   "scripts": {
     "dev": "tsc --build --watch",