@argos-ci/core 1.5.5 → 2.1.0

package/dist/index.mjs

@@ -181,11 +181,11 @@ const getBranch = ({ env })=>{
         return null;
     }
     const matches = branchRegex.exec(env.GITHUB_REF);
-    return (matches === null || matches === void 0 ? void 0 : matches[1]) ?? null;
+    return matches?.[1] ?? null;
 };
 const getRepository$1 = ({ env })=>{
     if (!env.GITHUB_REPOSITORY) return null;
-    return env.GITHUB_REPOSITORY.split("/")[1];
+    return env.GITHUB_REPOSITORY.split("/")[1] || null;
 };
 const readEventPayload = ({ env })=>{
     if (!env.GITHUB_EVENT_PATH) return null;
@@ -196,7 +196,6 @@ const service$4 = {
     name: "GitHub Actions",
     detect: ({ env })=>Boolean(env.GITHUB_ACTIONS),
     config: async ({ env })=>{
-        var _payload_pull_request, _payload_pull_request1, _payload_pull_request2;
         const payload = readEventPayload({
             env
         });
@@ -215,7 +214,7 @@ const service$4 = {
             nonce: `${env.GITHUB_RUN_ID}-${env.GITHUB_RUN_ATTEMPT}` || null
         };
         // If the job is triggered by from a "deployment" or a "deployment_status"
-        if (payload === null || payload === void 0 ? void 0 : payload.deployment) {
+        if (payload?.deployment) {
             debug("Deployment event detected");
             // Try to find a relevant pull request for the sha
             const pullRequest = await getPullRequestFromHeadSha({
@@ -225,18 +224,18 @@ const service$4 = {
                 ...commonConfig,
                 // If no pull request is found, we fallback to the deployment environment as branch name
                 // Branch name is required to create a build but has no real impact on the build.
-                branch: (pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.head.ref) || payload.deployment.environment || null,
-                prNumber: (pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.number) || null,
-                prHeadCommit: (pullRequest === null || pullRequest === void 0 ? void 0 : pullRequest.head.sha) || null
+                branch: pullRequest?.head.ref || payload.deployment.environment || null,
+                prNumber: pullRequest?.number || null,
+                prHeadCommit: pullRequest?.head.sha || null
             };
         }
         return {
             ...commonConfig,
-            branch: (payload === null || payload === void 0 ? void 0 : (_payload_pull_request = payload.pull_request) === null || _payload_pull_request === void 0 ? void 0 : _payload_pull_request.head.ref) || getBranch({
+            branch: payload?.pull_request?.head.ref || getBranch({
                 env
             }) || null,
-            prNumber: (payload === null || payload === void 0 ? void 0 : (_payload_pull_request1 = payload.pull_request) === null || _payload_pull_request1 === void 0 ? void 0 : _payload_pull_request1.number) || null,
-            prHeadCommit: (payload === null || payload === void 0 ? void 0 : (_payload_pull_request2 = payload.pull_request) === null || _payload_pull_request2 === void 0 ? void 0 : _payload_pull_request2.head.sha) ?? null
+            prNumber: payload?.pull_request?.number || null,
+            prHeadCommit: payload?.pull_request?.head.sha ?? null
         };
     }
 };
@@ -495,21 +494,21 @@ async function readConfig(options = {}) {
     const ciEnv = await getCiEnvironment();
     config.load({
         apiBaseUrl: options.apiBaseUrl || config.get("apiBaseUrl"),
-        commit: options.commit || config.get("commit") || (ciEnv === null || ciEnv === void 0 ? void 0 : ciEnv.commit) || null,
-        branch: options.branch || config.get("branch") || (ciEnv === null || ciEnv === void 0 ? void 0 : ciEnv.branch) || null,
+        commit: options.commit || config.get("commit") || ciEnv?.commit || null,
+        branch: options.branch || config.get("branch") || ciEnv?.branch || null,
         token: options.token || config.get("token") || null,
         buildName: options.buildName || config.get("buildName") || null,
-        prNumber: options.prNumber || config.get("prNumber") || (ciEnv === null || ciEnv === void 0 ? void 0 : ciEnv.prNumber) || null,
-        prHeadCommit: config.get("prHeadCommit") || (ciEnv === null || ciEnv === void 0 ? void 0 : ciEnv.prHeadCommit) || null,
+        prNumber: options.prNumber || config.get("prNumber") || ciEnv?.prNumber || null,
+        prHeadCommit: config.get("prHeadCommit") || ciEnv?.prHeadCommit || null,
         referenceBranch: options.referenceBranch || config.get("referenceBranch") || null,
         referenceCommit: options.referenceCommit || config.get("referenceCommit") || null,
-        ciService: (ciEnv === null || ciEnv === void 0 ? void 0 : ciEnv.name) || null,
-        owner: (ciEnv === null || ciEnv === void 0 ? void 0 : ciEnv.owner) || null,
-        repository: (ciEnv === null || ciEnv === void 0 ? void 0 : ciEnv.repository) || null,
-        jobId: (ciEnv === null || ciEnv === void 0 ? void 0 : ciEnv.jobId) || null,
-        runId: (ciEnv === null || ciEnv === void 0 ? void 0 : ciEnv.runId) || null,
+        ciService: ciEnv?.name || null,
+        owner: ciEnv?.owner || null,
+        repository: ciEnv?.repository || null,
+        jobId: ciEnv?.jobId || null,
+        runId: ciEnv?.runId || null,
         parallel: options.parallel ?? config.get("parallel") ?? false,
-        parallelNonce: options.parallelNonce || config.get("parallelNonce") || (ciEnv === null || ciEnv === void 0 ? void 0 : ciEnv.nonce) || null,
+        parallelNonce: options.parallelNonce || config.get("parallelNonce") || ciEnv?.nonce || null,
         parallelTotal: options.parallelTotal || config.get("parallelTotal") || null
     });
     config.validate();
@@ -612,8 +611,7 @@ const createArgosApiClient = (options)=>{
             });
             return response.data;
         } catch (error) {
-            var _error_response_data_error, _error_response_data, _error_response;
-            if (error === null || error === void 0 ? void 0 : (_error_response = error.response) === null || _error_response === void 0 ? void 0 : (_error_response_data = _error_response.data) === null || _error_response_data === void 0 ? void 0 : (_error_response_data_error = _error_response_data.error) === null || _error_response_data_error === void 0 ? void 0 : _error_response_data_error.message) {
+            if (error?.response?.data?.error?.message) {
                 // @ts-ignore
                 throw new Error(error.response.data.error.message, {
                     cause: error
@@ -678,7 +676,11 @@ async function uploadFilesToS3(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 })=>{
+        const chunk = chunks[i];
+        if (!chunk) {
+            throw new Error(`Invariant: chunk ${i} is empty`);
+        }
+        await Promise.all(chunk.map(async ({ url, path, contentType })=>{
             await upload$1({
                 url,
                 path,
@@ -691,7 +693,6 @@ async function uploadFilesToS3(files) {
 /**
  * Upload screenshots to argos-ci.com.
  */ async function upload(params) {
-    var _result_pwTraces;
     debug("Starting upload with params", params);
     // Read config
     const config = await getConfigFromOptions(params);
@@ -774,7 +775,7 @@ async function uploadFilesToS3(files) {
                 contentType: "image/png"
             };
         }),
-        ...((_result_pwTraces = result.pwTraces) === null || _result_pwTraces === void 0 ? void 0 : _result_pwTraces.map(({ key, putUrl })=>{
+        ...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`);
@@ -784,22 +785,19 @@ async function uploadFilesToS3(files) {
                 path: screenshot.pwTrace.path,
                 contentType: "application/json"
             };
-        })) ?? []
+        }) ?? []
     ];
     await uploadFilesToS3(uploadFiles);
     // Update build
     debug("Updating build");
     await apiClient.updateBuild({
         buildId: result.build.id,
-        screenshots: screenshots.map((screenshot)=>{
-            var _screenshot_pwTrace;
-            return {
+        screenshots: screenshots.map((screenshot)=>({
                 key: screenshot.hash,
                 name: screenshot.name,
                 metadata: screenshot.metadata,
-                pwTraceKey: ((_screenshot_pwTrace = screenshot.pwTrace) === null || _screenshot_pwTrace === void 0 ? void 0 : _screenshot_pwTrace.hash) ?? null
-            };
-        }),
+                pwTraceKey: screenshot.pwTrace?.hash ?? null
+            })),
         parallel: config.parallel,
         parallelTotal: config.parallelTotal
     });

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.5.5",
+  "version": "2.1.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "types": "./dist/index.d.ts",
@@ -24,7 +24,7 @@
     "url": "https://github.com/argos-ci/argos-javascript/issues"
   },
   "engines": {
-    "node": ">=16.0.0"
+    "node": ">=18.0.0"
   },
   "license": "MIT",
   "keywords": [
@@ -40,24 +40,24 @@
     "access": "public"
   },
   "dependencies": {
-    "@argos-ci/util": "1.2.1",
-    "axios": "^1.5.0",
+    "@argos-ci/util": "2.0.0",
+    "axios": "^1.6.8",
     "convict": "^6.2.4",
     "debug": "^4.3.4",
-    "fast-glob": "^3.3.1",
-    "sharp": "^0.32.5",
-    "tmp": "^0.2.1"
+    "fast-glob": "^3.3.2",
+    "sharp": "^0.33.3",
+    "tmp": "^0.2.3"
   },
   "devDependencies": {
-    "@types/convict": "^6.1.4",
+    "@types/convict": "^6.1.6",
     "@types/debug": "^4.1.12",
-    "@types/tmp": "^0.2.3",
-    "msw": "^1.3.0"
+    "@types/tmp": "^0.2.6",
+    "msw": "^2.2.13"
   },
   "scripts": {
     "prebuild": "rm -rf dist",
     "build": "rollup -c",
     "e2e": "node ./e2e/upload.cjs && node ./e2e/upload.mjs"
   },
-  "gitHead": "4da90d82cfb93a1377497731164b9fbaeb9fb7f6"
+  "gitHead": "1d91294d32a09302aa8890807ddd810e14e9950b"
 }