@empiricalrun/playwright-utils 0.18.18 → 0.18.20

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @empiricalrun/playwright-utils
 
+## 0.18.20
+
+### Patch Changes
+
+- b99ba96: fix: removed logger import from r2-uploader
+
+## 0.18.19
+
+### Patch Changes
+
+- 96f7acc: fix: replaced unsigned asset urls with public url
+- Updated dependencies [e85633b]
+  - @empiricalrun/test-gen@0.38.44
+
 ## 0.18.18
 
 ### Patch Changes

package/dist/reporter/custom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/reporter/custom.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAMH,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EAMV,KAAK,EACL,QAAQ,IAAI,cAAc,EAC1B,SAAS,EACT,UAAU,IAAI,gBAAgB,EAE/B,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAML,UAAU,EAMX,MAAM,2BAA2B,CAAC;AAkBnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAsC/C,QAAA,MAAM,iBAAiB,UAAoC,CAAC;AAC5D,KAAK,oBAAoB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAM/D,KAAK,mBAAmB,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AA+BF,cAAM,YAAa,YAAW,UAAU;IACtC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,mBAAmB,CAAU;IACrC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAKlC,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,YAAY,CAEN;IACd,OAAO,CAAC,eAAe,CAAmB;gBAE9B,OAAO,EAAE,mBAAmB;IAIxC,aAAa;IAIb,QAAQ;IAER,QAAQ;IAER,WAAW;IAEX,SAAS;IAET,WAAW,CAAC,IAAI,EAAE,cAAc;IAIhC,OAAO,IAAI,IAAI;IAIf,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB;YA4D1C,qBAAqB;IA6CnC,WAAW,CAAC,MAAM,EAAE,UAAU;IAI9B,OAAO,CAAC,KAAK,EAAE,KAAK;IAYpB,eAAe,IAAI;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,oBAAoB,CAAC;QAC3B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;KAC1B;IAsBD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IASxD,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzB,KAAK,CAAC,MAAM,EAAE,UAAU;IAkIxB,MAAM;CA8Bb;AAwED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,GAAE,MAAoB,EAC1B,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM,iBAqBhB;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAsBhE;AAsiBD,eAAe,YAAY,CAAC"}
+{"version":3,"file":"custom.d.ts","sourceRoot":"","sources":["../../src/reporter/custom.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,KAAK,EACV,UAAU,EACV,UAAU,EAMV,KAAK,EACL,QAAQ,IAAI,cAAc,EAC1B,SAAS,EACT,UAAU,IAAI,gBAAgB,EAE/B,MAAM,2BAA2B,CAAC;AAInC,OAAO,EAML,UAAU,EAMX,MAAM,2BAA2B,CAAC;AAkBnC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAuC/C,QAAA,MAAM,iBAAiB,UAAoC,CAAC;AAC5D,KAAK,oBAAoB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAM/D,KAAK,mBAAmB,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,IAAI,CAAC,EAAE,oBAAoB,CAAC;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB,CAAC;AA6BF,cAAM,YAAa,YAAW,UAAU;IACtC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,QAAQ,CAAsB;IACtC,OAAO,CAAC,aAAa,CAAU;IAC/B,OAAO,CAAC,mBAAmB,CAAU;IACrC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,KAAK,CAAqB;IAKlC,OAAO,CAAC,mBAAmB,CAAqB;IAEhD,OAAO,CAAC,YAAY,CAEN;IACd,OAAO,CAAC,eAAe,CAAmB;gBAE9B,OAAO,EAAE,mBAAmB;IAIxC,aAAa;IAIb,QAAQ;IAER,QAAQ;IAER,WAAW;IAEX,SAAS;IAET,WAAW,CAAC,IAAI,EAAE,cAAc;IAIhC,OAAO,IAAI,IAAI;IAIf,SAAS,CAAC,IAAI,EAAE,cAAc,EAAE,MAAM,EAAE,gBAAgB;YA4D1C,qBAAqB;IA+BnC,WAAW,CAAC,MAAM,EAAE,UAAU;IAI9B,OAAO,CAAC,KAAK,EAAE,KAAK;IAYpB,eAAe,IAAI;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,IAAI,EAAE,oBAAoB,CAAC;QAC3B,kBAAkB,EAAE,MAAM,CAAC;QAC3B,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;QACzB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAC;KAC1B;IAsBD,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO;IASxD,OAAO,CAAC,KAAK,EAAE,SAAS,GAAG,IAAI;IAIzB,KAAK,CAAC,MAAM,EAAE,UAAU;IA8FxB,MAAM;CA8Bb;AAwED,wBAAsB,cAAc,CAClC,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,IAAI,GAAE,MAAoB,EAC1B,IAAI,CAAC,EAAE,MAAM,EACb,MAAM,CAAC,EAAE,MAAM,iBAqBhB;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAsBhE;AAsiBD,eAAe,YAAY,CAAC"}

package/dist/reporter/custom.js

@@ -22,7 +22,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.startHtmlReportServer = exports.showHTMLReport = void 0;
 const code_frame_1 = require("@babel/code-frame");
-const r2_uploader_1 = require("@empiricalrun/r2-uploader");
 const crypto_1 = require("crypto");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -35,6 +34,7 @@ const stream_1 = require("stream");
 const logger_1 = require("../logger");
 const base_1 = require("./base");
 const queue_1 = require("./queue");
+const uploader_1 = require("./uploader");
 const util_1 = require("./util");
 const htmlReportOptions = ["always", "never", "on-failure"];
 const isHtmlReportOption = (type) => {
@@ -63,7 +63,6 @@ function listFilesRecursively(dir) {
     }
     return files;
 }
-const R2_BUCKET_NAME = "test-report";
 class HtmlReporter {
     config;
     suite;
@@ -162,24 +161,11 @@ class HtmlReporter {
             return;
         }
         try {
-            const uploadTask = async () => {
-                const uploadedFiles = await (0, r2_uploader_1.uploadDirectory)({
-                    fileList: [attachment.path],
-                    sourceDir: this._outputFolder + "/data/" + folderName,
-                    destinationDir: process.env.PROJECT_NAME +
-                        "/" +
-                        process.env.TEST_RUN_GITHUB_ACTION_ID +
-                        "/data/" +
-                        folderName,
-                    uploadBucket: R2_BUCKET_NAME,
-                })
-                    .then((fileMap) => {
-                    logger_1.logger.debug("Finished uploading test attachment", fileMap);
-                    return fileMap;
-                })
-                    .catch((e) => logger_1.logger.error("Error uploading test attachment", e));
-                return uploadedFiles;
-            };
+            const uploadTask = (0, uploader_1.createUploadTask)({
+                fileList: [attachment.path],
+                outputFolder: this._outputFolder,
+                relativePath: path_1.default.join("data", folderName || ""),
+            });
             return (0, queue_1.sendTaskToQueue)(uploadTask);
         }
         catch (e) {
@@ -254,53 +240,20 @@ class HtmlReporter {
             const tracePath = this._outputFolder + "/trace";
             const traceExists = fs_1.default.existsSync(tracePath);
             logger_1.logger.debug("trace exists:", traceExists);
-            const uploadTraceTask = async () => {
-                logger_1.logger.debug("Uploading playwright trace");
-                return (0, r2_uploader_1.uploadDirectory)({
-                    sourceDir: this._outputFolder + "/trace",
-                    destinationDir: process.env.PROJECT_NAME +
-                        "/" +
-                        process.env.TEST_RUN_GITHUB_ACTION_ID +
-                        "/trace",
-                    uploadBucket: R2_BUCKET_NAME,
-                })
-                    .then((fileMap) => {
-                    logger_1.logger.debug("Finished uploading playwright trace", fileMap);
-                })
-                    .catch((e) => logger_1.logger.error("Error uploading playwright trace", e));
-            };
+            const uploadTraceTask = (0, uploader_1.createUploadTask)({
+                outputFolder: this._outputFolder,
+                relativePath: "trace",
+            });
             // upload index.html
-            const uploadIndexTask = async () => {
-                logger_1.logger.debug("Uploading html report");
-                return (0, r2_uploader_1.uploadDirectory)({
-                    sourceDir: this._outputFolder,
-                    fileList: [path_1.default.join(this._outputFolder, "index.html")],
-                    destinationDir: process.env.PROJECT_NAME +
-                        "/" +
-                        process.env.TEST_RUN_GITHUB_ACTION_ID,
-                    uploadBucket: R2_BUCKET_NAME,
-                })
-                    .then((fileMap) => {
-                    logger_1.logger.debug("Finished uploading html report", fileMap);
-                })
-                    .catch((e) => logger_1.logger.error("Error uploading html report", e));
-            };
+            const uploadIndexTask = (0, uploader_1.createUploadTask)({
+                outputFolder: this._outputFolder,
+                fileList: [path_1.default.join(this._outputFolder, "index.html")],
+            });
             // upload summary.json
-            const uploadSummaryTask = async () => {
-                logger_1.logger.debug("Uploading json report");
-                return (0, r2_uploader_1.uploadDirectory)({
-                    sourceDir: this._outputFolder,
-                    fileList: [path_1.default.join(this._outputFolder, "summary.json")],
-                    destinationDir: process.env.PROJECT_NAME +
-                        "/" +
-                        process.env.TEST_RUN_GITHUB_ACTION_ID,
-                    uploadBucket: R2_BUCKET_NAME,
-                })
-                    .then((fileMap) => {
-                    logger_1.logger.debug("Finished uploading json report", fileMap);
-                })
-                    .catch((e) => logger_1.logger.error("Error uploading json report", e));
-            };
+            const uploadSummaryTask = (0, uploader_1.createUploadTask)({
+                outputFolder: this._outputFolder,
+                fileList: [path_1.default.join(this._outputFolder, "summary.json")],
+            });
             if (traceExists) {
                 void (0, queue_1.sendTaskToQueue)(uploadTraceTask);
             }

package/dist/reporter/queue.d.ts

@@ -1,5 +1,5 @@
 import { FileMap } from "@empiricalrun/r2-uploader";
-type AsyncTask = () => Promise<FileMap | void>;
+export type AsyncTask = () => Promise<FileMap | void>;
 type AsyncTaskReturnType = FileMap | void;
 type AsyncTaskResult = Promise<AsyncTaskReturnType>;
 export declare function sendTaskToQueue(task: AsyncTask): AsyncTaskResult;

package/dist/reporter/queue.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/reporter/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAIpD,KAAK,SAAS,GAAG,MAAM,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;AAC/C,KAAK,mBAAmB,GAAG,OAAO,GAAG,IAAI,CAAC;AAC1C,KAAK,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAoGpD,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,GAAG,eAAe,CAQhE;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC,CAOxD"}
+{"version":3,"file":"queue.d.ts","sourceRoot":"","sources":["../../src/reporter/queue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AAIpD,MAAM,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;AACtD,KAAK,mBAAmB,GAAG,OAAO,GAAG,IAAI,CAAC;AAC1C,KAAK,eAAe,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC;AAoGpD,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,GAAG,eAAe,CAQhE;AAED,wBAAgB,wBAAwB,IAAI,OAAO,CAAC,IAAI,CAAC,CAOxD"}

package/dist/reporter/uploader.d.ts

@@ -0,0 +1,13 @@
+import { FileMap } from "@empiricalrun/r2-uploader/src/types";
+import { AsyncTask } from "./queue";
+export declare function uploadFiles({ fileList, outputFolder, relativePath, }: {
+    outputFolder: string;
+    fileList?: string[];
+    relativePath: string;
+}): Promise<FileMap | void>;
+export declare function createUploadTask({ fileList, outputFolder, relativePath, }: {
+    outputFolder: string;
+    fileList?: string[];
+    relativePath?: string;
+}): AsyncTask;
+//# sourceMappingURL=uploader.d.ts.map

package/dist/reporter/uploader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"uploader.d.ts","sourceRoot":"","sources":["../../src/reporter/uploader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qCAAqC,CAAC;AAK9D,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAKpC,wBAAsB,WAAW,CAAC,EAChC,QAAQ,EACR,YAAY,EACZ,YAAY,GACb,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,CAwB1B;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,QAAQ,EACR,YAAY,EACZ,YAAiB,GAClB,EAAE;IACD,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,SAAS,CAaZ"}

package/dist/reporter/uploader.js

@@ -0,0 +1,48 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createUploadTask = exports.uploadFiles = void 0;
+const upload_1 = require("@empiricalrun/r2-uploader/src/upload");
+const path_1 = __importDefault(require("path"));
+const logger_1 = require("../logger");
+const R2_BUCKET_NAME = "test-report";
+const R2_BASE_URL = "https://reports.empirical.run";
+async function uploadFiles({ fileList, outputFolder, relativePath, }) {
+    if (!process.env.PROJECT_NAME || !process.env.TEST_RUN_GITHUB_ACTION_ID) {
+        return;
+    }
+    const urls = {};
+    const sourceDir = path_1.default.join(outputFolder, relativePath);
+    const destinationDir = path_1.default.join(process.env.PROJECT_NAME, process.env.TEST_RUN_GITHUB_ACTION_ID, relativePath);
+    const uploadedfiles = await (0, upload_1.uploadDirectory)({
+        sourceDir,
+        fileList,
+        destinationDir,
+        uploadBucket: R2_BUCKET_NAME,
+    });
+    Object.entries(uploadedfiles).forEach(([filePath]) => {
+        const fileName = filePath.split("/").pop() || "";
+        const fileUrl = new URL(path_1.default.join(destinationDir, fileName), R2_BASE_URL);
+        urls[fileName] = fileUrl.toString();
+    });
+    logger_1.logger.debug("Finished uploading files:", urls);
+    return urls;
+}
+exports.uploadFiles = uploadFiles;
+function createUploadTask({ fileList, outputFolder, relativePath = "", }) {
+    return async () => {
+        return uploadFiles({
+            fileList,
+            outputFolder,
+            relativePath,
+        })
+            .then((fileMap) => {
+            logger_1.logger.debug("Finished uploading files", fileMap);
+            return fileMap;
+        })
+            .catch((e) => logger_1.logger.error("Error uploading files", e));
+    };
+}
+exports.createUploadTask = createUploadTask;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@empiricalrun/playwright-utils",
-  "version": "0.18.18",
+  "version": "0.18.20",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
@@ -43,8 +43,8 @@
     "playwright-extra": "^4.3.6",
     "puppeteer-extra-plugin-recaptcha": "^3.6.8",
     "rimraf": "^6.0.1",
+    "@empiricalrun/test-gen": "^0.38.44",
     "@empiricalrun/r2-uploader": "^0.3.7",
-    "@empiricalrun/test-gen": "^0.38.43",
     "@empiricalrun/llm": "^0.9.28"
   },
   "scripts": {