@argos-ci/core 3.2.2 → 4.0.0

package/dist/index.d.ts

@@ -288,7 +288,6 @@ interface Config {
     parallelTotal: number | null;
     referenceBranch: string | null;
     referenceCommit: string | null;
-    owner: string | null;
     repository: string | null;
     jobId: string | null;
     runId: string | null;

package/dist/index.js

@@ -5,7 +5,7 @@ import { createClient, throwAPIError } from "@argos-ci/api-client";
 import convict from "convict";
 
 // src/ci-environment/git.ts
-import { execSync } from "node:child_process";
+import { execSync } from "child_process";
 
 // src/debug.ts
 import createDebug from "debug";
@@ -49,6 +49,14 @@ function branch() {
     return null;
   }
 }
+function getRepositoryURL() {
+  try {
+    const url = execSync("git config --get remote.origin.url").toString().trim();
+    return url;
+  } catch {
+    return null;
+  }
+}
 function getMergeBaseCommitShaWithDepth(input) {
   execSync(
     `git fetch --update-head-ok --depth ${input.depth} origin ${input.head}:${input.head}`
@@ -99,19 +107,27 @@ function listParentCommits(input) {
 }
 
 // src/ci-environment/services/bitrise.ts
-var getPrNumber = ({ env }) => {
+function getPrNumber(context) {
+  const { env } = context;
   return env.BITRISE_PULL_REQUEST ? Number(env.BITRISE_PULL_REQUEST) : null;
-};
+}
+function getRepository(context) {
+  const { env } = context;
+  if (env.BITRISEIO_GIT_REPOSITORY_OWNER && env.BITRISEIO_GIT_REPOSITORY_SLUG) {
+    return `${env.BITRISEIO_GIT_REPOSITORY_OWNER}/${env.BITRISEIO_GIT_REPOSITORY_SLUG}`;
+  }
+  return null;
+}
 var service = {
   name: "Bitrise",
   key: "bitrise",
   detect: ({ env }) => Boolean(env.BITRISE_IO),
-  config: ({ env }) => {
+  config: (context) => {
+    const { env } = context;
     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,
+      repository: getRepository(context),
       jobId: null,
       runId: null,
       runAttempt: null,
@@ -126,18 +142,40 @@ var service = {
 };
 var bitrise_default = service;
 
+// src/util/url.ts
+function getRepositoryNameFromURL(url) {
+  const sshMatch = url.match(/^git@[^:]+:([^/]+)\/(.+?)(?:\.git)?$/);
+  if (sshMatch && sshMatch[1] && sshMatch[2]) {
+    return `${sshMatch[1]}/${sshMatch[2]}`;
+  }
+  const httpsMatch = url.match(
+    /^(?:https?|git):\/\/[^/]+\/([^/]+)\/(.+?)(?:\.git)?$/
+  );
+  if (httpsMatch && httpsMatch[1] && httpsMatch[2]) {
+    return `${httpsMatch[1]}/${httpsMatch[2]}`;
+  }
+  return null;
+}
+
 // src/ci-environment/services/buildkite.ts
+function getRepository2(context) {
+  const { env } = context;
+  if (env.BUILDKITE_REPO) {
+    return getRepositoryNameFromURL(env.BUILDKITE_REPO);
+  }
+  return null;
+}
 var service2 = {
   name: "Buildkite",
   key: "buildkite",
   detect: ({ env }) => Boolean(env.BUILDKITE),
-  config: ({ env }) => {
+  config: (context) => {
+    const { env } = context;
     return {
       // Buildkite doesn't work well so we fallback to git to ensure we have commit and branch
       commit: env.BUILDKITE_COMMIT || head() || null,
       branch: env.BUILDKITE_BRANCH || branch() || null,
-      owner: env.BUILDKITE_ORGANIZATION_SLUG || null,
-      repository: env.BUILDKITE_PROJECT_SLUG || null,
+      repository: getRepository2(context),
       jobId: null,
       runId: null,
       runAttempt: null,
@@ -176,8 +214,7 @@ var service3 = {
 var heroku_default = service3;
 
 // src/ci-environment/services/github-actions.ts
-import { existsSync, readFileSync } from "node:fs";
-import axios from "axios";
+import { existsSync, readFileSync } from "fs";
 async function getPullRequestFromHeadSha({ env }, sha) {
   debug("Fetching pull request number from head sha", sha);
   if (!env.GITHUB_REPOSITORY) {
@@ -203,27 +240,32 @@ DISABLE_GITHUB_TOKEN_WARNING: true
     return null;
   }
   try {
-    const result = await axios.get(
-      `https://api.github.com/repos/${env.GITHUB_REPOSITORY}/pulls`,
-      {
-        params: {
-          state: "open",
-          sort: "updated",
-          per_page: 30,
-          page: 1
-        },
-        headers: {
-          Accept: "application/vnd.github+json",
-          Authorization: `Bearer ${process.env.GITHUB_TOKEN}`,
-          "X-GitHub-Api-Version": "2022-11-28"
-        }
-      }
+    const url = new URL(
+      `https://api.github.com/repos/${env.GITHUB_REPOSITORY}/pulls`
     );
-    if (result.data.length === 0) {
+    url.search = new URLSearchParams({
+      state: "open",
+      sort: "updated",
+      per_page: "30",
+      page: "1"
+    }).toString();
+    const response = await fetch(url, {
+      headers: {
+        Accept: "application/vnd.github+json",
+        Authorization: `Bearer ${process.env.GITHUB_TOKEN}`,
+        "X-GitHub-Api-Version": "2022-11-28"
+      },
+      signal: AbortSignal.timeout(1e4)
+    });
+    if (!response.ok) {
+      throw new Error(`Failed to fetch pull requests: ${response.statusText}`);
+    }
+    const result = await response.json();
+    if (result.length === 0) {
       debug("Aborting because no pull request found");
       return null;
     }
-    const matchingPr = result.data.find((pr) => pr.head.sha === sha);
+    const matchingPr = result.find((pr) => pr.head.sha === sha);
     if (matchingPr) {
       debug("Pull request found", matchingPr);
       return matchingPr;
@@ -256,11 +298,15 @@ function getBranchFromPayload(payload) {
   }
   return null;
 }
-function getRepositoryFromContext({ env }) {
-  if (!env.GITHUB_REPOSITORY) {
-    return null;
+function getRepository3(context, payload) {
+  const { env } = context;
+  if (payload && "pull_request" in payload && payload.pull_request) {
+    const pr = payload.pull_request;
+    if (pr.head && pr.head.repo && pr.head.repo.full_name) {
+      return pr.head.repo.full_name;
+    }
   }
-  return env.GITHUB_REPOSITORY.split("/")[1] || null;
+  return env.GITHUB_REPOSITORY || null;
 }
 function readEventPayload({ env }) {
   if (!env.GITHUB_EVENT_PATH) {
@@ -297,8 +343,7 @@ var service4 = {
     const pullRequest = payload ? getPullRequestFromPayload(payload) : await getPullRequestFromHeadSha(context, sha);
     return {
       commit: sha,
-      owner: env.GITHUB_REPOSITORY_OWNER || null,
-      repository: getRepositoryFromContext(context),
+      repository: getRepository3(context, payload),
       jobId: env.GITHUB_JOB || null,
       runId: env.GITHUB_RUN_ID || null,
       runAttempt: env.GITHUB_RUN_ATTEMPT ? Number(env.GITHUB_RUN_ATTEMPT) : null,
@@ -315,24 +360,34 @@ var service4 = {
 var github_actions_default = service4;
 
 // src/ci-environment/services/circleci.ts
-var getPrNumber2 = ({ env }) => {
-  const branchRegex = /pull\/(\d+)/;
-  const matches = branchRegex.exec(env.CIRCLE_PULL_REQUEST || "");
+function getPrNumber2(context) {
+  const { env } = context;
+  const matches = /pull\/(\d+)/.exec(env.CIRCLE_PULL_REQUEST || "");
   if (matches) {
     return Number(matches[1]);
   }
   return null;
-};
+}
+function getRepository4(context) {
+  const { env } = context;
+  if (env.CIRCLE_PR_REPONAME && env.CIRCLE_PR_USERNAME) {
+    return `${env.CIRCLE_PR_USERNAME}/${env.CIRCLE_PR_REPONAME}`;
+  }
+  if (env.CIRCLE_PROJECT_USERNAME && env.CIRCLE_PROJECT_REPONAME) {
+    return `${env.CIRCLE_PROJECT_USERNAME}/${env.CIRCLE_PROJECT_REPONAME}`;
+  }
+  return null;
+}
 var service5 = {
   name: "CircleCI",
   key: "circleci",
   detect: ({ env }) => Boolean(env.CIRCLECI),
-  config: ({ env }) => {
+  config: (context) => {
+    const { env } = context;
     return {
       commit: env.CIRCLE_SHA1 || null,
       branch: env.CIRCLE_BRANCH || null,
-      owner: env.CIRCLE_PROJECT_USERNAME || null,
-      repository: env.CIRCLE_PROJECT_REPONAME || null,
+      repository: getRepository4(context),
       jobId: null,
       runId: null,
       runAttempt: null,
@@ -348,24 +403,23 @@ var service5 = {
 var circleci_default = service5;
 
 // src/ci-environment/services/travis.ts
-var getOwner = ({ env }) => {
-  if (!env.TRAVIS_REPO_SLUG) {
-    return null;
+function getRepository5(context) {
+  const { env } = context;
+  if (env.TRAVIS_PULL_REQUEST_SLUG) {
+    return env.TRAVIS_PULL_REQUEST_SLUG;
   }
-  return env.TRAVIS_REPO_SLUG.split("/")[0] || null;
-};
-var getRepository = ({ env }) => {
-  if (!env.TRAVIS_REPO_SLUG) {
-    return null;
+  if (env.TRAVIS_REPO_SLUG) {
+    return env.TRAVIS_REPO_SLUG;
   }
-  return env.TRAVIS_REPO_SLUG.split("/")[1] || null;
-};
-var getPrNumber3 = ({ env }) => {
+  return null;
+}
+function getPrNumber3(context) {
+  const { env } = context;
   if (env.TRAVIS_PULL_REQUEST) {
     return Number(env.TRAVIS_PULL_REQUEST);
   }
   return null;
-};
+}
 var service6 = {
   name: "Travis CI",
   key: "travis",
@@ -375,8 +429,7 @@ var service6 = {
     return {
       commit: env.TRAVIS_COMMIT || null,
       branch: env.TRAVIS_BRANCH || null,
-      owner: getOwner(ctx),
-      repository: getRepository(ctx),
+      repository: getRepository5(ctx),
       jobId: null,
       runId: null,
       runAttempt: null,
@@ -392,16 +445,23 @@ var service6 = {
 var travis_default = service6;
 
 // src/ci-environment/services/gitlab.ts
+function getRepository6(context) {
+  const { env } = context;
+  if (env.CI_MERGE_REQUEST_PROJECT_PATH) {
+    return env.CI_MERGE_REQUEST_PROJECT_PATH;
+  }
+  return env.CI_PROJECT_PATH || null;
+}
 var service7 = {
   name: "GitLab",
   key: "gitlab",
   detect: ({ env }) => env.GITLAB_CI === "true",
-  config: ({ env }) => {
+  config: (context) => {
+    const { env } = context;
     return {
       commit: env.CI_COMMIT_SHA || null,
       branch: env.CI_COMMIT_REF_NAME || null,
-      owner: null,
-      repository: null,
+      repository: getRepository6(context),
       jobId: null,
       runId: null,
       runAttempt: null,
@@ -417,6 +477,13 @@ var service7 = {
 var gitlab_default = service7;
 
 // src/ci-environment/services/git.ts
+function getRepository7() {
+  const repositoryURL = getRepositoryURL();
+  if (!repositoryURL) {
+    return null;
+  }
+  return getRepositoryNameFromURL(repositoryURL);
+}
 var service8 = {
   name: "Git",
   key: "git",
@@ -425,8 +492,7 @@ var service8 = {
     return {
       commit: head() || null,
       branch: branch() || null,
-      owner: null,
-      repository: null,
+      repository: getRepository7(),
       jobId: null,
       runId: null,
       runAttempt: null,
@@ -673,7 +739,6 @@ async function readConfig(options = {}) {
     prBaseBranch: config.get("prBaseBranch") || ciEnv?.prBaseBranch || null,
     referenceBranch: options.referenceBranch || config.get("referenceBranch") || null,
     referenceCommit: options.referenceCommit || config.get("referenceCommit") || null,
-    owner: ciEnv?.owner || null,
     repository: ciEnv?.repository || null,
     jobId: ciEnv?.jobId || null,
     runId: ciEnv?.runId || null,
@@ -691,7 +756,7 @@ async function readConfig(options = {}) {
 }
 
 // src/discovery.ts
-import { resolve } from "node:path";
+import { resolve } from "path";
 import glob from "fast-glob";
 var discoverScreenshots = async (patterns, { root = process.cwd(), ignore } = {}) => {
   debug(
@@ -709,8 +774,8 @@ var discoverScreenshots = async (patterns, { root = process.cwd(), ignore } = {}
 };
 
 // src/optimize.ts
-import { promisify } from "node:util";
-import { basename } from "node:path";
+import { promisify } from "util";
+import { basename } from "path";
 import sharp from "sharp";
 import tmp from "tmp";
 var tmpFile = promisify(tmp.file);
@@ -775,8 +840,8 @@ var optimizeScreenshot = async (filepath) => {
 };
 
 // src/hashing.ts
-import { createReadStream } from "node:fs";
-import { createHash } from "node:crypto";
+import { createReadStream } from "fs";
+import { createHash } from "crypto";
 var hashFile = async (filepath) => {
   const fileStream = createReadStream(filepath);
   const hash = createHash("sha256");
@@ -824,19 +889,24 @@ function getAuthToken({
 }
 
 // src/s3.ts
-import { readFile } from "node:fs/promises";
-import axios2 from "axios";
-var upload = async (input) => {
+import { readFile } from "fs/promises";
+async function uploadFile(input) {
   const file = await readFile(input.path);
-  await axios2({
+  const response = await fetch(input.url, {
     method: "PUT",
-    url: input.url,
-    data: file,
     headers: {
-      "Content-Type": input.contentType
-    }
+      "Content-Type": input.contentType,
+      "Content-Length": file.length.toString()
+    },
+    signal: AbortSignal.timeout(3e4),
+    body: new Uint8Array(file)
   });
-};
+  if (!response.ok) {
+    throw new Error(
+      `Failed to upload file to ${input.url}: ${response.status} ${response.statusText}`
+    );
+  }
+}
 
 // src/util/chunk.ts
 var chunk = (collection, size) => {
@@ -854,7 +924,7 @@ import { getPlaywrightTracePath, readMetadata } from "@argos-ci/util";
 
 // src/version.ts
 import { readVersionFromPackage } from "@argos-ci/util";
-import { createRequire } from "node:module";
+import { createRequire } from "module";
 var require2 = createRequire(import.meta.url);
 async function getArgosCoreSDKIdentifier() {
   const pkgPath = require2.resolve("@argos-ci/core/package.json");
@@ -890,7 +960,7 @@ async function uploadFilesToS3(files) {
     }
     await Promise.all(
       chunk2.map(async ({ url, path, contentType }) => {
-        await upload({
+        await uploadFile({
           url,
           path,
           contentType
@@ -910,7 +980,7 @@ function formatPreviewUrl(url, formatter) {
     formatter.baseUrl
   ).href;
 }
-async function upload2(params) {
+async function upload(params) {
   debug("Starting upload with params", params);
   const [config, argosSdk] = await Promise.all([
     getConfigFromOptions(params),
@@ -1122,5 +1192,5 @@ async function finalize(params) {
 export {
   finalize,
   readConfig,
-  upload2 as upload
+  upload
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@argos-ci/core",
   "description": "Node.js SDK for visual testing with Argos.",
-  "version": "3.2.2",
+  "version": "4.0.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "exports": {
@@ -24,7 +24,7 @@
     "url": "https://github.com/argos-ci/argos-javascript/issues"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "license": "MIT",
   "keywords": [
@@ -40,21 +40,20 @@
     "access": "public"
   },
   "dependencies": {
-    "@argos-ci/api-client": "0.8.2",
-    "@argos-ci/util": "2.3.3",
-    "axios": "^1.8.4",
+    "@argos-ci/api-client": "0.9.0",
+    "@argos-ci/util": "3.0.0",
     "convict": "^6.2.4",
     "debug": "^4.4.0",
     "fast-glob": "^3.3.3",
-    "sharp": "^0.33.5",
+    "sharp": "^0.34.3",
     "tmp": "^0.2.3"
   },
   "devDependencies": {
-    "@octokit/webhooks": "^13.7.5",
+    "@octokit/webhooks": "^14.1.3",
     "@types/convict": "^6.1.6",
     "@types/debug": "^4.1.12",
     "@types/tmp": "^0.2.6",
-    "msw": "^2.7.3",
+    "msw": "^2.10.4",
     "vitest": "catalog:"
   },
   "scripts": {
@@ -65,5 +64,5 @@
     "lint": "eslint .",
     "test": "vitest"
   },
-  "gitHead": "ecab2281c36828d0c43728e3ed98e1eefe227c99"
+  "gitHead": "807e4a9f3c4bfddd4197ed7394b032a39bc1c58e"
 }