@argos-ci/core 1.2.0 → 1.3.0

package/dist/index.mjs

@@ -12,6 +12,29 @@ import axios from 'axios';
 import { readFile } from 'node:fs/promises';
 import { readMetadata, getPlaywrightTracePath } from '@argos-ci/util';
 
+const getPrNumber$2 = ({ env })=>{
+    return env.BITRISE_PULL_REQUEST ? Number(env.BITRISE_PULL_REQUEST) : null;
+};
+const service$7 = {
+    name: "Bitrise",
+    detect: ({ env })=>Boolean(env.BITRISE_IO),
+    config: ({ env })=>{
+        return {
+            commit: env.BITRISE_GIT_COMMIT || null,
+            branch: env.BITRISE_GIT_BRANCH || null,
+            owner: env.BITRISEIO_GIT_REPOSITORY_OWNER || null,
+            repository: env.BITRISEIO_GIT_REPOSITORY_SLUG || null,
+            jobId: null,
+            runId: null,
+            prNumber: getPrNumber$2({
+                env
+            }),
+            prHeadCommit: null,
+            nonce: env.BITRISEIO_PIPELINE_ID || null
+        };
+    }
+};
+
 /**
  * Check if the current directory is a git repository.
  */ const checkIsGitRepository = ()=>{
@@ -207,7 +230,6 @@ const service = {
     detect: ()=>checkIsGitRepository(),
     config: ()=>{
         return {
-            // Buildkite doesn't work well so we fallback to git to ensure we have commit and branch
             commit: head() || null,
             branch: branch() || null,
             owner: null,
@@ -236,6 +258,8 @@ const debugTimeEnd = (arg)=>{
     }
 };
 
+// List of services ordered by usage
+// "git" must be the last one
 const services = [
     service$5,
     service$4,
@@ -243,6 +267,7 @@ const services = [
     service$2,
     service$6,
     service$1,
+    service$7,
     service
 ];
 const getCiEnvironment = ({ env = process.env } = {})=>{
@@ -558,9 +583,29 @@ const getConfigFromOptions = ({ parallel, ...options })=>{
     });
     return config;
 };
+async function uploadFilesToS3(files) {
+    debug(`Split files in chunks of ${CHUNK_SIZE}`);
+    const chunks = chunk(files, CHUNK_SIZE);
+    debug(`Starting upload of ${chunks.length} chunks`);
+    for(let i = 0; i < chunks.length; i++){
+        // Upload files
+        debug(`Uploading chunk ${i + 1}/${chunks.length}`);
+        const timeLabel = `Chunk ${i + 1}/${chunks.length}`;
+        debugTime(timeLabel);
+        await Promise.all(chunks[i].map(async ({ url, path, contentType })=>{
+            await upload$1({
+                url,
+                path,
+                contentType
+            });
+        }));
+        debugTimeEnd(timeLabel);
+    }
+}
 /**
  * Upload screenshots to argos-ci.com.
  */ const upload = async (params)=>{
+    var _result_pwTraces;
     debug("Starting upload with params", params);
     // Read config
     const config = getConfigFromOptions(params);
@@ -602,20 +647,21 @@ const getConfigFromOptions = ({ parallel, ...options })=>{
     }));
     // Create build
     debug("Creating build");
-    const screenshotKeys = Array.from(new Set(screenshots.map((screenshot)=>screenshot.hash)));
-    const pwTraces = screenshotKeys.reduce((pwTraces, key)=>{
-        const screenshot = screenshots.find((screenshot)=>screenshot.hash === key);
-        if (!screenshot) {
-            throw new Error(`Invariant: screenshot with hash ${key} not found`);
+    const [pwTraceKeys, screenshotKeys] = screenshots.reduce(([pwTraceKeys, screenshotKeys], screenshot)=>{
+        if (screenshot.pwTrace && !pwTraceKeys.includes(screenshot.pwTrace.hash)) {
+            pwTraceKeys.push(screenshot.pwTrace.hash);
         }
-        if (screenshot.pwTrace) {
-            pwTraces.push({
-                screenshotKey: screenshot.hash,
-                traceKey: screenshot.pwTrace.hash
-            });
+        if (!screenshotKeys.includes(screenshot.hash)) {
+            screenshotKeys.push(screenshot.hash);
         }
-        return pwTraces;
-    }, []);
+        return [
+            pwTraceKeys,
+            screenshotKeys
+        ];
+    }, [
+        [],
+        []
+    ]);
     const result = await apiClient.createBuild({
         commit: config.commit,
         branch: config.branch,
@@ -623,50 +669,38 @@ const getConfigFromOptions = ({ parallel, ...options })=>{
         parallel: config.parallel,
         parallelNonce: config.parallelNonce,
         screenshotKeys,
-        pwTraces,
+        pwTraceKeys,
         prNumber: config.prNumber,
         prHeadCommit: config.prHeadCommit,
         referenceBranch: config.referenceBranch,
         referenceCommit: config.referenceCommit
     });
-    debug("Got screenshots", result);
-    debug(`Split screenshots in chunks of ${CHUNK_SIZE}`);
-    const chunks = chunk(result.screenshots, CHUNK_SIZE);
-    debug(`Starting upload of ${chunks.length} chunks`);
-    for(let i = 0; i < chunks.length; i++){
-        // Upload screenshots
-        debug(`Uploading chunk ${i + 1}/${chunks.length}`);
-        const timeLabel = `Chunk ${i + 1}/${chunks.length}`;
-        debugTime(timeLabel);
-        await Promise.all(chunks[i].map(async ({ key, putUrl, putTraceUrl })=>{
+    debug("Got uploads url", result);
+    const uploadFiles = [
+        ...result.screenshots.map(({ key, putUrl })=>{
             const screenshot = screenshots.find((s)=>s.hash === key);
             if (!screenshot) {
                 throw new Error(`Invariant: screenshot with hash ${key} not found`);
             }
-            await Promise.all([
-                // Upload screenshot
-                upload$1({
-                    url: putUrl,
-                    path: screenshot.optimizedPath,
-                    contentType: "image/png"
-                }),
-                // Upload trace
-                (async ()=>{
-                    if (putTraceUrl) {
-                        if (!screenshot.pwTrace) {
-                            throw new Error(`Invariant: screenshot with hash ${key} has a putTraceUrl but no pwTrace`);
-                        }
-                        await upload$1({
-                            url: putTraceUrl,
-                            path: screenshot.pwTrace.path,
-                            contentType: "application/zip"
-                        });
-                    }
-                })()
-            ]);
-        }));
-        debugTimeEnd(timeLabel);
-    }
+            return {
+                url: putUrl,
+                path: screenshot.optimizedPath,
+                contentType: "image/png"
+            };
+        }),
+        ...((_result_pwTraces = result.pwTraces) === null || _result_pwTraces === void 0 ? void 0 : _result_pwTraces.map(({ key, putUrl })=>{
+            const screenshot = screenshots.find((s)=>s.pwTrace && s.pwTrace.hash === key);
+            if (!screenshot || !screenshot.pwTrace) {
+                throw new Error(`Invariant: trace with ${key} not found`);
+            }
+            return {
+                url: putUrl,
+                path: screenshot.pwTrace.path,
+                contentType: "application/json"
+            };
+        })) ?? []
+    ];
+    await uploadFilesToS3(uploadFiles);
     // Update build
     debug("Updating build");
     await apiClient.updateBuild({

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/core",
   "description": "Visual testing solution to avoid visual regression. The core component of Argos SDK that handles build creation.",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
@@ -59,5 +59,5 @@
     "build": "rollup -c",
     "e2e": "node ./e2e/upload.cjs && node ./e2e/upload.mjs"
   },
-  "gitHead": "47a939474ca0c0d55ca5360dcaa5f8912547ed76"
+  "gitHead": "8022e7391f8bd156e23a83b5da0ce452e28e324e"
 }